diff --git a/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java b/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java index bd7aa1a..2260d47 100644 --- a/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java +++ b/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java @@ -1,17 +1,15 @@ package com.watschman.betterenhancement; -import com.watschman.betterenhancement.blocks.ModBlockBase; +import com.watschman.betterenhancement.blocks.ModBlocks; +import com.watschman.betterenhancement.items.ModItems; +import com.watschman.betterenhancement.reference.Reference; import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.event.RegistryEvent; import static com.watschman.betterenhancement.reference.Reference.*; @@ -32,6 +30,11 @@ @Mod.EventHandler public void preinit(FMLPreInitializationEvent event) { MOD_LOGGER = event.getModLog(); + + MOD_LOGGER.info("Beginning PreInitialization Event..."); + + + MOD_LOGGER.info("Ending PreInitialization Event..."); } /** @@ -39,7 +42,8 @@ */ @Mod.EventHandler public void init(FMLInitializationEvent event) { - + MOD_LOGGER.info("Beginning Initialization Event..."); + MOD_LOGGER.info("Ending Initialization Event..."); } /** @@ -47,32 +51,8 @@ */ @Mod.EventHandler public void postinit(FMLPostInitializationEvent event) { - - } - - /** - * Forge will automatically look up and bind blocks to the fields in this class - * based on their registry name. - */ - @GameRegistry.ObjectHolder(MOD_ID) - public static class Blocks { - /* - public static final MySpecialBlock mySpecialBlock = null; // placeholder for special block below - */ - - public static final ModBlockBase blockAntizide = new ModBlockBase(Material.ROCK, MapColor.PINK, "antizide"); - } - - /** - * Forge will automatically look up and bind items to the fields in this class - * based on their registry name. - */ - @GameRegistry.ObjectHolder(MOD_ID) - public static class Items { - /* - public static final ItemBlock mySpecialBlock = null; // itemblock for the block above - public static final MySpecialItem mySpecialItem = null; // placeholder for special item below - */ + MOD_LOGGER.info("Beginning PostInitialization Event..."); + MOD_LOGGER.info("Ending PostInitialization Event..."); } /** @@ -85,12 +65,16 @@ */ @SubscribeEvent public static void addItems(RegistryEvent.Register event) { - /* - event.getRegistry().register(new ItemBlock(Blocks.myBlock).setRegistryName(MOD_ID, "myBlock")); - event.getRegistry().register(new MySpecialItem().setRegistryName(MOD_ID, "mySpecialItem")); - */ + MOD_LOGGER.info("Starting Item Registering Event..."); - event.getRegistry().register(new ItemBlock(Blocks.blockAntizide).setRegistryName(MOD_ID, "antizide")); + ModItems.init(); + + for(Item item : Reference.MOD_ITEMS) { + MOD_LOGGER.info("Registering Item: " + item.getRegistryName()); + event.getRegistry().register(item); + } + + MOD_LOGGER.info("Ending Item Registering Event..."); } /** @@ -98,11 +82,16 @@ */ @SubscribeEvent public static void addBlocks(RegistryEvent.Register event) { - /* - event.getRegistry().register(new MySpecialBlock().setRegistryName(MOD_ID, "mySpecialBlock")); - */ - MOD_LOGGER.info("registering stuff"); - event.getRegistry().register(Blocks.blockAntizide); + MOD_LOGGER.info("Starting Block Registering Event..."); + + ModBlocks.init(); + + for(Block block : Reference.MOD_BLOCKS) { + MOD_LOGGER.info("Registering Block: " + block.getRegistryName()); + event.getRegistry().register(block); + } + + MOD_LOGGER.info("Ending Block Registering Event..."); } } }