Fix more broken NEI caused by renaming (GTNewHorizons#3102)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
evgengoldwar · Sep 7, 2024 · 543dd4a · 543dd4a
1 parent 8582f7a
commit 543dd4a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java b/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java
@@ -28,7 +28,7 @@ public class BioLabNEIHandler extends GTNEIDefaultHandler {
 
     public BioLabNEIHandler(RecipeCategory recipeCategory) {
         super(recipeCategory);
-        if (!BWNEIConfig.sIsAdded) {
+        if (!NEIBWConfig.sIsAdded) {
             FMLInterModComms.sendRuntimeMessage(
                 GTValues.GT,
                 "NEIPlugins",
@@ -50,7 +50,7 @@ public void loadCraftingRecipes(ItemStack aResult) {
             && aResult.getItemDamage() < 3
             && aResult.getTagCompound() != null) {
             for (CachedDefaultRecipe recipe : this.getCache())
-                if (BWNEIConfig.checkRecipe(aResult, recipe.mOutputs)) this.arecipes.add(recipe);
+                if (NEIBWConfig.checkRecipe(aResult, recipe.mOutputs)) this.arecipes.add(recipe);
         } else {
             super.loadCraftingRecipes(aResult);
         }
@@ -62,7 +62,7 @@ public void loadUsageRecipes(ItemStack aResult) {
             && aResult.getItemDamage() < 3
             && aResult.getTagCompound() != null) {
             for (CachedDefaultRecipe recipe : this.getCache())
-                if (BWNEIConfig.checkRecipe(aResult, recipe.mInputs)) this.arecipes.add(recipe);
+                if (NEIBWConfig.checkRecipe(aResult, recipe.mInputs)) this.arecipes.add(recipe);
         } else {
             super.loadUsageRecipes(aResult);
         }

diff --git a/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java b/src/main/java/bartworks/neiHandler/BioVatNEIHandler.java
@@ -31,7 +31,7 @@ public class BioVatNEIHandler extends GTNEIDefaultHandler {
 
     public BioVatNEIHandler(RecipeCategory recipeCategory) {
         super(recipeCategory);
-        if (!BWNEIConfig.sIsAdded) {
+        if (!NEIBWConfig.sIsAdded) {
             FMLInterModComms.sendRuntimeMessage(
                 GTValues.GT,
                 "NEIPlugins",
@@ -53,7 +53,7 @@ private void loadLabPartRecipes(ItemStack aResult) {
             // see constructor of CachedDefaultRecipe on why relx==120 and rely==52 means special slot
             for (PositionedStack stack : recipe.mInputs) {
                 if (stack.relx == 120 && stack.rely == 52
-                    && BWNEIConfig.checkRecipe(aResult, Collections.singletonList(stack))) this.arecipes.add(recipe);
+                    && NEIBWConfig.checkRecipe(aResult, Collections.singletonList(stack))) this.arecipes.add(recipe);
             }
         }
     }

diff --git a/...ava/bartworks/neiHandler/BWNEIConfig.java → ...ava/bartworks/neiHandler/NEIBWConfig.java b/...ava/bartworks/neiHandler/BWNEIConfig.java → ...ava/bartworks/neiHandler/NEIBWConfig.java
@@ -25,7 +25,7 @@
 import codechicken.nei.api.IConfigureNEI;
 import gregtech.api.enums.OrePrefixes;
 
-public class BWNEIConfig implements IConfigureNEI {
+public class NEIBWConfig implements IConfigureNEI {
 
     static boolean sIsAdded = true;
 
@@ -77,11 +77,11 @@ public void loadConfig() {
             API.hideItem(stack);
         }
 
-        BWNEIConfig.sIsAdded = false;
+        NEIBWConfig.sIsAdded = false;
         new OreNEIHandler();
         new BioVatNEIHandler(BartWorksRecipeMaps.bacterialVatRecipes.getDefaultRecipeCategory());
         new BioLabNEIHandler(BartWorksRecipeMaps.bioLabRecipes.getDefaultRecipeCategory());
-        BWNEIConfig.sIsAdded = true;
+        NEIBWConfig.sIsAdded = true;
     }
 
     @Override

diff --git a/src/main/java/bartworks/neiHandler/OreNEIHandler.java b/src/main/java/bartworks/neiHandler/OreNEIHandler.java
@@ -40,7 +40,7 @@
 public class OreNEIHandler extends TemplateRecipeHandler {
 
     public OreNEIHandler() {
-        if (!BWNEIConfig.sIsAdded) {
+        if (!NEIBWConfig.sIsAdded) {
             FMLInterModComms.sendRuntimeMessage(
                 MainMod.MOD_ID,
                 "NEIPlugins",

diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -46,7 +46,7 @@
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches;
 import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
-import gtPlusPlus.nei.GTPPNEIConfig;
+import gtPlusPlus.nei.NEIGTPPConfig;
 import gtPlusPlus.xmod.gregtech.common.render.CapeRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.FlaskRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.MachineBlockRenderer;
@@ -97,7 +97,7 @@ public void init(final FMLInitializationEvent e) {
 
         new FlaskRenderer();
 
-        MinecraftForge.EVENT_BUS.register(new GTPPNEIConfig());
+        MinecraftForge.EVENT_BUS.register(new NEIGTPPConfig());
 
         super.init(e);
     }

diff --git a/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java
@@ -43,7 +43,7 @@ public LFTRSpargingNEIHandler() {
                 new Rectangle(65, 13, 36, 18),
                 this.getOverlayIdentifier(),
                 new Object[0]));
-        if (!GTPPNEIConfig.sIsAdded) {
+        if (!NEIGTPPConfig.sIsAdded) {
             FMLInterModComms.sendRuntimeMessage(
                 GTValues.GT,
                 "NEIPlugins",

diff --git a/...in/java/gtPlusPlus/nei/GTPPNEIConfig.java → ...in/java/gtPlusPlus/nei/NEIGTPPConfig.java b/...in/java/gtPlusPlus/nei/GTPPNEIConfig.java → ...in/java/gtPlusPlus/nei/NEIGTPPConfig.java
@@ -19,7 +19,7 @@
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
-public class GTPPNEIConfig implements IConfigureNEI {
+public class NEIGTPPConfig implements IConfigureNEI {
 
     public static boolean sIsAdded = true;