GTNewHorizons · slprime · Sep 7, 2024 · Sep 7, 2024 · Sep 7, 2024
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,18 +1,12 @@
 dependencies {
 
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-435-GTNH:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.6.26-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev")
 
     implementation("com.github.GTNewHorizons:Baubles:1.0.4:dev")
     implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.6:dev")
 
-    compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.26-gtnh:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.7.1-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.17:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.8.17:dev') { transitive=false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.26-gtnh:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.7.1-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.17:dev") { transitive = false }

diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java
@@ -12,11 +12,15 @@
 import org.lwjgl.input.Keyboard;
 
 import com.github.vfyjxf.nee.client.GuiEventHandler;
-import com.github.vfyjxf.nee.nei.NEECraftingHandler;
-import com.github.vfyjxf.nee.nei.NEECraftingHelper;
+import com.github.vfyjxf.nee.nei.NEECraftingTerminalHandler;
+import com.github.vfyjxf.nee.nei.NEEExtremeAutoCrafterHandler;
+import com.github.vfyjxf.nee.nei.NEEKnowledgeInscriberHandler;
+import com.github.vfyjxf.nee.nei.NEEPatternTerminalHandler;
+import com.github.vfyjxf.nee.nei.NEETerminalBookmarkContainerHandler;
 import com.github.vfyjxf.nee.processor.IRecipeProcessor;
 import com.github.vfyjxf.nee.processor.RecipeProcessor;
 import com.github.vfyjxf.nee.utils.ModIDs;
+import com.glodblock.github.client.gui.GuiFluidCraftingWireless;
 import com.glodblock.github.client.gui.GuiFluidPatternExWireless;
 import com.glodblock.github.client.gui.GuiFluidPatternTerminal;
 import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx;
@@ -58,22 +62,24 @@ public void loadConfig() {
 
         for (String ident : identifiers) {
             API.registerGuiOverlay(GuiPatternTerm.class, ident);
-            API.registerGuiOverlayHandler(GuiPatternTerm.class, NEECraftingHandler.INSTANCE, ident);
+            API.registerGuiOverlayHandler(GuiPatternTerm.class, NEEPatternTerminalHandler.instance, ident);
         }
 
         installCraftingTermSupport();
 
         installWirelessCraftingTermSupport();
 
-        installFluidPatternTerminalSupport(new HashSet<String>(identifiers));
+        installFluidPatternTerminalSupport(new HashSet<>(identifiers));
 
         installThaumicEnergisticsSupport();
 
         installAvaritiaddonsSupport();
 
-        installPatternTerminalExSupport(new HashSet<String>(identifiers));
+        installPatternTerminalExSupport(new HashSet<>(identifiers));
 
-        installFluidPatternTerminalExSupport(new HashSet<String>(identifiers));
+        installFluidPatternTerminalExSupport(new HashSet<>(identifiers));
+
+        installlBookmarkContainerHandler();
     }
 
     private void installFluidPatternTerminalExSupport(Set<String> identifiers) {
@@ -83,8 +89,15 @@ private void installFluidPatternTerminalExSupport(Set<String> identifiers) {
             for (String ident : identifiers) {
                 API.registerGuiOverlay(GuiFluidPatternTerminalEx.class, ident);
                 API.registerGuiOverlay(GuiFluidPatternExWireless.class, ident);
-                API.registerGuiOverlayHandler(GuiFluidPatternTerminalEx.class, NEECraftingHandler.INSTANCE, ident);
-                API.registerGuiOverlayHandler(GuiFluidPatternExWireless.class, NEECraftingHandler.INSTANCE, ident);
+
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternTerminalEx.class,
+                        NEEPatternTerminalHandler.instance,
+                        ident);
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternExWireless.class,
+                        NEEPatternTerminalHandler.instance,
+                        ident);
             }
         }
     }
@@ -94,12 +107,44 @@ private void installFluidPatternTerminalSupport(Set<String> identifiers) {
             for (String ident : identifiers) {
                 API.registerGuiOverlay(GuiFluidPatternTerminal.class, ident);
                 API.registerGuiOverlay(GuiFluidPatternWireless.class, ident);
-                API.registerGuiOverlayHandler(GuiFluidPatternTerminal.class, NEECraftingHandler.INSTANCE, ident);
-                API.registerGuiOverlayHandler(GuiFluidPatternWireless.class, NEECraftingHandler.INSTANCE, ident);
+
+                API.registerGuiOverlayHandler(GuiFluidPatternTerminal.class, NEEPatternTerminalHandler.instance, ident);
+                API.registerGuiOverlayHandler(GuiFluidPatternWireless.class, NEEPatternTerminalHandler.instance, ident);
             }
         }
     }
 
