Cleanup of common constructs

This commit is contained in:
Henry Loenwind authored and HenryLoenwind committed 2015-03-18 21:44:48 +01:00
1 parent 31f193be2c
commit d7f9eb05fe
36 files changed
+160 -246

No files matched your search

@@ -16,6 +16,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
// Power
private Capacitors capacitorType;
private ICapacitor capacitor;
private int storedEnergyRF;
protected float lastSyncPowerStored = -1;
@@ -25,6 +26,12 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
capacitorType = Capacitors.BASIC_CAPACITOR;
}
@Override
public void init() {
super.init();
onCapacitorTypeChange();
}
@Override
public void updateEntity() {
@@ -33,7 +40,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
if(worldObj == null || worldObj.isRemote) { // sanity check
return;
}
boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 5 == 0);
boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5));
if(powerChanged) {
lastSyncPowerStored = storedEnergyRF;
PacketHandler.sendToAllAround(new PacketPowerStorage(this), this);
@@ -84,9 +91,9 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
public Capacitors getCapacitorType() {
return capacitorType;
}
public ICapacitor getCapacitor() {
return capacitorType.capacitor;
return capacitor != null ? capacitor : capacitorType.capacitor;
}
public int getEnergyStoredScaled(int scale) {
@@ -94,13 +101,23 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
return VecmathUtil.clamp(Math.round(scale * ((float) storedEnergyRF / getMaxEnergyStored())), 0, scale);
}
public void setCapacitor(Capacitors capacitorType) {
this.capacitorType = capacitorType;
forceClientUpdate = true;
protected void setCapacitor(ICapacitor capacitor) {
this.capacitor = capacitor;
//Force a check that the new value is in bounds
setEnergyStored(getEnergyStored());
}
public void setCapacitor(Capacitors capacitorType) {
this.capacitorType = capacitorType;
this.capacitor = null;
onCapacitorTypeChange();
//Force a check that the new value is in bounds
setEnergyStored(getEnergyStored());
forceClientUpdate = true;
}
public void onCapacitorTypeChange() {}
public int getPowerUsePerTick() {
return getCapacitor().getMaxEnergyExtracted();
}