2 files changed, 76 insertions, 49 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/menu/AlchemicalChestMenu.java b/src/main/java/lv/enes/mc/eris_alchemy/menu/AlchemicalChestMenu.java
index a464f3f..1dc3364 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/menu/AlchemicalChestMenu.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/menu/AlchemicalChestMenu.java
@@ -1,38 +1,31 @@
 package lv.enes.mc.eris_alchemy.menu;
 
-import jakarta.annotation.Nonnull;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry;
 import net.minecraft.world.Container;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
 
-public class AlchemicalChestMenu extends AbstractContainerMenu {
+public class AlchemicalChestMenu extends ChestLikeBlockMenu {
         private static final int WIDTH = 13;
         private static final int HEIGHT = 8;
 
-        private final Container container;
-
         public AlchemicalChestMenu(int syncId, Inventory playerInventory) {
                 this(syncId, playerInventory, new SimpleContainer(WIDTH * HEIGHT));
         }
 
-        public AlchemicalChestMenu(int syncId, Inventory playerInventory, Container inventory) {
-                super(ErisAlchemyRegistry.Menus.ALCHEMICAL_CHEST, syncId);
-                checkContainerSize(inventory, WIDTH * HEIGHT);
-
-                this.container = inventory;
-                inventory.startOpen(playerInventory.player);
+        public AlchemicalChestMenu(int syncId, Inventory playerInventory, Container container) {
+                super(ErisAlchemyRegistry.Menus.ALCHEMICAL_CHEST, syncId, playerInventory, container);
+        }
 
+        @Override
+        protected void addSlots(Inventory playerInventory) {
                 var x_off = 8;
                 var y_off = 8;
 
                 for (var y = 0; y < HEIGHT; y++) {
                         for (var x = 0; x < WIDTH; x++ ) {
-                                addSlot(new Slot(inventory, y * WIDTH + x, x_off + x * 18, y_off + y * 18));
+                                addSlot(new Slot(container, y * WIDTH + x, x_off + x * 18, y_off + y * 18));
                         }
                 }
 
@@ -52,41 +45,8 @@ public class AlchemicalChestMenu extends AbstractContainerMenu {
                 }
         }
 
-        public Container getContainer() {
-                return container;
-        }
-
-        @Nonnull
-        @Override
-        public ItemStack quickMoveStack(Player player, int fromIndex) {
-                var newStack = ItemStack.EMPTY;
-                var slot = slots.get(fromIndex);
-                if (!slot.hasItem()) {
-                        return newStack;
-                }
-
-                var originalStack = slot.getItem();
-                newStack = originalStack.copy();
-
-                if (fromIndex < container.getContainerSize()) {
-                        if (!moveItemStackTo(originalStack, container.getContainerSize(), slots.size(), true)) {
-                                return ItemStack.EMPTY;
-                        }
-                } else if (!moveItemStackTo(originalStack, 0, container.getContainerSize(), false)) {
-                        return ItemStack.EMPTY;
-                }
-
-                if (originalStack.isEmpty()) {
-                        slot.setByPlayer(ItemStack.EMPTY);
-                } else {
-                        slot.setChanged();
-                }
-
-                return newStack;
-        }
-
         @Override
-        public boolean stillValid(Player player) {
-                return container.stillValid(player);
+        protected int getRequiredSize() {
+                return WIDTH * HEIGHT;
         }
 }
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/menu/ChestLikeBlockMenu.java b/src/main/java/lv/enes/mc/eris_alchemy/menu/ChestLikeBlockMenu.java
new file mode 100644
index 0000000..897abe9
--- /dev/null
+++ b/src/main/java/lv/enes/mc/eris_alchemy/menu/ChestLikeBlockMenu.java
@@ -0,0 +1,67 @@
+package lv.enes.mc.eris_alchemy.menu;
+
+import jakarta.annotation.Nonnull;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.ItemStack;
+
+public abstract class ChestLikeBlockMenu extends AbstractContainerMenu {
+        protected final Container container;
+
+        public ChestLikeBlockMenu(
+                        MenuType<? extends ChestLikeBlockMenu> type,
+                        int syncId,
+                        Inventory playerInventory,
+                        Container container
+        ) {
+                super(type, syncId);
+                checkContainerSize(container, getRequiredSize());
+                this.container = container;
+                container.startOpen(playerInventory.player);
+                addSlots(playerInventory);
+        }
+
+        protected abstract void addSlots(Inventory playerInventory);
+        protected abstract int getRequiredSize();
+
+        public Container getContainer() {
+                return container;
+        }
+
+        @Nonnull
+        @Override
+        public ItemStack quickMoveStack(Player player, int fromIndex) {
+                var newStack = ItemStack.EMPTY;
+                var slot = slots.get(fromIndex);
+                if (!slot.hasItem()) {
+                        return newStack;
+                }
+
+                var originalStack = slot.getItem();
+                newStack = originalStack.copy();
+
+                if (fromIndex < container.getContainerSize()) {
+                        if (!moveItemStackTo(originalStack, container.getContainerSize(), slots.size(), true)) {
+                                return ItemStack.EMPTY;
+                        }
+                } else if (!moveItemStackTo(originalStack, 0, container.getContainerSize(), false)) {
+                        return ItemStack.EMPTY;
+                }
+
+                if (originalStack.isEmpty()) {
+                        slot.setByPlayer(ItemStack.EMPTY);
+                } else {
+                        slot.setChanged();
+                }
+
+                return newStack;
+        }
+
+        @Override
+        public boolean stillValid(Player player) {
+                return container.stillValid(player);
+        }
+}