From c61856cdba87912f3b4297e164ae0f654bba0c4a Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Sat, 6 Nov 2021 15:41:20 +0300
Subject: [PATCH] Mod blocks in registry, version change

---
 gradle.properties                             |  2 +-
 .../java/ru/bclib/registry/BaseRegistry.java  | 23 ++++++++++++++-----
 .../java/ru/bclib/registry/BlockRegistry.java |  4 +++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 096d2710..a20ca271 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ loader_version= 0.12.4
 fabric_version = 0.41.3+1.17
 
 # Mod Properties
-mod_version = 0.4.4
+mod_version = 0.5.0
 maven_group = ru.bclib
 archives_base_name = bclib
 
diff --git a/src/main/java/ru/bclib/registry/BaseRegistry.java b/src/main/java/ru/bclib/registry/BaseRegistry.java
index 8e61ebe7..ea5a4fd7 100644
--- a/src/main/java/ru/bclib/registry/BaseRegistry.java
+++ b/src/main/java/ru/bclib/registry/BaseRegistry.java
@@ -6,6 +6,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 import ru.bclib.config.PathConfig;
 
 import java.util.List;
@@ -13,7 +14,8 @@ import java.util.Map;
 
 public abstract class BaseRegistry<T> {
 	private static final List<BaseRegistry<?>> REGISTRIES = Lists.newArrayList();
-	private static final Map<String, List<Item>> MOD_BLOCKS = Maps.newHashMap();
+	private static final Map<String, List<Item>> MOD_BLOCK_ITEMS = Maps.newHashMap();
+	private static final Map<String, List<Block>> MOD_BLOCKS = Maps.newHashMap();
 	private static final Map<String, List<Item>> MOD_ITEMS = Maps.newHashMap();
 	
 	protected final CreativeModeTab creativeTab;
@@ -37,19 +39,19 @@ public abstract class BaseRegistry<T> {
 	private void registerInternal() {}
 	
 	public static Map<String, List<Item>> getRegisteredBlocks() {
-		return MOD_BLOCKS;
+		return MOD_BLOCK_ITEMS;
 	}
 	
 	public static Map<String, List<Item>> getRegisteredItems() {
 		return MOD_ITEMS;
 	}
 	
-	public static List<Item> getModBlocks(String modId) {
-		if (MOD_BLOCKS.containsKey(modId)) {
-			return MOD_BLOCKS.get(modId);
+	public static List<Item> getModBlockItems(String modId) {
+		if (MOD_BLOCK_ITEMS.containsKey(modId)) {
+			return MOD_BLOCK_ITEMS.get(modId);
 		}
 		List<Item> modBlocks = Lists.newArrayList();
-		MOD_BLOCKS.put(modId, modBlocks);
+		MOD_BLOCK_ITEMS.put(modId, modBlocks);
 		return modBlocks;
 	}
 	
@@ -62,6 +64,15 @@ public abstract class BaseRegistry<T> {
 		return modBlocks;
 	}
 	
+	public static List<Block> getModBlocks(String modId) {
+		if (MOD_BLOCKS.containsKey(modId)) {
+			return MOD_BLOCKS.get(modId);
+		}
+		List<Block> modBlocks = Lists.newArrayList();
+		MOD_BLOCKS.put(modId, modBlocks);
+		return modBlocks;
+	}
+	
 	public static void register() {
 		REGISTRIES.forEach(BaseRegistry::registerInternal);
 	}
diff --git a/src/main/java/ru/bclib/registry/BlockRegistry.java b/src/main/java/ru/bclib/registry/BlockRegistry.java
index f071ad0d..608e9ca7 100644
--- a/src/main/java/ru/bclib/registry/BlockRegistry.java
+++ b/src/main/java/ru/bclib/registry/BlockRegistry.java
@@ -38,6 +38,7 @@ public class BlockRegistry extends BaseRegistry<Block> {
 		}
 
 		block = Registry.register(Registry.BLOCK, id, block);
+		getModBlocks(id.getNamespace()).add(block);
 
 		if (block instanceof BaseLeavesBlock){
 			TagAPI.addTags(block, TagAPI.BLOCK_LEAVES);
@@ -58,6 +59,7 @@ public class BlockRegistry extends BaseRegistry<Block> {
 		if (!config.getBooleanRoot(id.getNamespace(), true)) {
 			return block;
 		}
+		getModBlocks(id.getNamespace()).add(block);
 		return Registry.register(Registry.BLOCK, id, block);
 	}
 	
@@ -70,7 +72,7 @@ public class BlockRegistry extends BaseRegistry<Block> {
 	public void registerItem(ResourceLocation id, Item item) {
 		if (item != null && item != Items.AIR) {
 			Registry.register(Registry.ITEM, id, item);
-			getModBlocks(id.getNamespace()).add(item);
+			getModBlockItems(id.getNamespace()).add(item);
 		}
 	}
 }