From 543dd4a60fe6517940b6eaaaecfe85cafb7d826d Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Sun, 8 Sep 2024 00:25:53 +0800 Subject: Fix more broken NEI caused by renaming (#3102) Co-authored-by: Martin Robertz --- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 4 +- src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java | 102 --------------------- .../gtPlusPlus/nei/LFTRSpargingNEIHandler.java | 2 +- src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java | 102 +++++++++++++++++++++ 4 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java create mode 100644 src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java (limited to 'src/main/java/gtPlusPlus') 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/GTPPNEIConfig.java b/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java deleted file mode 100644 index 1cd6a2acb6..0000000000 --- a/src/main/java/gtPlusPlus/nei/GTPPNEIConfig.java +++ /dev/null @@ -1,102 +0,0 @@ -package gtPlusPlus.nei; - -import java.util.Arrays; - -import net.minecraft.item.ItemStack; - -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.event.NEIRegisterHandlerInfosEvent; -import codechicken.nei.recipe.HandlerInfo; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.enums.Mods; -import gregtech.api.recipe.RecipeMaps; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; - -public class GTPPNEIConfig implements IConfigureNEI { - - public static boolean sIsAdded = true; - - @Override - public synchronized void loadConfig() { - sIsAdded = false; - - Logger.INFO("NEI Registration: Registering NEI handler for " + DecayableRecipeHandler.mNEIName); - API.registerRecipeHandler(new DecayableRecipeHandler()); - API.registerUsageHandler(new DecayableRecipeHandler()); - API.addRecipeCatalyst(new ItemStack(ModBlocks.blockDecayablesChest, 1), "GTPP_Decayables"); - - Logger.INFO("NEI Registration: Registering NEI handler for " + LFTRSpargingNEIHandler.mNEIName); - new LFTRSpargingNEIHandler(); - API.addRecipeCatalyst(GregtechItemList.Controller_Sparge_Tower.get(1), "gtpp.recipe.lftr.sparging"); - - for (GregtechItemList item : Arrays.asList( - GregtechItemList.GT4_Electric_Auto_Workbench_LV, - GregtechItemList.GT4_Electric_Auto_Workbench_MV, - GregtechItemList.GT4_Electric_Auto_Workbench_HV, - GregtechItemList.GT4_Electric_Auto_Workbench_EV, - GregtechItemList.GT4_Electric_Auto_Workbench_IV, - GregtechItemList.GT4_Electric_Auto_Workbench_LuV, - GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, - GregtechItemList.GT4_Electric_Auto_Workbench_UV)) { - API.addRecipeCatalyst(item.get(1), "crafting", -10); - } - // Bronze workbench - API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31081", 1), "crafting"); - API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31082", 1), "crafting"); - - // Moved to its own handler - API.removeRecipeCatalyst( - GregtechItemList.Controller_Vacuum_Furnace.get(1), - GTPPRecipeMaps.chemicalDehydratorRecipes.unlocalizedName); - - // ULV simple washer - API.removeRecipeCatalyst( - ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:767", 1), - GTPPRecipeMaps.simpleWasherRecipes.unlocalizedName); - - // ULV combustion generator - API.removeRecipeCatalyst( - ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:960", 1), - RecipeMaps.dieselFuels.unlocalizedName); - - // ULV gas turbine - API.removeRecipeCatalyst( - ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:961", 1), - RecipeMaps.gasTurbineFuels.unlocalizedName); - - // Hide Flasks - if (Utils.isClient()) { - API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1)); - API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_32k.get(1)); - } - sIsAdded = true; - } - - @SubscribeEvent - public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) { - event.registerHandlerInfo( - new HandlerInfo.Builder("gtpp.recipe.lftr.sparging", GTPPCore.name, Mods.GTPlusPlus.ID) - .setDisplayStack(GregtechItemList.Controller_Sparge_Tower.get(1)) - .setShiftY(6) - .setHeight(135) - .setMaxRecipesPerPage(1) - .build()); - } - - @Override - public String getName() { - return "GT++ NEI Plugin"; - } - - @Override - public String getVersion() { - return "(1.12)"; - } -} 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/NEIGTPPConfig.java b/src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java new file mode 100644 index 0000000000..6f0da32994 --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/NEIGTPPConfig.java @@ -0,0 +1,102 @@ +package gtPlusPlus.nei; + +import java.util.Arrays; + +import net.minecraft.item.ItemStack; + +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import codechicken.nei.event.NEIRegisterHandlerInfosEvent; +import codechicken.nei.recipe.HandlerInfo; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import gregtech.api.enums.Mods; +import gregtech.api.recipe.RecipeMaps; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; + +public class NEIGTPPConfig implements IConfigureNEI { + + public static boolean sIsAdded = true; + + @Override + public synchronized void loadConfig() { + sIsAdded = false; + + Logger.INFO("NEI Registration: Registering NEI handler for " + DecayableRecipeHandler.mNEIName); + API.registerRecipeHandler(new DecayableRecipeHandler()); + API.registerUsageHandler(new DecayableRecipeHandler()); + API.addRecipeCatalyst(new ItemStack(ModBlocks.blockDecayablesChest, 1), "GTPP_Decayables"); + + Logger.INFO("NEI Registration: Registering NEI handler for " + LFTRSpargingNEIHandler.mNEIName); + new LFTRSpargingNEIHandler(); + API.addRecipeCatalyst(GregtechItemList.Controller_Sparge_Tower.get(1), "gtpp.recipe.lftr.sparging"); + + for (GregtechItemList item : Arrays.asList( + GregtechItemList.GT4_Electric_Auto_Workbench_LV, + GregtechItemList.GT4_Electric_Auto_Workbench_MV, + GregtechItemList.GT4_Electric_Auto_Workbench_HV, + GregtechItemList.GT4_Electric_Auto_Workbench_EV, + GregtechItemList.GT4_Electric_Auto_Workbench_IV, + GregtechItemList.GT4_Electric_Auto_Workbench_LuV, + GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, + GregtechItemList.GT4_Electric_Auto_Workbench_UV)) { + API.addRecipeCatalyst(item.get(1), "crafting", -10); + } + // Bronze workbench + API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31081", 1), "crafting"); + API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31082", 1), "crafting"); + + // Moved to its own handler + API.removeRecipeCatalyst( + GregtechItemList.Controller_Vacuum_Furnace.get(1), + GTPPRecipeMaps.chemicalDehydratorRecipes.unlocalizedName); + + // ULV simple washer + API.removeRecipeCatalyst( + ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:767", 1), + GTPPRecipeMaps.simpleWasherRecipes.unlocalizedName); + + // ULV combustion generator + API.removeRecipeCatalyst( + ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:960", 1), + RecipeMaps.dieselFuels.unlocalizedName); + + // ULV gas turbine + API.removeRecipeCatalyst( + ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:961", 1), + RecipeMaps.gasTurbineFuels.unlocalizedName); + + // Hide Flasks + if (Utils.isClient()) { + API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1)); + API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_32k.get(1)); + } + sIsAdded = true; + } + + @SubscribeEvent + public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) { + event.registerHandlerInfo( + new HandlerInfo.Builder("gtpp.recipe.lftr.sparging", GTPPCore.name, Mods.GTPlusPlus.ID) + .setDisplayStack(GregtechItemList.Controller_Sparge_Tower.get(1)) + .setShiftY(6) + .setHeight(135) + .setMaxRecipesPerPage(1) + .build()); + } + + @Override + public String getName() { + return "GT++ NEI Plugin"; + } + + @Override + public String getVersion() { + return "(1.12)"; + } +} -- cgit