Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make BuildCraft actually have a single maximum energy per tick count

Browse source
This commit is contained in:
asiekierka 2015-02-23 21:30:31 +01:00
parent dcccad0658
commit a2a0143268
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/buildcraft/core/TileBuildCraft.java
View file

@ -49,6 +49,8 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
private String owner = "[BuildCraft]";
private RFBattery battery;
private int receivedTick, extractedTick;
public String getOwner() {
return owner;
}
@ -71,6 +73,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
initialize();
init = true;
}
if (battery != null) {
receivedTick = 0;
extractedTick = 0;
}
}
public void initialize() {
@ -172,7 +179,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
public int receiveEnergy(ForgeDirection from, int maxReceive,
boolean simulate) {
if (battery != null && this.canConnectEnergy(from)) {
return battery.receiveEnergy(maxReceive, simulate);
int received = battery.receiveEnergy(maxReceive - receivedTick, simulate);
if (!simulate) {
receivedTick += received;
}
return received;
} else {
return 0;
}
@ -184,7 +195,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
public int extractEnergy(ForgeDirection from, int maxExtract,
boolean simulate) {
if (battery != null && this.canConnectEnergy(from)) {
return battery.extractEnergy(maxExtract, simulate);
int extracted = battery.extractEnergy(maxExtract - extractedTick, simulate);
if (!simulate) {
extractedTick += extracted;
}
return extracted;
} else {
return 0;
}

2
common/buildcraft/factory/TileMiningWell.java
View file

@ -37,6 +37,8 @@ public class TileMiningWell extends TileBuildCraft implements IHasWork, IPipeCon
*/
@Override
public void updateEntity () {
super.updateEntity();
if (worldObj.isRemote) {
return;
}

2
common/buildcraft/factory/TileRefinery.java
View file

@ -110,6 +110,8 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
@Override
public void updateEntity() {
super.updateEntity();
if (worldObj.isRemote) {
simpleAnimationIterate();
return;