diff --git a/dependencies.gradle b/dependencies.gradle index 9706cb2..5b698aa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,8 +4,9 @@ dependencies { compile("com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev") compile("com.github.GTNewHorizons:NotEnoughItems:2.3.2-GTNH:dev") compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") - compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.8:dev") + compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.1:dev") + compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.15-gtnh:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.12:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.40:dev") { transitive = false } diff --git a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java index 1bf42d6..264c276 100644 --- a/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java +++ b/src/main/java/com/github/vfyjxf/nee/NEINeeConfig.java @@ -15,6 +15,8 @@ import com.github.vfyjxf.nee.nei.NEECraftingHelper; import com.github.vfyjxf.nee.processor.IRecipeProcessor; import com.github.vfyjxf.nee.processor.RecipeProcessor; import com.github.vfyjxf.nee.utils.ModIDs; +import com.glodblock.github.client.gui.GuiFluidPatternTerminal; +import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; import cpw.mods.fml.common.Loader; import java.util.*; import net.minecraft.client.gui.inventory.GuiContainer; @@ -54,11 +56,35 @@ public class NEINeeConfig implements IConfigureNEI { installWirelessCraftingTermSupport(); - installPatternTerminalExSupport(identifiers); + installFluidPatternTerminalSupport(new HashSet(identifiers)); installThaumicEnergisticsSupport(); installAvaritiaddonsSupport(); + + installPatternTerminalExSupport(new HashSet(identifiers)); + + installFluidPatternTerminalExSupport(new HashSet(identifiers)); + } + + private void installFluidPatternTerminalExSupport(Set identifiers) { + if (Loader.isModLoaded(ModIDs.FC)) { + identifiers.remove("crafting"); + identifiers.remove("crafting2x2"); + for (String ident : identifiers) { + API.registerGuiOverlay(GuiFluidPatternTerminalEx.class, ident); + API.registerGuiOverlayHandler(GuiFluidPatternTerminalEx.class, new NEECraftingHandler(), ident); + } + } + } + + private void installFluidPatternTerminalSupport(Set identifiers) { + if (Loader.isModLoaded(ModIDs.FC)) { + for (String ident : identifiers) { + API.registerGuiOverlay(GuiFluidPatternTerminal.class, ident); + API.registerGuiOverlayHandler(GuiFluidPatternTerminal.class, NEECraftingHandler.INSTANCE, ident); + } + } } @Override diff --git a/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java b/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java index 9a043d2..2f52f1b 100644 --- a/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java +++ b/src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java @@ -29,7 +29,7 @@ public class NotEnoughEnergistics { public static final String NAME = "NotEnoughEnergistics"; public static final String VERSION = "GRADLETOKEN_VERSION"; public static final String DEPENDENCIES = - "required-after:NotEnoughItems;required-after:appliedenergistics2@[rv3.beta.22,),[rv3.beta-22,),[rv3-beta.22,),[rv3-beta-22,);after:ae2wct"; + "required-after:NotEnoughItems;required-after:appliedenergistics2@[rv3.beta.22,),[rv3.beta-22,),[rv3-beta.22,),[rv3-beta-22,);after:ae2wct;after:ae2fc"; public static final String GUI_FACTORY = "com.github.vfyjxf.nee.config.NEEConfigGuiFactory"; public static final Logger logger = LogManager.getLogger("NotEnoughEnergistics"); diff --git a/src/main/java/com/github/vfyjxf/nee/asm/AppengHelper.java b/src/main/java/com/github/vfyjxf/nee/asm/AppengHelper.java index eb2553b..c0c3822 100644 --- a/src/main/java/com/github/vfyjxf/nee/asm/AppengHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/asm/AppengHelper.java @@ -1,10 +1,9 @@ package com.github.vfyjxf.nee.asm; import static com.github.vfyjxf.nee.nei.NEECraftingHandler.INPUT_KEY; +import static com.github.vfyjxf.nee.utils.GuiUtils.isPatternTerm; import appeng.client.gui.implementations.GuiInterface; -import appeng.client.gui.implementations.GuiPatternTerm; -import appeng.client.gui.implementations.GuiPatternTermEx; import appeng.container.slot.SlotFake; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; @@ -33,8 +32,7 @@ public class AppengHelper { */ public static boolean handleMouseWheelInput(int dWheel) { Minecraft mc = Minecraft.getMinecraft(); - boolean isPatternTerm = - mc.currentScreen instanceof GuiPatternTerm || mc.currentScreen instanceof GuiPatternTermEx; + boolean isPatternTerm = isPatternTerm(mc.currentScreen); boolean isInterface = mc.currentScreen instanceof GuiInterface; if (isPatternTerm || isInterface) { if (dWheel != 0) { diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java index 9d82829..55ad5c3 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java @@ -1,9 +1,8 @@ package com.github.vfyjxf.nee.nei; import static com.github.vfyjxf.nee.processor.RecipeProcessor.NULL_IDENTIFIER; +import static com.github.vfyjxf.nee.utils.GuiUtils.isPatternTerm; -import appeng.client.gui.implementations.GuiPatternTerm; -import appeng.client.gui.implementations.GuiPatternTermEx; import appeng.util.Platform; import codechicken.nei.PositionedStack; import codechicken.nei.api.IOverlayHandler; @@ -18,6 +17,9 @@ import com.github.vfyjxf.nee.network.packet.PacketNEIPatternRecipe; import com.github.vfyjxf.nee.processor.IRecipeProcessor; import com.github.vfyjxf.nee.processor.RecipeProcessor; import com.github.vfyjxf.nee.utils.ItemUtils; +import com.github.vfyjxf.nee.utils.ModIDs; +import com.glodblock.github.nei.FluidPatternTerminalRecipeTransferHandler; +import cpw.mods.fml.common.Optional; import java.util.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -64,10 +66,16 @@ public class NEECraftingHandler implements IOverlayHandler { } } + @Optional.Method(modid = ModIDs.FC) + private void fluidCraftOverlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) { + FluidPatternTerminalRecipeTransferHandler.INSTANCE.overlayRecipe(firstGui, recipe, recipeIndex, shift); + } + @Override public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) { - if (firstGui instanceof GuiPatternTerm || firstGui instanceof GuiPatternTermEx) { + if (isPatternTerm(firstGui)) { NEENetworkHandler.getInstance().sendToServer(packRecipe(recipe, recipeIndex)); + fluidCraftOverlayRecipe(firstGui, recipe, recipeIndex, shift); } else { knowledgeInscriberHandler(firstGui, recipe, recipeIndex); extremeAutoCrafterHandler(firstGui, recipe, recipeIndex); diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java index 4167c01..043a4af 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java @@ -2,10 +2,10 @@ package com.github.vfyjxf.nee.nei; import static com.github.vfyjxf.nee.nei.NEECraftingHandler.INPUT_KEY; import static com.github.vfyjxf.nee.nei.NEECraftingHandler.OUTPUT_KEY; +import static com.github.vfyjxf.nee.utils.GuiUtils.isGuiCraftingTerm; +import static com.github.vfyjxf.nee.utils.GuiUtils.isPatternTerm; import appeng.client.gui.implementations.GuiCraftingTerm; -import appeng.client.gui.implementations.GuiPatternTerm; -import appeng.client.gui.implementations.GuiPatternTermEx; import appeng.container.slot.SlotCraftingMatrix; import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.core.AELog; @@ -267,10 +267,8 @@ public class NEECraftingHelper implements IOverlayHandler { } if (event.button.id >= OVERLAY_BUTTON_ID_START && event.button.id < OVERLAY_BUTTON_ID_START + overlayButtons.size()) { - boolean isPatternTerm = guiRecipe.firstGui instanceof GuiPatternTerm - || guiRecipe.firstGui instanceof GuiPatternTermEx; - boolean isCraftingTerm = guiRecipe.firstGui instanceof GuiCraftingTerm - || GuiUtils.isGuiWirelessCrafting(guiRecipe.firstGui); + boolean isPatternTerm = isPatternTerm(guiRecipe.firstGui); + boolean isCraftingTerm = isGuiCraftingTerm(guiRecipe.firstGui); if (isCraftingTerm || isPatternTerm) { int recipesPerPage = 2; IRecipeHandler handler = (IRecipeHandler) guiRecipe.currenthandlers.get(guiRecipe.recipetype); 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 b5dac70..ef41810 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 @@ -6,9 +6,14 @@ import appeng.api.networking.IGrid; import appeng.api.networking.IGridNode; import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.storage.IStorageGrid; +import appeng.container.AEBaseContainer; import appeng.container.implementations.ContainerPatternTerm; import appeng.container.implementations.ContainerPatternTermEx; import appeng.helpers.IContainerCraftingPacket; +import com.github.vfyjxf.nee.utils.ModIDs; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -67,11 +72,27 @@ public class PacketNEIPatternRecipe implements IMessage { ((ContainerPatternTermEx) container).getPatternTerminal().setInverted(false); message.processRecipeHandler((ContainerPatternTermEx) container, message); } + addFluidCraftSupport(message, ctx); return null; } + + @Optional.Method(modid = ModIDs.FC) + private void addFluidCraftSupport(PacketNEIPatternRecipe message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + Container container = player.openContainer; + if (container instanceof ContainerFluidPatternTerminal && message.output == null) { + ((ContainerFluidPatternTerminal) container).getPatternTerminal().setCraftingRecipe(true); + message.craftingTableRecipeHandler((ContainerFluidPatternTerminal) container, message); + } else if (container instanceof ContainerFluidPatternTerminal) { + ((ContainerFluidPatternTerminal) container).getPatternTerminal().setCraftingRecipe(false); + message.processRecipeHandler((ContainerFluidPatternTerminal) container, message); + } else if (container instanceof ContainerFluidPatternTerminalEx) { + message.processRecipeHandler((ContainerFluidPatternTerminalEx) container, message); + } + } } - private void craftingTableRecipeHandler(ContainerPatternTerm container, PacketNEIPatternRecipe message) { + private void craftingTableRecipeHandler(AEBaseContainer container, PacketNEIPatternRecipe message) { ItemStack[] recipeInput = new ItemStack[9]; NBTTagCompound currentStack; @@ -80,7 +101,7 @@ public class PacketNEIPatternRecipe implements IMessage { recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); } - final IContainerCraftingPacket cct = container; + final IContainerCraftingPacket cct = (IContainerCraftingPacket) container; final IGridNode node = cct.getNetworkNode(); if (node != null) { @@ -106,22 +127,8 @@ public class PacketNEIPatternRecipe implements IMessage { } } - private void processRecipeHandler(ContainerPatternTerm container, PacketNEIPatternRecipe message) { - - ItemStack[] recipeInput = new ItemStack[9]; - ItemStack[] recipeOutput = new ItemStack[3]; - - for (int i = 0; i < recipeInput.length; i++) { - NBTTagCompound currentStack = (NBTTagCompound) message.input.getTag("#" + i); - recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); - } - - for (int i = 0; i < recipeOutput.length; i++) { - NBTTagCompound currentStack = (NBTTagCompound) message.output.getTag(OUTPUT_KEY + i); - recipeOutput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); - } - - final IContainerCraftingPacket cct = container; + private void processRecipeHandler(AEBaseContainer container, PacketNEIPatternRecipe message) { + final IContainerCraftingPacket cct = (IContainerCraftingPacket) container; final IGridNode node = cct.getNetworkNode(); if (node != null) { @@ -133,7 +140,18 @@ public class PacketNEIPatternRecipe implements IMessage { final ISecurityGrid security = grid.getCache(ISecurityGrid.class); final IInventory craftMatrix = cct.getInventoryByName("crafting"); final IInventory outputMatrix = cct.getInventoryByName("output"); + ItemStack[] recipeInput = new ItemStack[craftMatrix.getSizeInventory()]; + ItemStack[] recipeOutput = new ItemStack[outputMatrix.getSizeInventory()]; + for (int i = 0; i < recipeInput.length; i++) { + NBTTagCompound currentStack = (NBTTagCompound) message.input.getTag("#" + i); + recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); + } + + for (int i = 0; i < recipeOutput.length; i++) { + NBTTagCompound currentStack = (NBTTagCompound) message.output.getTag(OUTPUT_KEY + i); + recipeOutput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); + } if (inv != null && message.input != null && security != null) { for (int i = 0; i < craftMatrix.getSizeInventory(); i++) { ItemStack currentItem = null; @@ -154,53 +172,4 @@ public class PacketNEIPatternRecipe implements IMessage { } } } - - private void processRecipeHandler(ContainerPatternTermEx container, PacketNEIPatternRecipe message) { - - ItemStack[] recipeInput = new ItemStack[16]; - ItemStack[] recipeOutput = new ItemStack[4]; - - for (int i = 0; i < recipeInput.length; i++) { - NBTTagCompound currentStack = (NBTTagCompound) message.input.getTag("#" + i); - recipeInput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); - } - - for (int i = 0; i < recipeOutput.length; i++) { - NBTTagCompound currentStack = (NBTTagCompound) message.output.getTag(OUTPUT_KEY + i); - recipeOutput[i] = currentStack == null ? null : ItemStack.loadItemStackFromNBT(currentStack); - } - - final IContainerCraftingPacket cct = container; - final IGridNode node = cct.getNetworkNode(); - - if (node != null) { - final IGrid grid = node.getGrid(); - if (grid == null) { - return; - } - final IStorageGrid inv = grid.getCache(IStorageGrid.class); - final ISecurityGrid security = grid.getCache(ISecurityGrid.class); - final IInventory craftMatrix = cct.getInventoryByName("crafting"); - final IInventory outputMatrix = cct.getInventoryByName("output"); - - if (inv != null && message.input != null && security != null) { - for (int i = 0; i < craftMatrix.getSizeInventory(); i++) { - ItemStack currentItem = null; - if (i < recipeInput.length && recipeInput[i] != null) { - currentItem = recipeInput[i].copy(); - } - craftMatrix.setInventorySlotContents(i, currentItem); - } - - for (int i = 0; i < outputMatrix.getSizeInventory(); i++) { - ItemStack currentItem = null; - if (i < recipeOutput.length && recipeOutput[i] != null) { - currentItem = recipeOutput[i].copy(); - } - outputMatrix.setInventorySlotContents(i, currentItem); - } - container.onCraftMatrixChanged(craftMatrix); - } - } - } } diff --git a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java index 071adda..d6084e4 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java @@ -8,6 +8,10 @@ import appeng.container.implementations.ContainerPatternTerm; import appeng.container.implementations.ContainerPatternTermEx; import appeng.helpers.IContainerCraftingPacket; import com.github.vfyjxf.nee.container.WCTContainerCraftingConfirm; +import com.glodblock.github.client.gui.GuiFluidPatternTerminal; +import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; import cpw.mods.fml.common.Loader; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -21,6 +25,7 @@ import net.minecraft.inventory.Slot; public class GuiUtils { private static final boolean isWirelessCraftingTerminalModLoaded = Loader.isModLoaded(ModIDs.WCT); + private static final boolean isFluidCraftModloaded = Loader.isModLoaded(ModIDs.FC); public static boolean isGuiWirelessCrafting(GuiScreen gui) { if (!isWirelessCraftingTerminalModLoaded) return false; @@ -57,7 +62,7 @@ public class GuiUtils { return false; } Container container = Minecraft.getMinecraft().thePlayer.openContainer; - if (!(container instanceof ContainerPatternTerm) && !(container instanceof ContainerPatternTermEx)) { + if (!isPatternContainer(container)) { return false; } IContainerCraftingPacket cct = (IContainerCraftingPacket) container; @@ -65,12 +70,35 @@ public class GuiUtils { return craftMatrix.equals(slot.inventory); } + public static boolean isPatternContainer(Container container) { + if (isFluidCraftModloaded) { + return container instanceof ContainerPatternTerm + || container instanceof ContainerPatternTermEx + || container instanceof ContainerFluidPatternTerminal + || container instanceof ContainerFluidPatternTerminalEx; + } else { + return container instanceof ContainerPatternTerm || container instanceof ContainerPatternTermEx; + } + } + public static boolean isGuiCraftingTerm(GuiScreen guiScreen) { return guiScreen instanceof GuiCraftingTerm || isGuiWirelessCrafting(guiScreen); } + public static boolean isFluidCraftPatternTerm(GuiScreen guiScreen) { + return isFluidCraftModloaded + && (guiScreen instanceof GuiFluidPatternTerminal || guiScreen instanceof GuiFluidPatternTerminalEx); + } + public static boolean isPatternTerm(GuiScreen guiScreen) { - return guiScreen instanceof GuiPatternTerm || guiScreen instanceof GuiPatternTermEx; + if (isFluidCraftModloaded) { + return guiScreen instanceof GuiPatternTerm + || guiScreen instanceof GuiPatternTermEx + || guiScreen instanceof GuiFluidPatternTerminal + || guiScreen instanceof GuiFluidPatternTerminalEx; + } else { + return guiScreen instanceof GuiPatternTerm || guiScreen instanceof GuiPatternTermEx; + } } public static boolean isGuiCraftConfirm(GuiScreen gui) { diff --git a/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java b/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java index 0cbc9f9..07b899a 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java @@ -1,6 +1,7 @@ package com.github.vfyjxf.nee.utils; import static com.github.vfyjxf.nee.nei.NEECraftingHelper.noPreview; +import static com.github.vfyjxf.nee.utils.GuiUtils.isFluidCraftPatternTerm; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -13,6 +14,7 @@ import codechicken.nei.recipe.IRecipeHandler; import com.github.vfyjxf.nee.config.NEEConfig; import com.github.vfyjxf.nee.network.NEENetworkHandler; import com.github.vfyjxf.nee.network.packet.PacketCraftingRequest; +import com.glodblock.github.client.gui.GuiFCBaseMonitor; import cpw.mods.fml.relauncher.ReflectionHelper; import java.util.ArrayList; import java.util.List; @@ -75,6 +77,16 @@ public class IngredientTracker { } } + private ItemRepo getRepo() throws IllegalAccessException { + if (isFluidCraftPatternTerm(termGui)) { + return (ItemRepo) + ReflectionHelper.findField(GuiFCBaseMonitor.class, "repo").get(termGui); + } else { + return (ItemRepo) + ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(termGui); + } + } + @SuppressWarnings("unchecked") private List getCraftableStacks() { List craftableStacks = new ArrayList<>(); @@ -82,8 +94,7 @@ public class IngredientTracker { IItemList list = null; try { if (!GuiUtils.isGuiWirelessCrafting(termGui)) { - ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiMEMonitorable.class, "repo") - .get(termGui); + ItemRepo repo = getRepo(); list = (IItemList) ReflectionHelper.findField(ItemRepo.class, "list").get(repo); } else { diff --git a/src/main/java/com/github/vfyjxf/nee/utils/ModIDs.java b/src/main/java/com/github/vfyjxf/nee/utils/ModIDs.java index 41b6831..664d3ba 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/ModIDs.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/ModIDs.java @@ -2,4 +2,5 @@ package com.github.vfyjxf.nee.utils; public class ModIDs { public static final String WCT = "ae2wct"; + public static final String FC = "ae2fc"; }