Some performance tweaks.

This commit is contained in:
CrazyPants committed 2014-06-16 13:03:09 +08:00
1 parent ccfb2bd04b
commit 20a2d2ac61
4 files changed
+34 -19

No files matched your search

@@ -319,7 +319,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
}
requiresClientSync |= doSideIo();
if(worldObj.getTotalWorldTime() % 5 == 0) {
requiresClientSync |= doSideIo();
}
requiresClientSync |= prevRedCheck != redstoneCheckPassed;
@@ -118,14 +118,16 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) {
return 0;
}
tanksDirty = true;
int res = 0;
if(IronEngineCoolant.isCoolant(resource.getFluid())) {
return getCoolantTank().fill(resource, doFill);
res = getCoolantTank().fill(resource, doFill);
} else if(IronEngineFuel.getFuelForFluid(resource.getFluid()) != null) {
res = getFuelTank().fill(resource, doFill);
}
if(IronEngineFuel.getFuelForFluid(resource.getFluid()) != null) {
return getFuelTank().fill(resource, doFill);
if(res > 0) {
tanksDirty = true;
}
return 0;
return res;
}
@Override
@@ -165,13 +167,13 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
}
if(storedEnergy >= capacitorType.capacitor.getMaxEnergyStored()) {
inPause = true;
}
inPause = true;
}
transmitEnergy();
}
if(tanksDirty) {
if(tanksDirty && worldObj.getTotalWorldTime() % 10 == 0) {
PacketHandler.sendToAllAround(new PacketCombustionTank(this), this);
tanksDirty = false;
}
@@ -197,7 +199,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP
}
private boolean generateEnergy() {
generated = 0;
if((ticksRemaingCoolant <= 0 && getCoolantTank().getFluidAmount() <= 0) ||
@@ -97,11 +97,13 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler {
source.amount = amountPerNeighbour;
used += tc.container.fill(tc.fillFromDir, source, true);
}
tank.drain(used, true);
tankDirty = true;
if(used > 0) {
tank.drain(used, true);
tankDirty = true;
}
}
}
if(tankDirty) {
if(tankDirty && worldObj.getTotalWorldTime() % 2 == 0) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
tankDirty = false;
}
@@ -145,8 +145,11 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler
if(resource == null || !canFill(from, resource.getFluid())) {
return 0;
}
tanksDirty = true;
return inputTank.fill(resource, doFill);
int res = inputTank.fill(resource, doFill);
if(res > 0 && doFill) {
tanksDirty = true;
}
return res;
}
@Override
@@ -157,8 +160,11 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler
if(outputTank.getFluid() == null || resource == null || !resource.isFluidEqual(outputTank.getFluid())) {
return null;
}
tanksDirty = true;
return outputTank.drain(resource.amount, doDrain);
FluidStack res = outputTank.drain(resource.amount, doDrain);
if(res != null && res.amount > 0 && doDrain) {
tanksDirty = true;
}
return res;
}
@Override
@@ -166,8 +172,11 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler
if(isSideDisabled(from.ordinal())) {
return null;
}
tanksDirty = true;
return outputTank.drain(maxDrain, doDrain);
FluidStack res = outputTank.drain(maxDrain, doDrain);
if(res != null && res.amount > 0 && doDrain) {
tanksDirty = true;
}
return res;
}
@Override