From 38f3042711cd6a046c79cb207dab22e106b7ce3f Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Wed, 11 Feb 2026 19:49:41 +0200 Subject: [PATCH] fix --- .../github/inventory/gui/ItemGuiFactory.java | 6 +++--- .../github/inventory/gui/PartOrItemGuiFactory.java | 5 +++-- src/main/java/com/glodblock/github/util/Util.java | 11 +---------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/gui/ItemGuiFactory.java b/src/main/java/com/glodblock/github/inventory/gui/ItemGuiFactory.java index 1b489354..b684143f 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/ItemGuiFactory.java +++ b/src/main/java/com/glodblock/github/inventory/gui/ItemGuiFactory.java @@ -9,10 +9,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.inventory.item.IItemInventory; -import com.glodblock.github.util.Util; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; +import appeng.util.Platform; public abstract class ItemGuiFactory implements IGuiFactory { @@ -30,7 +30,7 @@ public abstract class ItemGuiFactory implements IGuiFactory { @Nullable @Override public Object createServerGui(EntityPlayer player, World world, int x, int y, int z, ForgeDirection face) { - ItemStack item = Util.getWirelessTerminal(player, x); + ItemStack item = Platform.getItemFromPlayerInventoryBySlotIndex(player, x); if (item == null || !(item.getItem() instanceof IItemInventory)) { return null; } @@ -57,7 +57,7 @@ public abstract class ItemGuiFactory implements IGuiFactory { @Nullable @Override public Object createClientGui(EntityPlayer player, World world, int x, int y, int z, ForgeDirection face) { - ItemStack item = Util.getWirelessTerminal(player, x); + ItemStack item = Platform.getItemFromPlayerInventoryBySlotIndex(player, x); if (item == null || !(item.getItem() instanceof IItemInventory)) { return null; } diff --git a/src/main/java/com/glodblock/github/inventory/gui/PartOrItemGuiFactory.java b/src/main/java/com/glodblock/github/inventory/gui/PartOrItemGuiFactory.java index e2cea656..bf298ba0 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/PartOrItemGuiFactory.java +++ b/src/main/java/com/glodblock/github/inventory/gui/PartOrItemGuiFactory.java @@ -14,6 +14,7 @@ import com.glodblock.github.util.Util; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; +import appeng.util.Platform; public abstract class PartOrItemGuiFactory extends PartGuiFactory { @@ -31,7 +32,7 @@ public abstract class PartOrItemGuiFactory extends PartGuiFactory { public Object createServerGui(EntityPlayer player, World world, int x, int y, int z, ForgeDirection face) { ImmutablePair result = Util.GuiHelper.decodeType(y); if (result.getLeft() == Util.GuiHelper.GuiType.ITEM) { - ItemStack item = Util.getWirelessTerminal(player, x); + ItemStack item = Platform.getItemFromPlayerInventoryBySlotIndex(player, x); if (item == null || !(item.getItem() instanceof IItemInventory)) { return null; } @@ -62,7 +63,7 @@ public abstract class PartOrItemGuiFactory extends PartGuiFactory { public Object createClientGui(EntityPlayer player, World world, int x, int y, int z, ForgeDirection face) { ImmutablePair result = Util.GuiHelper.decodeType(y); if (result.left == Util.GuiHelper.GuiType.ITEM) { - ItemStack item = Util.getWirelessTerminal(player, x); + ItemStack item = Platform.getItemFromPlayerInventoryBySlotIndex(player, x); if (item == null || !(item.getItem() instanceof IItemInventory)) { return null; } diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 118a94a7..38d7cede 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -73,7 +73,7 @@ public final class Util { public static int drainItemPower(AEBaseContainer c, InventoryPlayer ip, int slot, int ticks, double pm, IFluidPortableCell wt) { if (slot != -1) { - final ItemStack currentItem = getWirelessTerminal(ip.player, slot); + final ItemStack currentItem = Platform.getItemFromPlayerInventoryBySlotIndex(ip.player, slot); if (wt != null) { if (currentItem != wt.getItemStack()) { if (currentItem != null) { @@ -193,15 +193,6 @@ public final class Util { return new NullInventory<>(); } - public static ItemStack getWirelessTerminal(EntityPlayer player, int x) { - ImmutablePair result = GuiHelper.decodeInvType(x); - if (result.getLeft() == GuiHelper.InvType.PLAYER_INV) { - return player.inventory.getStackInSlot(result.getRight()); - } else { - return BaublesApi.getBaubles(player).getStackInSlot(result.getRight()); - } - } - public static ImmutablePair getUltraWirelessTerm(EntityPlayer player) { int invSize = player.inventory.getSizeInventory();