diff --git a/classes/production/PrimalEnergy_main/assets/primalenergy/sounds.json b/classes/production/PrimalEnergy_main/assets/primalenergy/sounds.json new file mode 100644 index 0000000..e69de29 diff --git a/classes/production/PrimalEnergy_main/assets/primalenergy/textures/logo.png b/classes/production/PrimalEnergy_main/assets/primalenergy/textures/logo.png new file mode 100644 index 0000000..e69de29 diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/PrimalEnergy.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/PrimalEnergy.class index 3c4d204..60cdab5 100644 Binary files a/classes/production/PrimalEnergy_main/nmd/primal/energy/PrimalEnergy.class and b/classes/production/PrimalEnergy_main/nmd/primal/energy/PrimalEnergy.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Blocks.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Blocks.class new file mode 100644 index 0000000..1099408 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Blocks.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Fluids.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Fluids.class new file mode 100644 index 0000000..13488f3 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Fluids.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Items.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Items.class new file mode 100644 index 0000000..0f5edc2 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Items.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Particles.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Particles.class new file mode 100644 index 0000000..a6a8516 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Particles.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Potions.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Potions.class new file mode 100644 index 0000000..749c77b Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Potions.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Registries.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Registries.class new file mode 100644 index 0000000..1d9621a Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Registries.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Sounds.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Sounds.class new file mode 100644 index 0000000..c3aa51e Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$Sounds.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$ToolMaterials.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$ToolMaterials.class new file mode 100644 index 0000000..69edcae Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI$ToolMaterials.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI.class new file mode 100644 index 0000000..d1c4223 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/api/PrimalEnergyAPI.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks$RegistrationHandler.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks$RegistrationHandler.class new file mode 100644 index 0000000..2bda071 Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks$RegistrationHandler.class differ diff --git a/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks.class b/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks.class new file mode 100644 index 0000000..d195adc Binary files /dev/null and b/classes/production/PrimalEnergy_main/nmd/primal/energy/common/init/ModBlocks.class differ diff --git a/src/main/java/nmd/primal/energy/api/PrimalEnergyAPI.java b/src/main/java/nmd/primal/energy/api/PrimalEnergyAPI.java new file mode 100644 index 0000000..11696ed --- /dev/null +++ b/src/main/java/nmd/primal/energy/api/PrimalEnergyAPI.java @@ -0,0 +1,74 @@ +package nmd.primal.energy.api; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +public class PrimalEnergyAPI { + + // ***************************************************************************** // + // Blocks + // ***************************************************************************** // + public static class Blocks + { + public static Block TEST_BLOCK; + } + + // ***************************************************************************** // + // Items + // ***************************************************************************** // + public static class Items + { + public static Item TEST_ITEM; + } + + public static class Fluids + { + //public static Fluid ANOINTING_OIL; + } + + public static class ToolMaterials + { + //public static Item.ToolMaterial TOOL_QUARTZ_IGNIS = EnumHelper.addToolMaterial("quartz_ignis", 2, 900, 6.0F, 6.0F, 20); + } + + // ***************************************************************************** // + // Potions + // ***************************************************************************** // + public static class Potions + { + //public static PrimalPotion PORPHYRIA; + + } + + + // ***************************************************************************** // + // Sounds + // ***************************************************************************** // + public static class Sounds + { + //public static SoundType CRYSTAL; + } + + // ***************************************************************************** // + // Particles + // ***************************************************************************** // + public enum Particles + { + //MOON_PEARL + } + + // ***************************************************************************** // + // Registries + // ***************************************************************************** // + public static class Registries + { + //public static final IForgeRegistry GALLAGHER_RECIPES = GameRegistry.findRegistry(GallagherRecipe.class); + + } + + // ***************************************************************************** // + // .. + // ***************************************************************************** // + + +} diff --git a/src/main/java/nmd/primal/energy/PrimalEnergy.java b/src/main/java/nmd/primal/energy/common/PrimalEnergy.java similarity index 83% rename from src/main/java/nmd/primal/energy/PrimalEnergy.java rename to src/main/java/nmd/primal/energy/common/PrimalEnergy.java index 789a45b..7a7614b 100644 --- a/src/main/java/nmd/primal/energy/PrimalEnergy.java +++ b/src/main/java/nmd/primal/energy/common/PrimalEnergy.java @@ -1,5 +1,9 @@ -package nmd.primal.energy; +package nmd.primal.energy.common; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -10,7 +14,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import nmd.primal.energy.common.CommonProxy; +import nmd.primal.energy.common.init.ModBlocks; import nmd.primal.energy.common.init.ModInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,13 +40,17 @@ public class PrimalEnergy private static SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ModInfo.MOD_ID); private static Logger LOGGER = LogManager.getLogger(ModInfo.MOD_ID); + public static final NonNullList BLOCKS = NonNullList.create(); + public static final NonNullList ITEMS = NonNullList.create(); + public static final NonNullList ITEM_BLOCKS = NonNullList.create(); + @EventHandler public void preInit(FMLPreInitializationEvent event) { Locale.setDefault(Locale.ENGLISH); LOGGER.info("Pre-Init"); PROXY.preInit(); - + ModBlocks.addBlocks(); // pre init stuff } diff --git a/src/main/java/nmd/primal/energy/common/init/ModBlocks.java b/src/main/java/nmd/primal/energy/common/init/ModBlocks.java new file mode 100644 index 0000000..7a2d219 --- /dev/null +++ b/src/main/java/nmd/primal/energy/common/init/ModBlocks.java @@ -0,0 +1,73 @@ +package nmd.primal.energy.common.init; + +import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.registries.IForgeRegistry; +import nmd.primal.core.api.interfaces.crafting.IDictionaryName; +import nmd.primal.core.common.helper.RegistryHelper; +import nmd.primal.energy.common.PrimalEnergy; + +import static nmd.primal.energy.api.PrimalEnergyAPI.Blocks.*; + +public class ModBlocks { + + // ***************************************************************************** // + // Blocks + // ***************************************************************************** // + public static void addBlocks() + { + + TEST_BLOCK = RegistryHelper.addBlock("void_block", new Block(Material.GROUND)); + + } + + // ***************************************************************************** // + // Tile Entities + // ***************************************************************************** // + public static void registerTiles() + { + //registerTileEntity(TileVoid.class, "void_block"); + } + + // ***************************************************************************** // + // Registration + // ***************************************************************************** // + @Mod.EventBusSubscriber(modid=ModInfo.MOD_ID) + public static class RegistrationHandler + { + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) + { + PrimalEnergy.getLogger().info("Registering " + PrimalEnergy.BLOCKS.size() + " Blocks"); + final IForgeRegistry registry = event.getRegistry(); + + for (Block block : PrimalEnergy.BLOCKS) { + registry.register(block); + } + } + + @SubscribeEvent + public static void registerItemBlocks(final RegistryEvent.Register event) + { + PrimalEnergy.getLogger().info("Registering " + PrimalEnergy.ITEM_BLOCKS.size() + " Item Blocks"); + final IForgeRegistry items = event.getRegistry(); + + for (ItemBlock item : PrimalEnergy.ITEM_BLOCKS) + { + final Block block = item.getBlock(); + final ResourceLocation registryName = Preconditions.checkNotNull(block.getRegistryName(), "Block %s has null registry REGISTRY_NAME", block); + items.register(item.setRegistryName(registryName)); + + if (block instanceof IDictionaryName) + ((IDictionaryName) block).registerDictionaryNames(); + } + } + } +}