Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2145 and related oilgen issues

Browse source
This commit is contained in:
Adrian Siekierka 2014-11-07 19:06:06 +01:00
parent a3064c12cd
commit 928cc436dd
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/buildcraft/BuildCraftEnergy.java
View file

@ -104,9 +104,6 @@ public class BuildCraftEnergy extends BuildCraftMod {
public static boolean canOilBurn; public static boolean canOilBurn;
public static double oilWellScalar = 1.0; public static double oilWellScalar = 1.0;
public static Set<Integer> oilBiomeIDs = new HashSet<Integer>();
public static Set<Integer> excessiveOilBiomeIDs = new HashSet<Integer>();
public static Set<Integer> excludeOilBiomeIDs = new HashSet<Integer>();
public static TreeMap<BlockIndex, Integer> saturationStored = new TreeMap<BlockIndex, Integer>(); public static TreeMap<BlockIndex, Integer> saturationStored = new TreeMap<BlockIndex, Integer>();
public static ITriggerExternal triggerBlueEngineHeat = new TriggerEngineHeat(EnergyStage.BLUE); public static ITriggerExternal triggerBlueEngineHeat = new TriggerEngineHeat(EnergyStage.BLUE);
public static ITriggerExternal triggerGreenEngineHeat = new TriggerEngineHeat(EnergyStage.GREEN); 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); oilWellScalar = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilWellGenerationRate", 1.0, "Probability of oil well generation").getDouble(1.0);
setBiomeList( setBiomeList(
oilBiomeIDs, OilPopulate.INSTANCE.surfaceDepositBiomes,
BuildCraftCore.mainConfiguration BuildCraftCore.mainConfiguration
.get(Configuration.CATEGORY_GENERAL, "oil.increasedBiomeIDs", .get(Configuration.CATEGORY_GENERAL, "oil.increasedBiomeIDs",
new String[] {BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName}, 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.")); "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have increased oil generation rates."));
setBiomeList( setBiomeList(
excessiveOilBiomeIDs, OilPopulate.INSTANCE.excessiveBiomes,
BuildCraftCore.mainConfiguration BuildCraftCore.mainConfiguration
.get(Configuration.CATEGORY_GENERAL, .get(Configuration.CATEGORY_GENERAL,
"oil.excessiveBiomeIDs", "oil.excessiveBiomeIDs",
new String[] {}, new String[] {},
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have GREATLY increased oil generation rates.")); "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", .get(Configuration.CATEGORY_GENERAL, "oil.excludeBiomeIDs",
new String[] {BiomeGenBase.sky.biomeName, BiomeGenBase.hell.biomeName}, new String[] {BiomeGenBase.sky.biomeName, BiomeGenBase.hell.biomeName},
"IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that are excluded from generating oil.")); "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that are excluded from generating oil."));

14
common/buildcraft/energy/worldgen/OilPopulate.java
View file

@ -46,17 +46,11 @@ public final class OilPopulate {
public final Set<Integer> excludedBiomes = new HashSet<Integer>(); public final Set<Integer> excludedBiomes = new HashSet<Integer>();
private enum GenType { private enum GenType {
LARGE, MEDIUM, LAKE, NONE LARGE, MEDIUM, LAKE, NONE
}; };
private OilPopulate() { private OilPopulate() {
// BuildCraftCore.debugMode = true; // BuildCraftCore.debugWorldgen = true;
surfaceDepositBiomes.add(BiomeGenBase.desert.biomeID);
surfaceDepositBiomes.add(BiomeGenBase.taiga.biomeID);
excludedBiomes.add(BiomeGenBase.sky.biomeID);
excludedBiomes.add(BiomeGenBase.hell.biomeID);
} }
@SubscribeEvent @SubscribeEvent
@ -80,15 +74,15 @@ public final class OilPopulate {
BiomeGenBase biome = world.getBiomeGenForCoords(x, z); BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
// Do not generate oil in the End or Nether // Do not generate oil in the End or Nether
if (BuildCraftEnergy.excludeOilBiomeIDs.contains(biome.biomeID)) { if (excludedBiomes.contains(biome.biomeID)) {
return; return;
} }
boolean oilBiome = BuildCraftEnergy.oilBiomeIDs.contains(biome.biomeID); boolean oilBiome = surfaceDepositBiomes.contains(biome.biomeID);
double bonus = oilBiome ? 3.0 : 1.0; double bonus = oilBiome ? 3.0 : 1.0;
bonus *= BuildCraftEnergy.oilWellScalar; bonus *= BuildCraftEnergy.oilWellScalar;
if (BuildCraftEnergy.excessiveOilBiomeIDs.contains(biome.biomeID)) { if (excessiveBiomes.contains(biome.biomeID)) {
bonus *= 30.0; bonus *= 30.0;
} else if (BuildCraftCore.debugWorldgen) { } else if (BuildCraftCore.debugWorldgen) {
bonus *= 20.0; bonus *= 20.0;