1 files changed, 25 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java
index 58adfc6c..7df3cef5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionHouseScreenHandler.java
@@ -1,8 +1,10 @@
 package de.hysky.skyblocker.skyblock.auction;
 
 import de.hysky.skyblocker.mixin.accessor.SlotAccessor;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
 import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.screen.slot.Slot;
@@ -14,19 +16,21 @@ public class AuctionHouseScreenHandler extends GenericContainerScreenHandler {
         int yOffset = (rows - 4) * 18;
         // Shift player inventory by 2 pixels and also remove the yOffset
         for (int i = rows*9; i < slots.size(); i++) {
-            SlotAccessor slotAccessor = (SlotAccessor) slots.get(i);
-            slotAccessor.setY(2-yOffset);
+            Slot slot = slots.get(i);
+            SlotAccessor slotAccessor = (SlotAccessor) slot;
+            slotAccessor.setY(slot.y+2-yOffset);
         }
 
         if (isView) return;
         // disable ALL THE OTHER SLOTS MWAHAHAHA and also move the good ones around and stuff
-        for (int i = 9; i < (rows-1)*9; i++) {
+        for (int i = 0; i < rows*9; i++) {
             int lineI = i % 9;
             Slot slot = slots.get(i);
-            if (lineI > 1 && lineI < 8) {
+            if (i>9 && i<(rows-1)*9 && lineI > 1 && lineI < 8) {
+                int miniInventorySlot = lineI - 2 + (i/9 - 1)*6;
                 SlotAccessor slotAccessor = (SlotAccessor) slot;
-                slotAccessor.setX(8+ lineI * 18);
-                slotAccessor.setY(18 + (i/9 -1) * 18);
+                slotAccessor.setX(8 + miniInventorySlot%8 * 18);
+                slotAccessor.setY(18 + miniInventorySlot/8 * 18);
             } else {
                 slots.set(i, new Slot(slot.inventory, slot.getIndex(), slot.x, slot.y){
                     @Override
@@ -37,4 +41,19 @@ public class AuctionHouseScreenHandler extends GenericContainerScreenHandler {
             }
         }
     }
+    
+    public static AuctionHouseScreenHandler of(GenericContainerScreenHandler original, boolean isView) {
+        return new AuctionHouseScreenHandler(original.getType(),
+                original.syncId,
+                MinecraftClient.getInstance().player.getInventory(),
+                original.getInventory(),
+                original.getRows(),
+                isView);
+    }
+
+    @Override
+    public void setStackInSlot(int slot, int revision, ItemStack stack) {
+        super.setStackInSlot(slot, revision, stack);
+        onContentChanged(slots.get(slot).inventory);
+    }
 }