maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Started adding progress bars to other machines

Browse source
This commit is contained in:
gigabit101 2015-07-21 17:53:43 +01:00
parent 0880ffac72
commit ab72f7dced
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java
View file

@ -72,12 +72,10 @@ public class BlockAlloySmelter extends BlockMachineBase {
if(side == metadata && tileAlloySmelter.crafter.isActive()){
return this.iconFrontOn;
}
return metadata == 0 && side == 3 ? this.iconFront
: side == 1 ? this.iconTop :
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
: (side == metadata ? this.iconFront : this.blockIcon));
}
@SideOnly(Side.CLIENT)

23
src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
View file

@ -17,8 +17,7 @@ public class GuiIndustrialElectrolyzer extends GuiContainer {
TileIndustrialElectrolyzer eletrolyzer;
public GuiIndustrialElectrolyzer(EntityPlayer player,
TileIndustrialElectrolyzer tileeletrolyzer)
public GuiIndustrialElectrolyzer(EntityPlayer player, TileIndustrialElectrolyzer tileeletrolyzer)
{
super(new ContainerIndustrialElectrolyzer(tileeletrolyzer, player));
this.xSize = 176;
@ -40,15 +39,25 @@ public class GuiIndustrialElectrolyzer extends GuiContainer {
int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = 0;
j = eletrolyzer.getProgressScaled(24);
if(j > 0) {
this.drawTexturedModalRect(k + 72, l + 38, 176, 14, j + 1, 16);
}
j = eletrolyzer.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 134, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_,
int p_146979_2_)
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_)
{
String name = StatCollector.translateToLocal("tile.techreborn.industrialelectrolyzer.name");
this.fontRendererObj.drawString(name, (this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2), 6, 4210752);
this.fontRendererObj.drawString(
I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
}
}

10
src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
View file

@ -216,5 +216,15 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren
{
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();
}
}