From 0163031bf1b894fae93b35e5a22f097755fe93f6 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 21 Sep 2014 20:33:30 -0700 Subject: [PATCH] Engine *10 cleanup --- src/main/java/forestry/core/config/Defaults.java | 16 ++++++++-------- src/main/java/forestry/core/gadgets/Engine.java | 6 +++--- .../forestry/energy/gadgets/EngineBronze.java | 4 ++-- .../forestry/energy/gadgets/EngineClockwork.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 4 ++-- .../java/forestry/energy/gadgets/EngineTin.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index bf7c5b843..bfcf6137d 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -177,12 +177,12 @@ public class Defaults { public static final int ENGINE_CYCLE_DURATION_SEED_OIL = 2500; public static final int ENGINE_CYCLE_DURATION_BIOMASS = 2500; public static final int ENGINE_CYCLE_DURATION_ETHANOL = 15000; - public static final int ENGINE_FUEL_VALUE_WATER = 1; - public static final int ENGINE_FUEL_VALUE_JUICE = 1; - public static final int ENGINE_FUEL_VALUE_HONEY = 2; - public static final int ENGINE_FUEL_VALUE_MILK = 1; - public static final int ENGINE_FUEL_VALUE_SEED_OIL = 3; - public static final int ENGINE_FUEL_VALUE_BIOMASS = 5; + public static final int ENGINE_FUEL_VALUE_WATER = 10; + public static final int ENGINE_FUEL_VALUE_JUICE = 10; + public static final int ENGINE_FUEL_VALUE_HONEY = 20; + public static final int ENGINE_FUEL_VALUE_MILK = 10; + public static final int ENGINE_FUEL_VALUE_SEED_OIL = 30; + public static final int ENGINE_FUEL_VALUE_BIOMASS = 50; public static final int ENGINE_HEAT_VALUE_LAVA = 20; public static final float ENGINE_PISTON_SPEED_MAX = 0.08f; @@ -194,9 +194,9 @@ public class Defaults { public static final int ENGINE_BRONZE_HEAT_GENERATION_ENERGY = 1; public static final int ENGINE_COPPER_CYCLE_DURATION_PEAT = 5000; - public static final int ENGINE_COPPER_FUEL_VALUE_PEAT = 1; + public static final int ENGINE_COPPER_FUEL_VALUE_PEAT = 10; public static final int ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT = 6000; - public static final int ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT = 2; + public static final int ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT = 20; public static final int ENGINE_COPPER_HEAT_MAX = 10000; public static final int ENGINE_COPPER_ASH_FOR_ITEM = 7500; diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index bf5a4ecd0..dec1873ba 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -77,8 +77,8 @@ public abstract class Engine extends TileBase implements IEnergyHandler { public Engine(int maxHeat, int maxEnergy, int maxEnergyExtracted) { this.maxHeat = maxHeat; - this.maxEnergy = maxEnergy * 10; //TODO Temporary until all are converted - this.maxEnergyExtracted = maxEnergyExtracted * 10; + this.maxEnergy = maxEnergy; + this.maxEnergyExtracted = maxEnergyExtracted; energyStorage = new EnergyStorage(maxEnergy, maxEnergyExtracted); //powerProvider = new PowerHandler(this, PowerHandler.Type.ENGINE); //powerProvider.configure(10, 200, 10, 100000); @@ -191,7 +191,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { if (mayBurn()) burn(); else - energyStorage.extractEnergy(2, false); + energyStorage.extractEnergy(20, false); } diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 8c77acb2a..7a2ffa03f 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -81,7 +81,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa private boolean shutdown; public EngineBronze() { - super(Defaults.ENGINE_BRONZE_HEAT_MAX, 30000, 500); + super(Defaults.ENGINE_BRONZE_HEAT_MAX, 300000, 5000); setHints(Config.hints.get("engine.bronze")); inventory = new TileInventoryAdapter(this, 1, "Items"); @@ -238,7 +238,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa */ private int determineFuelValue(Fluid fluid) { if (FuelManager.bronzeEngineFuel.containsKey(fluid)) - return FuelManager.bronzeEngineFuel.get(fluid).powerPerCycle * 10; //Too Lazy to change all the numbers to RF, so just doing this. + return FuelManager.bronzeEngineFuel.get(fluid).powerPerCycle; else return 0; } diff --git a/src/main/java/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/gadgets/EngineClockwork.java index 9a39d0153..7ed2ad196 100755 --- a/src/main/java/forestry/energy/gadgets/EngineClockwork.java +++ b/src/main/java/forestry/energy/gadgets/EngineClockwork.java @@ -38,7 +38,7 @@ public class EngineClockwork extends Engine { private short delay = 0; public EngineClockwork() { - super(ENGINE_CLOCKWORK_HEAT_MAX, 1000, 50); + super(ENGINE_CLOCKWORK_HEAT_MAX, 10000, 500); } @Override diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index bd1c46936..e5994bb5e 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -61,7 +61,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv private final TileInventoryAdapter inventory; public EngineCopper() { - super(Defaults.ENGINE_COPPER_HEAT_MAX, 20000, 400); + super(Defaults.ENGINE_COPPER_HEAT_MAX, 200000, 4000); setHints(Config.hints.get("engine.copper")); ashForItem = Defaults.ENGINE_COPPER_ASH_FOR_ITEM; @@ -209,7 +209,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv */ private int determineFuelValue(ItemStack fuel) { if (FuelManager.copperEngineFuel.containsKey(fuel)) - return FuelManager.copperEngineFuel.get(fuel).powerPerCycle * 10; //Too Lazy to change all the numbers to RF, so just doing this. + return FuelManager.copperEngineFuel.get(fuel).powerPerCycle; else return 0; } diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index cad13807b..ec046ff64 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -60,7 +60,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { private final DelayTimer delayUpdateTimer = new DelayTimer(); public EngineTin() { - super(Defaults.ENGINE_TIN_HEAT_MAX, 10000, 400); + super(Defaults.ENGINE_TIN_HEAT_MAX, 100000, 4000); setHints(Config.hints.get("engine.tin")); if (PluginIC2.instance.isAvailable()) ic2EnergySink = new BasicSink(this, euConfig.euStorage, 3);