From dab217eab0e8714ca30fdcc26c68c71d9a7af221 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 24 Jan 2015 00:21:20 -0800 Subject: [PATCH] Close #457 Add config option for village generation --- .../java/forestry/core/config/Config.java | 5 +++++ .../forestry/plugins/PluginApiculture.java | 20 +++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 677aff035..cf421f0de 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -61,6 +61,7 @@ public class Config { public static boolean generateTinOre = true; public static boolean generateBeehives = true; public static boolean generateBeehivesDebug = false; + public static boolean enableVillager = true; // Retrogen public static boolean doRetrogen = false; @@ -167,6 +168,10 @@ public class Config { genTinOre.comment = "set to false to force forestry to skip generating own tin ore blocks in the world"; generateTinOre = Boolean.parseBoolean(genTinOre.value); + Property enableVillagerProp = config.get("world.generate.villager", CATEGORY_COMMON, true); + enableVillagerProp.comment = "set to false to disable the creation of forestry villagers and their houses"; + enableVillager = Boolean.parseBoolean(enableVillagerProp.value); + Property bronzeRecipe = config.get("crafting.bronze.enabled", CATEGORY_COMMON, true); bronzeRecipe.comment = "set to false to disable crafting recipe for bronze"; craftingBronzeEnabled = Boolean.parseBoolean(bronzeRecipe.value); diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 8f22926da..e59c2293b 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -252,8 +252,10 @@ public class PluginApiculture extends ForestryPlugin { ApicultureTriggers.initialize(); } - // Register village components with the Structure registry. - VillageHandlerApiculture.registerVillageComponents(); + if (Config.enableVillager) { + // Register village components with the Structure registry. + VillageHandlerApiculture.registerVillageComponents(); + } // Modes PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.easy); @@ -325,12 +327,14 @@ public class PluginApiculture extends ForestryPlugin { BeeManager.villageBees[1].add(beeInterface.templateAsGenome(BeeTemplates.getCommonTemplate())); BeeManager.villageBees[1].add(beeInterface.templateAsGenome(BeeTemplates.getValiantTemplate())); - // Register villager stuff - VillageHandlerApiculture villageHandler = new VillageHandlerApiculture(); - VillagerRegistry.instance().registerVillageCreationHandler(villageHandler); - VillagerRegistry.instance().registerVillagerId(Defaults.ID_VILLAGER_BEEKEEPER); - Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_BEEKEEPER, Defaults.TEXTURE_SKIN_BEEKPEEPER); - VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_BEEKEEPER, villageHandler); + if (Config.enableVillager) { + // Register villager stuff + VillageHandlerApiculture villageHandler = new VillageHandlerApiculture(); + VillagerRegistry.instance().registerVillageCreationHandler(villageHandler); + VillagerRegistry.instance().registerVillagerId(Defaults.ID_VILLAGER_BEEKEEPER); + Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_BEEKEEPER, Defaults.TEXTURE_SKIN_BEEKPEEPER); + VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_BEEKEEPER, villageHandler); + } proxy.initializeRendering(); }