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

Heat Generator now shows exact heat generation amount in GUI

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-22 01:00:38 -05:00
parent d6c48a6e71
commit e31d5573f1
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
View file

@ -42,7 +42,7 @@ public class GuiHeatGenerator extends GuiMekanism
public List<String> getInfo() public List<String> getInfo()
{ {
return ListUtils.asList( return ListUtils.asList(
"Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.heatGeneration : tileEntity.getBoost()) + "/t", "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t",
"Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()),
"Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t");
} }

37
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
View file

@ -48,6 +48,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
public double invHeatCapacity = 1; public double invHeatCapacity = 1;
public double heatToAbsorb = 0; public double heatToAbsorb = 0;
public double producingEnergy;
public TileEntityHeatGenerator() public TileEntityHeatGenerator()
{ {
@ -122,6 +124,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
} }
} }
} }
double prev = getEnergy();
transferHeatTo(getBoost()); transferHeatTo(getBoost());
@ -135,8 +139,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
else { else {
setActive(false); setActive(false);
} }
simulateHeat(); simulateHeat();
applyTemperatureChange(); applyTemperatureChange();
producingEnergy = getEnergy()-prev;
} }
} }
@ -203,21 +210,20 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
int lavaBoost = 0; int lavaBoost = 0;
double netherBoost = 0D; double netherBoost = 0D;
if(isLava(xCoord+1, yCoord, zCoord)) for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
lavaBoost+=1; {
if(isLava(xCoord-1, yCoord, zCoord)) Coord4D coord = Coord4D.get(this).getFromSide(side);
lavaBoost+=1;
if(isLava(xCoord, yCoord+1, zCoord)) if(isLava(coord.xCoord, coord.yCoord, coord.zCoord))
lavaBoost+=1; {
if(isLava(xCoord, yCoord-1, zCoord)) lavaBoost++;
lavaBoost+=1; }
if(isLava(xCoord, yCoord, zCoord+1)) }
lavaBoost+=1;
if(isLava(xCoord, yCoord, zCoord-1))
lavaBoost+=1;
if(worldObj.provider.dimensionId == -1) if(worldObj.provider.dimensionId == -1)
{
netherBoost = generators.heatGenerationNether; netherBoost = generators.heatGenerationNether;
}
return (generators.heatGenerationLava * lavaBoost) + netherBoost; return (generators.heatGenerationLava * lavaBoost) + netherBoost;
} }
@ -257,6 +263,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
public void handlePacketData(ByteBuf dataStream) public void handlePacketData(ByteBuf dataStream)
{ {
super.handlePacketData(dataStream); super.handlePacketData(dataStream);
producingEnergy = dataStream.readDouble();
int amount = dataStream.readInt(); int amount = dataStream.readInt();
@ -273,6 +281,8 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
public ArrayList getNetworkedData(ArrayList data) public ArrayList getNetworkedData(ArrayList data)
{ {
super.getNetworkedData(data); super.getNetworkedData(data);
data.add(producingEnergy);
if(lavaTank.getFluid() != null) if(lavaTank.getFluid() != null)
{ {
@ -412,6 +422,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
transferHeatTo(-heatLost); transferHeatTo(-heatLost);
setEnergy(getEnergy() + workDone); setEnergy(getEnergy() + workDone);
} }
return HeatUtils.simulate(this); return HeatUtils.simulate(this);
} }
@ -435,11 +446,13 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
if(canConnectHeat(side)) if(canConnectHeat(side))
{ {
TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj);
if(adj instanceof IHeatTransfer) if(adj instanceof IHeatTransfer)
{ {
return (IHeatTransfer)adj; return (IHeatTransfer)adj;
} }
} }
return null; return null;
} }
} }