Created EnergyManager to help replicate previous behaviors

This commit is contained in:
mezz committed 2014-09-21 23:48:20 -07:00
1 parent 60fa471910
commit 6cc67e2df5
12 files changed
+143 -71

No files matched your search

@@ -210,10 +210,10 @@ public class Defaults {
public static final int PROCESSOR_TANK_CAPACITY = 10 * BUCKET_VOLUME;
public static final int MACHINE_LATENCY = 1000;
public static final int MACHINE_MIN_ENERGY_RECEIVED = 5;
public static final int MACHINE_MAX_ENERGY_RECEIVED = 40;
public static final int MACHINE_MIN_ACTIVATION_ENERGY = 15;
public static final int MACHINE_MAX_ENERGY = 500;
public static final int MACHINE_MIN_ENERGY_RECEIVED = 50;
public static final int MACHINE_MAX_ENERGY_RECEIVED = 400;
public static final int MACHINE_MIN_ACTIVATION_ENERGY = 150;
public static final int MACHINE_MAX_ENERGY = 5000;
public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
@@ -23,6 +23,7 @@ public abstract class Mill extends TilePowered {
public float progress;
public Mill() {
super(0, 0, 0, 0);
speed = 0.01F;
}
@@ -10,7 +10,6 @@
******************************************************************************/
package forestry.core.gadgets;
import cofh.api.energy.EnergyStorage;
import cofh.api.energy.IEnergyHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -18,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import forestry.core.GameMode;
import forestry.core.interfaces.IRenderableMachine;
import forestry.core.network.ClassMap;
import forestry.core.network.IndexInPayload;
@@ -26,6 +24,7 @@ import forestry.core.network.PacketPayload;
import forestry.core.proxy.Proxies;
import forestry.core.utils.EnumTankLevel;
import forestry.core.fluids.tanks.StandardTank;
import forestry.energy.EnergyManager;
public abstract class TilePowered extends TileBase implements IRenderableMachine, IEnergyHandler {
@@ -65,28 +64,13 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
ex.printStackTrace();
}
}
protected EnergyStorage energyStorage;
public int energyPerUse;
protected final EnergyManager energyManager;
public TilePowered() {
this(5000, 150);
public TilePowered(int minAcceptedEnergy, int maxTransfer, int energyPerWork, int capacity) {
this.energyManager = new EnergyManager(minAcceptedEnergy, maxTransfer, energyPerWork, capacity);
this.energyManager.setReceiveOnly();
}
public TilePowered(int defaultCapacity, int defaultEnergyPerUse) {
this(defaultCapacity, defaultEnergyPerUse, defaultCapacity);
}
public TilePowered(int defaultCapacity, int defaultEnergyPerUse, int defaultMaxTransfer) {
this.energyPerUse = scaleEnergyByDifficulty(defaultEnergyPerUse);
int capacity = scaleEnergyByDifficulty(defaultCapacity);
int maxTransfer = scaleEnergyByDifficulty(defaultMaxTransfer);
energyStorage = new EnergyStorage(capacity, maxTransfer);
}
private static int scaleEnergyByDifficulty(int energyPerUse) {
return Math.round(energyPerUse * GameMode.getGameMode().getFloatSetting("energy.demand.modifier"));
}
/*private final PowerHandler powerHandler;
public TilePowered() {
@@ -131,8 +115,7 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
if (!Proxies.common.isSimulating(worldObj))
return;
if (workCounter < WORK_CYCLES && energyStorage.getEnergyStored() >= energyPerUse) {
energyStorage.modifyEnergyStored(-energyPerUse); //TODO Make it continuous usage while doing work
if (workCounter < WORK_CYCLES && energyManager.consumeEnergyToDoWork()) {
workCounter++;
}
@@ -147,13 +130,13 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
energyStorage.writeToNBT(nbt);
energyManager.writeToNBT(nbt);
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
energyStorage.readFromNBT(nbt);
energyManager.readFromNBT(nbt);
}
/* LIQUID CONTAINER HANDLING */
@@ -191,26 +174,26 @@ public abstract class TilePowered extends TileBase implements IRenderableMachine
@Override
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
return energyStorage.receiveEnergy(maxReceive, simulate);
return energyManager.receiveEnergy(from, maxReceive, simulate);
}
@Override
public int extractEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
return 0;
return energyManager.extractEnergy(from, maxReceive, simulate);
}
@Override
public int getEnergyStored(ForgeDirection from) {
return energyStorage.getEnergyStored();
return energyManager.getEnergyStored(from);
}
@Override
public int getMaxEnergyStored(ForgeDirection from) {
return energyStorage.getMaxEnergyStored();
return energyManager.getMaxEnergyStored(from);
}
@Override
public boolean canConnectEnergy(ForgeDirection from) {
return true;
return energyManager.canConnectEnergy(from);
}
}
@@ -0,0 +1,117 @@
package forestry.energy;
import cofh.api.energy.EnergyStorage;
import cofh.api.energy.IEnergyHandler;
import forestry.core.GameMode;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
public class EnergyManager implements IEnergyHandler {
private enum EnergyTransferMode {
EXTRACT, RECEIVE, BOTH;
}
private int energyPerWork;
private int minAcceptedEnergy;
protected EnergyStorage energyStorage;
private EnergyTransferMode mode = EnergyTransferMode.BOTH;
public EnergyManager(int minAcceptedEnergy, int maxTransfer, int energyPerWork, int capacity) {
this.energyPerWork = scaleForDifficulty(energyPerWork);
this.minAcceptedEnergy = scaleForDifficulty(minAcceptedEnergy);
energyStorage = new EnergyStorage(scaleForDifficulty(capacity), scaleForDifficulty(maxTransfer), scaleForDifficulty(maxTransfer));
}
private static int scaleForDifficulty(int energyPerUse) {
return Math.round(energyPerUse * GameMode.getGameMode().getFloatSetting("energy.demand.modifier"));
}
public void setExtractOnly() {
mode = EnergyTransferMode.EXTRACT;
}
public void setReceiveOnly() {
mode = EnergyTransferMode.RECEIVE;
}
private boolean canExtract() {
switch (mode) {
case EXTRACT:
case BOTH:
return true;
}
return false;
}
private boolean canReceive() {
switch (mode) {
case RECEIVE:
case BOTH:
return true;
}
return false;
}
/* NBT */
public EnergyManager readFromNBT(NBTTagCompound nbt) {
NBTTagCompound energyManagerNBT = nbt.getCompoundTag("EnergyManager");
NBTTagCompound energyStorageNBT = energyManagerNBT.getCompoundTag("EnergyStorage");
energyStorage.readFromNBT(energyStorageNBT);
return this;
}
public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
NBTTagCompound energyStorageNBT = new NBTTagCompound();
energyStorage.writeToNBT(energyStorageNBT);
NBTTagCompound energyManagerNBT = new NBTTagCompound();
energyManagerNBT.setTag("EnergyStorage", energyStorageNBT);
nbt.setTag("EnergyManager", energyManagerNBT);
return nbt;
}
/* IEnergyHandler */
@Override
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
if (!canReceive() || maxReceive < minAcceptedEnergy)
return 0;
return energyStorage.receiveEnergy(maxReceive, simulate);
}
@Override
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
if (!canExtract())
return 0;
return energyStorage.extractEnergy(maxExtract, simulate);
}
@Override
public int getEnergyStored(ForgeDirection from) {
return energyStorage.getEnergyStored();
}
@Override
public int getMaxEnergyStored(ForgeDirection from) {
return energyStorage.getMaxEnergyStored();
}
@Override
public boolean canConnectEnergy(ForgeDirection from) {
return true;
}
/**
* Consumes one work cycle's worth of energy.
* @return true if the energy to do work was consumed
*/
public boolean consumeEnergyToDoWork() {
if (energyStorage.getEnergyStored() < energyPerWork)
return false;
energyStorage.modifyEnergyStored(-energyPerWork);
return true;
}
}
@@ -157,7 +157,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq
private int fillingTotalTime;
public MachineBottler() {
energyStorage = new EnergyStorage(4000);
super(500, 1100, 50, 4000);
setHints(Config.hints.get("bottler"));
resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY);
tankManager = new TankManager(resourceTank);
@@ -173,12 +173,6 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq
player.openGui(ForestryAPI.instance, GuiId.BottlerGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(50, 110, 5, 400);
}*/
/* SAVING & LOADING */
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
@@ -235,7 +235,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
}
public MachineCarpenter() {
energyStorage = new EnergyStorage(4000);
super(500, 1100, 50, 4000);
setHints(Config.hints.get("carpenter"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids);
craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems");
@@ -254,11 +254,6 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
player.openGui(ForestryAPI.instance, GuiId.CarpenterGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(50, 110, 5, 400);
}*/
/* LOADING & SAVING */
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
@@ -143,6 +143,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I
private int timePerItem;
public MachineCentrifuge() {
super(400, 800, 40, Defaults.MACHINE_MAX_ENERGY);
setHints(Config.hints.get("centrifuge"));
}
@@ -156,11 +157,6 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I
player.openGui(ForestryAPI.instance, GuiId.CentrifugeGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(40, 80, 4, Defaults.MACHINE_MAX_ENERGY);
}*/
/* LOADING & SAVING */
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
@@ -242,7 +242,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial
private FluidStack pendingSmelt;
public MachineFabricator() {
super(3300, 50, 1100);
super(500, 1100, 50, 3300);
Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS);
moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass);
moltenTank.tankMode = StandardTank.TankMode.INTERNAL;
@@ -198,7 +198,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL
public int fuelCurrentFerment = 0;
public MachineFermenter() {
energyStorage = new EnergyStorage(8000);
super(50, 2000, 150, 8000);
setHints(Config.hints.get("fermenter"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs);
resourceTank.tankMode = StandardTank.TankMode.INPUT;
@@ -217,11 +217,6 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL
player.openGui(ForestryAPI.instance, GuiId.FermenterGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(5, 200, 15, 800);
}*/
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
super.writeToNBT(nbttagcompound);
@@ -145,6 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
private ItemStack pendingProduct;
public MachineMoistener() {
super(0, 0, 0, 0);
setHints(Config.hints.get("moistener"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
tankManager = new TankManager(resourceTank);
@@ -151,7 +151,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
private int timePerItem;
public MachineSqueezer() {
energyStorage = new EnergyStorage(4000);
super(500, 1100, 50, 4000);
setHints(Config.hints.get("squeezer"));
productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids);
productTank.tankMode = StandardTank.TankMode.OUTPUT;
@@ -168,11 +168,6 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
player.openGui(ForestryAPI.instance, GuiId.SqueezerGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(50, 110, 5, 400);
}*/
/* LOADING & SAVING */
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
@@ -141,7 +141,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid
public int distillationTotalTime = 0;
public MachineStill() {
energyStorage = new EnergyStorage(8000);
super(500, 1100, 50, 8000);
setHints(Config.hints.get("still"));
resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs);
resourceTank.tankMode = StandardTank.TankMode.INPUT;
@@ -160,11 +160,6 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid
player.openGui(ForestryAPI.instance, GuiId.StillGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord);
}
/*@Override //TODO
protected void configurePowerProvider(PowerHandler provider) {
provider.configure(50, 110, 5, 800);
}*/
@Override
public void writeToNBT(NBTTagCompound nbttagcompound) {
super.writeToNBT(nbttagcompound);