Should fix electric furnace progress + formatting. Closes #1621

This commit is contained in:
drcrazy 2018-10-29 17:40:16 +03:00
parent 50e35578a2
commit df13aeeba2
4 changed files with 16 additions and 16 deletions

View file

@ -37,24 +37,24 @@ public class GuiElectricFurnace extends GuiBase {
}
@Override
protected void drawGuiContainerBackgroundLayer(final float f, final int mouseX, final int mouseY) {
super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY);
final Layer layer = Layer.BACKGROUND;
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
Layer layer = Layer.BACKGROUND;
this.drawSlot(8, 72, layer);
drawSlot(8, 72, layer);
this.drawSlot(55, 45, layer);
this.drawOutputSlot(101, 45, layer);
drawSlot(55, 45, layer);
drawOutputSlot(101, 45, layer);
this.builder.drawJEIButton(this, 150, 4, layer);
builder.drawJEIButton(this, 150, 4, layer);
}
@Override
protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) {
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND;
Layer layer = Layer.FOREGROUND;
this.builder.drawProgressBar(this, this.tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer);
this.builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer);
builder.drawProgressBar(this, tile.gaugeProgressScaled(100), 100, 76, 48, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer);
builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer);
}
}

View file

@ -112,8 +112,8 @@ public class ModelDynamicCell implements IModel {
TextureAtlasSprite fluidSprite = bakedTextureGetter.apply(sprite);
if (fluid != null) {
if (fluidSprite != null) {
builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color));
builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color));
builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color, -1));
builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color, -1));
}
}

View file

@ -67,8 +67,8 @@ public abstract class TileGenericMachine extends TilePowerAcceptor
}
public int getProgressScaled(final int scale) {
if (getRecipeCrafter() != null && getRecipeCrafter().currentTickTime != 0) {
return getRecipeCrafter().currentTickTime * scale / getRecipeCrafter().currentNeededTicks;
if (crafter != null && crafter.currentTickTime != 0) {
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
}
return 0;
}

View file

@ -64,7 +64,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
}
public int gaugeProgressScaled(int scale) {
return progress * scale / fuelScale;
return progress * scale / (int) (fuelScale * (1.0 - getSpeedMultiplier()));
}
public void cookItems() {