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

Add appropriate transmission priorities for side config interfaces, fixed temp units

Browse source
This commit is contained in:
aidancbrady 2016-04-28 10:00:08 -04:00
parent feb48db20e
commit 32c1708cd2
10 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/client/gui/GuiBoilerStats.java
View file

@ -12,7 +12,6 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiGraph;
import mekanism.client.gui.element.GuiGraph.GraphDataHandler;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.common.content.boiler.BoilerUpdateProtocol;
import mekanism.common.content.boiler.SynchronizedBoilerData;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.tile.TileEntityBoilerCasing;
@ -43,8 +42,9 @@ public class GuiBoilerStats extends GuiMekanism
@Override
public List<String> getInfo()
{
String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t");
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, unit);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png")));
guiElements.add(boilGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 83, 160, 36, new GraphDataHandler() {

7
src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
View file

@ -2,6 +2,7 @@ package mekanism.client.gui;
import java.util.List;
import mekanism.api.MekanismConfig.general;
import mekanism.api.util.ListUtils;
import mekanism.api.util.UnitDisplayUtils;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
@ -38,9 +39,9 @@ public class GuiFuelwoodHeater extends GuiMekanism
@Override
public List<String> getInfo()
{
String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN);
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN);
return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, unit);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png")));
}

7
src/main/java/mekanism/client/gui/GuiResistiveHeater.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.util.ListUtils;
import mekanism.api.util.UnitDisplayUtils;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
@ -61,9 +62,9 @@ public class GuiResistiveHeater extends GuiMekanism
@Override
public List<String> getInfo()
{
String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN);
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN);
return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, unit);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png")));
}

6
src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
View file

@ -2,6 +2,7 @@ package mekanism.client.gui;
import java.util.List;
import mekanism.api.MekanismConfig.general;
import mekanism.api.util.ListUtils;
import mekanism.api.util.UnitDisplayUtils;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
@ -51,8 +52,9 @@ public class GuiThermalEvaporationController extends GuiMekanism
@Override
public List<String> getInfo()
{
String loss = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss, TemperatureUnit.KELVIN);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t");
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss*unit.intervalSize, unit);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png")));
}

5
src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
View file

@ -70,8 +70,9 @@ public class GuiThermoelectricBoiler extends GuiMekanism
@Override
public List<String> getInfo()
{
String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t");
TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()];
String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, unit);
return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t");
}
}, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png")));
}

6
src/main/java/mekanism/common/integration/WailaDataProvider.java
View file

@ -10,6 +10,7 @@ import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.common.tile.TileEntityBin;
import mekanism.common.tile.TileEntityBoundingBlock;
import mekanism.common.tile.TileEntityEnergyCube;
import mekanism.common.tile.TileEntityFactory;
import mekanism.common.tile.TileEntityFluidTank;
import mekanism.common.tile.TileEntityGasTank;
@ -39,6 +40,7 @@ public class WailaDataProvider implements IWailaDataProvider
registrar.registerHeadProvider(provider, TileEntityFluidTank.class);
registrar.registerHeadProvider(provider, TileEntityGasTank.class);
registrar.registerHeadProvider(provider, TileEntityBin.class);
registrar.registerHeadProvider(provider, TileEntityEnergyCube.class);
}
@Override
@ -78,6 +80,10 @@ public class WailaDataProvider implements IWailaDataProvider
{
currenttip.set(0, EnumColor.WHITE + ((TileEntityBin)tile).getInventoryName());
}
else if(tile instanceof TileEntityEnergyCube)
{
currenttip.set(0, EnumColor.WHITE + ((TileEntityEnergyCube)tile).getInventoryName());
}
else if(tile instanceof TileEntityBoundingBlock)
{
TileEntityBoundingBlock bound = (TileEntityBoundingBlock)tile;

2
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
View file

@ -54,7 +54,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo
{
super("EnergyCube", 0);
configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY);
configComponent = new TileComponentConfig(this, TransmissionType.ENERGY, TransmissionType.ITEM);
configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.ITEM, new SideData("Charge", EnumColor.DARK_BLUE, new int[] {0}));

4
src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
View file

@ -38,7 +38,6 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
/** How many ticks must pass until this block's active state can sync with the client. */
public int updateDelay;
public double lastTransferLoss;
public double lastEnvironmentLoss;
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
@ -109,7 +108,6 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
double[] loss = simulateHeat();
applyTemperatureChange();
lastTransferLoss = loss[0];
lastEnvironmentLoss = loss[1];
setActive(burning);
@ -148,7 +146,6 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
burnTime = dataStream.readInt();
maxBurnTime = dataStream.readInt();
lastTransferLoss = dataStream.readDouble();
lastEnvironmentLoss = dataStream.readDouble();
if(updateDelay == 0 && clientActive != isActive)
@ -169,7 +166,6 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
data.add(burnTime);
data.add(maxBurnTime);
data.add(lastTransferLoss);
data.add(lastEnvironmentLoss);
return data;

2
src/main/java/mekanism/common/tile/TileEntityGasTank.java
View file

@ -64,7 +64,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
{
super("GasTank");
configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.GAS);
configComponent = new TileComponentConfig(this, TransmissionType.GAS, TransmissionType.ITEM);
configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.ITEM, new SideData("Fill", EnumColor.DARK_BLUE, new int[] {0}));

4
src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
View file

@ -42,7 +42,6 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
public float soundScale = 1;
public double lastTransferLoss;
public double lastEnvironmentLoss;
public RedstoneControl controlType = RedstoneControl.DISABLED;
@ -101,7 +100,6 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
double[] loss = simulateHeat();
applyTemperatureChange();
lastTransferLoss = loss[0];
lastEnvironmentLoss = loss[1];
float newSoundScale = (float)Math.max(0, (toUse/1E5));
@ -182,7 +180,6 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
soundScale = dataStream.readFloat();
controlType = RedstoneControl.values()[dataStream.readInt()];
lastTransferLoss = dataStream.readDouble();
lastEnvironmentLoss = dataStream.readDouble();
if(updateDelay == 0 && clientActive != isActive)
@ -205,7 +202,6 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
data.add(soundScale);
data.add(controlType.ordinal());
data.add(lastTransferLoss);
data.add(lastEnvironmentLoss);
return data;