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

Fixed usage displays of certain machinery

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-29 00:42:40 -04:00
parent cd323920fe
commit 0c9fd9364e
8 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
View file

@ -47,15 +47,8 @@ public class GuiChemicalInfuser extends GuiMekanism
@Override
public List<String> getInfo()
{
double usage = 0;
if(tileEntity.getRecipe() != null)
{
usage = tileEntity.getUpgradedUsage(tileEntity.getRecipe())*tileEntity.energyPerTick;
}
String multiplier = MekanismUtils.getEnergyDisplay(usage);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png")));
guiElements.add(new GuiGasGauge(new IGasInfoHandler() {

4
src/main/java/mekanism/client/gui/GuiChemicalWasher.java
View file

@ -53,8 +53,8 @@ public class GuiChemicalWasher extends GuiMekanism
@Override
public List<String> getInfo()
{
String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick*tileEntity.getUpgradedUsage());
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png")));
guiElements.add(new GuiFluidGauge(new IFluidInfoHandler()

11
src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
View file

@ -53,15 +53,8 @@ public class GuiElectrolyticSeparator extends GuiMekanism
@Override
public List<String> getInfo()
{
double usage = 0;
if(tileEntity.getRecipe() != null)
{
usage = tileEntity.getUpgradedUsage(tileEntity.getRecipe())*tileEntity.energyPerTick;
}
String multiplier = MekanismUtils.getEnergyDisplay(usage);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png")));
guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {

4
src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
View file

@ -59,8 +59,8 @@ public class GuiRotaryCondensentrator extends GuiMekanism
@Override
public List<String> getInfo()
{
String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick*tileEntity.getUpgradedUsage());
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed);
return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy()));
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png")));
guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {

7
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
View file

@ -63,6 +63,8 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
public ChemicalInfuserRecipe cachedRecipe;
public double clientEnergyUsed;
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4);
/** This machine's current RedstoneControl type. */
@ -126,7 +128,10 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
setActive(true);
int operations = operate(recipe);
double prev = getEnergy();
setEnergy(getEnergy() - energyPerTick*operations);
clientEnergyUsed = prev-getEnergy();
}
else {
if(prevEnergy >= getEnergy())
@ -235,6 +240,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
isActive = dataStream.readBoolean();
controlType = RedstoneControl.values()[dataStream.readInt()];
clientEnergyUsed = dataStream.readDouble();
if(dataStream.readBoolean())
{
@ -271,6 +277,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
data.add(isActive);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(leftTank.getGas() != null)
{

8
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
View file

@ -19,9 +19,9 @@ import mekanism.api.gas.ITubeConnection;
import mekanism.common.Mekanism;
import mekanism.common.Upgrade;
import mekanism.common.Upgrade.IUpgradeInfoHandler;
import mekanism.common.base.ITankManager;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ITankManager;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
@ -76,6 +76,8 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
public WasherRecipe cachedRecipe;
public double clientEnergyUsed;
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4);
/** This machine's current RedstoneControl type. */
@ -130,8 +132,10 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
setActive(true);
int operations = operate(recipe);
double prev = getEnergy();
setEnergy(getEnergy() - energyPerTick*operations);
clientEnergyUsed = prev-getEnergy();
}
else {
if(prevEnergy >= getEnergy())
@ -295,6 +299,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
isActive = dataStream.readBoolean();
controlType = RedstoneControl.values()[dataStream.readInt()];
clientEnergyUsed = dataStream.readDouble();
if(dataStream.readBoolean())
{
@ -330,6 +335,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
data.add(isActive);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(fluidTank.getFluid() != null)
{

6
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
View file

@ -85,6 +85,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
public SeparatorRecipe cachedRecipe;
public double clientEnergyUsed;
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4);
public TileEntityElectrolyticSeparator()
@ -162,8 +164,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
setActive(true);
int operations = operate(recipe);
double prev = getEnergy();
setEnergy(getEnergy() - energyPerTick*operations);
clientEnergyUsed = prev-getEnergy();
}
else {
setActive(false);
@ -445,6 +449,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
dumpLeft = GasMode.values()[dataStream.readInt()];
dumpRight = GasMode.values()[dataStream.readInt()];
isActive = dataStream.readBoolean();
clientEnergyUsed = dataStream.readDouble();
}
else if(type == 1)
{
@ -492,6 +497,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
data.add(dumpLeft.ordinal());
data.add(dumpRight.ordinal());
data.add(isActive);
data.add(clientEnergyUsed);
return data;
}

16
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
View file

@ -69,6 +69,8 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
public double energyPerTick = BASE_ENERGY_USAGE;
public double clientEnergyUsed;
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 5);
/** This machine's current RedstoneControl type. */
@ -175,12 +177,14 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
if(getEnergy() >= energyPerTick && MekanismUtils.canFunction(this) && isValidGas(gasTank.getGas()) && (fluidTank.getFluid() == null || (fluidTank.getFluid().amount < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
{
int usage = getUpgradedUsage();
int operations = getUpgradedUsage();
double prev = getEnergy();
setActive(true);
fluidTank.fill(new FluidStack(gasTank.getGas().getGas().getFluid(), usage), true);
gasTank.draw(usage, true);
setEnergy(getEnergy() - energyPerTick*usage);
fluidTank.fill(new FluidStack(gasTank.getGas().getGas().getFluid(), operations), true);
gasTank.draw(operations, true);
setEnergy(getEnergy() - energyPerTick*operations);
clientEnergyUsed = prev-getEnergy();
}
else {
if(prevEnergy >= getEnergy())
@ -283,11 +287,13 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
if(getEnergy() >= energyPerTick && MekanismUtils.canFunction(this) && isValidFluid(fluidTank.getFluid()) && (gasTank.getGas() == null || (gasTank.getStored() < MAX_FLUID && gasEquals(gasTank.getGas(), fluidTank.getFluid()))))
{
int operations = getUpgradedUsage();
double prev = getEnergy();
setActive(true);
gasTank.receive(new GasStack(GasRegistry.getGas(fluidTank.getFluid().getFluid()), operations), true);
fluidTank.drain(operations, true);
setEnergy(getEnergy() - energyPerTick*operations);
clientEnergyUsed = prev-getEnergy();
}
else {
if(prevEnergy >= getEnergy())
@ -373,6 +379,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
mode = dataStream.readInt();
isActive = dataStream.readBoolean();
controlType = RedstoneControl.values()[dataStream.readInt()];
clientEnergyUsed = dataStream.readDouble();
if(dataStream.readBoolean())
{
@ -402,6 +409,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
data.add(mode);
data.add(isActive);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(fluidTank.getFluid() != null)
{