dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix energy extraction + can only receive energy, not take energy

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-12 22:06:50 +01:00
parent 38ec0ce004
commit 7db9674ad6
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/storagecraft/tile/TileController.java
View File

@@ -1,7 +1,7 @@
package storagecraft.tile; package storagecraft.tile;
import cofh.api.energy.EnergyStorage; import cofh.api.energy.EnergyStorage;
import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import storagecraft.storage.Storage; import storagecraft.storage.Storage;
public class TileController extends TileSC implements IEnergyHandler, INetworkTile { public class TileController extends TileSC implements IEnergyReceiver, INetworkTile {
public static final int BASE_ENERGY_USAGE = 100; public static final int BASE_ENERGY_USAGE = 100;
private Storage storage = new Storage(); private Storage storage = new Storage();
@@ -31,7 +31,8 @@ public class TileController extends TileSC implements IEnergyHandler, INetworkTi
if (!destroyed) { if (!destroyed) {
++ticks; ++ticks;
if (!worldObj.isRemote && ticks % 40 == 0) { if (!worldObj.isRemote) {
if (ticks % 40 == 0) {
if (!isActive()) { if (!isActive()) {
disconnectAll(); disconnectAll();
} else { } else {
@@ -65,6 +66,7 @@ public class TileController extends TileSC implements IEnergyHandler, INetworkTi
for (TileMachine machine : connectedMachines) { for (TileMachine machine : connectedMachines) {
energyUsage += machine.getEnergyUsage(); energyUsage += machine.getEnergyUsage();
} }
}
energy.extractEnergy(energyUsage, false); energy.extractEnergy(energyUsage, false);
} else { } else {
@@ -114,11 +116,6 @@ public class TileController extends TileSC implements IEnergyHandler, INetworkTi
return energy.receiveEnergy(maxReceive, simulate); return energy.receiveEnergy(maxReceive, simulate);
} }
@Override
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
return energy.extractEnergy(maxExtract, simulate);
}
@Override @Override
public int getEnergyStored(ForgeDirection from) { public int getEnergyStored(ForgeDirection from) {
return energy.getEnergyStored(); return energy.getEnergyStored();