diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java index a30eb630a..63df303fd 100644 --- a/src/main/java/mekanism/api/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/api/util/UnitDisplayUtils.java @@ -48,14 +48,14 @@ public class UnitDisplayUtils intervalSize = size; } - public double convertFromK(double T) + public double convertFromK(double T, boolean shift) { - return (T * intervalSize) - zeroOffset; + return (T * intervalSize) - (shift ? zeroOffset : 0); } - public double convertToK(double T) + public double convertToK(double T, boolean shift) { - return (T + zeroOffset) / intervalSize; + return (T + (shift ? zeroOffset : 0)) / intervalSize; } } @@ -206,12 +206,12 @@ public class UnitDisplayUtils return roundDecimals(value, decimalPlaces) + " " + unit.name; } - public static String getDisplay(double T, TemperatureUnit unit, int decimalPlaces, boolean isShort) + public static String getDisplay(double T, TemperatureUnit unit, int decimalPlaces, boolean shift, boolean isShort) { String unitName = unit.name; String prefix = ""; - double value = unit.convertFromK(T); + double value = unit.convertFromK(T, shift); if(value < 0) { @@ -257,12 +257,17 @@ public class UnitDisplayUtils public static String getDisplayShort(double value, TemperatureUnit unit) { - return getDisplay(value, unit, 2, true); + return getDisplayShort(value, true, unit); + } + + public static String getDisplayShort(double value, boolean shift, TemperatureUnit unit) + { + return getDisplayShort(value, unit, shift, 2); } - public static String getDisplayShort(double value, TemperatureUnit unit, int decimalPlaces) + public static String getDisplayShort(double value, TemperatureUnit unit, boolean shift, int decimalPlaces) { - return getDisplay(value, unit, decimalPlaces, true); + return getDisplay(value, unit, decimalPlaces, shift, true); } public static double roundDecimals(double d, int decimalPlaces) diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 45e96ce68..e23e5161a 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -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 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() { diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java index 365b579d1..634ce007c 100644 --- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -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 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"))); } diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 0fe576737..73e16751d 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -5,6 +5,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; @@ -62,9 +63,10 @@ public class GuiResistiveHeater extends GuiMekanism @Override public List 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"); + System.out.println(tileEntity.lastEnvironmentLoss); + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); } @@ -92,7 +94,7 @@ public class GuiResistiveHeater extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); - renderScaledText(LangUtils.localize("gui.usage") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.energyUsage), 50, 41, 0x00CD00, 76); + renderScaledText(LangUtils.localize("gui.usage") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.energyUsage) + "/t", 50, 41, 0x00CD00, 76); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index 0d157ea00..46cc1204f 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -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 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"))); } diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index dbd9dffc7..ee5e70c7d 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -70,8 +70,9 @@ public class GuiThermoelectricBoiler extends GuiMekanism @Override public List 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"))); } diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 731e5509f..47c6ebaba 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -77,9 +77,11 @@ public class ModelChargepad extends ModelBase public void render(float size, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(OVERLAY); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -88,6 +90,7 @@ public class ModelChargepad extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 5de768cec..07dc17d97 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -424,9 +424,11 @@ public class ModelDigitalMiner extends ModelBase public void render(float size, boolean on, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -435,6 +437,7 @@ public class ModelDigitalMiner extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 4b2f235ee..80f32d65b 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -31,109 +31,109 @@ public class ModelElectrolyticSeparator extends ModelBase textureWidth = 128; textureHeight = 64; - tank2 = new ModelRenderer(this, 64, 0); - tank2.addBox(0F, 0F, 0F, 7, 10, 7); - tank2.setRotationPoint(1F, 10F, 1F); - tank2.setTextureSize(128, 64); - tank2.mirror = true; - setRotation(tank2, 0F, 0F, 0F); - tank1 = new ModelRenderer(this, 0, 20); - tank1.addBox(0F, 0F, 0F, 8, 12, 16); - tank1.setRotationPoint(-8F, 8F, -8F); - tank1.setTextureSize(128, 64); - tank1.mirror = true; - setRotation(tank1, 0F, 0F, 0F); - tank3 = new ModelRenderer(this, 64, 0); - tank3.addBox(0F, 0F, 0F, 7, 10, 7); - tank3.setRotationPoint(1F, 10F, -8F); - tank3.setTextureSize(128, 64); - tank3.mirror = true; - setRotation(tank3, 0F, 0F, 0F); - tube6 = new ModelRenderer(this, 0, 0); - tube6.addBox(0F, 0F, 0F, 1, 1, 1); - tube6.setRotationPoint(4F, 9F, 4F); - tube6.setTextureSize(128, 64); - tube6.mirror = true; - setRotation(tube6, 0F, 0F, 0F); - tube5 = new ModelRenderer(this, 0, 0); - tube5.addBox(0F, 0F, 0F, 1, 1, 1); - tube5.setRotationPoint(4F, 9F, -5F); - tube5.setTextureSize(128, 64); - tube5.mirror = true; - setRotation(tube5, 0F, 0F, 0F); - tube4 = new ModelRenderer(this, 0, 48); - tube4.addBox(0F, 0F, 0F, 1, 1, 10); - tube4.setRotationPoint(4F, 8F, -5F); - tube4.setTextureSize(128, 64); - tube4.mirror = true; - setRotation(tube4, 0F, 0F, 0F); - tube3 = new ModelRenderer(this, 0, 0); - tube3.addBox(0F, 0F, 0F, 1, 3, 1); - tube3.setRotationPoint(4F, 9F, -0.5F); - tube3.setTextureSize(128, 64); - tube3.mirror = true; - setRotation(tube3, 0F, 0F, 0F); - tube2 = new ModelRenderer(this, 0, 0); - tube2.addBox(-4F, -1F, 0F, 4, 1, 1); - tube2.setRotationPoint(5F, 12F, -0.5F); - tube2.setTextureSize(128, 64); - tube2.mirror = true; - //TODO - setRotation(tube2, 0F, 0F, -0.5235988F); - tube1 = new ModelRenderer(this, 0, 0); - tube1.addBox(-3F, -1F, 0F, 3, 1, 1); - tube1.setRotationPoint(1.5F, 14F, -0.5F); - tube1.setTextureSize(128, 64); - tube1.mirror = true; - setRotation(tube1, 0F, 0F, 0F); - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 4, 16); - base.setRotationPoint(-8F, 20F, -8F); - base.setTextureSize(128, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - portToggle1 = new ModelRenderer(this, 48, 20); - portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle1.setRotationPoint(-8.01F, 12F, -4F); - portToggle1.setTextureSize(128, 64); - portToggle1.mirror = true; - setRotation(portToggle1, 0F, 0F, 0F); - portToggle2a = new ModelRenderer(this, 48, 20); - portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle2a.setRotationPoint(7.01F, 12F, -4F); - portToggle2a.setTextureSize(128, 64); - portToggle2a.mirror = true; - setRotation(portToggle2a, 0F, 0F, 0F); - portToggle2b = new ModelRenderer(this, 0, 4); - portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); - portToggle2b.setRotationPoint(5F, 13F, -1F); - portToggle2b.setTextureSize(128, 64); - portToggle2b.mirror = true; - setRotation(portToggle2b, 0F, 0F, 0F); - portToggle3a = new ModelRenderer(this, 66, 20); - portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle3a.setRotationPoint(-4F, 12F, -8.01F); - portToggle3a.setTextureSize(128, 64); - portToggle3a.mirror = true; - setRotation(portToggle3a, 0F, 0F, 0F); - portToggle3b = new ModelRenderer(this, 0, 4); - portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle3b.setRotationPoint(0F, 13F, -7F); - portToggle3b.setTextureSize(128, 64); - portToggle3b.mirror = true; - setRotation(portToggle3b, 0F, 0F, 0F); - portToggle4a = new ModelRenderer(this, 66, 20); - portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle4a.setRotationPoint(-4F, 12F, 7.01F); - portToggle4a.setTextureSize(128, 64); - portToggle4a.mirror = true; - setRotation(portToggle4a, 0F, 0F, 0F); - portToggle4b = new ModelRenderer(this, 0, 4); - portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle4b.setRotationPoint(0F, 13F, 5F); - portToggle4b.setTextureSize(128, 64); - portToggle4b.mirror = true; - setRotation(portToggle4b, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + //TODO + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 48, 36); + portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); + portToggle1.setRotationPoint(-8.01F, 11F, -5F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } public void render(float size) diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index f2142d6ab..f53ca5251 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -316,9 +316,11 @@ public class ModelQuantumEntangloporter extends ModelBase public void render(float size, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(OVERLAY); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -327,6 +329,7 @@ public class ModelQuantumEntangloporter extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index ec5ef6e01..85b896d90 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -1,7 +1,5 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -9,6 +7,9 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -168,9 +169,11 @@ public class ModelResistiveHeater extends ModelBase public void render(float size, boolean on, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -179,6 +182,7 @@ public class ModelResistiveHeater extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index fef14c4b9..d58d343ce 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -1,7 +1,5 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -9,6 +7,9 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -104,9 +105,11 @@ public class ModelSecurityDesk extends ModelBase public void render(float size, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(OVERLAY); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -115,6 +118,7 @@ public class ModelSecurityDesk extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index e9ae2f43f..9e0687122 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -65,6 +65,8 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); + MekanismRenderer.blendOn(); + energyCube.render(0.0625F, tier, mc.renderEngine); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) @@ -72,6 +74,8 @@ public class ItemRenderingHandler// implements IItemRenderer mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); } + + MekanismRenderer.blendOff(); GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index e0fe7d1d5..a9966126c 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -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; @@ -40,6 +41,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 @@ -79,6 +81,10 @@ public class WailaDataProvider implements IWailaDataProvider { currenttip.set(0, EnumColor.WHITE + ((TileEntityBin)tile).getName()); } + else if(tile instanceof TileEntityEnergyCube) + { + currenttip.set(0, EnumColor.WHITE + ((TileEntityEnergyCube)tile).getName()); + } else if(tile instanceof TileEntityBoundingBlock) { TileEntityBoundingBlock bound = (TileEntityBoundingBlock)tile; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 7b4febd71..d68953c10 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -55,7 +55,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})); diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 8cb06b4ab..ee24a0b6d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -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; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 2b6ef6f38..975f175c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -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})); diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 2899e77a4..0965837f7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -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)); @@ -167,7 +165,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { if(!worldObj.isRemote) { - energyUsage = dataStream.readInt(); + energyUsage = MekanismUtils.convertToJoules(dataStream.readInt()); maxEnergy = energyUsage * 400; return; @@ -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; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e546c401a..e6bddf9c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -17,6 +17,9 @@ import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { @@ -299,4 +302,11 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements return null; } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 35fb94dec..e3e43f8bd 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -21,7 +21,10 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { @@ -233,4 +236,11 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement worldObj.setBlockToAir(getPos().up()); worldObj.setBlockToAir(getPos()); } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index d3006e9b7..1d3682658 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -29,8 +29,11 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager, ISecurityTile { @@ -410,4 +413,11 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { return securityComponent; } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 186670fcd..5d3606cc0 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1257,7 +1257,7 @@ public final class MekanismUtils */ public static String getTemperatureDisplay(double T, TemperatureUnit unit) { - double TK = unit.convertToK(T); + double TK = unit.convertToK(T, true); switch(general.tempUnit) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 17548bcd8..4fb97a72b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -70,7 +70,7 @@ public class GuiReactorHeat extends GuiMekanism @Override public double getLevel() { - return TemperatureUnit.AMBIENT.convertToK(tileEntity.getPlasmaTemp()); + return TemperatureUnit.AMBIENT.convertToK(tileEntity.getPlasmaTemp(), true); } @Override @@ -104,7 +104,7 @@ public class GuiReactorHeat extends GuiMekanism @Override public double getLevel() { - return TemperatureUnit.AMBIENT.convertToK(tileEntity.getCaseTemp()); + return TemperatureUnit.AMBIENT.convertToK(tileEntity.getCaseTemp(), true); } @Override diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 33d299cba..7796b0de9 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -144,9 +144,11 @@ public class ModelHeatGenerator extends ModelBase public void render(float size, boolean on, TextureManager manager) { + GL11.glPushMatrix(); + MekanismRenderer.blendOn(); + doRender(size); - GL11.glPushMatrix(); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GL11.glScalef(1.001F, 1.001F, 1.001F); GL11.glTranslatef(0, -0.0011F, 0); @@ -155,6 +157,7 @@ public class ModelHeatGenerator extends ModelBase doRender(size); MekanismRenderer.glowOff(); + MekanismRenderer.blendOff(); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 360d473c1..946994d24 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -52,7 +52,7 @@ public class FusionReactor implements IFusionReactor public double heatToAbsorb = 0; //Reaction characteristics - public static double burnTemperature = TemperatureUnit.AMBIENT.convertFromK(1E8); + public static double burnTemperature = TemperatureUnit.AMBIENT.convertFromK(1E8, true); public static double burnRatio = 1; public static double energyPerFuel = 5E6; public int injectionRate = 0; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 958401b7d..b3f26a6f6 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -47,7 +47,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH public void onUpdate() { super.onUpdate(); - + if(!worldObj.isRemote) { ChargeUtils.charge(1, this); @@ -81,8 +81,10 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } } } - - if(canOperate()) + + boolean operate = canOperate(); + + if(operate && getEnergy()+generationRate < getMaxEnergy()) { setActive(true); @@ -97,7 +99,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH int toUse = getToUse(); - output = generationRate*getToUse()*2; + output = Math.max(general.FROM_H2*2, generationRate*getToUse()*2); int total = burnTicks + fuelTank.getStored()*maxBurnTicks; total -= toUse; @@ -112,8 +114,13 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH burnTicks = total % maxBurnTicks; clientUsed = toUse; } - else { - reset(); + else { + if(!operate) + { + reset(); + } + + clientUsed = 0; setActive(false); } } @@ -125,7 +132,6 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH maxBurnTicks = 0; generationRate = 0; output = general.FROM_H2*2; - clientUsed = 0; } public int getToUse() @@ -182,7 +188,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public boolean canOperate() { - return getEnergy() < getMaxEnergy() && (fuelTank.getStored() > 0 || burnTicks > 0) && MekanismUtils.canFunction(this); + return (fuelTank.getStored() > 0 || burnTicks > 0) && MekanismUtils.canFunction(this); } /** diff --git a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png index 2a7dc215b..267158c06 100644 Binary files a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png and b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png differ