From 2690cd2cd89007c2e3b583ee7e89ae72a7bb458f Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 3 Jan 2023 01:32:39 +0900 Subject: [PATCH] Remove individual NEI handler (#55) --- dependencies.gradle | 2 +- .../common/loader/EMT_RecipeAdder.java | 2 +- .../java/emt/nei/FusionCraftingHandler.java | 32 ------------------- src/main/java/emt/nei/NEI_Config.java | 4 +-- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/emt/nei/FusionCraftingHandler.java diff --git a/dependencies.gradle b/dependencies.gradle index 0559c57..8829a21 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.161:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.195:dev' compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev' compile 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' diff --git a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java index 6e306f7..ec7dc82 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java @@ -35,7 +35,7 @@ public class EMT_RecipeAdder { 1, E, false, - false) + true) .setSlotOverlay(false, false, EMT_UITextures.OVERLAY_SLOT_FUSION_CRAFTING); public static void addFusionCraftingRecipe( diff --git a/src/main/java/emt/nei/FusionCraftingHandler.java b/src/main/java/emt/nei/FusionCraftingHandler.java deleted file mode 100644 index 4696bfa..0000000 --- a/src/main/java/emt/nei/FusionCraftingHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package emt.nei; - -import static emt.nei.NEI_Config.isAdded; - -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Recipe; -import gregtech.nei.GT_NEI_DefaultHandler; - -public class FusionCraftingHandler extends GT_NEI_DefaultHandler { - // TODO: BETTER GUI <3 - public FusionCraftingHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { - super(aRecipeMap); - if (!isAdded) { - FMLInterModComms.sendRuntimeMessage( - GT_Values.GT, - "NEIPlugins", - "register-crafting-handler", - "emt@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - @Override - public TemplateRecipeHandler newInstance() { - return new FusionCraftingHandler(this.mRecipeMap); - } -} diff --git a/src/main/java/emt/nei/NEI_Config.java b/src/main/java/emt/nei/NEI_Config.java index 25fda18..aff97bc 100644 --- a/src/main/java/emt/nei/NEI_Config.java +++ b/src/main/java/emt/nei/NEI_Config.java @@ -3,7 +3,6 @@ package emt.nei; import codechicken.nei.api.IConfigureNEI; import cpw.mods.fml.common.event.FMLInterModComms; import emt.EMT; -import emt.gthandler.common.loader.EMT_RecipeAdder; import net.minecraft.nbt.NBTTagCompound; public class NEI_Config implements IConfigureNEI { @@ -13,7 +12,6 @@ public class NEI_Config implements IConfigureNEI { @Override public void loadConfig() { NEI_Config.isAdded = false; - new FusionCraftingHandler(EMT_RecipeAdder.sFusionCraftingRecipes); NEI_Config.isAdded = true; } @@ -28,7 +26,7 @@ public class NEI_Config implements IConfigureNEI { } public static void Init() { - sendHandler("emt.nei.FusionCraftingHandler", "gregtech:gt.blockmachines:5001"); + sendHandler("emt.recipe.fusioncrafting", "gregtech:gt.blockmachines:5001"); sendCatalyst("emt.recipe.fusioncrafting", "gregtech:gt.blockmachines:5001"); }