From 928cc436ddf8e6949f1cf8b60b56027614569fe9 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Fri, 7 Nov 2014 19:06:06 +0100 Subject: [PATCH] fix #2145 and related oilgen issues --- common/buildcraft/BuildCraftEnergy.java | 10 ++++------ common/buildcraft/energy/worldgen/OilPopulate.java | 14 ++++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 30718ed0..3125b83b 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -104,9 +104,6 @@ public class BuildCraftEnergy extends BuildCraftMod { public static boolean canOilBurn; public static double oilWellScalar = 1.0; - public static Set oilBiomeIDs = new HashSet(); - public static Set excessiveOilBiomeIDs = new HashSet(); - public static Set excludeOilBiomeIDs = new HashSet(); public static TreeMap saturationStored = new TreeMap(); public static ITriggerExternal triggerBlueEngineHeat = new TriggerEngineHeat(EnergyStage.BLUE); public static ITriggerExternal triggerGreenEngineHeat = new TriggerEngineHeat(EnergyStage.GREEN); @@ -126,21 +123,22 @@ public class BuildCraftEnergy extends BuildCraftMod { oilWellScalar = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilWellGenerationRate", 1.0, "Probability of oil well generation").getDouble(1.0); setBiomeList( - oilBiomeIDs, + OilPopulate.INSTANCE.surfaceDepositBiomes, BuildCraftCore.mainConfiguration .get(Configuration.CATEGORY_GENERAL, "oil.increasedBiomeIDs", new String[] {BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have increased oil generation rates.")); setBiomeList( - excessiveOilBiomeIDs, + OilPopulate.INSTANCE.excessiveBiomes, BuildCraftCore.mainConfiguration .get(Configuration.CATEGORY_GENERAL, "oil.excessiveBiomeIDs", new String[] {}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have GREATLY increased oil generation rates.")); - setBiomeList(excludeOilBiomeIDs, BuildCraftCore.mainConfiguration + setBiomeList(OilPopulate.INSTANCE.excludedBiomes, + BuildCraftCore.mainConfiguration .get(Configuration.CATEGORY_GENERAL, "oil.excludeBiomeIDs", new String[] {BiomeGenBase.sky.biomeName, BiomeGenBase.hell.biomeName}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that are excluded from generating oil.")); diff --git a/common/buildcraft/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java index 377953f7..31691d55 100644 --- a/common/buildcraft/energy/worldgen/OilPopulate.java +++ b/common/buildcraft/energy/worldgen/OilPopulate.java @@ -46,17 +46,11 @@ public final class OilPopulate { public final Set excludedBiomes = new HashSet(); private enum GenType { - LARGE, MEDIUM, LAKE, NONE }; private OilPopulate() { -// BuildCraftCore.debugMode = true; - surfaceDepositBiomes.add(BiomeGenBase.desert.biomeID); - surfaceDepositBiomes.add(BiomeGenBase.taiga.biomeID); - - excludedBiomes.add(BiomeGenBase.sky.biomeID); - excludedBiomes.add(BiomeGenBase.hell.biomeID); +// BuildCraftCore.debugWorldgen = true; } @SubscribeEvent @@ -80,15 +74,15 @@ public final class OilPopulate { BiomeGenBase biome = world.getBiomeGenForCoords(x, z); // Do not generate oil in the End or Nether - if (BuildCraftEnergy.excludeOilBiomeIDs.contains(biome.biomeID)) { + if (excludedBiomes.contains(biome.biomeID)) { return; } - boolean oilBiome = BuildCraftEnergy.oilBiomeIDs.contains(biome.biomeID); + boolean oilBiome = surfaceDepositBiomes.contains(biome.biomeID); double bonus = oilBiome ? 3.0 : 1.0; bonus *= BuildCraftEnergy.oilWellScalar; - if (BuildCraftEnergy.excessiveOilBiomeIDs.contains(biome.biomeID)) { + if (excessiveBiomes.contains(biome.biomeID)) { bonus *= 30.0; } else if (BuildCraftCore.debugWorldgen) { bonus *= 20.0;