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 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