Fix a dedicated server crash

3 files changed, 25 insertions, 9 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestEntity.java
index 659e4b1..4fff3fa 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestEntity.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestEntity.java
@@ -3,15 +3,17 @@ package lv.enes.mc.eris_alchemy.block.entity;
 import jakarta.annotation.Nonnull;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.BlockEntities;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.Blocks;
-import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.Materials;
+import lv.enes.mc.eris_alchemy.client.ErisAlchemyClientRegistry.Materials;
 import lv.enes.mc.eris_alchemy.menu.AlchemicalChestMenu;
 import lv.enes.mc.eris_alchemy.menu.ChestLikeMenu;
+import net.minecraft.client.resources.model.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import org.quiltmc.loader.api.minecraft.ClientOnly;
 
 public class AlchemicalChestEntity extends ChestLikeEntity {
         private final static int WIDTH = 13;
@@ -20,7 +22,7 @@ public class AlchemicalChestEntity extends ChestLikeEntity {
         private final NonNullList<ItemStack> items = NonNullList.withSize(WIDTH * HEIGHT, ItemStack.EMPTY);
 
         public AlchemicalChestEntity(BlockPos pos, BlockState state) {
-                super(BlockEntities.ALCHEMICAL_CHEST, pos, state, Materials.ALCHEMICAL_CHEST);
+                super(BlockEntities.ALCHEMICAL_CHEST, pos, state);
         }
 
         @Nonnull
@@ -35,6 +37,12 @@ public class AlchemicalChestEntity extends ChestLikeEntity {
                 return items;
         }
 
+        @ClientOnly
+        @Nonnull
+        public Material getMaterial() {
+                return Materials.ALCHEMICAL_CHEST;
+        }
+
         @Nonnull
         @Override
         protected Block getParent() {
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ChestLikeEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ChestLikeEntity.java
index 8f40d26..09aecc7 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ChestLikeEntity.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ChestLikeEntity.java
@@ -18,12 +18,11 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.*;
 import net.minecraft.world.level.block.state.BlockState;
+import org.quiltmc.loader.api.minecraft.ClientOnly;
 
 public abstract class ChestLikeEntity extends BaseContainerBlockEntity implements LidBlockEntity {
         protected static final int EVENT_INTERACTED = 1;
 
-        public final Material material;
-
         protected final ChestLidController lidController = new ChestLidController();
         protected final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() {
                 @Override
@@ -53,16 +52,17 @@ public abstract class ChestLikeEntity extends BaseContainerBlockEntity implement
         public ChestLikeEntity(
                         BlockEntityType<? extends ChestLikeEntity> type,
                         BlockPos pos,
-                        BlockState state,
-                        Material material
+                        BlockState state
         ) {
                 super(type, pos, state);
-                this.material = material;
         }
 
 
         @Nonnull
         protected abstract NonNullList<ItemStack> getItems();
+        @ClientOnly
+        @Nonnull
+        public abstract Material getMaterial();
         @Nonnull
         protected abstract Block getParent();
 
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
index 432ba6f..33a6250 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/EnergyCondenserEntity.java
@@ -4,12 +4,13 @@ import jakarta.annotation.Nonnull;
 import lv.enes.mc.eris_alchemy.Emc;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.BlockEntities;
 import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.Blocks;
-import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry.Materials;
+import lv.enes.mc.eris_alchemy.client.ErisAlchemyClientRegistry;
 import lv.enes.mc.eris_alchemy.menu.ChestLikeMenu;
 import lv.enes.mc.eris_alchemy.menu.EnergyCondenserMenu;
 import lv.enes.mc.eris_alchemy.utils.ContainerOpenersCounterUtil;
 import lv.enes.mc.eris_alchemy.utils.SyncedValue.SyncedDouble;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
+import net.minecraft.client.resources.model.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
@@ -20,6 +21,7 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import org.quiltmc.loader.api.minecraft.ClientOnly;
 
 import java.util.stream.IntStream;
 
@@ -32,7 +34,7 @@ public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedSc
         public final SyncedDouble storedEmc = new SyncedDouble(0);
 
         public EnergyCondenserEntity(BlockPos pos, BlockState state) {
-                super(BlockEntities.ENERGY_CONDENSER, pos, state, Materials.ENERGY_CONDENSER);
+                super(BlockEntities.ENERGY_CONDENSER, pos, state);
         }
 
         @Nonnull
@@ -47,6 +49,12 @@ public class EnergyCondenserEntity extends ChestLikeEntity implements ExtendedSc
                 return items;
         }
 
+        @ClientOnly
+        @Nonnull
+        public Material getMaterial() {
+                return ErisAlchemyClientRegistry.Materials.ENERGY_CONDENSER;
+        }
+
         @Nonnull
         @Override
         protected Block getParent() {