Remove unnecessary duplicate menu type

62832 · Jul 11, 2024 · a4d0512 · a4d0512
1 parent 120af85
commit a4d0512
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 35 deletions.
diff --git a/src/main/java/gripe/_90/fulleng/FullblockEnergistics.java b/src/main/java/gripe/_90/fulleng/FullblockEnergistics.java
@@ -26,12 +26,10 @@
 import appeng.api.ids.AECreativeTabIds;
 import appeng.api.networking.IInWorldGridNodeHost;
 import appeng.api.util.AEColor;
-import appeng.client.gui.me.patternaccess.PatternAccessTermScreen;
 import appeng.client.render.ColorableBlockEntityBlockColor;
 import appeng.client.render.StaticItemColor;
 import appeng.core.AppEng;
 import appeng.core.network.serverbound.PartLeftClickPacket;
-import appeng.init.client.InitScreens;
 import appeng.util.InteractionUtil;
 
 import gripe._90.fulleng.block.entity.monitor.ConversionMonitorBlockEntity;
@@ -41,7 +39,6 @@
 import gripe._90.fulleng.integration.Addons;
 import gripe._90.fulleng.integration.requester.RequesterIntegration;
 import gripe._90.fulleng.integration.requester.RequesterTerminalMenu;
-import gripe._90.fulleng.menu.PatternAccessTerminalMenu;
 
 @Mod(FullblockEnergistics.MODID)
 public class FullblockEnergistics {
@@ -70,11 +67,6 @@ private void registerAll(RegisterEvent event) {
         event.register(Registries.BLOCK_ENTITY_TYPE, helper -> FullEngBlockEntities.getBlockEntities()
                 .forEach(helper::register));
 
-        event.register(
-                Registries.MENU,
-                AppEng.makeId("patternaccessterminal_f"),
-                () -> PatternAccessTerminalMenu.TYPE_FULLBLOCK);
-
         if (Addons.REQUESTER.isLoaded()) {
             event.register(
                     Registries.MENU, AppEng.makeId("requester_terminal_f"), () -> RequesterTerminalMenu.TYPE_FULLBLOCK);
@@ -111,12 +103,6 @@ private Client(IEventBus modEventBus) {
         }
 
         private void initScreens(RegisterMenuScreensEvent event) {
-            InitScreens.register(
-                    event,
-                    PatternAccessTerminalMenu.TYPE_FULLBLOCK,
-                    PatternAccessTermScreen<PatternAccessTerminalMenu>::new,
-                    "/screens/terminals/pattern_access_terminal.json");
-
             if (Addons.REQUESTER.isLoaded()) {
                 RequesterIntegration.initScreen(event);
             }

diff --git a/src/main/java/gripe/_90/fulleng/block/entity/terminal/PatternAccessTerminalBlockEntity.java b/src/main/java/gripe/_90/fulleng/block/entity/terminal/PatternAccessTerminalBlockEntity.java
@@ -12,9 +12,9 @@
 import appeng.api.storage.ILinkStatus;
 import appeng.api.storage.IPatternAccessTermMenuHost;
 import appeng.api.util.IConfigManagerBuilder;
+import appeng.menu.implementations.PatternAccessTermMenu;
 
 import gripe._90.fulleng.definition.FullEngBlockEntities;
-import gripe._90.fulleng.menu.PatternAccessTerminalMenu;
 
 public class PatternAccessTerminalBlockEntity extends TerminalBlockEntity implements IPatternAccessTermMenuHost {
     public PatternAccessTerminalBlockEntity(BlockPos pos, BlockState blockState) {
@@ -28,7 +28,7 @@ protected void registerSettings(IConfigManagerBuilder builder) {
 
     @Override
     public MenuType<?> getMenuType() {
-        return PatternAccessTerminalMenu.TYPE_FULLBLOCK;
+        return PatternAccessTermMenu.TYPE;
     }
 
     @Nullable

diff --git a/src/main/java/gripe/_90/fulleng/menu/PatternAccessTerminalMenu.java b/src/main/java/gripe/_90/fulleng/menu/PatternAccessTerminalMenu.java