Some GUI fixes

This commit is contained in:
Tntrololol 2015-06-14 13:34:52 -05:00
parent 22d018efb3
commit 083696280c
17 changed files with 148 additions and 46 deletions

View file

@ -40,12 +40,12 @@ public class GuiAlloySmelter extends GuiContainer {
int j = 0;
if(alloysmelter.crafter.currentTickTime != 0) {
j = this.alloysmelter.crafter.currentTickTime * 24 / this.alloysmelter.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 79, l + 34, 176, 14, j + 1, 16);
j = alloysmelter.getProgressScaled(24);
if(j > 0) {
this.drawTexturedModalRect(k + 79, l + 34, 176, 14, j + 1, 16);
}
j = (int)this.alloysmelter.energy.getEnergyStored() * 12 / this.alloysmelter.energy.getCapacity();
j = alloysmelter.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -42,14 +42,14 @@ public class GuiAssemblingMachine extends GuiContainer {
int j = 0;
if(this.assemblingmachine.crafter.currentTickTime != 0){
j = this.assemblingmachine.crafter.currentTickTime * 20 / this.assemblingmachine.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 86, l + 34, 176, 14, j + 1, 16);
j = (int) (this.assemblingmachine.energy.getEnergyStored() * 12 / this.assemblingmachine.energy.getCapacity());
j = assemblingmachine.getProgressScaled(20);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
this.drawTexturedModalRect(k + 86, l + 34, 176, 14, j + 1, 16);
}
j = assemblingmachine.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}

View file

@ -40,15 +40,15 @@ public class GuiCentrifuge extends GuiContainer {
int j = 0;
if(centrifuge.crafter.currentRecipe != null) {
j = this.centrifuge.crafter.currentTickTime * 11 / this.centrifuge.crafter.currentNeededTicks;
j = centrifuge.getProgressScaled(11);
if(j > 0) {
this.drawTexturedModalRect(k + 83, l + 23 + 10 - j, 177, 15 + 10 - j, 10, j);
this.drawTexturedModalRect(k + 98, l + 38, 177, 51, j, 10);
this.drawTexturedModalRect(k + 83, l + 53, 177, 39, 10, j);
this.drawTexturedModalRect(k + 68 + 10 - j, l + 38, 177 + 10 - j, 27, j, 10);
}
this.drawTexturedModalRect(k + 83, l + 23 + 10 - j, 177, 15 + 10 - j, 10, j);
this.drawTexturedModalRect(k + 98, l + 38, 177, 51, j, 10);
this.drawTexturedModalRect(k + 83, l + 53, 177, 39, 10, j);
this.drawTexturedModalRect(k + 68 + 10 - j, l + 38, 177 + 10 - j, 27, j, 10);
j = (int)this.centrifuge.energy.getEnergyStored() * 12 / this.centrifuge.energy.getCapacity();
j = centrifuge.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 9, l + 32 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -42,12 +42,12 @@ public class GuiChemicalReactor extends GuiContainer {
int j = 0;
if(this.chemicalReactor.crafter.currentTickTime != 0){
j = this.chemicalReactor.crafter.currentTickTime * 20 / this.chemicalReactor.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 73, l + 39, 177, 15, 30, j);
j = chemicalReactor.getProgressScaled(11);
if(j > 0) {
this.drawTexturedModalRect(k + 73, l + 39, 177, 15, 30, j);
}
j = (int) (this.chemicalReactor.crafter.energy.getEnergyStored() * 12 / this.chemicalReactor.energy.getCapacity());
j = chemicalReactor.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 9, l + 32 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -33,12 +33,12 @@ public class GuiGrinder extends GuiContainer{
int j = 0;
if(grinder.crafter.currentRecipe != null) {
j = this.grinder.crafter.currentTickTime * 24 / this.grinder.crafter.currentNeededTicks;
j = grinder.getProgressScaled(24);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 38, 176, 14, j + 1, 16);
}
this.drawTexturedModalRect(k + 51, l + 35, 176, 14, j + 1, 16);
j = (int)this.grinder.energy.getEnergyStored() * 12 / this.grinder.energy.getCapacity();
j = grinder.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 132, l + 63 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -46,15 +46,17 @@ public class GuiIndustrialSawmill extends GuiContainer {
int j = 0;
if(sawmill.crafter.currentTickTime != 0) {
j = this.sawmill.crafter.currentTickTime * 24 / this.sawmill.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 57, l + 36, 176, 11, j - 1, 13);
j = (int)this.sawmill.energy.getEnergyStored() * 12 / this.sawmill.energy.getCapacity();
j = sawmill.getProgressScaled(24);
if(j > 0) {
this.drawTexturedModalRect(k + 36, l + 66 + 12 - j, 176, 12 - j, 14, j + 2);
this.drawTexturedModalRect(k + 56, l + 38, 176, 14, j - 1, 11);
}
j = sawmill.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 33, l + 65 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_,

View file

@ -42,12 +42,12 @@ public class GuiLathe extends GuiContainer {
int j = 0;
if(this.lathe.crafter.currentTickTime != 0){
j = this.lathe.crafter.currentTickTime * 20 / this.lathe.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 80, l + 34, 176, 14, j, 16);
j = lathe.getProgressScaled(20);
if(j > 0) {
this.drawTexturedModalRect(k + 80, l + 34, 176, 14, j, 16);
}
j = (int) (this.lathe.energy.getEnergyStored() * 12 / this.lathe.energy.getCapacity());
j = lathe.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}

View file

@ -43,12 +43,12 @@ public class GuiPlateCuttingMachine extends GuiContainer {
int j = 0;
if(this.platecuttingmachine.crafter.currentTickTime != 0){
j = this.platecuttingmachine.crafter.currentTickTime * 20 / this.platecuttingmachine.crafter.currentNeededTicks;
}
this.drawTexturedModalRect(k + 83, l + 34, 176, 14, j, 16);
j = platecuttingmachine.getProgressScaled(20);
if(j > 0) {
this.drawTexturedModalRect(k + 83, l + 34, 176, 14, j, 16);
}
j = (int) (this.platecuttingmachine.energy.getEnergyStored() * 12 / this.platecuttingmachine.energy.getCapacity());
j = platecuttingmachine.getEnergyScaled(12);
if(j > 0) {
this.drawTexturedModalRect(k + 56, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}