From 982f0bbbd7564b6f292a0890dd862149d9f710a9 Mon Sep 17 00:00:00 2001
From: Uko Kokņevičs
Date: Wed, 10 Jan 2024 00:26:04 +0100
Subject: Some refactoring

---
 .../java/lv/enes/mc/eris_alchemy/ErisAlchemy.java  | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/main/java/lv/enes/mc/eris_alchemy/ErisAlchemy.java')

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/ErisAlchemy.java b/src/main/java/lv/enes/mc/eris_alchemy/ErisAlchemy.java
index 83cef8c..bb804b3 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/ErisAlchemy.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/ErisAlchemy.java
@@ -1,9 +1,5 @@
 package lv.enes.mc.eris_alchemy;
 
-import lv.enes.mc.eris_alchemy.block.ErisAlchemyBlocks;
-import lv.enes.mc.eris_alchemy.block.entity.ErisAlchemyBlockEntities;
-import lv.enes.mc.eris_alchemy.menu.ErisAlchemyMenus;
-import lv.enes.mc.eris_alchemy.recipe.ErisAlchemyRecipeSerializers;
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -21,9 +17,11 @@ public class ErisAlchemy implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger(ID);
 
 	public static final CreativeModeTab ITEM_GROUP = FabricItemGroup.builder()
-			.icon(() -> new ItemStack(ErisAlchemyItems.LOW_COVALENCE_DUST))
+			.icon(() -> new ItemStack(ErisAlchemyRegistry.Items.LOW_COVALENCE_DUST))
 			.title(Component.translatable("itemGroup.eris_alchemy.item_group"))
-			.displayItems((context, entries) -> ErisAlchemyItems.consumeItems((id, item) -> entries.accept(item)))
+			.displayItems(
+					(context, entries) -> ErisAlchemyRegistry.Items.consume((id, item) -> entries.accept(item))
+			)
 			.build();
 
 	@Override
@@ -35,10 +33,14 @@ public class ErisAlchemy implements ModInitializer {
 
 		Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation(ID, "item_group"), ITEM_GROUP);
 
-		ErisAlchemyBlocks.consumeBlocks((id, block) -> Registry.register(BuiltInRegistries.BLOCK, id, block));
-		ErisAlchemyBlockEntities.consumeBlockEntities((id, block) -> Registry.register(BuiltInRegistries.BLOCK_ENTITY_TYPE, id, block));
-		ErisAlchemyItems.consumeItems((id, item) -> Registry.register(BuiltInRegistries.ITEM, id, item));
-		ErisAlchemyMenus.consumeMenus((id, menu) -> Registry.register(BuiltInRegistries.MENU, id, menu));
-		ErisAlchemyRecipeSerializers.consumeSerializers((id, serializer) -> Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, id, serializer));
+		ErisAlchemyRegistry.BlockEntities.consume(
+				(id, block) -> Registry.register(BuiltInRegistries.BLOCK_ENTITY_TYPE, id, block)
+		);
+		ErisAlchemyRegistry.Blocks.consume((id, block) -> Registry.register(BuiltInRegistries.BLOCK, id, block));
+		ErisAlchemyRegistry.Items.consume((id, item) -> Registry.register(BuiltInRegistries.ITEM, id, item));
+		ErisAlchemyRegistry.Menus.consume((id, menu) -> Registry.register(BuiltInRegistries.MENU, id, menu));
+		ErisAlchemyRegistry.RecipeSerializers.consume(
+				(id, serializer) -> Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, id, serializer)
+		);
 	}
 }
-- 
cgit v1.2.3