2 files changed, 57 insertions, 15 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/client/AlchemicalChestScreen.java b/src/main/java/lv/enes/mc/eris_alchemy/client/AlchemicalChestScreen.java
index 319dea8..0e0f029 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/client/AlchemicalChestScreen.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/client/AlchemicalChestScreen.java
@@ -2,13 +2,11 @@ package lv.enes.mc.eris_alchemy.client;
 
 import lv.enes.mc.eris_alchemy.ErisAlchemy;
 import lv.enes.mc.eris_alchemy.menu.AlchemicalChestMenu;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 
-public class AlchemicalChestScreen extends AbstractContainerScreen<AlchemicalChestMenu> {
+public class AlchemicalChestScreen extends ChestLikeScreen<AlchemicalChestMenu> {
         public static final ResourceLocation TEXTURE =
                         new ResourceLocation(ErisAlchemy.ID, "textures/gui/container/alchemical_chest.png");
 
@@ -17,27 +15,25 @@ public class AlchemicalChestScreen extends AbstractContainerScreen<AlchemicalChe
 
         public AlchemicalChestScreen(AlchemicalChestMenu menu, Inventory inventory, Component title) {
                 super(menu, inventory, title);
+        }
 
-                imageWidth = TEXTURE_WIDTH;
-                imageHeight = TEXTURE_HEIGHT;
+        @Override
+        protected ResourceLocation getTexture() {
+                return TEXTURE;
         }
 
         @Override
-        public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-                renderBackground(graphics);
-                super.render(graphics, mouseX, mouseY, delta);
-                renderTooltip(graphics, mouseX, mouseY);
+        protected int getTextureWidth() {
+                return TEXTURE_WIDTH;
         }
 
         @Override
-        protected void renderBg(GuiGraphics graphics, float delta, int mouseX, int mouseY) {
-                int x = (width - imageWidth) / 2;
-                int y = (height - imageHeight) / 2;
-                graphics.blit(TEXTURE, x, y, 0, 0, imageWidth, imageHeight);
+        protected int getTextureHeight() {
+                return TEXTURE_HEIGHT;
         }
 
         @Override
-        protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
-                // Don't render any labels, there's no space for them lol
+        protected boolean shouldRenderLabels() {
+                return false;
         }
 }
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/client/ChestLikeScreen.java b/src/main/java/lv/enes/mc/eris_alchemy/client/ChestLikeScreen.java
new file mode 100644
index 0000000..c98b356
--- /dev/null
+++ b/src/main/java/lv/enes/mc/eris_alchemy/client/ChestLikeScreen.java
@@ -0,0 +1,46 @@
+package lv.enes.mc.eris_alchemy.client;
+
+import lv.enes.mc.eris_alchemy.menu.ChestLikeBlockMenu;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
+
+public abstract class ChestLikeScreen<M extends ChestLikeBlockMenu> extends AbstractContainerScreen<M> {
+        public ChestLikeScreen(M menu, Inventory inventory, Component title) {
+                super(menu, inventory, title);
+
+                imageWidth = getTextureWidth();
+                imageHeight = getTextureHeight();
+        }
+
+        protected abstract ResourceLocation getTexture();
+        protected abstract int getTextureWidth();
+        protected abstract int getTextureHeight();
+
+        protected boolean shouldRenderLabels() {
+                return true;
+        }
+
+        @Override
+        public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+                renderBackground(graphics);
+                super.render(graphics, mouseX, mouseY, delta);
+                renderTooltip(graphics, mouseX, mouseY);
+        }
+
+        @Override
+        protected void renderBg(GuiGraphics graphics, float delta, int mouseX, int mouseY) {
+                int x = (width - imageWidth) / 2;
+                int y = (height - imageHeight) / 2;
+                graphics.blit(getTexture(), x, y, 0, 0, imageWidth, imageHeight);
+        }
+
+        @Override
+        protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
+                if (shouldRenderLabels()) {
+                        super.renderLabels(graphics, mouseX, mouseY);
+                }
+        }
+}