Merge pull request #85 from asdflj/nee

add nee support
GTNewHorizons · Feb 16, 2023 · 271917c · 271917c
2 parents e292a4d + 7d09bf6
commit 271917c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 28 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,8 +1,8 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev')
-    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-156-GTNH:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.32-GTNH:dev')
+    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-158-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
     compile('com.github.GTNewHorizons:waila:1.5.22:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.32:dev') { transitive = false }

diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java
@@ -109,8 +109,6 @@ public void readFromNBT() {
         this.setSubstitution(data.getBoolean("substitute"));
         this.setCombineMode(data.getBoolean("combine"));
         this.setBeSubstitute(data.getBoolean("beSubstitute"));
-        this.setPrioritization(data.getBoolean("priorization"));
-        this.setInverted(data.getBoolean("inverted"));
         this.setActivePage(data.getInteger("activePage"));
     }
 
@@ -120,8 +118,6 @@ public void writeToNBT() {
         data.setBoolean("substitute", this.substitute);
         data.setBoolean("combine", this.combine);
         data.setBoolean("beSubstitute", this.beSubstitute);
-        data.setBoolean("priorization", this.prioritize);
-        data.setBoolean("inverted", this.inverted);
         data.setInteger("activePage", this.activePage);
     }
 
@@ -239,7 +235,7 @@ private void fixCraftingRecipes() {
 
     @Override
     public boolean isInverted() {
-        return this.inverted;
+        return false;
     }
 
     @Override
@@ -266,7 +262,7 @@ public boolean canBeSubstitute() {
 
     @Override
     public boolean isPrioritize() {
-        return this.prioritize;
+        return false;
     }
 
     @Override

diff --git a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java
@@ -14,26 +14,37 @@ public void loadConfig() {
         API.registerNEIGuiHandler(new NEIGuiHandler());
         API.addSearchProvider(new NEIItemFilter());
         for (String identifier : FluidRecipe.getSupportRecipes()) {
-            API.registerGuiOverlayHandler(
-                    GuiFluidCraftingWireless.class,
-                    FluidCraftingTransferHandler.INSTANCE,
-                    identifier);
-            API.registerGuiOverlayHandler(
-                    GuiFluidPatternWireless.class,
-                    FluidPatternTerminalRecipeTransferHandler.INSTANCE,
-                    identifier);
-            API.registerGuiOverlayHandler(
-                    GuiFluidPatternExWireless.class,
-                    FluidPatternTerminalRecipeTransferHandler.INSTANCE,
-                    identifier);
-            API.registerGuiOverlayHandler(
-                    GuiFluidPatternTerminal.class,
-                    FluidPatternTerminalRecipeTransferHandler.INSTANCE,
-                    identifier);
-            API.registerGuiOverlayHandler(
-                    GuiFluidPatternTerminalEx.class,
-                    FluidPatternTerminalRecipeTransferHandler.INSTANCE,
-                    identifier);
+            // that NEE handlers take priority
+            if (!API.hasGuiOverlayHandler(GuiFluidCraftingWireless.class, identifier)) {
+                API.registerGuiOverlayHandler(
+                        GuiFluidCraftingWireless.class,
+                        FluidCraftingTransferHandler.INSTANCE,
+                        identifier);
+            }
+            if (!API.hasGuiOverlayHandler(GuiFluidPatternWireless.class, identifier)) {
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternWireless.class,
+                        FluidPatternTerminalRecipeTransferHandler.INSTANCE,
+                        identifier);
+            }
+            if (!API.hasGuiOverlayHandler(GuiFluidPatternExWireless.class, identifier)) {
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternExWireless.class,
+                        FluidPatternTerminalRecipeTransferHandler.INSTANCE,
+                        identifier);
+            }
+            if (!API.hasGuiOverlayHandler(GuiFluidPatternTerminal.class, identifier)) {
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternTerminal.class,
+                        FluidPatternTerminalRecipeTransferHandler.INSTANCE,
+                        identifier);
+            }
+            if (!API.hasGuiOverlayHandler(GuiFluidPatternTerminalEx.class, identifier)) {
+                API.registerGuiOverlayHandler(
+                        GuiFluidPatternTerminalEx.class,
+                        FluidPatternTerminalRecipeTransferHandler.INSTANCE,
+                        identifier);
+            }
         }
     }