Fix crashing when the Entities module is disabled. Closes #389

progwml6 · Aug 12, 2017 · 9aacb11 · 9aacb11
1 parent 232ee69
commit 9aacb11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/main/java/com/progwml6/natura/entities/NaturaEntities.java b/src/main/java/com/progwml6/natura/entities/NaturaEntities.java
@@ -19,7 +19,6 @@
 
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.item.crafting.FurnaceRecipes;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.storage.loot.LootTableList;
 import net.minecraftforge.common.BiomeDictionary;
@@ -43,17 +42,17 @@ public class NaturaEntities extends NaturaPulse
     @Subscribe
     public void preInit(FMLPreInitializationEvent event)
     {
-        EntityRegistry.registerModEntity(new ResourceLocation("natura", "imp"), EntityImp.class, "imp", EntityIDs.IMP, Natura.instance, 32, 5, true, 0xF29735, 0x2E1F10);
+        EntityRegistry.registerModEntity(Util.getResource("imp"), EntityImp.class, "imp", EntityIDs.IMP, Natura.instance, 32, 5, true, 0xF29735, 0x2E1F10);
         LootTableList.register(EntityImp.LOOT_TABLE);
 
         if (Config.enableHeatscarSpider)
         {
-            EntityRegistry.registerModEntity(new ResourceLocation("natura", "heatscarspider"), EntityHeatscarSpider.class, "heatscarspider", EntityIDs.HEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
-            EntityRegistry.registerModEntity(new ResourceLocation("natura", "babyheatscarspider"), EntityBabyHeatscarSpider.class, "babyheatscarspider", EntityIDs.BABYHEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
+            EntityRegistry.registerModEntity(Util.getResource("heatscarspider"), EntityHeatscarSpider.class, "heatscarspider", EntityIDs.HEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
+            EntityRegistry.registerModEntity(Util.getResource("babyheatscarspider"), EntityBabyHeatscarSpider.class, "babyheatscarspider", EntityIDs.BABYHEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
             LootTableList.register(EntityHeatscarSpider.LOOT_TABLE);
         }
 
-        EntityRegistry.registerModEntity(new ResourceLocation("natura", "nitrocreeper"), EntityNitroCreeper.class, "nitrocreeper", EntityIDs.NITROCREEPER, Natura.instance, 64, 5, true, 0xF73E6C, 0x9B5004);
+        EntityRegistry.registerModEntity(Util.getResource("nitrocreeper"), EntityNitroCreeper.class, "nitrocreeper", EntityIDs.NITROCREEPER, Natura.instance, 64, 5, true, 0xF73E6C, 0x9B5004);
 
         proxy.preInit();
     }
@@ -63,7 +62,6 @@ public void init(FMLInitializationEvent event)
     {
         proxy.init();
 
-        this.registerRecipes();
         this.registerSmelting();
     }
 
@@ -88,11 +86,6 @@ public void postInit(FMLPostInitializationEvent event)
         proxy.postInit();
     }
 
-    private void registerRecipes()
-    {
-
-    }
-
     private void registerSmelting()
     {
         FurnaceRecipes furnaceRecipes = FurnaceRecipes.instance();

diff --git a/src/main/java/com/progwml6/natura/tools/NaturaTools.java b/src/main/java/com/progwml6/natura/tools/NaturaTools.java
@@ -177,7 +177,10 @@ private void registerRecipes()
                 addShapedRecipe(new ItemStack(tools[i][2], 1, 0), "#", "s", "s", '#', new ItemStack(NaturaNether.netherPlanks, 1, plankMeta[i]), 's', stickItem[i]);
                 addShapedRecipe(new ItemStack(tools[i][3], 1, 0), "##", "#s", " s", '#', new ItemStack(NaturaNether.netherPlanks, 1, plankMeta[i]), 's', stickItem[i]);
                 addShapedRecipe(new ItemStack(tools[i][4], 1, 0), "##", " s", " s", '#', new ItemStack(NaturaNether.netherPlanks, 1, plankMeta[i]), 's', stickItem[i]);
-                addShapedRecipe(new ItemStack(tools[i][5], 1, 0), "#s ", "# s", "#s ", '#', NaturaCommons.flameString.copy(), 's', stickItem[i]);
+                if (isEntitiesLoaded())
+                {
+                    addShapedRecipe(new ItemStack(tools[i][5], 1, 0), "#s ", "# s", "#s ", '#', NaturaCommons.flameString.copy(), 's', stickItem[i]);
+                }
             }
 
             GameRegistry.addRecipe(new ItemStack(netherquartzSword, 1, 0), "#", "#", "s", '#', new ItemStack(Blocks.QUARTZ_BLOCK, 1, OreDictionary.WILDCARD_VALUE), 's', NaturaCommons.ghostwood_stick.copy());