GUI/Container fixes Ugh

src/main/java/appeng/container/implementations/ContainerMEPortableCell.java

@@ -136,7 +136,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
         if (wirelessTerminalGUIObject != null) {
             for (int upgradeSlot = 0; upgradeSlot < availableUpgrades(); upgradeSlot++) {
                 this.addSlotToContainer(
-                        (new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, upgradeSlot, 187, upgradeSlot * 18, this.getInventoryPlayer()))
+                        (new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, upgradeSlot, 206, 135 + upgradeSlot * 18, this.getInventoryPlayer()))
                                 .setNotDraggable());
             }
         }
@@ -157,7 +157,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
         }
     }
 
-    private void loadFromNBT() {
+    protected void loadFromNBT() {
         NBTTagCompound data = wirelessTerminalGUIObject.getItemStack().getTagCompound();
         if (data != null) {
             upgrades.readFromNBT(wirelessTerminalGUIObject.getItemStack().getTagCompound().getCompoundTag("upgrades"));

src/main/java/appeng/container/implementations/ContainerWirelessCraftingTerminal.java

@@ -40,23 +40,18 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.PlayerInvWrapper;
 
 
-public class ContainerWirelessCraftingTerminal extends ContainerMEPortableCell implements IAEAppEngInventory, IContainerCraftingPacket {
-
-    private final WirelessTerminalGuiObject wirelessTerminalGUIObject;
+public class ContainerWirelessCraftingTerminal extends ContainerMEPortableCell implements IContainerCraftingPacket {
 
     private final AppEngInternalInventory output = new AppEngInternalInventory(this, 1);
     private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9];
     private final SlotCraftingTerm outputSlot;
 
-    private final AppEngInternalInventory craftingGrid = new AppEngInternalInventory(this, 9);
+    private AppEngInternalInventory craftingGrid;
 
     private IRecipe currentRecipe;
 
     public ContainerWirelessCraftingTerminal(final InventoryPlayer ip, final WirelessTerminalGuiObject gui) {
-        super(ip, gui, false);
-        this.wirelessTerminalGUIObject = gui;
-
-        this.loadFromNBT();
+        super(ip, gui, true);
 
         final IItemHandler crafting = this.craftingGrid;
 
@@ -104,11 +99,13 @@ public class ContainerWirelessCraftingTerminal extends ContainerMEPortableCell i
         }
     }
 
+    @Override
     protected void loadFromNBT() {
+        super.loadFromNBT();
+        this.craftingGrid = new AppEngInternalInventory(this, 9);
         NBTTagCompound data = wirelessTerminalGUIObject.getItemStack().getTagCompound();
         if (data != null) {
             this.craftingGrid.readFromNBT(data, "craftingGrid");
-            upgrades.readFromNBT(wirelessTerminalGUIObject.getItemStack().getTagCompound().getCompoundTag("upgrades"));
         }
     }
 

src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java

@@ -48,7 +48,7 @@ import net.minecraftforge.items.IItemHandler;
 import static appeng.helpers.PatternHelper.CRAFTING_GRID_DIMENSION;
 
 
-public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder implements IUpgradeableCellContainer {
+public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder implements IUpgradeableCellContainer, IInventorySlotAware {
 
     private final WirelessTerminalGuiObject wirelessTerminalGUIObject;
     private final int slot;
@@ -259,9 +259,19 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im
         if (wirelessTerminalGUIObject != null) {
             for (int upgradeSlot = 0; upgradeSlot < availableUpgrades(); upgradeSlot++) {
                 this.addSlotToContainer(
-                        (new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, upgradeSlot, 187, upgradeSlot * 18 - 2, this.getInventoryPlayer()))
+                        (new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, upgradeSlot, 206, 135 + upgradeSlot * 18, this.getInventoryPlayer()))
                                 .setNotDraggable());
             }
         }
     }
+
+    @Override
+    public int getInventorySlot() {
+        return wirelessTerminalGUIObject.getInventorySlot();
+    }
+
+    @Override
+    public boolean isBaubleSlot() {
+        return wirelessTerminalGUIObject.isBaubleSlot();
+    }
 }