+    private void installlBookmarkContainerHandler() {
+        API.registerBookmarkContainerHandler(GuiPatternTerm.class, NEETerminalBookmarkContainerHandler.instance);
+        API.registerBookmarkContainerHandler(GuiPatternTermEx.class, NEETerminalBookmarkContainerHandler.instance);
+        API.registerBookmarkContainerHandler(GuiCraftingTerm.class, NEETerminalBookmarkContainerHandler.instance);
+
+        if (Loader.isModLoaded(ModIDs.FC)) {
+            API.registerBookmarkContainerHandler(
+                    GuiFluidPatternWireless.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+            API.registerBookmarkContainerHandler(
+                    GuiFluidPatternTerminal.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+            API.registerBookmarkContainerHandler(
+                    GuiFluidPatternTerminalEx.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+            API.registerBookmarkContainerHandler(
+                    GuiFluidPatternExWireless.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+
+            API.registerBookmarkContainerHandler(
+                    GuiFluidCraftingWireless.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+        }
+
+        if (Loader.isModLoaded(ModIDs.WCT)) {
+            API.registerBookmarkContainerHandler(
+                    GuiWirelessCraftingTerminal.class,
+                    NEETerminalBookmarkContainerHandler.instance);
+        }
+    }
+
     @Override
     public String getName() {
         return NotEnoughEnergistics.NAME;
@@ -150,14 +195,31 @@ public boolean mouseScrolled(GuiContainer gui, int mouseX, int mouseY, int scrol
     private void installCraftingTermSupport() {
         API.registerGuiOverlay(GuiCraftingTerm.class, "crafting");
         API.registerGuiOverlay(GuiCraftingTerm.class, "crafting2x2");
-        API.registerGuiOverlayHandler(GuiCraftingTerm.class, NEECraftingHelper.INSTANCE, "crafting");
-        API.registerGuiOverlayHandler(GuiCraftingTerm.class, NEECraftingHelper.INSTANCE, "crafting2x2");
+        API.registerGuiOverlayHandler(GuiCraftingTerm.class, NEECraftingTerminalHandler.instance, "crafting");
+        API.registerGuiOverlayHandler(GuiCraftingTerm.class, NEECraftingTerminalHandler.instance, "crafting2x2");
+
+        if (Loader.isModLoaded(ModIDs.FC)) {
+            API.registerGuiOverlayHandler(
+                    GuiFluidCraftingWireless.class,
+                    NEECraftingTerminalHandler.instance,
+                    "crafting");
+            API.registerGuiOverlayHandler(
+                    GuiFluidCraftingWireless.class,
+                    NEECraftingTerminalHandler.instance,
+                    "crafting2x2");
+        }
     }
 
     private void installWirelessCraftingTermSupport() {
         if (Loader.isModLoaded(ModIDs.WCT)) {
-            API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, NEECraftingHelper.INSTANCE, "crafting");
-            API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, NEECraftingHelper.INSTANCE, "crafting2x2");
+            API.registerGuiOverlayHandler(
+                    GuiWirelessCraftingTerminal.class,
+                    NEECraftingTerminalHandler.instance,
+                    "crafting");
+            API.registerGuiOverlayHandler(
+                    GuiWirelessCraftingTerminal.class,
+                    NEECraftingTerminalHandler.instance,
+                    "crafting2x2");
         }
     }
 
@@ -167,14 +229,18 @@ private void installThaumicEnergisticsSupport() {
         } catch (ClassNotFoundException e) {
             return;
         }
+
         if (Loader.isModLoaded("thaumcraftneiplugin")) {
             NotEnoughEnergistics.logger.info("Install ThaumicEnergistics support");
             API.registerGuiOverlay(GuiKnowledgeInscriber.class, "arcaneshapedrecipes");
             API.registerGuiOverlay(GuiKnowledgeInscriber.class, "arcaneshapelessrecipes");
-            API.registerGuiOverlayHandler(GuiKnowledgeInscriber.class, new NEECraftingHandler(), "arcaneshapedrecipes");
             API.registerGuiOverlayHandler(
                     GuiKnowledgeInscriber.class,
-                    new NEECraftingHandler(),
+                    NEEKnowledgeInscriberHandler.instance,
+                    "arcaneshapedrecipes");
+            API.registerGuiOverlayHandler(
+                    GuiKnowledgeInscriber.class,
+                    NEEKnowledgeInscriberHandler.instance,
                     "arcaneshapelessrecipes");
         }
     }
@@ -185,7 +251,7 @@ private void installPatternTerminalExSupport(Set<String> identifiers) {
         // PatternTermEx Support
         for (String ident : identifiers) {
             API.registerGuiOverlay(GuiPatternTermEx.class, ident);
-            API.registerGuiOverlayHandler(GuiPatternTermEx.class, new NEECraftingHandler(), ident);
+            API.registerGuiOverlayHandler(GuiPatternTermEx.class, NEEPatternTerminalHandler.instance, ident);
         }
     }
 
@@ -195,10 +261,14 @@ private void installAvaritiaddonsSupport() {
         } catch (ClassNotFoundException e) {
             return;
         }
+
         if (Loader.isModLoaded("avaritiaddons")) {
             NotEnoughEnergistics.logger.info("Install Avaritiaddons support");
             API.registerGuiOverlay(GuiExtremeAutoCrafter.class, "extreme");
-            API.registerGuiOverlayHandler(GuiExtremeAutoCrafter.class, new NEECraftingHandler(), "extreme");
+            API.registerGuiOverlayHandler(
+                    GuiExtremeAutoCrafter.class,
+                    NEEExtremeAutoCrafterHandler.instance,
+                    "extreme");
         }
     }
 }
diff --git a/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java b/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java
@@ -8,7 +8,6 @@
 import org.apache.logging.log4j.Logger;
 
 import com.github.vfyjxf.nee.config.NEEConfig;
-import com.github.vfyjxf.nee.network.NEEGuiHandler;
 import com.github.vfyjxf.nee.network.NEENetworkHandler;
 import com.github.vfyjxf.nee.proxy.CommonProxy;
 
@@ -19,7 +18,6 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
 
 @Mod(
         modid = NotEnoughEnergistics.MODID,
@@ -59,7 +57,5 @@ public void init(FMLInitializationEvent event) {
     }
 
     @EventHandler
-    public void postInit(FMLPostInitializationEvent event) {
-        NetworkRegistry.INSTANCE.registerGuiHandler(this, new NEEGuiHandler());
-    }
+    public void postInit(FMLPostInitializationEvent event) {}
 }
diff --git a/src/main/java/com/github/vfyjxf/nee/block/BlockPatternInterface.java b/src/main/java/com/github/vfyjxf/nee/block/BlockPatternInterface.java