Add a config setting to disable Heatscar spiders as they are still br…

…oken.
progwml6 · Oct 9, 2016 · cb87d70 · cb87d70
1 parent 699588c
commit cb87d70
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/main/java/com/progwml6/natura/common/config/Config.java b/src/main/java/com/progwml6/natura/common/config/Config.java
@@ -21,6 +21,8 @@ public final class Config
 
     private static final String WORLDGEN = "Worldgen";
 
+    private static final String ENTITIES = "Entities";
+
     private Config()
     {
     }
@@ -163,6 +165,8 @@ public static boolean syncConfig()
 
         seaLevel = configFile.get("general", "Sea level", seaLevel).getInt(seaLevel);
 
+        enableHeatscarSpider = configFile.get(ENTITIES, "Enable Heatscar Spiders", enableHeatscarSpider).getBoolean(enableHeatscarSpider);
+
         // save changes if any
         boolean changed = false;
         if (configFile.hasChanged())
@@ -178,8 +182,11 @@ public static boolean syncConfig()
     public static boolean doRetrogen = false;
     // Retrogen End
 
+    // Entites Start
     public static int babyHeatscarMinimum = 2;
     public static int babyHeatscarMaximum = 4;
+    public static boolean enableHeatscarSpider = false;
+    // Entites End
 
     public static int seaLevel = 64;
 

diff --git a/src/main/java/com/progwml6/natura/entities/EntitiesClientProxy.java b/src/main/java/com/progwml6/natura/entities/EntitiesClientProxy.java
@@ -1,6 +1,7 @@
 package com.progwml6.natura.entities;
 
 import com.progwml6.natura.common.ClientProxy;
+import com.progwml6.natura.common.config.Config;
 import com.progwml6.natura.entities.entity.monster.EntityBabyHeatscarSpider;
 import com.progwml6.natura.entities.entity.monster.EntityHeatscarSpider;
 import com.progwml6.natura.entities.entity.monster.EntityNitroCreeper;
@@ -19,8 +20,11 @@ public void preInit()
     {
         // Entities
         RenderingRegistry.registerEntityRenderingHandler(EntityImp.class, RenderNaturaImp.FACTORY_imp);
-        RenderingRegistry.registerEntityRenderingHandler(EntityHeatscarSpider.class, RenderNautraHeatscarSpider.FACTORY_heatscarSpider);
-        RenderingRegistry.registerEntityRenderingHandler(EntityBabyHeatscarSpider.class, RenderNautraBabyHeatscarSpider.FACTORY_babyHeatscarSpider);
+        if (Config.enableHeatscarSpider)
+        {
+            RenderingRegistry.registerEntityRenderingHandler(EntityHeatscarSpider.class, RenderNautraHeatscarSpider.FACTORY_heatscarSpider);
+            RenderingRegistry.registerEntityRenderingHandler(EntityBabyHeatscarSpider.class, RenderNautraBabyHeatscarSpider.FACTORY_babyHeatscarSpider);
+        }
         RenderingRegistry.registerEntityRenderingHandler(EntityNitroCreeper.class, RenderNaturaNitroCreeper.FACTORY_nitrocreeper);
 
         super.preInit();

diff --git a/src/main/java/com/progwml6/natura/entities/NaturaEntities.java b/src/main/java/com/progwml6/natura/entities/NaturaEntities.java
@@ -7,6 +7,7 @@
 import com.progwml6.natura.common.CommonProxy;
 import com.progwml6.natura.common.EntityIDs;
 import com.progwml6.natura.common.NaturaPulse;
+import com.progwml6.natura.common.config.Config;
 import com.progwml6.natura.entities.entity.monster.EntityBabyHeatscarSpider;
 import com.progwml6.natura.entities.entity.monster.EntityHeatscarSpider;
 import com.progwml6.natura.entities.entity.monster.EntityNitroCreeper;
@@ -34,39 +35,42 @@ public class NaturaEntities extends NaturaPulse
     @SidedProxy(clientSide = "com.progwml6.natura.entities.EntitiesClientProxy", serverSide = "com.progwml6.natura.common.CommonProxy")
     public static CommonProxy proxy;
 
-    // PRE-INITIALIZATION
     @Subscribe
     public void preInit(FMLPreInitializationEvent event)
     {
         EntityRegistry.registerModEntity(EntityImp.class, "imp", EntityIDs.IMP, Natura.instance, 32, 5, true, 0xF29735, 0x2E1F10);
         LootTableList.register(EntityImp.LOOT_TABLE);
 
-        EntityRegistry.registerModEntity(EntityHeatscarSpider.class, "heatscarspider", EntityIDs.HEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
-        EntityRegistry.registerModEntity(EntityBabyHeatscarSpider.class, "babyheatscarspider", EntityIDs.BABYHEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
-        LootTableList.register(EntityHeatscarSpider.LOOT_TABLE);
+        if (Config.enableHeatscarSpider)
+        {
+            EntityRegistry.registerModEntity(EntityHeatscarSpider.class, "heatscarspider", EntityIDs.HEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
+            EntityRegistry.registerModEntity(EntityBabyHeatscarSpider.class, "babyheatscarspider", EntityIDs.BABYHEATSCARSPIDER, Natura.instance, 32, 5, true, 0xE64D10, 0x57B1BD);
+            LootTableList.register(EntityHeatscarSpider.LOOT_TABLE);
+        }
 
         EntityRegistry.registerModEntity(EntityNitroCreeper.class, "nitrocreeper", EntityIDs.NITROCREEPER, Natura.instance, 64, 5, true, 0xF73E6C, 0x9B5004);
 
         proxy.preInit();
     }
 
-    // INITIALIZATION
     @Subscribe
     public void init(FMLInitializationEvent event)
     {
         proxy.init();
     }
 
-    // POST-INITIALIZATION
     @Subscribe
     public void postInit(FMLPostInitializationEvent event)
     {
         //TODO add way to exclude some of these
         Biome[] nether = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.NETHER);
 
         EntityRegistry.addSpawn(EntityImp.class, 10, 8, 12, EnumCreatureType.CREATURE, nether);
-        EntityRegistry.addSpawn(EntityHeatscarSpider.class, 10, 4, 4, EnumCreatureType.MONSTER, nether);
-        EntityRegistry.addSpawn(EntityBabyHeatscarSpider.class, 10, 4, 4, EnumCreatureType.MONSTER, nether);
+        if (Config.enableHeatscarSpider)
+        {
+            EntityRegistry.addSpawn(EntityHeatscarSpider.class, 10, 4, 4, EnumCreatureType.MONSTER, nether);
+            EntityRegistry.addSpawn(EntityBabyHeatscarSpider.class, 10, 4, 4, EnumCreatureType.MONSTER, nether);
+        }
         EntityRegistry.addSpawn(EntityNitroCreeper.class, 8, 4, 6, EnumCreatureType.MONSTER, nether);
 
         proxy.postInit();