Some refactoring

2 files changed, 10 insertions, 37 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestBlockEntity.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestBlockEntity.java
index 9c9942f..1e881f8 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestBlockEntity.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/AlchemicalChestBlockEntity.java
@@ -1,7 +1,7 @@
 package lv.enes.mc.eris_alchemy.block.entity;
 
 import jakarta.annotation.Nonnull;
-import lv.enes.mc.eris_alchemy.block.ErisAlchemyBlocks;
+import lv.enes.mc.eris_alchemy.ErisAlchemyRegistry;
 import lv.enes.mc.eris_alchemy.menu.AlchemicalChestMenu;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
@@ -62,8 +62,14 @@ public class AlchemicalChestBlockEntity extends BaseContainerBlockEntity impleme
                 }
 
                 @Override
-                protected void openerCountChanged(Level world, BlockPos pos, BlockState state, int oldViewerCount, int newViewerCount) {
-                        world.blockEvent(worldPosition, ErisAlchemyBlocks.ALCHEMICAL_CHEST, EVENT, newViewerCount);
+                protected void openerCountChanged(
+                                Level world,
+                                BlockPos pos,
+                                BlockState state,
+                                int oldViewerCount,
+                                int newViewerCount
+                ) {
+                        world.blockEvent(worldPosition, ErisAlchemyRegistry.Blocks.ALCHEMICAL_CHEST, EVENT, newViewerCount);
                 }
 
                 @Override
@@ -76,7 +82,7 @@ public class AlchemicalChestBlockEntity extends BaseContainerBlockEntity impleme
         };
 
         public AlchemicalChestBlockEntity(BlockPos pos, BlockState state) {
-                super(ErisAlchemyBlockEntities.ALCHEMICAL_CHEST, pos, state);
+                super(ErisAlchemyRegistry.BlockEntities.ALCHEMICAL_CHEST, pos, state);
         }
 
         @Override
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ErisAlchemyBlockEntities.java b/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ErisAlchemyBlockEntities.java
deleted file mode 100644
index a95ac58..0000000
--- a/src/main/java/lv/enes/mc/eris_alchemy/block/entity/ErisAlchemyBlockEntities.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package lv.enes.mc.eris_alchemy.block.entity;
-
-import lv.enes.mc.eris_alchemy.ErisAlchemy;
-import lv.enes.mc.eris_alchemy.block.ErisAlchemyBlocks;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.quiltmc.qsl.block.entity.api.QuiltBlockEntityTypeBuilder;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
-
-public final class ErisAlchemyBlockEntities {
-        private static final Map<ResourceLocation, BlockEntityType<?>> entities = new LinkedHashMap<>();
-
-        public static final BlockEntityType<AlchemicalChestBlockEntity> ALCHEMICAL_CHEST = register(
-                        "alchemical_chest",
-                        QuiltBlockEntityTypeBuilder.create(AlchemicalChestBlockEntity::new, ErisAlchemyBlocks.ALCHEMICAL_CHEST)
-                                        .build()
-        );
-
-        public static void consumeBlockEntities(BiConsumer<? super ResourceLocation, ? super BlockEntityType<?>> consumer) {
-                entities.forEach(consumer);
-        }
-
-        private static <T extends BlockEntity> BlockEntityType<T> register(String id, BlockEntityType<T> type) {
-                entities.putIfAbsent(new ResourceLocation(ErisAlchemy.ID, id), type);
-                return type;
-        }
-
-        private ErisAlchemyBlockEntities() {}
-}