From f876fe9ede2a1b0c747ae5cc38beee8c353298a7 Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Thu, 6 Nov 2025 15:43:02 +0900 Subject: [PATCH 1/6] Fix dual interface crash --- .../com/glodblock/github/client/FluidInterfaceButtons.java | 5 +++++ .../com/glodblock/github/common/tile/TileFluidInterface.java | 1 + 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/glodblock/github/client/FluidInterfaceButtons.java b/src/main/java/com/glodblock/github/client/FluidInterfaceButtons.java index 414f2b14..1ffac6da 100644 --- a/src/main/java/com/glodblock/github/client/FluidInterfaceButtons.java +++ b/src/main/java/com/glodblock/github/client/FluidInterfaceButtons.java @@ -21,6 +21,8 @@ import appeng.client.gui.widgets.GuiTabButton; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketConfigButton; import appeng.helpers.ICustomButtonDataObject; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; public class FluidInterfaceButtons implements ICustomButtonDataObject { @@ -34,6 +36,8 @@ public class FluidInterfaceButtons implements ICustomButtonDataObject { this.fullBlock = fullBlock; } + @SideOnly(Side.CLIENT) + @Override public void initCustomButtons(int guiLeft, int guiTop, int xSize, int ySize, int xOffset, int yOffset, List buttonList) { if (fullBlock) { @@ -56,6 +60,7 @@ public class FluidInterfaceButtons implements ICustomButtonDataObject { FluidCraft.proxy.netHandler.sendToServer(new CPacketCustomButtonUpdate()); } + @SideOnly(Side.CLIENT) @Override public boolean actionPerformedCustomButtons(final GuiButton btn) { if (btn == this.switcher) { diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java index 146690ab..a2c8e701 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java @@ -247,6 +247,7 @@ public class TileFluidInterface extends TileInterface implements IDualHost, ICus @Override public void readCustomButtonData() {} + @SideOnly(Side.CLIENT) @Override public void initCustomButtons(int guiLeft, int guiTop, int xSize, int ySize, int xOffset, int yOffset, List buttonList) { From a900afc9fe72ca066be2de575102b7b81be28dd2 Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Thu, 6 Nov 2025 22:09:04 +0200 Subject: [PATCH 2/6] fix extreme cell was stackable --- .../github/common/item/ItemFluidExtremeStorageCell.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidExtremeStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemFluidExtremeStorageCell.java index e2329a10..f96487b9 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidExtremeStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidExtremeStorageCell.java @@ -1,5 +1,7 @@ package com.glodblock.github.common.item; +import java.util.EnumSet; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -9,6 +11,7 @@ import com.glodblock.github.common.Config; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.loader.IRegister; +import appeng.core.features.AEFeature; import cpw.mods.fml.common.registry.GameRegistry; public class ItemFluidExtremeStorageCell extends FCBaseItemCell implements IRegister { @@ -17,6 +20,8 @@ public class ItemFluidExtremeStorageCell extends FCBaseItemCell implements IRegi public ItemFluidExtremeStorageCell(String name, long bytes, int perType, int totalTypes, double drain) { super(bytes, perType, totalTypes, drain); + this.setFeature(EnumSet.of(AEFeature.StorageCells)); + this.setMaxStackSize(1); setUnlocalizedName(name); this.name = name; setTextureName(FluidCraft.resource(name).toString()); From c1ccceb12347fec8b69ba67fe44d60d52de088f9 Mon Sep 17 00:00:00 2001 From: lc_1337 Date: Fri, 7 Nov 2025 11:23:40 +0200 Subject: [PATCH 3/6] fix fluid bus legacy config --- .../common/parts/PartFluidExportBus.java | 20 +++++++++++++++++++ .../common/parts/PartFluidImportBus.java | 18 +++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java index e2077278..49c95287 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java @@ -1,17 +1,23 @@ package com.glodblock.github.common.parts; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import com.glodblock.github.client.textures.FCPartsTexture; +import com.glodblock.github.util.Util; import appeng.api.config.FuzzyMode; import appeng.api.config.Upgrades; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.storage.IMEMonitor; +import appeng.api.storage.StorageName; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.me.GridAccessException; import appeng.parts.automation.PartBaseExportBus; +import appeng.tile.inventory.IAEStackInventory; import appeng.util.InventoryAdaptor; public class PartFluidExportBus extends PartBaseExportBus { @@ -66,4 +72,18 @@ public class PartFluidExportBus extends PartBaseExportBus { @Override protected void doOreDict(InventoryAdaptor destination, IEnergyGrid energy, IMEMonitor gridInv) {} + + // legacy + @Override + public void readFromNBT(NBTTagCompound extra) { + super.readFromNBT(extra); + + final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE); + for (int i = 0; i < config.getSizeInventory(); i++) { + final IAEStack stack = config.getAEStackInSlot(i); + if (stack instanceof IAEItemStack ais) { + config.putAEStackInSlot(i, Util.getAEFluidFromItem(ais.getItemStack())); + } + } + } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index 37f63d02..9f5799ab 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -1,6 +1,7 @@ package com.glodblock.github.common.parts; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -10,6 +11,7 @@ import net.minecraftforge.fluids.IFluidHandler; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.util.BlockPos; +import com.glodblock.github.util.Util; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -19,6 +21,8 @@ import appeng.api.networking.energy.IEnergySource; import appeng.api.storage.IMEMonitor; import appeng.api.storage.StorageName; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.me.GridAccessException; import appeng.parts.automation.PartBaseImportBus; import appeng.tile.inventory.IAEStackInventory; @@ -155,4 +159,18 @@ public class PartFluidImportBus extends PartBaseImportBus { } return false; } + + // legacy + @Override + public void readFromNBT(NBTTagCompound extra) { + super.readFromNBT(extra); + + final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE); + for (int i = 0; i < config.getSizeInventory(); i++) { + final IAEStack stack = config.getAEStackInSlot(i); + if (stack instanceof IAEItemStack ais) { + config.putAEStackInSlot(i, Util.getAEFluidFromItem(ais.getItemStack())); + } + } + } } From 9456dd5ecdb4877bcf4d6b27bdb897f0e77199a7 Mon Sep 17 00:00:00 2001 From: lc_1337 Date: Fri, 7 Nov 2025 15:56:19 +0200 Subject: [PATCH 4/6] fix terminal open keybind (sketch) --- .../item/ItemWirelessUltraTerminal.java | 36 ++++++++++++++----- .../github/network/CPacketSwitchGuis.java | 2 +- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index b78aaaa3..46a0f3ca 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -1,6 +1,7 @@ package com.glodblock.github.common.item; import static appeng.util.Platform.nextEnum; +import static com.glodblock.github.util.Util.GuiHelper.decodeInvType; import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown; import java.util.Arrays; @@ -121,17 +122,22 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal return super.onItemRightClick(is, w, player); } - public void switchTerminal(EntityPlayer player, ItemStack term, UltraTerminalModes mode) { - if (term != null && term.getItem() instanceof ItemWirelessUltraTerminal) { - if (mode != null) setMode(term, mode); - else mode = getMode(term); - openGui(term, player.worldObj, player, mode); + public void switchTerminal(EntityPlayer player, ImmutablePair term, UltraTerminalModes mode) { + if (term != null) { + final ItemStack terminal = term.getRight(); + if (terminal == null) return; + if (mode != null) setMode(terminal, mode); + else mode = getMode(terminal); + openGui(terminal, player.worldObj, player, mode, term.getLeft()); } } - @Override - public void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode) { + private void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode, + final int slotIndex) { final GuiBridge aeGui; + final int slot = slotIndex == -1 ? player.inventory.currentItem : slotIndex; + final ImmutablePair invSlotPair = decodeInvType(slotIndex); + switch (mode instanceof UltraTerminalModes utm ? utm : getMode(is)) { case CRAFTING -> aeGui = GuiBridge.GUI_CRAFTING_TERMINAL; case PATTERN -> aeGui = GuiBridge.GUI_PATTERN_TERMINAL; @@ -142,7 +148,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal player, w, new BlockPos( - player.inventory.currentItem, + slot, 0, player.openContainer instanceof AEBaseContainer abc ? abc.getSwitchAbleGuiNext() : 0), ForgeDirection.UNKNOWN, @@ -151,7 +157,19 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal } default -> aeGui = GuiBridge.GUI_ME; } - Platform.openGUI(player, null, null, aeGui); + + Platform.openGUI( + player, + null, + null, + aeGui, + invSlotPair.getLeft() == Util.GuiHelper.InvType.PLAYER_INV ? slotIndex + : invSlotPair.getRight() + 1_000_000); + } + + @Override + public void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode) { + this.openGui(is, w, player, mode, -1); } public static boolean hasInfinityBoosterCard(EntityPlayer player) { diff --git a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java index 44297d0b..14cf3846 100644 --- a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java +++ b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java @@ -81,7 +81,7 @@ public class CPacketSwitchGuis implements IMessage { abc.setSwitchAbleGuiNext(message.mode.ordinal()); } - iwut.switchTerminal(player, temp.getRight(), message.mode); + iwut.switchTerminal(player, temp, message.mode); if (player.openContainer instanceof AEBaseContainer abc) { if (abc.getTarget() instanceof ICustomButtonProvider icbp) { FluidCraft.proxy.netHandler From 488b08f1fa87ee21f112456f3853a992e92c6d53 Mon Sep 17 00:00:00 2001 From: hiroscho Date: Fri, 7 Nov 2025 18:52:19 +0100 Subject: [PATCH 5/6] Fix dupe bug for dual p2p interface (#352) --- .../com/glodblock/github/common/parts/PartFluidP2PInterface.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java index 80bef8e2..0f472aed 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java @@ -234,6 +234,7 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic Date: Fri, 7 Nov 2025 18:53:47 +0100 Subject: [PATCH 6/6] update --- dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c6a9bbc4..c55fb487 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,11 +34,11 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-727-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.8.33-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-732-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.9.7:dev') - api("com.github.GTNewHorizons:GTNHLib:0.7.3:dev") + api("com.github.GTNewHorizons:GTNHLib:0.8.0:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.7:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' @@ -46,9 +46,9 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.0:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.2:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.10.3:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.87:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.99:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,7 +57,7 @@ dependencies { compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.4-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.14-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.9:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.11:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.0:dev") }