tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Interface fixes

Browse source
This commit is contained in:
aidancbrady 2016-01-25 00:29:28 -05:00
parent 2984bf45a8
commit d210f6c47c
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/network/PacketSimpleGui.java
View file

@ -107,6 +107,7 @@ public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessa
dataStream.writeInt(coord4D.dimensionId); dataStream.writeInt(coord4D.dimensionId);
dataStream.writeInt(guiHandler);
dataStream.writeInt(guiId); dataStream.writeInt(guiId);
dataStream.writeInt(windowId); dataStream.writeInt(windowId);
} }
@ -116,6 +117,7 @@ public class PacketSimpleGui implements IMessageHandler<SimpleGuiMessage, IMessa
{ {
coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
guiHandler = dataStream.readInt();
guiId = dataStream.readInt(); guiId = dataStream.readInt();
windowId = dataStream.readInt(); windowId = dataStream.readInt();
} }

8
src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
View file

@ -63,10 +63,10 @@ public class GuiIndustrialTurbine extends GuiMekanism
double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW);
rate = Math.min(rate, tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW); rate = Math.min(rate, tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW);
fontRendererObj.drawString(LangUtils.localize("gui.production") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier), 53, 26, 0x00CD00); renderScaledText(LangUtils.localize("gui.production") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier), 53, 26, 0x00CD00, 106);
fontRendererObj.drawString(LangUtils.localize("gui.flowRate") + ": " + tileEntity.structure.clientFlow + " mB/t", 53, 35, 0x00CD00); renderScaledText(LangUtils.localize("gui.flowRate") + ": " + tileEntity.structure.clientFlow + " mB/t", 53, 35, 0x00CD00, 106);
fontRendererObj.drawString(LangUtils.localize("gui.capacity") + ": " + tileEntity.structure.getFluidCapacity() + " mB", 53, 44, 0x00CD00); renderScaledText(LangUtils.localize("gui.capacity") + ": " + tileEntity.structure.getFluidCapacity() + " mB", 53, 44, 0x00CD00, 106);
fontRendererObj.drawString(LangUtils.localize("gui.maxFlow") + ": " + rate + " mB/t", 53, 53, 0x00CD00); renderScaledText(LangUtils.localize("gui.maxFlow") + ": " + rate + " mB/t", 53, 53, 0x00CD00, 106);
if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72)
{ {

6
src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
View file

@ -48,14 +48,14 @@ public class GuiTurbineStats extends GuiMekanism
fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979);
fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040);
fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 8, 58, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040);
boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades; boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades;
boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades; boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades;
fontRendererObj.drawString(LangUtils.localize("gui.generation"), 8, 72, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979);
fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040);
fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (bladesLimiting ? limiting : ""), 8, 90, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040);
double energyMultiplier = TileEntityTurbineCasing.ENERGY_PER_STEAM*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*TileEntityTurbineCasing.BLADE_TO_COIL_RATIO); double energyMultiplier = TileEntityTurbineCasing.ENERGY_PER_STEAM*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*TileEntityTurbineCasing.BLADE_TO_COIL_RATIO);
double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW);

7
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
View file

@ -13,6 +13,7 @@ import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.multiblock.UpdateProtocol;
import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityMultiblock;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.content.turbine.SynchronizedTurbineData;
@ -120,6 +121,12 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock<SynchronizedTu
} }
} }
@Override
public String getInventoryName()
{
return LangUtils.localize("gui.industrialTurbine");
}
@Override @Override
public boolean onActivate(EntityPlayer player) public boolean onActivate(EntityPlayer player)
{ {

BIN
src/main/resources/assets/mekanism/gui/GuiIndustrialTurbine.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

3
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -486,7 +486,7 @@ gui.moveUp=Move Up
gui.moveDown=Move Down gui.moveDown=Move Down
gui.flowRate=Flow rate gui.flowRate=Flow rate
gui.maxFlow=Max flow gui.maxFlow=Max flow
gui.tankVolume=Tank volume gui.tankVolume=Tank Volume
gui.steamFlow=Steam Flow gui.steamFlow=Steam Flow
gui.production=Production gui.production=Production
gui.blades=Blades gui.blades=Blades
@ -496,6 +496,7 @@ gui.vents=Vents
gui.maxProduction=Max Production gui.maxProduction=Max Production
gui.limiting=Limiting gui.limiting=Limiting
gui.steamInput=Steam Input gui.steamInput=Steam Input
gui.capacity=Capacity
gui.reactor.injectionRate=Injection Rate gui.reactor.injectionRate=Injection Rate