1.12.2 backports

CHANGELOG.md

@@ -56,6 +56,10 @@ NOTE: This is an alpha release. Bugs may happen. Remember to take backups.
 
 ### 1.6.16
 - Updated Russian translation (Bytegm)
+- Fixed erroring controller tile entity (ian-rampage)
+- Fixed Inventory Tweaks sorting not respecting locked slots (Landmaster)
+- Fixed OpenComputers driver voiding excess fluids (BlueAgent)
+- Fixed being able to move wireless items in inventory (raoulvdberge, Dabombber)
 
 ### 1.6.15
 - Fixed recipes with more than 1 bucket of fluid not transferring from JEI (Darkere)

src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java

@@ -58,10 +58,24 @@ public abstract class BaseContainer extends Container {
     }
 
     protected void addPlayerInventory(int xInventory, int yInventory) {
-        int id = 0;
-
         int disabledSlotNumber = getDisabledSlotNumber();
 
+        int id = 9;
+
+        for (int y = 0; y < 3; y++) {
+            for (int x = 0; x < 9; x++) {
+                if (id == disabledSlotNumber) {
+                    addSlot(new LegacyDisabledSlot(player.inventory, id, xInventory + x * 18, yInventory + y * 18));
+                } else {
+                    addSlot(new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18));
+                }
+
+                id++;
+            }
+        }
+
+        id = 0;
+
         for (int i = 0; i < 9; i++) {
             int x = xInventory + i * 18;
             int y = yInventory + 4 + (3 * 18);
@@ -74,18 +88,6 @@ public abstract class BaseContainer extends Container {
 
             id++;
         }
-
-        for (int y = 0; y < 3; y++) {
-            for (int x = 0; x < 9; x++) {
-                if (id == disabledSlotNumber) {
-                    addSlot(new LegacyDisabledSlot(player.inventory, id, xInventory + x * 18, yInventory + y * 18));
-                } else {
-                    addSlot(new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18));
-                }
-
-                id++;
-            }
-        }
     }
 
     public List<FluidFilterSlot> getFluidSlots() {