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

Added Oil Burn config

Browse source
This commit is contained in:
CovertJaguar 2013-06-13 13:50:51 -07:00
parent 7b818ec45c
commit 77b92a8ce9
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftEnergy.java
View file

@ -84,6 +84,7 @@ public class BuildCraftEnergy {
public static Item fuel; public static Item fuel;
public static LiquidStack oilLiquid; public static LiquidStack oilLiquid;
public static LiquidStack fuelLiquid; public static LiquidStack fuelLiquid;
public static boolean canOilBurn;
public static TreeMap<BlockIndex, Integer> saturationStored = new TreeMap<BlockIndex, Integer>(); public static TreeMap<BlockIndex, Integer> saturationStored = new TreeMap<BlockIndex, Integer>();
public static BCTrigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.Blue); public static BCTrigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.Blue);
public static BCTrigger triggerGreenEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_GREEN_ENGINE_HEAT, EnergyStage.Green); public static BCTrigger triggerGreenEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_GREEN_ENGINE_HEAT, EnergyStage.Green);
@ -102,6 +103,7 @@ public class BuildCraftEnergy {
Property itemFuelId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "fuel.id", DefaultProps.FUEL_ID); Property itemFuelId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "fuel.id", DefaultProps.FUEL_ID);
Property oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilDesert", 160); Property oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilDesert", 160);
Property oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilOcean", 161); Property oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "oilOcean", 161);
canOilBurn = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "burnOil", true, "Can oil burn?").getBoolean(true);
BuildCraftCore.mainConfiguration.save(); BuildCraftCore.mainConfiguration.save();
class BiomeIdException extends RuntimeException { class BiomeIdException extends RuntimeException {

6
common/buildcraft/energy/BlockOilFlowing.java
View file

@ -304,7 +304,7 @@ public class BlockOilFlowing extends BlockFlowing implements ILiquid {
@Override @Override
public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) { public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) {
return 300; return BuildCraftEnergy.canOilBurn ? 300 : 0;
} }
@Override @Override
@ -314,11 +314,11 @@ public class BlockOilFlowing extends BlockFlowing implements ILiquid {
@Override @Override
public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) {
return true; return BuildCraftEnergy.canOilBurn;
} }
@Override @Override
public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) { public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) {
return true; return BuildCraftEnergy.canOilBurn;
} }
} }

6
common/buildcraft/energy/BlockOilStill.java
View file

@ -62,7 +62,7 @@ public class BlockOilStill extends BlockStationary implements ILiquid {
@Override @Override
public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) { public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) {
return 300; return BuildCraftEnergy.canOilBurn ? 300 : 0;
} }
@Override @Override
@ -72,11 +72,11 @@ public class BlockOilStill extends BlockStationary implements ILiquid {
@Override @Override
public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { public boolean isFlammable(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) {
return true; return BuildCraftEnergy.canOilBurn;
} }
@Override @Override
public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) { public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side) {
return true; return BuildCraftEnergy.canOilBurn;
} }
} }