From 31bcc661cd5fe78399603268bd0b37a053a34a35 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 3 Feb 2018 18:13:53 +0000 Subject: [PATCH 1/6] Added whitelist for dimension generation too --- .../java/forestry/apiculture/HiveConfig.java | 16 ++++++++-- .../forestry/apiculture/worldgen/Hive.java | 2 +- .../arboriculture/worldgen/TreeDecorator.java | 3 +- .../java/forestry/core/config/Config.java | 32 ++++++++++++++++++- .../core/worldgen/WorldGenerator.java | 2 +- 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/HiveConfig.java b/src/main/java/forestry/apiculture/HiveConfig.java index 36bc40bfa..3ec667b75 100644 --- a/src/main/java/forestry/apiculture/HiveConfig.java +++ b/src/main/java/forestry/apiculture/HiveConfig.java @@ -23,12 +23,17 @@ public class HiveConfig { private final Set blacklistedBiomes = new HashSet<>(); private static final Set blacklistedDims = new HashSet<>(); + + private static final Set whitelistedDims = new HashSet<>(); public static void parse(LocalizedConfiguration config){ config.addCategoryCommentLocalized(CATEGORY); for(int dimId : config.get("world.generate.beehives", "dimBlacklist", new int[0]).getIntList()){ blacklistedDims.add(dimId); } + for(int dimId : config.get("world.generate.beehives", "dimWhitelist", new int[0]).getIntList()) { + whitelistedDims.add(dimId); + } for(IHiveRegistry.HiveType type : IHiveRegistry.HiveType.values()){ String[] entries = config.get(CATEGORY, type.getName(), new String[0]).getStringList(); configs.put(type, new HiveConfig(entries)); @@ -62,11 +67,18 @@ public class HiveConfig { return BiomeDictionary.getTypes(biome).stream().anyMatch(blacklistedTypes::contains); } - public static boolean isDimBlacklisted(int dimId) { - return blacklistedDims.contains(dimId); + public static boolean isDimAllowed(int dimId) { //blacklist has priority + if(blacklistedDims.isEmpty() || !blacklistedDims.contains(dimId)) { + return whitelistedDims.contains(dimId); + } + return false; } public static void addBlacklistedDim(int dimId) { blacklistedDims.add(dimId); } + + public static void addWhitelistedDim(int dimId) { + whitelistedDims.add(dimId); + } } diff --git a/src/main/java/forestry/apiculture/worldgen/Hive.java b/src/main/java/forestry/apiculture/worldgen/Hive.java index 0c3fd7da6..5679f6832 100644 --- a/src/main/java/forestry/apiculture/worldgen/Hive.java +++ b/src/main/java/forestry/apiculture/worldgen/Hive.java @@ -67,7 +67,7 @@ public final class Hive { } public boolean isValidLocation(World world, BlockPos pos) { - if(HiveConfig.isDimBlacklisted(world.provider.getDimension())) { + if(!HiveConfig.isDimAllowed(world.provider.getDimension())) { return false; } return hiveDescription.getHiveGen().isValidLocation(world, pos); diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java index ac9c94834..54d0aaf8a 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java @@ -55,8 +55,9 @@ public class TreeDecorator { } public static void decorateTrees(World world, Random rand, int worldX, int worldZ) { - if(Config.blacklistedTreeDims.contains(world.provider.getDimension())) + if(!Config.isValidTreeDim(world.provider.getDimension())) { return; + } if (biomeCache.isEmpty()) { generateBiomeCache(world, rand); } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 5822d5914..ade988ae7 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -80,12 +80,14 @@ public class Config { public static boolean generateCopperOre = true; public static boolean generateTinOre = true; public static Set blacklistedOreDims = new HashSet(); + public static Set whitelistedOreDims = new HashSet(); private static float generateBeehivesAmount = 1.0f; public static boolean generateBeehivesDebug = false; public static boolean logHivePlacement = false; public static boolean enableVillagers = true; public static boolean generateTrees = true; public static Set blacklistedTreeDims = new HashSet(); + public static Set whitelistedTreeDims = new HashSet(); // Retrogen public static boolean doRetrogen = false; @@ -163,9 +165,31 @@ public class Config { blacklistedTreeDims.add(dimID); } + public static void whitelistTreeDim(int dimID) { + whitelistedTreeDims.add(dimID); + } + public static void blacklistOreDim(int dimID) { blacklistedOreDims.add(dimID); } + + public static void whitelistOreDim(int dimID) { + whitelistedOreDims.add(dimID); + } + + public static boolean isValidOreDim(int dimID) { //blacklist has priority + if(blacklistedOreDims.isEmpty() || !blacklistedOreDims.contains(dimID)) { + return whitelistedOreDims.contains(dimID); + } + return false; + } + + public static boolean isValidTreeDim(int dimID) { //blacklist has priority + if(blacklistedTreeDims.isEmpty() || !blacklistedTreeDims.contains(dimID)) { + return whitelistedTreeDims.contains(dimID); + } + return false; + } public static void load(Side side) { File configCommonFile = new File(Forestry.instance.getConfigFolder(), CATEGORY_COMMON + ".cfg"); @@ -235,9 +259,12 @@ public class Config { generateApatiteOre = configCommon.getBooleanLocalized("world.generate.ore", "apatite", generateApatiteOre); generateCopperOre = configCommon.getBooleanLocalized("world.generate.ore", "copper", generateCopperOre); generateTinOre = configCommon.getBooleanLocalized("world.generate.ore", "tin", generateTinOre); - for(int dimId : configCommon.get("world.generate.ore", "dimBlacklist", new int[0]).getIntList()){ + for(int dimId : configCommon.get("world.generate.ore", "dimBlacklist", new int[0]).getIntList()) { blacklistedOreDims.add(dimId); } + for(int dimId : configCommon.get("world.generate.ore", "dimWhitelist", new int[0]).getIntList()) { + whitelistedOreDims.add(dimId); + } enableVillagers = configCommon.getBooleanLocalized("world.generate", "villagers", enableVillagers); @@ -245,6 +272,9 @@ public class Config { for(int dimId : configCommon.get("world.generate.trees", "dimBlacklist", new int[0]).getIntList()){ blacklistedTreeDims.add(dimId); } + for(int dimId : configCommon.get("world.generate.trees", "dimWhitelist", new int[0]).getIntList()){ + whitelistedTreeDims.add(dimId); +} craftingBronzeEnabled = configCommon.getBooleanLocalized("crafting", "bronze", craftingBronzeEnabled); diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java index 5a2280454..0b359920a 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -68,7 +68,7 @@ public class WorldGenerator implements IWorldGenerator { } private void generateWorld(Random random, int chunkX, int chunkZ, World world) { - if(Config.blacklistedOreDims.contains(world.provider.getDimension())) + if(!Config.isValidOreDim(world.provider.getDimension())) return; if (apatiteGenerator == null || copperGenerator == null || tinGenerator == null) { From bb7a42dff5bb08a079e10e659fcf44c0812566db Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 3 Feb 2018 18:21:31 +0000 Subject: [PATCH 2/6] Woops --- src/main/java/forestry/apiculture/HiveConfig.java | 4 ++-- src/main/java/forestry/core/config/Config.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/HiveConfig.java b/src/main/java/forestry/apiculture/HiveConfig.java index 3ec667b75..084f2ae53 100644 --- a/src/main/java/forestry/apiculture/HiveConfig.java +++ b/src/main/java/forestry/apiculture/HiveConfig.java @@ -69,9 +69,9 @@ public class HiveConfig { public static boolean isDimAllowed(int dimId) { //blacklist has priority if(blacklistedDims.isEmpty() || !blacklistedDims.contains(dimId)) { - return whitelistedDims.contains(dimId); + return whitelistedDims.isEmpty() || whitelistedDims.contains(dimId); } - return false; + return true; } public static void addBlacklistedDim(int dimId) { diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index ade988ae7..a80837a66 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -179,16 +179,16 @@ public class Config { public static boolean isValidOreDim(int dimID) { //blacklist has priority if(blacklistedOreDims.isEmpty() || !blacklistedOreDims.contains(dimID)) { - return whitelistedOreDims.contains(dimID); + return whitelistedOreDims.isEmpty() || whitelistedOreDims.contains(dimID); } - return false; + return true; } public static boolean isValidTreeDim(int dimID) { //blacklist has priority if(blacklistedTreeDims.isEmpty() || !blacklistedTreeDims.contains(dimID)) { - return whitelistedTreeDims.contains(dimID); + return whitelistedTreeDims.isEmpty() || whitelistedTreeDims.contains(dimID); } - return false; + return true; } public static void load(Side side) { From 211ab566a79124c650d67ebbdbbdd9190d83517b Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 3 Feb 2018 18:32:24 +0000 Subject: [PATCH 3/6] Fix return statement --- src/main/java/forestry/apiculture/HiveConfig.java | 2 +- src/main/java/forestry/core/config/Config.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/apiculture/HiveConfig.java b/src/main/java/forestry/apiculture/HiveConfig.java index 084f2ae53..cd164f7e1 100644 --- a/src/main/java/forestry/apiculture/HiveConfig.java +++ b/src/main/java/forestry/apiculture/HiveConfig.java @@ -71,7 +71,7 @@ public class HiveConfig { if(blacklistedDims.isEmpty() || !blacklistedDims.contains(dimId)) { return whitelistedDims.isEmpty() || whitelistedDims.contains(dimId); } - return true; + return false; } public static void addBlacklistedDim(int dimId) { diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index a80837a66..82c74c063 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -181,14 +181,14 @@ public class Config { if(blacklistedOreDims.isEmpty() || !blacklistedOreDims.contains(dimID)) { return whitelistedOreDims.isEmpty() || whitelistedOreDims.contains(dimID); } - return true; + return false; } public static boolean isValidTreeDim(int dimID) { //blacklist has priority if(blacklistedTreeDims.isEmpty() || !blacklistedTreeDims.contains(dimID)) { return whitelistedTreeDims.isEmpty() || whitelistedTreeDims.contains(dimID); } - return true; + return false; } public static void load(Side side) { From 0b2589b0078bba8a603016000fe5d1566cb6a443 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sun, 11 Feb 2018 11:22:35 +0000 Subject: [PATCH 4/6] Fix crash if HarvestCraft present but Apiculture disabled --- .../forestry/plugins/PluginHarvestCraft.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginHarvestCraft.java b/src/main/java/forestry/plugins/PluginHarvestCraft.java index f2329e230..b07f7faf5 100644 --- a/src/main/java/forestry/plugins/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/PluginHarvestCraft.java @@ -32,6 +32,7 @@ import forestry.core.items.ItemRegistryCore; import forestry.core.recipes.RecipeUtil; import forestry.farming.logic.farmables.FarmableAgingCrop; import forestry.modules.ForestryModuleUids; +import forestry.modules.ModuleManager; @SuppressWarnings("unused") @ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.HARVESTCRAFT, name = "HarvestCraft", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.harvestcraft.description") @@ -340,23 +341,25 @@ public class PluginHarvestCraft extends CompatPlugin { for (String nutName : nuts) { ItemStack nut = getItemStack(nutName + "item"); - Block nutBlock = getBlock("pam" + nutName); + Block nutBlock = getBlock("pam" + nutName); if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && nutBlock != null) { - farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, nutBlock, fruitAGE, 2, 0)); + farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, nutBlock, fruitAGE, 2, 0)); } if (nut != null) { RecipeManagers.squeezerManager.addRecipe(20, nut, Fluids.SEED_OIL.getFluid(15 * seedamount)); } } - - ItemStack hcHoneyItem = getItemStack("honeyitem"); - if (hcHoneyItem != null) { - RecipeManagers.squeezerManager.addRecipe(10, hcHoneyItem, Fluids.FOR_HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); - } - - ItemStack hcBeeswaxItem = getItemStack("beeswaxitem"); - if (hcBeeswaxItem != null) { - RecipeUtil.addRecipe("pam_wax_capsule", ModuleFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); + + if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) { + ItemStack hcHoneyItem = getItemStack("honeyitem"); + if (hcHoneyItem != null) { + RecipeManagers.squeezerManager.addRecipe(10, hcHoneyItem, Fluids.FOR_HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); + } + + ItemStack hcBeeswaxItem = getItemStack("beeswaxitem"); + if (hcBeeswaxItem != null) { + RecipeUtil.addRecipe("pam_wax_capsule", ModuleFluids.getItems().waxCapsuleEmpty.getItemStack(ForestryAPI.activeMode.getIntegerSetting("recipe.output.capsule")), "XXX ", 'X', hcBeeswaxItem); + } } } From 74e381f1849c298b39f0db7fdb6729cfecf30e21 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sun, 11 Feb 2018 11:24:07 +0000 Subject: [PATCH 5/6] formatting --- src/main/java/forestry/plugins/PluginHarvestCraft.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginHarvestCraft.java b/src/main/java/forestry/plugins/PluginHarvestCraft.java index b07f7faf5..60aa29173 100644 --- a/src/main/java/forestry/plugins/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/PluginHarvestCraft.java @@ -341,9 +341,9 @@ public class PluginHarvestCraft extends CompatPlugin { for (String nutName : nuts) { ItemStack nut = getItemStack(nutName + "item"); - Block nutBlock = getBlock("pam" + nutName); + Block nutBlock = getBlock("pam" + nutName); if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING)) && nutBlock != null) { - farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, nutBlock, fruitAGE, 2, 0)); + farmRegistry.registerFarmables("farmOrchard", new FarmableAgingCrop(ItemStack.EMPTY, nutBlock, fruitAGE, 2, 0)); } if (nut != null) { RecipeManagers.squeezerManager.addRecipe(20, nut, Fluids.SEED_OIL.getFluid(15 * seedamount)); From 1745a7e94641c5d8aecde92716e07f40e89cd938 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sun, 11 Feb 2018 11:52:59 +0000 Subject: [PATCH 6/6] More correct method --- src/main/java/forestry/plugins/PluginHarvestCraft.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/plugins/PluginHarvestCraft.java b/src/main/java/forestry/plugins/PluginHarvestCraft.java index 60aa29173..42fad245d 100644 --- a/src/main/java/forestry/plugins/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/PluginHarvestCraft.java @@ -350,7 +350,7 @@ public class PluginHarvestCraft extends CompatPlugin { } } - if(ModuleManager.getInstance().isModuleEnabled(Constants.MOD_ID, ForestryModuleUids.APICULTURE)) { + if(ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { ItemStack hcHoneyItem = getItemStack("honeyitem"); if (hcHoneyItem != null) { RecipeManagers.squeezerManager.addRecipe(10, hcHoneyItem, Fluids.FOR_HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP));