diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 6b58481f8..2e5ec48c7 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -20,12 +20,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; import forestry.core.TemperatureState; import forestry.core.config.Defaults; import forestry.core.network.PacketPayload; import forestry.core.utils.BlockUtil; +import forestry.energy.EnergyManager; public abstract class Engine extends TileBase implements IEnergyHandler { @@ -37,7 +37,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { payload.intPayload[0] = 1; else payload.intPayload[0] = 0; - payload.intPayload[1] = energyStorage.getEnergyStored(); + payload.intPayload[1] = energyManager.toPacketInt(); payload.intPayload[2] = heat; payload.floatPayload[0] = pistonSpeedServer; @@ -48,7 +48,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { public void fromPacketPayload(PacketPayload payload) { isActive = payload.intPayload[0] > 0; - energyStorage.setEnergyStored(payload.intPayload[1]); + energyManager.fromPacketInt(payload.intPayload[1]); heat = payload.intPayload[2]; pistonSpeedServer = payload.floatPayload[0]; @@ -70,15 +70,13 @@ public abstract class Engine extends TileBase implements IEnergyHandler { protected final int maxHeat; protected boolean forceCooldown = false; public float progress; - protected EnergyStorage energyStorage; + protected EnergyManager energyManager; public Engine(int maxHeat, int maxEnergy, int maxEnergyExtracted) { this.maxHeat = maxHeat; this.maxEnergy = maxEnergy; this.maxEnergyExtracted = maxEnergyExtracted; - energyStorage = new EnergyStorage(maxEnergy, maxEnergyExtracted); - //powerProvider = new PowerHandler(this, PowerHandler.Type.ENGINE); - //powerProvider.configure(10, 200, 10, 100000); + energyManager = new EnergyManager(100, 2000, 100, 1000000); } @Override @@ -102,10 +100,6 @@ public abstract class Engine extends TileBase implements IEnergyHandler { public abstract int generateHeat(); - public int maxEnergyReceived() { - return 200; - } - public boolean mayBurn() { return !forceCooldown; } @@ -150,14 +144,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { if (progress > 0.25 && stagePiston == 1) { stagePiston = 2; - if (BlockUtil.isRFTile(getOrientation().getOpposite(), tile)) { - IEnergyHandler receptor = (IEnergyHandler) tile; - int extractable = extractEnergy(getOrientation(), energyStorage.getMaxExtract(), true); - if (extractable > 0) { - int extracted = receptor.receiveEnergy(getOrientation().getOpposite(), extractable, false); - extractEnergy(getOrientation(), extracted, false); - } - } + energyManager.sendEnergy(getOrientation(), tile); } else if (progress >= 0.5) { progress = 0; @@ -179,7 +166,7 @@ public abstract class Engine extends TileBase implements IEnergyHandler { if (mayBurn()) burn(); else - energyStorage.extractEnergy(20, false); + energyManager.drainEnergy(20); } @@ -201,10 +188,6 @@ public abstract class Engine extends TileBase implements IEnergyHandler { for (int i = getOrientation().ordinal() + 1; i <= getOrientation().ordinal() + 6; ++i) { ForgeDirection orient = ForgeDirection.values()[i % 6]; - /*Position pos = new Position(xCoord, yCoord, zCoord, orient); - pos.moveForwards(1.0F); - - TileEntity tile = worldObj.getTileEntity((int) pos.x, (int) pos.y, (int) pos.z);*/ TileEntity tile = worldObj.getTileEntity(xCoord + orient.offsetX, yCoord + orient.offsetY, zCoord + orient.offsetZ); if (BlockUtil.isRFTile(getOrientation().getOpposite(), tile)) { @@ -293,13 +276,9 @@ public abstract class Engine extends TileBase implements IEnergyHandler { @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - energyStorage.readFromNBT(nbt); + energyManager.readFromNBT(nbt); heat = nbt.getInteger("EngineHeat"); - /*if (nbt.hasKey("EngineStoredEnergy")) - storedEnergy = nbt.getInteger("EngineStoredEnergy"); - else - storedEnergy = nbt.getFloat("EngineStored");*/ progress = nbt.getFloat("EngineProgress"); forceCooldown = nbt.getBoolean("ForceCooldown"); @@ -308,10 +287,9 @@ public abstract class Engine extends TileBase implements IEnergyHandler { @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - energyStorage.writeToNBT(nbt); + energyManager.writeToNBT(nbt); nbt.setInteger("EngineHeat", heat); - //nbt.setFloat("EngineStored", storedEnergy); nbt.setFloat("EngineProgress", progress); nbt.setBoolean("ForceCooldown", forceCooldown); } @@ -321,15 +299,6 @@ public abstract class Engine extends TileBase implements IEnergyHandler { public abstract void sendGUINetworkData(Container containerEngine, ICrafting iCrafting); - /*@Override - public void doWork(PowerHandler workProvider) { - if (!Proxies.common.isSimulating(worldObj)) - return; - - addEnergy((int) (PluginBuildCraft.instance.invokeUseEnergyMethod(workProvider, 1, maxEnergyReceived(), true) * 0.95F)); - - }*/ - @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return 0; @@ -337,17 +306,17 @@ public abstract class Engine extends TileBase implements IEnergyHandler { @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return energyStorage.extractEnergy(maxExtract, simulate); //TODO + return energyManager.extractEnergy(from, maxExtract, 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 diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index 083e65c0c..513f9090f 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -3,7 +3,9 @@ package forestry.energy; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; import forestry.core.GameMode; +import forestry.core.utils.BlockUtil; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; public class EnergyManager implements IEnergyHandler { @@ -74,6 +76,15 @@ public class EnergyManager implements IEnergyHandler { return nbt; } + /* Packets */ + public int toPacketInt() { + return energyStorage.getEnergyStored(); + } + + public void fromPacketInt(int packetInt) { + energyStorage.setEnergyStored(packetInt); + } + /* IEnergyHandler */ @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { @@ -94,6 +105,10 @@ public class EnergyManager implements IEnergyHandler { return energyStorage.getEnergyStored(); } + public int getTotalEnergyStored() { + return energyStorage.getEnergyStored(); + } + @Override public int getMaxEnergyStored(ForgeDirection from) { return energyStorage.getMaxEnergyStored(); @@ -114,4 +129,51 @@ public class EnergyManager implements IEnergyHandler { energyStorage.modifyEnergyStored(-energyPerWork); return true; } + + /** + * Sends as much energy as it can to the tile at orientation + * @param orientation + * @param tile + * @return amount sent + */ + public int sendEnergy(ForgeDirection orientation, TileEntity tile) { + return sendEnergy(orientation, tile, Integer.MAX_VALUE); + } + + /** + * Sends amount of energy to the tile at orientation + * @param orientation + * @param tile + * @param amount + * @return amount sent + */ + public int sendEnergy(ForgeDirection orientation, TileEntity tile, int amount) { + int sent = 0; + if (BlockUtil.isRFTile(orientation.getOpposite(), tile)) { + IEnergyHandler receptor = (IEnergyHandler) tile; + + int extractable = extractEnergy(orientation, amount, true); + if (extractable > 0) { + sent = receptor.receiveEnergy(orientation.getOpposite(), extractable, false); + extractEnergy(orientation, sent, false); + } + } + return sent; + } + + /** + * Drains an amount of energy, due to decay from lack of work or other factors + * @param amount + */ + public void drainEnergy(int amount) { + energyStorage.modifyEnergyStored(-amount); + } + + /** + * Creates an amount of energy, generated by engines + * @param amount + */ + public void generateEnergy(int amount) { + energyStorage.modifyEnergyStored(amount); + } } diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 7a2ffa03f..bbc8b282b 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -167,7 +167,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa if (burnTime > 0) { burnTime--; currentOutput = determineFuelValue(FluidRegistry.getFluid(currentFluidId)); - energyStorage.modifyEnergyStored(currentOutput); + energyManager.generateEnergy(currentOutput); } else { burnTime = totalTime = this.determineBurnTime(fuelTank.getFluid().getFluid()); currentFluidId = fuelTank.getFluid().getFluid().getID(); @@ -353,7 +353,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa currentOutput = data; break; case 3: - energyStorage.setEnergyStored(data); + energyManager.fromPacketInt(data); break; case 4: heat = data; @@ -370,7 +370,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa iCrafting.sendProgressBarUpdate(containerEngine, i, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, i + 1, totalTime); iCrafting.sendProgressBarUpdate(containerEngine, i + 2, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, i + 3, energyStorage.getEnergyStored()); + iCrafting.sendProgressBarUpdate(containerEngine, i + 3, energyManager.toPacketInt()); iCrafting.sendProgressBarUpdate(containerEngine, i + 4, heat); iCrafting.sendProgressBarUpdate(containerEngine, i + 5, currentFluidId); } diff --git a/src/main/java/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/gadgets/EngineClockwork.java index 7ed2ad196..718cd4d0a 100755 --- a/src/main/java/forestry/energy/gadgets/EngineClockwork.java +++ b/src/main/java/forestry/energy/gadgets/EngineClockwork.java @@ -112,7 +112,7 @@ public class EngineClockwork extends Engine { tension *= 0.9995f; else tension = 0; - energyStorage.modifyEnergyStored(ENGINE_CLOCKWORK_ENERGY_PER_CYCLE * (int)tension); + energyManager.generateEnergy(ENGINE_CLOCKWORK_ENERGY_PER_CYCLE * (int)tension); } @Override @@ -142,7 +142,7 @@ public class EngineClockwork extends Engine { return 0; float fromClockwork = (tension / ENGINE_CLOCKWORK_WIND_MAX) * Defaults.ENGINE_PISTON_SPEED_MAX; - return fromClockwork >= 0.01f ? fromClockwork : energyStorage.getEnergyStored() > 0 ? 0.01f : 0; + return fromClockwork >= 0.01f ? fromClockwork : energyManager.getTotalEnergyStored() > 0 ? 0.01f : 0; } @Override public void getGUINetworkData(int i, int j) {} diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index e5994bb5e..27388234f 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -133,7 +133,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv if (isActivated()) { currentOutput = determineFuelValue(new ItemStack(fuelItem, 1, fuelItemMeta)); - energyStorage.modifyEnergyStored(currentOutput); + energyManager.generateEnergy(currentOutput); } } else if (isActivated()) { int fuelslot = getFuelSlot(); @@ -174,7 +174,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv if (isBurning()) { heat++; - if (((double) energyStorage.getEnergyStored() / (double) maxEnergy) > 0.5) + if (((double) energyManager.getTotalEnergyStored() / (double) maxEnergy) > 0.5) heat++; } @@ -333,7 +333,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv currentOutput = j; break; case 3: - energyStorage.setEnergyStored(j); + energyManager.fromPacketInt(j); break; case 4: heat = j; @@ -346,7 +346,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv iCrafting.sendProgressBarUpdate(containerEngine, 0, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, 1, totalBurnTime); iCrafting.sendProgressBarUpdate(containerEngine, 2, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 3, energyStorage.getEnergyStored()); + iCrafting.sendProgressBarUpdate(containerEngine, 3, energyManager.toPacketInt()); iCrafting.sendProgressBarUpdate(containerEngine, 4, heat); } diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index ec046ff64..37722db17 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -136,7 +136,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { int gain = 0; if (isActivated() && isBurning()) { gain++; - if (((double) energyStorage.getEnergyStored() / (double) maxEnergy) > 0.5) + if (((double) energyManager.getTotalEnergyStored() / (double) maxEnergy) > 0.5) gain++; } @@ -185,7 +185,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { if (ic2EnergySink.useEnergy(euConfig.euForCycle)) { currentOutput = euConfig.rfPerCycle; - energyStorage.modifyEnergyStored(euConfig.rfPerCycle); + energyManager.generateEnergy(euConfig.rfPerCycle); } } @@ -233,7 +233,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { currentOutput = j; break; case 1: - energyStorage.setEnergyStored(j); + energyManager.fromPacketInt(j); break; case 2: heat = j; @@ -248,7 +248,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { @Override public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { iCrafting.sendProgressBarUpdate(containerEngine, 0, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 1, energyStorage.getEnergyStored()); + iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.toPacketInt()); iCrafting.sendProgressBarUpdate(containerEngine, 2, heat); if (ic2EnergySink != null) { iCrafting.sendProgressBarUpdate(containerEngine, 3, (short) ic2EnergySink.getEnergyStored());