diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 7218fef36..77289d7ef 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,14 +1,24 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; 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; @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOff.png"); + ModelRenderer keyboard; ModelRenderer keyboardBottom; ModelRenderer keyboardSupportExt1; @@ -411,8 +421,24 @@ public class ModelDigitalMiner extends ModelBase monitor3.mirror = true; setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } + + public void render(float size, boolean on, TextureManager manager) + { + render(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + render(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size, boolean on) + public void render(float size) { keyboard.render(size); keyboardBottom.render(size); @@ -425,25 +451,12 @@ public class ModelDigitalMiner extends ModelBase monitor3back.render(size); monitorBar1.render(size); monitorBar2.render(size); - - if(on) - { - MekanismRenderer.glowOn(); - } - led1.render(size); led2.render(size); led3.render(size); - monitor1.render(size); monitor2.render(size); monitor3.render(size); - - if(on) - { - MekanismRenderer.glowOff(); - } - monitorMount1.render(size); monitorMount2.render(size); frame1.render(size); diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index fa38aa4a1..334846a76 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -20,8 +20,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { - public static ResourceLocation LED_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_On.png"); - public static ResourceLocation LED_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_Off.png"); + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOff.png"); ModelRenderer frame12; ModelRenderer frame11; @@ -412,7 +412,7 @@ public class ModelEnergyCube extends ModelBase } } - renderer.bindTexture(state == IOState.OUTPUT ? LED_ON : LED_OFF); + renderer.bindTexture(state == IOState.OUTPUT ? OVERLAY_ON : OVERLAY_OFF); if(state == IOState.OUTPUT) { diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index af15410ab..4e0ae34a3 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -10,11 +10,9 @@ public class ModelPressurizedReactionChamber extends ModelBase { ModelRenderer frontDivider1; ModelRenderer base; - ModelRenderer port2b; ModelRenderer front; ModelRenderer bar1; ModelRenderer body; - ModelRenderer port1b; ModelRenderer bar5; ModelRenderer bar4; ModelRenderer bar3; @@ -38,13 +36,6 @@ public class ModelPressurizedReactionChamber extends ModelBase base.setTextureSize(128, 64); base.mirror = true; setRotation(base, 0F, 0F, 0F); - port2b = new ModelRenderer(this, 0, 6); - port2b.addBox(0F, 0F, 0F, 1, 8, 2); - port2b.setRotationPoint(7F, 12F, -4F); - port2b.setTextureSize(128, 64); - port2b.mirror = true; - setRotation(port2b, 0F, 0F, 0F); - port2b.mirror = false; front = new ModelRenderer(this, 48, 0); front.addBox(0F, 0F, 0F, 9, 11, 5); front.setRotationPoint(-2F, 9F, -7F); @@ -63,12 +54,6 @@ public class ModelPressurizedReactionChamber extends ModelBase body.setTextureSize(128, 64); body.mirror = true; setRotation(body, 0F, 0F, 0F); - port1b = new ModelRenderer(this, 0, 6); - port1b.addBox(0F, 0F, 0F, 1, 8, 2); - port1b.setRotationPoint(-8F, 12F, -4F); - port1b.setTextureSize(128, 64); - port1b.mirror = true; - setRotation(port1b, 0F, 0F, 0F); bar5 = new ModelRenderer(this, 0, 0); bar5.addBox(0F, 0F, 0F, 1, 1, 5); bar5.setRotationPoint(-5F, 10F, -7F); @@ -94,23 +79,20 @@ public class ModelPressurizedReactionChamber extends ModelBase bar2.mirror = true; setRotation(bar2, 0F, 0F, 0F); frontDivider2 = new ModelRenderer(this, 52, 20); + frontDivider2.mirror = true; frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); frontDivider2.setTextureSize(128, 64); - frontDivider2.mirror = true; setRotation(frontDivider2, 0F, 0F, 0F); - frontDivider2.mirror = false; } public void render(float size) { frontDivider1.render(size); base.render(size); - port2b.render(size); front.render(size); bar1.render(size); body.render(size); - port1b.render(size); bar5.render(size); bar4.render(size); bar3.render(size); diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index ca1c4ad76..26fa88682 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -1,15 +1,23 @@ 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; 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 cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk_Overlay.png"); + ModelRenderer deskTop; - ModelRenderer port; ModelRenderer deskBase; ModelRenderer led; ModelRenderer monitorBack; @@ -31,12 +39,6 @@ public class ModelSecurityDesk extends ModelBase deskTop.setTextureSize(128, 64); deskTop.mirror = true; setRotation(deskTop, 0F, 0F, 0F); - port = new ModelRenderer(this, 64, 0); - port.addBox(0F, 0F, 0F, 8, 8, 1); - port.setRotationPoint(-4F, 12F, 7.01F); - port.setTextureSize(128, 64); - port.mirror = true; - setRotation(port, 0F, 0F, 0F); deskBase = new ModelRenderer(this, 0, 38); deskBase.addBox(0F, 0F, 0F, 16, 5, 16); deskBase.setRotationPoint(-8F, 19F, -8F); @@ -93,10 +95,25 @@ public class ModelSecurityDesk extends ModelBase setRotation(monitorScreen, -0.4712389F, 0F, 0F); } - public void render(float size) + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + private void doRender(float size) { deskTop.render(size); - port.render(size); deskBase.render(size); led.render(size); monitorBack.render(size); diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 5a7278685..7b59fbfab 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -21,6 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); @Override @@ -47,8 +49,8 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); GL11.glScalef(0.8F, 0.8F, 0.8F); GL11.glTranslatef(0.0F, -0.8F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); - securityDesk.render(0.0625F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F, mc.renderEngine); } if(type == BasicType.STRUCTURAL_GLASS) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index e2d0dd061..3f77abf78 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -38,6 +38,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelElectricPump electricPump = new ModelElectricPump(); public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); public ModelChargepad chargepad = new ModelChargepad(); @@ -75,7 +77,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); } else if(type == MachineType.METALLURGIC_INFUSER) @@ -83,14 +85,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); } else if(type == MachineType.CHARGEPAD) { GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -1.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); chargepad.render(0.0625F); } else if(type == MachineType.LOGISTICAL_SORTER) @@ -98,7 +100,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); logisticalSorter.render(0.0625F, false); } else if(type == MachineType.DIGITAL_MINER) @@ -106,15 +108,15 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.35F, 0.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); + digitalMiner.render(0.022F, false, mc.renderEngine); } else if(type == MachineType.ROTARY_CONDENSENTRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); rotaryCondensentrator.render(0.0625F); } else if(type == MachineType.CHEMICAL_OXIDIZER) @@ -122,7 +124,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.00F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); chemicalOxidizer.render(0.0625F); } else if(type == MachineType.CHEMICAL_INFUSER) @@ -130,7 +132,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); } else if(type == MachineType.ELECTROLYTIC_SEPARATOR) @@ -138,7 +140,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); electrolyticSeparator.render(0.0625F); } else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) @@ -146,7 +148,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } else if(type == MachineType.CHEMICAL_WASHER) @@ -154,7 +156,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } else if(type == MachineType.CHEMICAL_CRYSTALLIZER) @@ -162,7 +164,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } else if(type == MachineType.SEISMIC_VIBRATOR) @@ -171,7 +173,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glTranslatef(0.0F, -0.55F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) @@ -179,7 +181,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); pressurizedReactionChamber.render(0.0625F); } else if(type == MachineType.FLUIDIC_PLENISHER) @@ -187,7 +189,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); fluidicPlenisher.render(0.0560F); } else if(type == MachineType.LASER) @@ -195,7 +197,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); laser.render(0.0560F); } else if(type == MachineType.LASER_AMPLIFIER) @@ -203,7 +205,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); laserAmplifier.render(0.0560F); } else if(type == MachineType.LASER_TRACTOR_BEAM) @@ -211,7 +213,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); laserAmplifier.render(0.0560F); } else if(type == MachineType.RESISTIVE_HEATER) @@ -219,7 +221,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); resistiveHeater.render(0.0625F); } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) @@ -228,7 +230,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glTranslatef(0.0F, -0.55F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index a4eec471c..152d9e735 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -52,7 +52,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F, tileEntity.isActive); + model.render(0.0625F, tileEntity.isActive, field_147501_a.field_147553_e); GL11.glPopMatrix(); if(tileEntity.clientRendering) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java index 08f1e551a..1644afd11 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -39,7 +39,7 @@ public class RenderSecurityDesk extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, field_147501_a.field_147553_e); GL11.glPopMatrix(); } } diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png new file mode 100644 index 000000000..066761bcb Binary files /dev/null and b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png differ diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png new file mode 100644 index 000000000..a9cb86786 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCube_Off.png rename to src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCube_On.png rename to src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png diff --git a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png index a01c3a730..57c1b70ec 100644 Binary files a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png and b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png differ diff --git a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png index bc43ff6d2..012243337 100644 Binary files a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png and b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png differ diff --git a/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png b/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png new file mode 100644 index 000000000..ff8569d2c Binary files /dev/null and b/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png differ