fixed mod loading

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<GallagherRecipe> GALLAGHER_RECIPES = GameRegistry.findRegistry(GallagherRecipe.class);
+
+    }
+
+    // ***************************************************************************** //
+    //  ..
+    // ***************************************************************************** //
+
+
+}

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<Block> BLOCKS = NonNullList.create();
+    public static final NonNullList<Item> ITEMS = NonNullList.create();
+    public static final NonNullList<ItemBlock> 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
     }
 

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<Block> event)
+        {
+            PrimalEnergy.getLogger().info("Registering " + PrimalEnergy.BLOCKS.size() + " Blocks");
+            final IForgeRegistry<Block> registry = event.getRegistry();
+
+            for (Block block : PrimalEnergy.BLOCKS) {
+                registry.register(block);
+            }
+        }
+
+        @SubscribeEvent
+        public static void registerItemBlocks(final RegistryEvent.Register<Item> event)
+        {
+            PrimalEnergy.getLogger().info("Registering " + PrimalEnergy.ITEM_BLOCKS.size() + " Item Blocks");
+            final IForgeRegistry<Item> 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();
+            }
+        }
+    }
+}

src/main/java/nmd/primal/energy/common/init/ModInfo.java

@@ -14,7 +14,7 @@ public class ModInfo
     public static final String MOD_ID           = "primalenergy";
     public static final String MOD_CONFIG       = "primal/" + MOD_ID;
     public static final String MOD_VERSION      = "@MOD_VERSION@";
-    public static final String MC_VERSIONS      = "[1.12.2)";
+    public static final String MC_VERSIONS = "[1.12.0, 1.13.0)";
     public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);"
                                                 + "required-after:primal@[0.6.69,);";
     public static final String MOD_CHANNEL = MOD_ID;