diff --git a/src/main/java/mc/lunar/Blahaj.java b/src/main/java/mc/lunar/Blahaj.java index 9dbb59c..bd3b40f 100644 --- a/src/main/java/mc/lunar/Blahaj.java +++ b/src/main/java/mc/lunar/Blahaj.java @@ -1,5 +1,6 @@ package mc.lunar; +import mc.lunar.block.ModBlocks; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; @@ -10,12 +11,17 @@ public class Blahaj implements ModInitializer { - public static final String MOD = "blahaj"; - public static final Logger LOGGER = LoggerFactory.getLogger(MOD); + public static final String MOD_ID = "blahaj"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); @Override public void onInitialize() { ModItemGroups.registerItemGroups(); + ModItems.registerModItems(); + + ModBlocks.registerModBlocks(); + + } } \ No newline at end of file diff --git a/src/main/java/mc/lunar/block/ModBlocks.java b/src/main/java/mc/lunar/block/ModBlocks.java new file mode 100644 index 0000000..e17837a --- /dev/null +++ b/src/main/java/mc/lunar/block/ModBlocks.java @@ -0,0 +1,35 @@ +package mc.lunar.block; + +import mc.lunar.Blahaj; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; + +public class ModBlocks { + public static final Block BLAHAJ_ID = registerBlock("blue_shark", + new Block(FabricBlockSettings.copyOf(Blocks.PINK_WOOL))); + public static final Block RAW_RUBY_BLOCK = registerBlock("raw_ruby_block", + new Block(FabricBlockSettings.copyOf(Blocks.PINK_WOOL))); + + + private static Block registerBlock(String name, Block block) { + registerBlockItem(name, block); + return Registry.register(Registries.BLOCK, new Identifier(Blahaj.MOD_ID, name), block); + } + + private static Item registerBlockItem(String name, Block block) { + return Registry.register(Registries.ITEM, new Identifier(Blahaj.MOD_ID, name), + new BlockItem(block, new FabricItemSettings())); + } + + public static void registerModBlocks() { + Blahaj.LOGGER.info("Registering ModBlocks for " + Blahaj.MOD_ID); + } +} \ No newline at end of file diff --git a/src/main/java/mc/lunar/item/ModItemGroups.java b/src/main/java/mc/lunar/item/ModItemGroups.java index d085a94..305ea08 100644 --- a/src/main/java/mc/lunar/item/ModItemGroups.java +++ b/src/main/java/mc/lunar/item/ModItemGroups.java @@ -4,18 +4,17 @@ import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class ModItemGroups { - public static final ItemGroup RUBY_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Blahaj.MOD, "blahaj"), + public static final ItemGroup BLAHAJ_GROUP = Registry.register(Registries.ITEM_GROUP, + new Identifier(Blahaj.MOD_ID, "blahaj"), FabricItemGroup.builder().displayName(Text.translatable("itemgroup.blahaj")) - .icon(() -> new ItemStack(ModItems.BLAHAJ)).entries((displayContext, entries) -> { - entries.add(ModItems.BLAHAJ); + .icon(() -> new ItemStack(ModItems.BLAHAJ_ID)).entries((displayContext, entries) -> { + entries.add(ModItems.BLAHAJ_ID); entries.add(ModItems.ACE_BLAHAJ); entries.add(ModItems.AGENDER_BLAHAJ); entries.add(ModItems.ARO_BLAHAJ); @@ -46,6 +45,6 @@ public class ModItemGroups { public static void registerItemGroups() { - Blahaj.LOGGER.info("Registering Item Groups for " + Blahaj.MOD); + Blahaj.LOGGER.info("Registering Item Groups for " + Blahaj.MOD_ID); } } \ No newline at end of file diff --git a/src/main/java/mc/lunar/item/ModItems.java b/src/main/java/mc/lunar/item/ModItems.java index aa17276..319494f 100644 --- a/src/main/java/mc/lunar/item/ModItems.java +++ b/src/main/java/mc/lunar/item/ModItems.java @@ -11,7 +11,7 @@ import net.minecraft.util.Identifier; public class ModItems { - public static final Item BLAHAJ = registerItem("blue_shark", new Item(new FabricItemSettings())); + public static final Item BLAHAJ_ID = registerItem("blue_shark", new Item(new FabricItemSettings())); public static final Item ACE_BLAHAJ = registerItem("ace_shark", new Item(new FabricItemSettings())); public static final Item AGENDER_BLAHAJ = registerItem("agender_shark", new Item(new FabricItemSettings())); public static final Item ARO_BLAHAJ = registerItem("aro_shark", new Item(new FabricItemSettings())); @@ -38,7 +38,7 @@ public class ModItems { public static final Item SEAL = registerItem("seal", new Item(new FabricItemSettings())); private static void addItemsToIngredientItemGroup(FabricItemGroupEntries entries) { - entries.add(BLAHAJ); + entries.add(BLAHAJ_ID); entries.add(ACE_BLAHAJ); entries.add(AGENDER_BLAHAJ); entries.add(ARO_BLAHAJ); @@ -66,11 +66,11 @@ private static void addItemsToIngredientItemGroup(FabricItemGroupEntries entries } private static Item registerItem(String name, Item item) { - return Registry.register(Registries.ITEM, new Identifier(Blahaj.MOD, name), item); + return Registry.register(Registries.ITEM, new Identifier(Blahaj.MOD_ID, name), item); } public static void registerModItems() { - Blahaj.LOGGER.info("Registering Mod Items for " + Blahaj.MOD); + Blahaj.LOGGER.info("Registering Mod Items for " + Blahaj.MOD_ID); ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(ModItems::addItemsToIngredientItemGroup); }