Fix #277. Remove minimum input energy requirement for machines

This commit is contained in:
mezz committed 2014-10-08 13:56:03 -07:00
1 parent 7fbdb8b670
commit 2792eda133
15 files changed
+17 -19

No files matched your search

@@ -42,7 +42,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IEner
public TileAlvearyClimatiser(ClimateControl control, int textureOff, int textureOn, int componentBlockMeta) {
super(componentBlockMeta);
this.climateControl = control;
energyManager = new EnergyManager(100, 1000, 250, 2000);
energyManager = new EnergyManager(1000, 250, 2000);
energyManager.setReceiveOnly();
this.textureOff = textureOff;
this.textureOn = textureOn;
@@ -76,7 +76,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler {
this.maxHeat = maxHeat;
this.maxEnergy = maxEnergy;
this.maxEnergyExtracted = maxEnergyExtracted;
energyManager = new EnergyManager(100, 2000, 100, 1000000);
energyManager = new EnergyManager(2000, 100, 1000000);
// allow engines to chain, but not have energy sucked out of them
energyManager.setReceiveOnly();
@@ -23,7 +23,7 @@ public abstract class Mill extends TilePowered {
public float progress;
public Mill() {
super(0, 0, 0, 0);
super(0, 0, 0);
speed = 0.01F;
}
@@ -76,7 +76,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui
/* CONSTRUCTOR */
public TileAnalyzer() {
super(400, 800, 40, Defaults.MACHINE_MAX_ENERGY);
super(800, 40, Defaults.MACHINE_MAX_ENERGY);
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, Fluids.HONEY.get());
tankManager = new TankManager(resourceTank);
}
@@ -65,8 +65,8 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
protected final EnergyManager energyManager;
public TilePowered(int minAcceptedEnergy, int maxTransfer, int energyPerWork, int capacity) {
this.energyManager = new EnergyManager(minAcceptedEnergy, maxTransfer, energyPerWork, capacity);
public TilePowered(int maxTransfer, int energyPerWork, int capacity) {
this.energyManager = new EnergyManager(maxTransfer, energyPerWork, capacity);
this.energyManager.setReceiveOnly();
}
@@ -14,13 +14,11 @@ public class EnergyManager implements IEnergyHandler {
}
private int energyPerWork;
private int minAcceptedEnergy;
protected EnergyStorage energyStorage;
private EnergyTransferMode mode = EnergyTransferMode.BOTH;
public EnergyManager(int minAcceptedEnergy, int maxTransfer, int energyPerWork, int capacity) {
public EnergyManager(int maxTransfer, int energyPerWork, int capacity) {
this.energyPerWork = scaleForDifficulty(energyPerWork);
this.minAcceptedEnergy = scaleForDifficulty(minAcceptedEnergy);
energyStorage = new EnergyStorage(scaleForDifficulty(capacity), scaleForDifficulty(maxTransfer), scaleForDifficulty(maxTransfer));
}
@@ -88,7 +86,7 @@ public class EnergyManager implements IEnergyHandler {
/* IEnergyHandler */
@Override
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
if (!canReceive() || maxReceive < minAcceptedEnergy)
if (!canReceive())
return 0;
return energyStorage.receiveEnergy(maxReceive, simulate);
}
@@ -155,7 +155,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq
private int fillingTotalTime;
public MachineBottler() {
super(500, 1100, 50, 4000);
super(1100, 50, 4000);
setHints(Config.hints.get("bottler"));
resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY);
tankManager = new TankManager(resourceTank);
@@ -233,7 +233,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
}
public MachineCarpenter() {
super(500, 1100, 50, 4000);
super(1100, 50, 4000);
setHints(Config.hints.get("carpenter"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids);
craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems");
@@ -142,7 +142,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I
private int timePerItem;
public MachineCentrifuge() {
super(400, 800, 40, Defaults.MACHINE_MAX_ENERGY);
super(800, 40, Defaults.MACHINE_MAX_ENERGY);
setHints(Config.hints.get("centrifuge"));
}
@@ -242,7 +242,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial
private FluidStack pendingSmelt;
public MachineFabricator() {
super(500, 1100, 50, 3300);
super(1100, 50, 3300);
Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS);
moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass);
moltenTank.tankMode = StandardTank.TankMode.INTERNAL;
@@ -196,7 +196,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL
public int fuelCurrentFerment = 0;
public MachineFermenter() {
super(50, 2000, 150, 8000);
super(2000, 150, 8000);
setHints(Config.hints.get("fermenter"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs);
resourceTank.tankMode = StandardTank.TankMode.INPUT;
@@ -145,7 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
private ItemStack pendingProduct;
public MachineMoistener() {
super(0, 0, 0, 0);
super(0, 0, 0);
setHints(Config.hints.get("moistener"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
tankManager = new TankManager(resourceTank);
@@ -149,7 +149,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
private int timePerItem;
public MachineSqueezer() {
super(500, 1100, 50, 4000);
super(1100, 50, 4000);
setHints(Config.hints.get("squeezer"));
productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids);
productTank.tankMode = StandardTank.TankMode.OUTPUT;
@@ -139,7 +139,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid
public int distillationTotalTime = 0;
public MachineStill() {
super(500, 1100, 50, 8000);
super(1100, 50, 8000);
setHints(Config.hints.get("still"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs);
resourceTank.tankMode = StandardTank.TankMode.INPUT;
@@ -26,7 +26,7 @@ public class TileGearbox extends TileFarm implements IPowerHandler {
private final EnergyManager energyManager;
public TileGearbox() {
energyManager = new EnergyManager(50, 200, 50, 10000);
energyManager = new EnergyManager(200, 50, 10000);
fixedType = TYPE_GEARS;
}