Fix Wireless Terminals hotkey (#13)

* Fix Wireless Terminals hotkey
 - Now they can be correctly opened, not just when the Wireless Terminals are held in hand.
 - Now they can also function properly when in the Baubles.

* Update zh_cn.lang

---------

Co-authored-by: 0xC4DE <0xc4de@0xc4de.dev>

Author: Circulate233

src/main/java/com/_0xc4de/ae2exttable/client/KeyBindings.java

@@ -13,7 +13,7 @@ public enum KeyBindings {
     elite(new KeyBinding("key.open_elite_extended_wireless_crafting_terminal", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, Keyboard.KEY_NONE, KEY_CATEGORY)),
     ultimate(new KeyBinding("key.open_ultimate_extended_wireless_crafting_terminal", KeyConflictContext.UNIVERSAL, KeyModifier.NONE, Keyboard.KEY_NONE, KEY_CATEGORY));
 
-    private KeyBinding binding;
+    private final KeyBinding binding;
 
     KeyBindings(KeyBinding keyBinding) {
         this.binding = keyBinding;

src/main/java/com/_0xc4de/ae2exttable/client/container/ContainerSharedWirelessTerminals.java

@@ -13,7 +13,6 @@
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.WrapperInvItemHandler;
 import baubles.api.BaublesApi;
-import com._0xc4de.ae2exttable.client.gui.AE2ExtendedGUIs;
 import com._0xc4de.ae2exttable.client.gui.ExtendedCraftingGUIConstants;
 import com._0xc4de.ae2exttable.client.gui.WirelessTerminalGuiObjectTwo;
 import net.minecraft.entity.player.EntityPlayer;
@@ -52,8 +51,8 @@ public ContainerSharedWirelessTerminals(
 
     if (guiItemObject != null) {
       final int slotIndex =
-          ((IInventorySlotAware) guiItemObject).getInventorySlot();
-      if (!((IInventorySlotAware) guiItemObject).isBaubleSlot()) {
+          guiItemObject.getInventorySlot();
+      if (!guiItemObject.isBaubleSlot()) {
         this.lockPlayerInventorySlot(slotIndex);
       }
       this.slot = slotIndex;

src/main/java/com/_0xc4de/ae2exttable/client/gui/PartGuiHandler.java

@@ -9,20 +9,14 @@
 import appeng.api.features.ILocatable;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWirelessTermRegistry;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHost;
-import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AEPartLocation;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerOpenContext;
 import appeng.core.localization.PlayerMessages;
 import appeng.me.GridAccessException;
-import appeng.tile.misc.TileSecurityStation;
 import appeng.util.Platform;
 import baubles.api.BaublesApi;
 import com._0xc4de.ae2exttable.AE2ExtendedCraftingTable;
@@ -52,6 +46,8 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.common.network.IGuiHandler;
 import org.jetbrains.annotations.Nullable;
 
@@ -90,13 +86,8 @@ public static void openWirelessTerminalGui(ItemStack item, int invSlot,
             return;
         }
         final long parsedKey = Long.parseLong(unparsedKey);
-        final ILocatable
-                securityStation =
+        final ILocatable securityStation =
                 AEApi.instance().registries().locatable().getLocatableBy(parsedKey);
-        TileSecurityStation security_station = (TileSecurityStation) securityStation;
-        IGrid grid = security_station.getProxy().getGrid();
-        IStorageGrid inv = grid.getCache(IStorageGrid.class);
-        final IMEMonitor<IAEItemStack> storage = inv.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
         if (securityStation == null) {
             player.sendMessage(PlayerMessages.StationCanNotBeLocated.get());
             return;
@@ -140,8 +131,7 @@ public static IPart getPartFromWorld(World world, BlockPos pos,
     private Object updateGui(final Object newContainer, final World w,
                              final int x, final int y, final int z,
                              final AEPartLocation side, final Object myItem) {
-        if (newContainer instanceof AEBaseContainer) {
-            final AEBaseContainer bc = (AEBaseContainer) newContainer;
+        if (newContainer instanceof AEBaseContainer bc) {
             bc.setOpenContext(new ContainerOpenContext(myItem));
             bc.getOpenContext().setWorld(w);
             bc.getOpenContext().setX(x);
@@ -163,21 +153,17 @@ private Object updateGui(final Object newContainer, final World w,
 
         if (guiIsWirelessTerminal(guiID)) { // idk is item
             ItemStack termItem = getWirelessTermItem(usingItemOnTile, player, world, guiID, side, x, y, z);
-            final Object item =
-                    this.getGuiObject(guiID, termItem, player, world, x, y, z, side);
+            final Object item = this.getGuiObject(guiID, termItem, player, world, x, y, z, side);
             return this.updateGui(item, world, x, y, z, side, termItem);
         } else {
-
             final TileEntity TE = world.getTileEntity(new BlockPos(x, y, z));
 
             if (TE instanceof IPartHost) {
                 final IPart part = ((IPartHost) TE).getPart(side);
                 if (part == null) {
                     return null;
                 }
-                Object gui =
-                        this.getGuiObject(guiID, ItemStack.EMPTY, player, world, x, y, z,
-                                side);
+                Object gui = this.getGuiObject(guiID, ItemStack.EMPTY, player, world, x, y, z, side);
                 return this.updateGui(gui, world, x, y, z, side, part);
             }
         }
@@ -193,8 +179,7 @@ private Object getGuiObject(final AE2ExtendedGUIs guiID,
                                 final int z, final AEPartLocation side) {
 
         if (myItem.isEmpty()) {
-            IPart part =
-                    PartGuiHandler.getPartFromWorld(world, new BlockPos(x, y, z), side);
+            IPart part = PartGuiHandler.getPartFromWorld(world, new BlockPos(x, y, z), side);
 
             return switch (guiID) {
                 case BASIC_CRAFTING_TERMINAL -> new ContainerBasicCraftingTerminal(player.inventory,
@@ -214,19 +199,15 @@ private Object getGuiObject(final AE2ExtendedGUIs guiID,
                         AEApi.instance().registries().wireless()
                                 .getWirelessTerminalHandler(myItem);
 
-                wireless =
-                        new WirelessTerminalGuiObjectTwo(handler, myItem, player, world, x,
-                                y, z);
+                wireless = new WirelessTerminalGuiObjectTwo(handler, myItem, player, world, x, y, z);
             }
 
             return switch (guiID) {
                 // Start wireless stuffs here
                 case WIRELESS_BASIC_CRAFTING_TERMINAL -> new ContainerBasicWirelessTerminal(player.inventory, wireless);
-                case WIRELESS_ADVANCED_CRAFTING_TERMINAL ->
-                        new ContainerAdvancedWirelessTerminal(player.inventory, wireless);
+                case WIRELESS_ADVANCED_CRAFTING_TERMINAL -> new ContainerAdvancedWirelessTerminal(player.inventory, wireless);
                 case WIRELESS_ELITE_CRAFTING_TERMINAL -> new ContainerEliteWirelessTerminal(player.inventory, wireless);
-                case WIRELESS_ULTIMATE_CRAFTING_TERMINAL ->
-                        new ContainerUltimateWirelessTerminal(player.inventory, wireless);
+                case WIRELESS_ULTIMATE_CRAFTING_TERMINAL -> new ContainerUltimateWirelessTerminal(player.inventory, wireless);
                 default -> null;
             };
         }
@@ -238,66 +219,62 @@ private Object getGuiObject(final AE2ExtendedGUIs guiID,
                                                 int z) {
         AE2ExtendedGUIs guiID = PartGuiHandler.getGUIFromOrdinal(ID);
         AEPartLocation side = PartGuiHandler.getSideFromOrdinal(ID);
-        IPart part =
-                PartGuiHandler.getPartFromWorld(world, new BlockPos(x, y, z), side);
         final boolean usingItemOnTile = ((ID >> 3) & 1) == 1;
 
         WirelessTerminalGuiObjectTwo gui = null;
+        ITerminalHost part = null;
         if (guiIsWirelessTerminal(guiID)) {
             ItemStack termItem = getWirelessTermItem(usingItemOnTile, player, world, guiID, side, x, y, z);
             final IWirelessTermHandler handler =
                     AEApi.instance().registries().wireless()
                             .getWirelessTerminalHandler(termItem);
-            gui = new WirelessTerminalGuiObjectTwo(
-                    handler, player.inventory.getCurrentItem(), player, world, x, y, z);
-        }
 
-        switch (guiID) {
-            case BASIC_CRAFTING_TERMINAL:
-                GuiBasicCraftingTerminal term =
-                        new GuiBasicCraftingTerminal(player.inventory, (ITerminalHost) part,
-                                new ContainerBasicCraftingTerminal(player.inventory,
-                                        (PartBasicCraftingTerminal) part));
-                return term;
-            case ADVANCED_CRAFTING_TERMINAL:
-                return new GuiAdvancedCraftingTerminal(player.inventory,
-                        (ITerminalHost) part,
-                        new ContainerAdvancedCraftingTerminal(player.inventory,
-                                (PartAdvancedCraftingTerminal) part));
-            case ELITE_CRAFTING_TERMINAL:
-                return new GuiEliteCraftingTerminal(player.inventory,
-                        (ITerminalHost) part,
-                        new ContainerEliteCraftingTerminal(player.inventory,
-                                (PartEliteCraftingTerminal) part));
-            case ULTIMATE_CRAFTING_TERMINAL:
-                return new GuiUltimateCraftingTerminal(player.inventory,
-                        (ITerminalHost) part,
-                        new ContainerUltimateCraftingTerminal(player.inventory,
-                                (PartUltimateCraftingTerminal) part));
+            ItemStack terminal = ItemStack.EMPTY;
+            if (y == 0) {
+                terminal = player.inventory.getStackInSlot(x);
+            } else if (y == 1 && Loader.isModLoaded("baubles")) {
+                terminal = getStackInBaubleSlot(player, x);
+            }
 
-            case WIRELESS_BASIC_CRAFTING_TERMINAL:
-                // TODO: Fix for baubles, I guess?
-                return new GuiWirelessBasicCraftingTerm(player.inventory, gui,
-                        new ContainerBasicWirelessTerminal(
-                                player.inventory, gui));
+            if (terminal.isEmpty())return null;
 
-            case WIRELESS_ADVANCED_CRAFTING_TERMINAL:
-                return new GuiWirelessAdvancedCraftingTerm(player.inventory, gui,
-                        new ContainerAdvancedWirelessTerminal(
-                                player.inventory, gui));
+            gui = new WirelessTerminalGuiObjectTwo(handler, terminal, player, world, x, y, z);
+        } else {
+            part = (ITerminalHost)PartGuiHandler.getPartFromWorld(world, new BlockPos(x, y, z), side);
+        }
 
-            case WIRELESS_ELITE_CRAFTING_TERMINAL:
-                return new GuiWirelessEliteCraftingTerm(player.inventory, gui,
-                        new ContainerEliteWirelessTerminal(
-                                player.inventory, gui));
+        return switch (guiID) {
+            case BASIC_CRAFTING_TERMINAL -> new GuiBasicCraftingTerminal(player.inventory, part,
+                    new ContainerBasicCraftingTerminal(
+                            player.inventory, part));
+            case ADVANCED_CRAFTING_TERMINAL -> new GuiAdvancedCraftingTerminal(player.inventory, part,
+                    new ContainerAdvancedCraftingTerminal(
+                            player.inventory, part));
+            case ELITE_CRAFTING_TERMINAL -> new GuiEliteCraftingTerminal(player.inventory, part,
+                    new ContainerEliteCraftingTerminal(
+                            player.inventory, part));
+            case ULTIMATE_CRAFTING_TERMINAL -> new GuiUltimateCraftingTerminal(player.inventory, part,
+                    new ContainerUltimateCraftingTerminal(
+                            player.inventory, part));
+            case WIRELESS_BASIC_CRAFTING_TERMINAL ->
+                    new GuiWirelessBasicCraftingTerm(player.inventory, gui,
+                            new ContainerBasicWirelessTerminal(
+                                    player.inventory, gui));
+            case WIRELESS_ADVANCED_CRAFTING_TERMINAL -> new GuiWirelessAdvancedCraftingTerm(player.inventory, gui,
+                    new ContainerAdvancedWirelessTerminal(player.inventory, gui));
+            case WIRELESS_ELITE_CRAFTING_TERMINAL -> new GuiWirelessEliteCraftingTerm(player.inventory, gui,
+                    new ContainerEliteWirelessTerminal(
+                            player.inventory, gui));
+            case WIRELESS_ULTIMATE_CRAFTING_TERMINAL -> new GuiWirelessUltimateCraftingTerm(player.inventory, gui,
+                    new ContainerUltimateWirelessTerminal(
+                            player.inventory, gui));
+            default -> null;
+        };
+    }
 
-            case WIRELESS_ULTIMATE_CRAFTING_TERMINAL:
-                return new GuiWirelessUltimateCraftingTerm(player.inventory, gui,
-                        new ContainerUltimateWirelessTerminal(
-                                player.inventory, gui));
-            default:
-                return null;
-        }
+    @Optional.Method(modid = "baubles")
+    private ItemStack getStackInBaubleSlot(EntityPlayer player,int slot){
+        return slot >= 0 && slot < BaublesApi.getBaublesHandler(player).getSlots() ? BaublesApi.getBaublesHandler(player).getStackInSlot(slot) : ItemStack.EMPTY;
     }
 
     private ItemStack getWirelessTermItem(boolean usingItemOnTile, EntityPlayer player, World world, AE2ExtendedGUIs guiID, AEPartLocation side, int x, int y, int z) {
@@ -314,8 +291,6 @@ private ItemStack getWirelessTermItem(boolean usingItemOnTile, EntityPlayer play
         return termItem;
     }
 
-    ;
-
     public static boolean guiIsWirelessTerminal(AE2ExtendedGUIs gui) {
         return gui.ordinal() > 4;
     }

src/main/java/com/_0xc4de/ae2exttable/network/packets/PacketOpenWirelessGui.java

@@ -1,71 +1,71 @@
 package com._0xc4de.ae2exttable.network.packets;
 
-import appeng.api.networking.security.IActionHost;
-import appeng.container.AEBaseContainer;
-import appeng.container.ContainerOpenContext;
-import appeng.container.interfaces.IInventorySlotAware;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.me.GridAccessException;
 import appeng.util.Platform;
 import baubles.api.BaublesApi;
 import com._0xc4de.ae2exttable.client.gui.AE2ExtendedGUIs;
 import com._0xc4de.ae2exttable.client.gui.PartGuiHandler;
-import com._0xc4de.ae2exttable.items.ItemRegistry;
+import com._0xc4de.ae2exttable.interfaces.ITerminalGui;
 import com._0xc4de.ae2exttable.network.ExtendedTerminalPacket;
 import com._0xc4de.ae2exttable.network.PacketHandler;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
-
+import net.minecraftforge.fml.common.Optional;
 
 public class PacketOpenWirelessGui extends ExtendedTerminalPacket {
 
-  private final AE2ExtendedGUIs gui;
+    private final AE2ExtendedGUIs gui;
 
-  public PacketOpenWirelessGui(final ByteBuf stream) {
-    this.gui = AE2ExtendedGUIs.values()[stream.readInt()];
-  }
+    public PacketOpenWirelessGui(final ByteBuf stream) {
+        this.gui = AE2ExtendedGUIs.values()[stream.readInt()];
+    }
 
-  public PacketOpenWirelessGui(final AE2ExtendedGUIs gui) {
-    this.gui = gui;
-    final ByteBuf data = Unpooled.buffer();
-    data.writeInt(this.getGuiPacketID());
-    data.writeInt(gui.ordinal());
+    public PacketOpenWirelessGui(final AE2ExtendedGUIs gui) {
+        this.gui = gui;
+        final ByteBuf data = Unpooled.buffer();
+        data.writeInt(this.getGuiPacketID());
+        data.writeInt(gui.ordinal());
 
-    this.configureWrite(data);
-  }
+        this.configureWrite(data);
+    }
 
-  public int getGuiPacketID() {
-    return PacketHandler.PacketTypes.getID(this.getClass()).ordinal();
-  }
+    public int getGuiPacketID() {
+        return PacketHandler.PacketTypes.getID(this.getClass()).ordinal();
+    }
 
-  @Override
-  public void serverPacketData(final INetworkInfo manager,
-                               final ExtendedTerminalPacket packet,
-                               final EntityPlayer player) throws GridAccessException {
+    @Override
+    public void serverPacketData(final INetworkInfo manager,
+                                 final ExtendedTerminalPacket packet,
+                                 final EntityPlayer player) throws GridAccessException {
         NonNullList<ItemStack> inventory = player.inventory.mainInventory;
-        ItemStack guiItem = new ItemStack(ItemRegistry.partByGuiType(this.gui));
         for (int i = 0; i < inventory.size(); i++) {
             ItemStack is = inventory.get(i);
-            if (Platform.itemComparisons().isEqualItemType(is, guiItem)) {
+            if (is.getItem() instanceof ITerminalGui wt && wt.getGuiType() == this.gui) {
                 openGui(is, i, player, false);
                 return;
             }
         }
         if (Platform.isModLoaded("baubles")) {
-            for (int i = 0; i< BaublesApi.getBaublesHandler(player).getSlots(); i++) {
-                ItemStack is = BaublesApi.getBaublesHandler(player).getStackInSlot(i);
-                if (Platform.itemComparisons().isEqualItemType(is, guiItem)) {
-                  openGui(is, i, player, true);
-                  return;
-                }
+            tryOpenBauble(player);
+        }
+    }
+
+    @Optional.Method(modid = "baubles")
+    private void tryOpenBauble(EntityPlayer player) throws GridAccessException {
+        for (int i = 0; i < BaublesApi.getBaublesHandler(player).getSlots(); i++) {
+            ItemStack is = BaublesApi.getBaublesHandler(player).getStackInSlot(i);
+            if (is.getItem() instanceof ITerminalGui wt && wt.getGuiType() == this.gui) {
+                openGui(is, i, player, true);
+                return;
             }
         }
     }
 
     private void openGui(ItemStack itemStack, int slotIndex, EntityPlayer player, boolean isBauble) throws GridAccessException {
         PartGuiHandler.openWirelessTerminalGui(itemStack, slotIndex, isBauble, player.world, player, this.gui);
     }
-}
+}