Merge remote-tracking branch 'origin/gui-reaper' into gui-reaper

This commit is contained in:
lc-1337 committed 2025-11-24 20:31:15 +02:00
commit 22ac5eee31
3 files changed
+6 -4

No files matched your search

@@ -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);
}
}
@@ -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);
};
}
@@ -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),