diff --git a/dependencies.gradle b/dependencies.gradle index e1d03da..5d97935 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ dependencies { - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-770-GTNH:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-817-GTNH:dev") api("com.github.GTNewHorizons:NotEnoughItems:2.8.44-GTNH:dev") api('com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev') implementation("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.12:dev") - implementation("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.38-gtnh:dev") + implementation("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.57-gtnh:dev") compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.173:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.78:dev") { transitive = false } @@ -15,7 +15,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:EnderIO:2.10.10:dev') {transitive=false} compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.4:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTplusplus:1.12.11:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.7.18-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.7.27-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.13.6-GTNH:dev") { transitive = false } compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false } compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false } diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingPreviewHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingPreviewHandler.java index 4312c51..a76c297 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingPreviewHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingPreviewHandler.java @@ -149,9 +149,7 @@ public class NEECraftingPreviewHandler { private void openCraftAmount(GuiContainer firstGui, ItemStack itemstack) { final IAEItemStack aeItemStack = AEItemStack.create(itemstack); - if (this.modID.equals(ModIDs.ThE)) { - sendToArcaneCraftingerver(aeItemStack); - } else if (this.modID.equals(ModIDs.WCT)) { + if (this.modID.equals(ModIDs.WCT)) { ((AEBaseContainer) firstGui.inventorySlots).setTargetStack(aeItemStack); sendToWirelessCraftingServer(); } else if (this.modID.equals("AE")) { @@ -161,12 +159,6 @@ public class NEECraftingPreviewHandler { } - @Optional.Method(modid = ModIDs.ThE) - protected void sendToArcaneCraftingerver(IAEItemStack aeItemStack) { - thaumicenergistics.common.network.packet.server.Packet_S_ArcaneCraftingTerminal - .sendAutoCraft(Minecraft.getMinecraft().thePlayer, aeItemStack); - } - @Optional.Method(modid = ModIDs.WCT) protected void sendToWirelessCraftingServer() { net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction packet = new net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction( diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingRequest.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingRequest.java index 2cde5b2..bb6630a 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingRequest.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketCraftingRequest.java @@ -11,7 +11,6 @@ import net.minecraft.nbt.NBTTagCompound; import com.github.vfyjxf.nee.block.tile.TilePatternInterface; import com.github.vfyjxf.nee.utils.GuiUtils; -import com.github.vfyjxf.nee.utils.ModIDs; import appeng.api.AEApi; import appeng.api.config.CraftingMode; @@ -21,29 +20,25 @@ import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingJob; import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.IActionHost; import appeng.api.networking.security.ISecurityGrid; -import appeng.api.networking.security.PlayerSource; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; +import appeng.container.ContainerSubGui; +import appeng.container.PrimaryGui; import appeng.container.implementations.ContainerCraftConfirm; import appeng.core.AELog; import appeng.core.sync.GuiBridge; import appeng.me.cache.CraftingGridCache; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.Platform; -import cpw.mods.fml.common.Loader; -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; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import thaumicenergistics.common.ThEGuiHandler; -import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal; public class PacketCraftingRequest implements IMessage { @@ -233,18 +228,9 @@ public class PacketCraftingRequest implements IMessage { public void openCraftConfirm(Container container, IGrid grid, IAEItemStack requireToCraftStack, EntityPlayerMP player) { - - if (Loader.isModLoaded(ModIDs.ThE) && this.modID.equals(ModIDs.ThE) - && container instanceof ContainerPartArcaneCraftingTerminal cpact) { - openTHContainerCraftConfirm(grid, requireToCraftStack, (IActionHost) cpact.terminal, player); - } else if (container instanceof AEBaseContainer baseContainer) { - if (Loader.isModLoaded(ModIDs.ThE) && this.modID.equals(ModIDs.ThE)) { - openTHContainerCraftConfirm(grid, requireToCraftStack, (IActionHost) baseContainer.getTarget(), player); - } else { - openAEContainerCraftConfirm(baseContainer, grid, requireToCraftStack, player); - } + if (container instanceof AEBaseContainer baseContainer) { + openAEContainerCraftConfirm(baseContainer, grid, requireToCraftStack, player); } - } private void openContainerCraftConfirm(IGrid grid, IAEItemStack requireToCraftStack, EntityPlayerMP player, @@ -289,6 +275,8 @@ public class PacketCraftingRequest implements IMessage { openContainerCraftConfirm(grid, requireToCraftStack, player, baseContainer.getActionSource(), job -> { final ContainerOpenContext openContext = baseContainer.getOpenContext(); + final PrimaryGui pGui = baseContainer instanceof ContainerSubGui ? baseContainer.getPrimaryGui() + : baseContainer.createPrimaryGui(); Platform.openGUI( player, openContext.getTile(), @@ -297,23 +285,8 @@ public class PacketCraftingRequest implements IMessage { baseContainer.getTargetSlotIndex()); if (player.openContainer instanceof ContainerCraftConfirm ccc) { - ccc.setPrimaryGui(baseContainer.createPrimaryGui()); + ccc.setPrimaryGui(pGui); } }); } - - @Optional.Method(modid = ModIDs.ThE) - private void openTHContainerCraftConfirm(IGrid grid, IAEItemStack requireToCraftStack, IActionHost host, - EntityPlayerMP player) { - - openContainerCraftConfirm( - grid, - requireToCraftStack, - player, - new PlayerSource(player, host), - job -> { - ThEGuiHandler.launchGui(ThEGuiHandler.AUTO_CRAFTING_CONFIRM, player, player.worldObj, 0, 0, 0); - }); - - } } diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIBookmark.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIBookmark.java index de20f20..c2c0e54 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIBookmark.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIBookmark.java @@ -8,20 +8,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import com.github.vfyjxf.nee.utils.ItemUtils; -import com.github.vfyjxf.nee.utils.ModIDs; -import appeng.api.networking.IGrid; -import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.PlayerSource; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; import appeng.container.implementations.ContainerMEMonitorable; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.item.AEItemStack; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -29,7 +24,6 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException; import io.netty.buffer.ByteBuf; -import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal; public class PacketNEIBookmark implements IMessage { @@ -63,7 +57,7 @@ public class PacketNEIBookmark implements IMessage { } if (container instanceof ContainerMEMonitorable monitorable) { - final IMEMonitor monitor = monitorable.getMonitor(); + final IMEMonitor monitor = monitorable.getItemMonitor(); if (monitor != null) { final IEnergySource energy = monitorable.getPowerSource(); final BaseActionSource actionSource = monitorable.getActionSource(); @@ -86,30 +80,6 @@ public class PacketNEIBookmark implements IMessage { } } - } else if (Loader.isModLoaded(ModIDs.ThE) && container instanceof ContainerPartArcaneCraftingTerminal act) { - final IMEMonitor monitor = getMonitor(container); - final IGrid grid = act.getHostGrid(); - if (grid == null || monitor == null) return null; - final IEnergyGrid energy = grid.getCache(IEnergyGrid.class); - final BaseActionSource actionSource = new PlayerSource(player, act.terminal); - - for (Object key : message.bookmarkItems.func_150296_c()) { - final ItemStack bookmarkItem = ItemUtils - .loadItemStackFromNBT(message.bookmarkItems.getCompoundTag((String) key)); - bookmarkItem.stackSize = getFreeStackSize(player, bookmarkItem); - - if (bookmarkItem.stackSize > 0) { - final AEItemStack requestStack = AEItemStack.create(bookmarkItem); - final IAEItemStack extractedStack = Platform - .poweredExtraction(energy, monitor, requestStack, actionSource); - - if (extractedStack != null) { - InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN) - .addItems(extractedStack.getItemStack()); - } - } - } - } return null; 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 246cab4..c30a3e7 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java @@ -16,16 +16,14 @@ import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; +import appeng.api.storage.data.IAEStack; import appeng.client.gui.implementations.GuiPatternTerm; import appeng.client.me.ItemRepo; import appeng.container.AEBaseContainer; import appeng.container.implementations.ContainerPatternTerm; import appeng.helpers.IContainerCraftingPacket; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException; -import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal; /** * @author vfyjxf @@ -78,29 +76,28 @@ public class GuiUtils { try { @SuppressWarnings("unchecked") - final IItemList list = (IItemList) ReflectionHelper + final Iterable> list = (Iterable>) ReflectionHelper .findField(ItemRepo.class, "list").get(repo); - for (IAEItemStack stack : list) { - if (predicate.test(stack)) { - storageStacks.add(stack.copy()); + for (IAEStack stack : list) { + if (stack instanceof IAEItemStack ais && predicate.test(ais)) { + storageStacks.add(ais.copy()); } } - } catch (Exception e) {} + } catch (Exception ignored) {} try { - final IAEItemStack[] pins = (IAEItemStack[]) ReflectionHelper.findField(ItemRepo.class, "pinsRepo") + final IAEStack[] pins = (IAEStack[]) ReflectionHelper.findField(ItemRepo.class, "pinsRepo") .get(repo); - for (int i = 0; i < pins.length; i++) { - final IAEItemStack stack = pins[i]; - if (stack != null && predicate.test(stack)) { - storageStacks.add(stack.copy()); + for (final IAEStack stack : pins) { + if (stack instanceof IAEItemStack ais && predicate.test(ais)) { + storageStacks.add(ais.copy()); } } - } catch (Exception e) {} + } catch (Exception ignored) {} } } @@ -109,25 +106,16 @@ public class GuiUtils { } public static IGrid getGrid(Container container) { - - if (Loader.isModLoaded(ModIDs.ThE) && container instanceof ContainerPartArcaneCraftingTerminal act) { - final IGridNode gridNode = act.terminal.getGridNode(ForgeDirection.UNKNOWN); + if (container instanceof AEBaseContainer baseContainer + && baseContainer.getTarget() instanceof IGridHost gridHost) { + final IGridNode gridNode = gridHost.getGridNode(ForgeDirection.UNKNOWN); if (gridNode == null) { return null; } return gridNode.getGrid(); - } else if (container instanceof AEBaseContainer baseContainer - && baseContainer.getTarget() instanceof IGridHost gridHost) { - final IGridNode gridNode = gridHost.getGridNode(ForgeDirection.UNKNOWN); - - if (gridNode == null) { - return null; - } - - return gridNode.getGrid(); - } + } return null; }