diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java index 26cdbbe..62df4b8 100644 --- a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java +++ b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java @@ -1,6 +1,7 @@ package com.github.vfyjxf.nee; import appeng.client.gui.implementations.GuiPatternTerm; +import appeng.client.gui.implementations.GuiPatternTermEx; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import com.github.vfyjxf.nee.nei.NEECraftingHandler; @@ -13,20 +14,36 @@ import java.util.List; public class NEINeeConfig implements IConfigureNEI { + @Override public void loadConfig() { RecipeProcessor.init(); - List identifiers = new ArrayList<>(Arrays.asList("crafting", "crafting2x2","brewing","smelting","fuel")); + List defaultIdentifiers= Arrays.asList("crafting", "crafting2x2","brewing","smelting","fuel"); + List identifiers = new ArrayList<>(defaultIdentifiers); + for(IRecipeProcessor processor : RecipeProcessor.recipeProcessors){ identifiers.addAll(processor.getAllOverlayIdentifier()); } for(String ident : identifiers){ - API.registerGuiOverlay(GuiPatternTerm.class,ident); + API.registerGuiOverlay(GuiPatternTerm.class, ident); API.registerGuiOverlayHandler(GuiPatternTerm.class, new NEECraftingHandler(), ident); } + + try { + Class.forName("appeng.client.gui.implementations.GuiPatternTermEx"); + } catch (ClassNotFoundException e) { + return; + } + + identifiers.removeAll(defaultIdentifiers); + //PatternTermEx Support + for(String ident : identifiers){ + API.registerGuiOverlay(GuiPatternTermEx.class, ident); + API.registerGuiOverlayHandler(GuiPatternTermEx.class, new NEECraftingHandler(), ident); + } } @Override diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java index 8d55efd..50225e5 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIPatternRecipe.java @@ -7,7 +7,6 @@ import appeng.api.networking.storage.IStorageGrid; import appeng.container.implementations.ContainerPatternTerm; import appeng.container.implementations.ContainerPatternTermEx; import appeng.helpers.IContainerCraftingPacket; -import com.github.vfyjxf.nee.nei.NEECraftingHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -21,15 +20,12 @@ import net.minecraft.nbt.NBTTagCompound; import static com.github.vfyjxf.nee.nei.NEECraftingHandler.OUTPUT_KEY; import javax.annotation.Nonnull; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; public class PacketNEIPatternRecipe implements IMessage, IMessageHandler { NBTTagCompound input; NBTTagCompound output; - private final ItemStack EMPTY = (ItemStack) null; public PacketNEIPatternRecipe() { } @@ -69,8 +65,9 @@ public class PacketNEIPatternRecipe implements IMessage, IMessageHandler