Merge branch 'master' into development
Conflicts: src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
This commit is contained in:
commit
3935fa74c1
1 changed files with 11 additions and 1 deletions
|
@ -76,6 +76,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
|
||||||
{
|
{
|
||||||
GasStack removed = GasTransmission.removeGas(inventory[0], gasType, fuelTank.getNeeded());
|
GasStack removed = GasTransmission.removeGas(inventory[0], gasType, fuelTank.getNeeded());
|
||||||
boolean isTankEmpty = (fuelTank.getGas() == null);
|
boolean isTankEmpty = (fuelTank.getGas() == null);
|
||||||
|
|
||||||
int fuelReceived = fuelTank.receive(removed, true);
|
int fuelReceived = fuelTank.receive(removed, true);
|
||||||
|
|
||||||
if(fuelReceived > 0 && isTankEmpty)
|
if(fuelReceived > 0 && isTankEmpty)
|
||||||
|
@ -250,7 +251,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
|
||||||
|
|
||||||
if(isTankEmpty && fuelReceived > 0)
|
if(isTankEmpty && fuelReceived > 0)
|
||||||
{
|
{
|
||||||
output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick * 2;
|
output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick*2;
|
||||||
}
|
}
|
||||||
|
|
||||||
return fuelReceived;
|
return fuelReceived;
|
||||||
|
@ -265,6 +266,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
|
||||||
super.readFromNBT(nbtTags);
|
super.readFromNBT(nbtTags);
|
||||||
|
|
||||||
fuelTank.read(nbtTags.getCompoundTag("fuelTank"));
|
fuelTank.read(nbtTags.getCompoundTag("fuelTank"));
|
||||||
|
|
||||||
FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas());
|
FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas());
|
||||||
|
|
||||||
if(fuel != null)
|
if(fuel != null)
|
||||||
|
@ -320,6 +322,14 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
|
||||||
if(itemStack.stackTagCompound.hasKey("fuelTank"))
|
if(itemStack.stackTagCompound.hasKey("fuelTank"))
|
||||||
{
|
{
|
||||||
fuelTank.read(itemStack.stackTagCompound.getCompoundTag("fuelTank"));
|
fuelTank.read(itemStack.stackTagCompound.getCompoundTag("fuelTank"));
|
||||||
|
|
||||||
|
//Update energy output based on any existing fuel in tank
|
||||||
|
FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas());
|
||||||
|
|
||||||
|
if(fuel != null)
|
||||||
|
{
|
||||||
|
output = fuel.energyPerTick * 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue