From 47fd07f5c39683cae807144d780ea5eb11deda1a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 27 Apr 2016 19:05:53 -0400 Subject: [PATCH 1/7] Rendering fixes --- .../mekanism/client/model/ModelChargepad.java | 5 ++++- .../client/model/ModelDigitalMiner.java | 5 ++++- .../model/ModelQuantumEntangloporter.java | 5 ++++- .../client/model/ModelResistiveHeater.java | 10 +++++++--- .../client/model/ModelSecurityDesk.java | 10 +++++++--- .../render/item/ItemRenderingHandler.java | 4 ++++ .../client/model/ModelHeatGenerator.java | 5 ++++- .../mekanism/render/ElectrolyticSeparator.png | Bin 19898 -> 6214 bytes 8 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 7cb1679d7..d6b0cd015 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 072b199df..00e36202c 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/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index 4597cfeba..ce935ceba 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -315,9 +315,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); @@ -326,6 +328,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 d21e83eb5..c6ad45b68 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 cpw.mods.fml.relauncher.Side; import cpw.mods.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 26fa88682..0bde64d7c 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -97,9 +98,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); @@ -108,6 +111,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 38d3e7565..591d02d8d 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -135,6 +135,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) @@ -142,6 +144,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/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 96b2afa3e..4b7e84520 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/resources/assets/mekanism/render/ElectrolyticSeparator.png b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png index 2a7dc215bcfee0f344beab4e2a29a242a961a51f..267158c06557d90979b39d13ff9c9a37bf9ef629 100644 GIT binary patch delta 5680 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 Date: Wed, 27 Apr 2016 19:08:01 -0400 Subject: [PATCH 2/7] More rendering fixes --- .../model/ModelElectrolyticSeparator.java | 204 +++++++++--------- .../common/tile/TileEntitySecurityDesk.java | 10 + .../tile/TileEntitySeismicVibrator.java | 10 + .../tile/TileEntitySolarNeutronActivator.java | 10 + 4 files changed, 132 insertions(+), 102 deletions(-) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index c01a48f45..f424ca347 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -31,108 +31,108 @@ 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; - 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; + 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/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 17e1d5fcc..6ed44da31 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -17,7 +17,10 @@ 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.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { @@ -300,4 +303,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 748369efb..67aec404f 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.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.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(xCoord, yCoord+1, zCoord); worldObj.setBlockToAir(xCoord, yCoord, zCoord); } + + @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 7107ee178..2af70377c 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.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.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; + } } From ba8e5e198b1109873213b04bc9503af515d35889 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 27 Apr 2016 23:37:01 -0400 Subject: [PATCH 3/7] Fixed resetting of gas data in Gas-Burning Generator --- .../common/tile/TileEntityGasGenerator.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index c1f93c259..2d3d54563 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -82,7 +82,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } } - if(canOperate()) + boolean operate = canOperate(); + + if(operate && getEnergy() < getMaxEnergy()) { setActive(true); @@ -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); } /** From f84e5293bff96e87d0634c9461b53d92e2eadef0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 Apr 2016 00:21:06 -0400 Subject: [PATCH 4/7] Gas Generator fixes --- .../generators/common/tile/TileEntityGasGenerator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 2d3d54563..c67800394 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,10 +81,10 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } } } - + boolean operate = canOperate(); - if(operate && getEnergy() < getMaxEnergy()) + if(operate && getEnergy()+generationRate < getMaxEnergy()) { setActive(true); @@ -99,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; From feb48db20e77805af11cd94b0933f4ac59ebd4c9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 Apr 2016 00:50:51 -0400 Subject: [PATCH 5/7] Fixed Resistive Heater energy unit conversion --- .../java/mekanism/common/tile/TileEntityResistiveHeater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 40f2c845a..1ef58844d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -167,7 +167,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { if(!worldObj.isRemote) { - energyUsage = dataStream.readInt(); + energyUsage = MekanismUtils.convertToJoules(dataStream.readInt()); maxEnergy = energyUsage * 400; return; From 32c1708cd239606251b3d54454c01b55058d532b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 Apr 2016 10:00:08 -0400 Subject: [PATCH 6/7] Add appropriate transmission priorities for side config interfaces, fixed temp units --- src/main/java/mekanism/client/gui/GuiBoilerStats.java | 6 +++--- src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java | 7 ++++--- src/main/java/mekanism/client/gui/GuiResistiveHeater.java | 7 ++++--- .../client/gui/GuiThermalEvaporationController.java | 6 ++++-- .../java/mekanism/client/gui/GuiThermoelectricBoiler.java | 5 +++-- .../mekanism/common/integration/WailaDataProvider.java | 6 ++++++ .../java/mekanism/common/tile/TileEntityEnergyCube.java | 2 +- .../mekanism/common/tile/TileEntityFuelwoodHeater.java | 4 ---- src/main/java/mekanism/common/tile/TileEntityGasTank.java | 2 +- .../mekanism/common/tile/TileEntityResistiveHeater.java | 4 ---- 10 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index fcb976f18..f51ad47c3 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 640d5b73e..4f8f1d159 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 9b21baf9f..c905807db 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -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 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"))); } diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index 400cc28e0..5bdec4066 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 d8ae6623f..3c0bf5214 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/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 3fd7d346f..670c7e195 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; @@ -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; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 43c3448fd..ae702bee7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -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})); diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index a78c170f0..f245bd498 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 cefbfa33c..5e6834696 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 1ef58844d..118dfe7c8 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)); @@ -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; From 1ddb56c226517af46c84612bd6ac0a63a96a4a9c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 Apr 2016 18:35:36 -0400 Subject: [PATCH 7/7] More unit fixes --- .../mekanism/api/util/UnitDisplayUtils.java | 23 +++++++++++-------- .../client/gui/GuiResistiveHeater.java | 5 ++-- .../mekanism/common/util/MekanismUtils.java | 2 +- .../generators/client/gui/GuiReactorHeat.java | 4 ++-- .../generators/common/FusionReactor.java | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) 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/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index c905807db..dfc5f29da 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -62,8 +62,9 @@ public class GuiResistiveHeater extends GuiMekanism @Override public List getInfo() { + System.out.println(tileEntity.lastEnvironmentLoss); TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, unit); + 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 +93,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/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 8e5262720..ccb9c29d9 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1279,7 +1279,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 94062c73b..83ebe932d 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/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 6e480791b..44b3eee6f 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;