Post-Merge fixes

src/main/java/appeng/container/slot/AppEngSlot.java

@@ -52,7 +52,7 @@ public class AppEngSlot extends Slot {
         super(EMPTY_INVENTORY, invSlot, x, y);
         this.itemHandler = inv;
         this.invSlot = invSlot;
-        this.backingSlot = inv.getSlot(idx);
+        this.backingSlot = inv.getSlot(invSlot);
 
         this.defX = x;
         this.defY = y;
@@ -92,7 +92,7 @@ public class AppEngSlot extends Slot {
             return ItemStack.EMPTY;
         }
 
-        if (this.index >= this.itemHandler.getSlotCount()) {
+        if (this.invSlot >= this.itemHandler.getSlotCount()) {
             return ItemStack.EMPTY;
         }
 

src/main/java/appeng/container/slot/CraftingMatrixSlot.java

@@ -30,8 +30,8 @@ public class CraftingMatrixSlot extends AppEngSlot {
     private final AEBaseContainer c;
     private final Inventory wrappedInventory;
 
-    public CraftingMatrixSlot(final AEBaseContainer c, final FixedItemInv inv, final int invSlot,
-            final int x, final int y) {
+    public CraftingMatrixSlot(final AEBaseContainer c, final FixedItemInv inv, final int invSlot, final int x,
+            final int y) {
         super(inv, invSlot, x, y);
         this.c = c;
         this.wrappedInventory = new WrapperInvItemHandler(inv);

src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java

@@ -30,11 +30,11 @@ public class MolecularAssemblerPatternSlot extends AppEngSlot {
 
     private final int slotIdx;
 
-    public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final FixedItemInv inv, final int invSlot,
-            final int x, final int y) {
+    public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final FixedItemInv inv,
+            final int invSlot, final int x, final int y) {
         super(inv, invSlot, x, y);
         this.mac = mac;
-        this.slotIdx = slotIdx;
+        this.slotIdx = invSlot;
     }
 
     @Override

src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java

@@ -27,8 +27,9 @@ public class OptionalRestrictedInputSlot extends RestrictedInputSlot {
     private final int groupNum;
     private final IOptionalSlotHost host;
 
-    public OptionalRestrictedInputSlot(final PlacableItemType valid, final FixedItemInv inv, final IOptionalSlotHost host,
-            final int invSlot, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) {
+    public OptionalRestrictedInputSlot(final PlacableItemType valid, final FixedItemInv inv,
+            final IOptionalSlotHost host, final int invSlot, final int x, final int y, final int grpNum,
+            final PlayerInventory invPlayer) {
         super(valid, inv, invSlot, x, y, invPlayer);
         this.groupNum = grpNum;
         this.host = host;