From 1d0a1bde9c004a85152137d02004d86b3e29779c Mon Sep 17 00:00:00 2001 From: lc_1337 Date: Mon, 24 Nov 2025 12:17:20 +0200 Subject: [PATCH] fix bind --- .../github/common/item/ItemWirelessInterfaceTerminal.java | 2 +- .../github/common/item/ItemWirelessUltraTerminal.java | 6 ++++-- .../java/com/glodblock/github/util/FluidPrimaryGui.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java index bf50e9f8..89746041 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java @@ -41,6 +41,6 @@ public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal public IGuiItemObject getGuiObject(ItemStack is, World world, EntityPlayer p, int x, int y, int z) { final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler(is); if (wh == null) return null; - return new WirelessInterfaceTerminalGuiObject(wh, is); + return new WirelessInterfaceTerminalGuiObject(wh, is, x); } } 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 c3914cf8..37791e41 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -129,7 +129,9 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal if (terminal == null) return; if (mode != null) setMode(terminal, mode); else mode = getMode(terminal); - openGui(terminal, player.worldObj, player, mode, term.getLeft()); + + if (AEApi.instance().registries().wireless().performCheck(terminal, player)) + openGui(terminal, player.worldObj, player, mode, term.getLeft()); } } @@ -217,7 +219,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal return switch (y != Integer.MIN_VALUE ? UltraTerminalModes.values()[y] : getMode(is)) { case CRAFTING -> new WirelessCraftingTerminalGuiObject(wh, is, p, world, x, y, z); case PATTERN, PATTERN_EX -> new WirelessPatternTerminalGuiObject(wh, is, p, world, x, y, z); - case INTERFACE -> new WirelessInterfaceTerminalGuiObject(wh, is); + case INTERFACE -> new WirelessInterfaceTerminalGuiObject(wh, is, x); default -> super.getGuiObject(is, world, p, x, y, z); }; } diff --git a/src/main/java/com/glodblock/github/util/FluidPrimaryGui.java b/src/main/java/com/glodblock/github/util/FluidPrimaryGui.java index 39935eda..f326f907 100644 --- a/src/main/java/com/glodblock/github/util/FluidPrimaryGui.java +++ b/src/main/java/com/glodblock/github/util/FluidPrimaryGui.java @@ -28,7 +28,7 @@ public class FluidPrimaryGui extends PrimaryGui { p, p.worldObj, new BlockPos( - p.inventory.currentItem, + this.slotIndex == Integer.MIN_VALUE ? p.inventory.currentItem : this.slotIndex, Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), 0), Objects.requireNonNull(side),