Add a config option to disable Tinker Villagers trading. They'll have…

… normal villager trades then. #1291
SlimeKnights · Jan 2, 2015 · dd4e165 · dd4e165
1 parent 22e9f49
commit dd4e165
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
@@ -170,7 +170,9 @@ public void preInit (FMLPreInitializationEvent event)
             // adds to the villager spawner egg
             VillagerRegistry.instance().registerVillagerId(78943);
             // moved down, not needed if 'addToVillages' is false
-            VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
+            if(PHConstruct.allowVillagerTrading)
+                VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
+
             VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
             VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
             MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");

diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java
@@ -8,6 +8,7 @@
 public class PHConstruct
 {
 
+
     public static void initProps (File location)
     {
 
@@ -116,6 +117,7 @@ public static void initProps (File location)
         generateAluminumBush = config.get("Worldgen Disabler", "Generate Aluminum Bushes", true).getBoolean(true);
         generateEssenceBush = config.get("Worldgen Disabler", "Generate Essence Bushes", true).getBoolean(true);
         addToVillages = config.get("Worldgen Disabler", "Add Village Generation", true).getBoolean(true);
+        allowVillagerTrading = config.get("Worldgen Disabler", "Enable the Tinkers Villager to trade for oreberries", true).getBoolean(true);
 
         copperuDensity = config.get("Worldgen", "Copper Underground Density", 2, "Density: Chances per chunk").getInt(2);
         tinuDensity = config.get("Worldgen", "Tin Underground Density", 2).getInt(2);
@@ -239,6 +241,7 @@ public static void initProps (File location)
     public static boolean generateEssenceBush;
 
     public static boolean addToVillages;
+    public static boolean allowVillagerTrading;
 
     public static int copperuDensity;
     public static int tinuDensity;