Initial untested port to new internal power system.

This resets all the machines internal power buffer
This commit is contained in:
modmuss50 2015-07-23 12:52:51 +01:00
parent 984b502ded
commit e9ece63a99
28 changed files with 580 additions and 486 deletions

View file

@ -28,8 +28,8 @@ public abstract class ContainerCrafting extends TechRebornContainer {
if(this.currentNeededTicks != crafter.currentNeededTicks){
icrafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
}
if(this.energy != (int)crafter.energy.getEnergyStored()){
icrafting.sendProgressBarUpdate(this, 2, (int)crafter.energy.getEnergyStored());
if(this.energy != (int)crafter.energy.getEnergy()){
icrafting.sendProgressBarUpdate(this, 2, (int)crafter.energy.getEnergy());
}
}
}
@ -39,7 +39,7 @@ public abstract class ContainerCrafting extends TechRebornContainer {
super.addCraftingToCrafters(crafting);
crafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
crafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
crafting.sendProgressBarUpdate(this, 2, (int)crafter.energy.getEnergyStored());
crafting.sendProgressBarUpdate(this, 2, (int)crafter.energy.getEnergy());
}
@SideOnly(Side.CLIENT)
@ -54,6 +54,6 @@ public abstract class ContainerCrafting extends TechRebornContainer {
}
this.crafter.currentTickTime = currentTickTime;
this.crafter.currentNeededTicks = currentNeededTicks;
this.crafter.energy.setEnergyStored(energy);
this.crafter.energy.setEnergy(energy);
}
}

View file

@ -52,7 +52,7 @@ public class GuiImplosionCompressor extends GuiContainer{
this.drawTexturedModalRect(k + 60, l + 38, 176, 14, j + 1, 16);
j = (int) (this.compresser.crafter.energy.getEnergyStored() * 12 / this.compresser.energy.getCapacity());
j = (int) (this.compresser.crafter.energy.getEnergy() * 12 / this.compresser.getMaxPower());
if(j > 0) {
this.drawTexturedModalRect(k + 16, l + 37 + 12 - j, 176, 12 - j, 14, j + 2);
}