diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java index b15dc445d..10d4473bd 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java +++ b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java @@ -1,6 +1,11 @@ package net.momirealms.craftEngineFabricMod; import net.fabricmc.api.ModInitializer; +import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; import net.momirealms.craftEngineFabricMod.util.RegisterBlocks; import net.momirealms.craftEngineFabricMod.util.YamlUtils; @@ -22,10 +27,17 @@ public class CraftEngineFabricMod implements ModInitializer { } else { blockCount.put(blockName, 0); } - RegisterBlocks.register(blockName + "_" + blockCount.get(blockName)); + RegisterBlocks.register( + blockName + "_" + blockCount.get(blockName), + Registries.BLOCK.get(keyOfBlock(blockName)) + ); } }); mappings.clear(); blockCount.clear(); } + + private static RegistryKey keyOfBlock(String name) { + return RegistryKey.of(RegistryKeys.BLOCK, Identifier.of("minecraft", name)); + } } diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java index 9afc6c5a3..57b9835fd 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java +++ b/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java @@ -2,7 +2,6 @@ package net.momirealms.craftEngineFabricMod.util; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; @@ -13,8 +12,8 @@ import net.momirealms.craftEngineFabricMod.CraftEngineFabricMod; import java.util.function.Function; public class RegisterBlocks { - public static Block register(String name) { - return register(name, Block::new, Block.Settings.copy(Blocks.STONE)); + public static Block register(String name, Block block) { + return register(name, Block::new, Block.Settings.copy(block)); } public static Block register(String name, Function blockFactory, AbstractBlock.Settings settings) { @@ -24,7 +23,7 @@ public class RegisterBlocks { return Registry.register(Registries.BLOCK, blockKey, block); } - public static RegistryKey keyOfBlock(String name) { + private static RegistryKey keyOfBlock(String name) { return RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(CraftEngineFabricMod.MOD_ID, name)); }