Merge branch 'master' of https://github.com/TechReborn/TechReborn
This commit is contained in:
commit
62e5ccddd0
6 changed files with 566 additions and 999 deletions
|
@ -72,12 +72,10 @@ public class BlockAlloySmelter extends BlockMachineBase {
|
||||||
if(side == metadata && tileAlloySmelter.crafter.isActive()){
|
if(side == metadata && tileAlloySmelter.crafter.isActive()){
|
||||||
return this.iconFrontOn;
|
return this.iconFrontOn;
|
||||||
}
|
}
|
||||||
|
|
||||||
return metadata == 0 && side == 3 ? this.iconFront
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom: (side == 0 ? this.iconTop
|
||||||
: (side == metadata ? this.iconFront : this.blockIcon));
|
: (side == metadata ? this.iconFront : this.blockIcon));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
|
|
@ -17,8 +17,7 @@ public class GuiIndustrialElectrolyzer extends GuiContainer {
|
||||||
|
|
||||||
TileIndustrialElectrolyzer eletrolyzer;
|
TileIndustrialElectrolyzer eletrolyzer;
|
||||||
|
|
||||||
public GuiIndustrialElectrolyzer(EntityPlayer player,
|
public GuiIndustrialElectrolyzer(EntityPlayer player, TileIndustrialElectrolyzer tileeletrolyzer)
|
||||||
TileIndustrialElectrolyzer tileeletrolyzer)
|
|
||||||
{
|
{
|
||||||
super(new ContainerIndustrialElectrolyzer(tileeletrolyzer, player));
|
super(new ContainerIndustrialElectrolyzer(tileeletrolyzer, player));
|
||||||
this.xSize = 176;
|
this.xSize = 176;
|
||||||
|
@ -40,15 +39,25 @@ public class GuiIndustrialElectrolyzer extends GuiContainer {
|
||||||
int k = (this.width - this.xSize) / 2;
|
int k = (this.width - this.xSize) / 2;
|
||||||
int l = (this.height - this.ySize) / 2;
|
int l = (this.height - this.ySize) / 2;
|
||||||
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawGuiContainerForegroundLayer(int p_146979_1_,
|
j = eletrolyzer.getEnergyScaled(12);
|
||||||
int p_146979_2_)
|
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_)
|
||||||
{
|
{
|
||||||
String name = StatCollector.translateToLocal("tile.techreborn.industrialelectrolyzer.name");
|
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(name, (this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2), 6, 4210752);
|
||||||
this.fontRendererObj.drawString(
|
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8,
|
||||||
I18n.format("container.inventory", new Object[0]), 8,
|
|
||||||
this.ySize - 96 + 2, 4210752);
|
this.ySize - 96 + 2, 4210752);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,11 @@ public class ChargeHud
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo))
|
if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo))
|
||||||
|
{
|
||||||
|
if (ConfigTechReborn.ShowChargeHud)
|
||||||
drawChargeHud(event.resolution);
|
drawChargeHud(event.resolution);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void drawChargeHud(ScaledResolution res)
|
public void drawChargeHud(ScaledResolution res)
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -14,8 +14,8 @@ import techreborn.util.LogHelper;
|
||||||
|
|
||||||
public class TileAesu extends EUStorageTile implements IWrenchable {
|
public class TileAesu extends EUStorageTile implements IWrenchable {
|
||||||
|
|
||||||
public static final int MAX_OUTPUT = 8192;
|
public static final int MAX_OUTPUT = ConfigTechReborn.aesuMaxOutput;
|
||||||
public static final int MAX_STORAGE = 1000000000; //One billion!
|
public static final int MAX_STORAGE = ConfigTechReborn.aesuMaxStorage;
|
||||||
public Inventory inventory = new Inventory(2, "TileAesu", 64);
|
public Inventory inventory = new Inventory(2, "TileAesu", 64);
|
||||||
private int OUTPUT = 64; //The current output
|
private int OUTPUT = 64; //The current output
|
||||||
private double euLastTick = 0;
|
private double euLastTick = 0;
|
||||||
|
|
|
@ -217,4 +217,14 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren
|
||||||
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5;
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue