Some GUI fixes
This commit is contained in:
parent
22d018efb3
commit
083696280c
17 changed files with 148 additions and 46 deletions
|
@ -200,4 +200,15 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
|
|||
{
|
||||
return slotIndex == 2;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -209,4 +209,15 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl
|
|||
// }
|
||||
// }
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -216,4 +216,15 @@ public class TileCentrifuge extends TileMachineBase implements IWrenchable, IEn
|
|||
{
|
||||
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
}
|
|
@ -209,4 +209,15 @@ public class TileChemicalReactor extends TileMachineBase implements IWrenchable,
|
|||
// }
|
||||
// }
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -241,4 +241,15 @@ public class TileGrinder extends TileMachineBase implements IWrenchable, IEnergy
|
|||
{
|
||||
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -202,4 +202,16 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha
|
|||
{
|
||||
return slotIndex == 2 || slotIndex == 3;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -130,7 +130,7 @@ public class TileIndustrialSawmill extends TileMachineBase implements IWrenchabl
|
|||
public void addWailaInfo(List<String> info)
|
||||
{
|
||||
super.addWailaInfo(info);
|
||||
info.add("Power Stored " + energy.getEnergyStored() +" EU");
|
||||
info.add("Power Stored " + energy.getEnergyStored() + " EU");
|
||||
if(crafter.currentRecipe !=null){
|
||||
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
|
||||
}
|
||||
|
@ -263,4 +263,15 @@ public class TileIndustrialSawmill extends TileMachineBase implements IWrenchabl
|
|||
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -208,4 +208,15 @@ public class TileLathe extends TileMachineBase implements IWrenchable, IEnergyTi
|
|||
// }
|
||||
// }
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -208,5 +208,16 @@ public class TilePlateCuttingMachine extends TileMachineBase implements IWrencha
|
|||
return slotIndex == 1;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
if(crafter.currentTickTime != 0) {
|
||||
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int getEnergyScaled(int scale) {
|
||||
return (int)energy.getEnergyStored() * scale / energy.getCapacity();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue