aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorHoleFish <48403212+HoleFish@users.noreply.github.com>2024-09-08 00:25:53 +0800
committerGitHub <noreply@github.com>2024-09-07 16:25:53 +0000
commit543dd4a60fe6517940b6eaaaecfe85cafb7d826d (patch)
treefc1c9ef7e1dcf219a8eae4814c3decbe4740605e /src/main
parent8582f7a126d06b3733414820e8a9b67f617ffc68 (diff)
downloadGT5-Unofficial-543dd4a60fe6517940b6eaaaecfe85cafb7d826d.tar.gz
GT5-Unofficial-543dd4a60fe6517940b6eaaaecfe85cafb7d826d.tar.bz2
GT5-Unofficial-543dd4a60fe6517940b6eaaaecfe85cafb7d826d.zip
Fix more broken NEI caused by renaming (#3102)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/bartworks/neiHandler/BioLabNEIHandler.java6
-rw-r--r--src/main/java/bartworks/neiHandler/BioVatNEIHandler.java4
-rw-r--r--src/main/java/bartworks/neiHandler/NEIBWConfig.java (renamed from src/main/java/bartworks/neiHandler/BWNEIConfig.java)6
-rw-r--r--src/main/java/bartworks/neiHandler/OreNEIHandler.java2
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java4
-rw-r--r--src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java2
-rw-r--r--src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java (renamed from src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java)2
7 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java b/src/main/java/bartworks/neiHandler/BioLabNEIHandler.java
index 40c20e42d3..243f3fe426 100644
--- 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 class BioLabNEIHandler extends GTNEIDefaultHandler {
&& 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 class BioLabNEIHandler extends GTNEIDefaultHandler {
&& 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
index 08583a617d..90651d3d7a 100644
--- 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 @@ public class BioVatNEIHandler extends GTNEIDefaultHandler {
// 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/src/main/java/bartworks/neiHandler/BWNEIConfig.java b/src/main/java/bartworks/neiHandler/NEIBWConfig.java
index 6226613e91..64c91072ee 100644
--- a/src/main/java/bartworks/neiHandler/BWNEIConfig.java
+++ b/src/main/java/bartworks/neiHandler/NEIBWConfig.java
@@ -25,7 +25,7 @@ import codechicken.nei.api.API;
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 class BWNEIConfig implements IConfigureNEI {
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
index bbb6802a61..7b5e5eee40 100644
--- a/src/main/java/bartworks/neiHandler/OreNEIHandler.java
+++ b/src/main/java/bartworks/neiHandler/OreNEIHandler.java
@@ -40,7 +40,7 @@ import gregtech.api.enums.OrePrefixes;
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
index 43b1d90648..04ad0c05c0 100644
--- 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.entity.projectile.EntityToxinballSmall;
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 class ClientProxy extends CommonProxy implements Runnable {
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
index 37a578f718..2cb6ac62b8 100644
--- a/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java
+++ b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java
@@ -43,7 +43,7 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler {
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/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java b/src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java
index 1cd6a2acb6..6f0da32994 100644
--- a/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java
+++ b/src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java
@@ -19,7 +19,7 @@ import gtPlusPlus.core.util.Utils;
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;