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

New assets and overlays!

Browse source
This commit is contained in:
aidancbrady 2016-04-19 13:35:10 -04:00
parent a95f231fcc
commit 12c2c6099f
15 changed files with 86 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/mekanism/client/model/ModelDigitalMiner.java
View file

@ -1,14 +1,24 @@
package mekanism.client.model; package mekanism.client.model;
import mekanism.client.render.MekanismRenderer; 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.ModelBase;
import net.minecraft.client.model.ModelRenderer; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ModelDigitalMiner extends ModelBase 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 keyboard;
ModelRenderer keyboardBottom; ModelRenderer keyboardBottom;
ModelRenderer keyboardSupportExt1; ModelRenderer keyboardSupportExt1;
@ -411,8 +421,24 @@ public class ModelDigitalMiner extends ModelBase
monitor3.mirror = true; monitor3.mirror = true;
setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); 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); keyboard.render(size);
keyboardBottom.render(size); keyboardBottom.render(size);
@ -425,25 +451,12 @@ public class ModelDigitalMiner extends ModelBase
monitor3back.render(size); monitor3back.render(size);
monitorBar1.render(size); monitorBar1.render(size);
monitorBar2.render(size); monitorBar2.render(size);
if(on)
{
MekanismRenderer.glowOn();
}
led1.render(size); led1.render(size);
led2.render(size); led2.render(size);
led3.render(size); led3.render(size);
monitor1.render(size); monitor1.render(size);
monitor2.render(size); monitor2.render(size);
monitor3.render(size); monitor3.render(size);
if(on)
{
MekanismRenderer.glowOff();
}
monitorMount1.render(size); monitorMount1.render(size);
monitorMount2.render(size); monitorMount2.render(size);
frame1.render(size); frame1.render(size);

6
src/main/java/mekanism/client/model/ModelEnergyCube.java
View file

@ -20,8 +20,8 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ModelEnergyCube extends ModelBase public class ModelEnergyCube extends ModelBase
{ {
public static ResourceLocation LED_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_On.png"); public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOn.png");
public static ResourceLocation LED_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_Off.png"); public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOff.png");
ModelRenderer frame12; ModelRenderer frame12;
ModelRenderer frame11; 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) if(state == IOState.OUTPUT)
{ {

20
src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java
View file

@ -10,11 +10,9 @@ public class ModelPressurizedReactionChamber extends ModelBase
{ {
ModelRenderer frontDivider1; ModelRenderer frontDivider1;
ModelRenderer base; ModelRenderer base;
ModelRenderer port2b;
ModelRenderer front; ModelRenderer front;
ModelRenderer bar1; ModelRenderer bar1;
ModelRenderer body; ModelRenderer body;
ModelRenderer port1b;
ModelRenderer bar5; ModelRenderer bar5;
ModelRenderer bar4; ModelRenderer bar4;
ModelRenderer bar3; ModelRenderer bar3;
@ -38,13 +36,6 @@ public class ModelPressurizedReactionChamber extends ModelBase
base.setTextureSize(128, 64); base.setTextureSize(128, 64);
base.mirror = true; base.mirror = true;
setRotation(base, 0F, 0F, 0F); 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 = new ModelRenderer(this, 48, 0);
front.addBox(0F, 0F, 0F, 9, 11, 5); front.addBox(0F, 0F, 0F, 9, 11, 5);
front.setRotationPoint(-2F, 9F, -7F); front.setRotationPoint(-2F, 9F, -7F);
@ -63,12 +54,6 @@ public class ModelPressurizedReactionChamber extends ModelBase
body.setTextureSize(128, 64); body.setTextureSize(128, 64);
body.mirror = true; body.mirror = true;
setRotation(body, 0F, 0F, 0F); 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 = new ModelRenderer(this, 0, 0);
bar5.addBox(0F, 0F, 0F, 1, 1, 5); bar5.addBox(0F, 0F, 0F, 1, 1, 5);
bar5.setRotationPoint(-5F, 10F, -7F); bar5.setRotationPoint(-5F, 10F, -7F);
@ -94,23 +79,20 @@ public class ModelPressurizedReactionChamber extends ModelBase
bar2.mirror = true; bar2.mirror = true;
setRotation(bar2, 0F, 0F, 0F); setRotation(bar2, 0F, 0F, 0F);
frontDivider2 = new ModelRenderer(this, 52, 20); frontDivider2 = new ModelRenderer(this, 52, 20);
frontDivider2.mirror = true;
frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6);
frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F);
frontDivider2.setTextureSize(128, 64); frontDivider2.setTextureSize(128, 64);
frontDivider2.mirror = true;
setRotation(frontDivider2, 0F, 0F, 0F); setRotation(frontDivider2, 0F, 0F, 0F);
frontDivider2.mirror = false;
} }
public void render(float size) public void render(float size)
{ {
frontDivider1.render(size); frontDivider1.render(size);
base.render(size); base.render(size);
port2b.render(size);
front.render(size); front.render(size);
bar1.render(size); bar1.render(size);
body.render(size); body.render(size);
port1b.render(size);
bar5.render(size); bar5.render(size);
bar4.render(size); bar4.render(size);
bar3.render(size); bar3.render(size);

35
src/main/java/mekanism/client/model/ModelSecurityDesk.java
View file

@ -1,15 +1,23 @@
package mekanism.client.model; 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.ModelBase;
import net.minecraft.client.model.ModelRenderer; 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.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ModelSecurityDesk extends ModelBase public class ModelSecurityDesk extends ModelBase
{ {
public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk_Overlay.png");
ModelRenderer deskTop; ModelRenderer deskTop;
ModelRenderer port;
ModelRenderer deskBase; ModelRenderer deskBase;
ModelRenderer led; ModelRenderer led;
ModelRenderer monitorBack; ModelRenderer monitorBack;
@ -31,12 +39,6 @@ public class ModelSecurityDesk extends ModelBase
deskTop.setTextureSize(128, 64); deskTop.setTextureSize(128, 64);
deskTop.mirror = true; deskTop.mirror = true;
setRotation(deskTop, 0F, 0F, 0F); 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 = new ModelRenderer(this, 0, 38);
deskBase.addBox(0F, 0F, 0F, 16, 5, 16); deskBase.addBox(0F, 0F, 0F, 16, 5, 16);
deskBase.setRotationPoint(-8F, 19F, -8F); deskBase.setRotationPoint(-8F, 19F, -8F);
@ -93,10 +95,25 @@ public class ModelSecurityDesk extends ModelBase
setRotation(monitorScreen, -0.4712389F, 0F, 0F); 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); deskTop.render(size);
port.render(size);
deskBase.render(size); deskBase.render(size);
led.render(size); led.render(size);
monitorBack.render(size); monitorBack.render(size);

6
src/main/java/mekanism/client/render/block/BasicRenderingHandler.java
View file

@ -21,6 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class BasicRenderingHandler implements ISimpleBlockRenderingHandler public class BasicRenderingHandler implements ISimpleBlockRenderingHandler
{ {
private Minecraft mc = Minecraft.getMinecraft();
public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); public ModelSecurityDesk securityDesk = new ModelSecurityDesk();
@Override @Override
@ -47,8 +49,8 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); GL11.glRotatef(180, 1.0F, 0.0F, 0.0F);
GL11.glScalef(0.8F, 0.8F, 0.8F); GL11.glScalef(0.8F, 0.8F, 0.8F);
GL11.glTranslatef(0.0F, -0.8F, 0.0F); GL11.glTranslatef(0.0F, -0.8F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png"));
securityDesk.render(0.0625F); securityDesk.render(0.0625F, mc.renderEngine);
} }
if(type == BasicType.STRUCTURAL_GLASS) if(type == BasicType.STRUCTURAL_GLASS)

44
src/main/java/mekanism/client/render/block/MachineRenderingHandler.java
View file

@ -38,6 +38,8 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
{ {
private Minecraft mc = Minecraft.getMinecraft();
public ModelElectricPump electricPump = new ModelElectricPump(); public ModelElectricPump electricPump = new ModelElectricPump();
public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser();
public ModelChargepad chargepad = new ModelChargepad(); public ModelChargepad chargepad = new ModelChargepad();
@ -75,7 +77,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
{ {
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(0.0F, -0.85F, 0.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); electricPump.render(0.0560F);
} }
else if(type == MachineType.METALLURGIC_INFUSER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(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); metallurgicInfuser.render(0.0625F);
} }
else if(type == MachineType.CHARGEPAD) else if(type == MachineType.CHARGEPAD)
{ {
GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
GL11.glTranslatef(0.0F, -1.1F, 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); chargepad.render(0.0625F);
} }
else if(type == MachineType.LOGISTICAL_SORTER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(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); logisticalSorter.render(0.0625F, false);
} }
else if(type == MachineType.DIGITAL_MINER) 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, 0.0F, 1.0F);
GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.35F, 0.1F, 0.0F); GL11.glTranslatef(0.35F, 0.1F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png"));
digitalMiner.render(0.022F, false); digitalMiner.render(0.022F, false, mc.renderEngine);
} }
else if(type == MachineType.ROTARY_CONDENSENTRATOR) else if(type == MachineType.ROTARY_CONDENSENTRATOR)
{ {
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); rotaryCondensentrator.render(0.0625F);
} }
else if(type == MachineType.CHEMICAL_OXIDIZER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, -1.00F, 0.05F); 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); chemicalOxidizer.render(0.0625F);
} }
else if(type == MachineType.CHEMICAL_INFUSER) 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, 0.0F, 1.0F);
GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.96F, 0.05F); 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); chemicalInfuser.render(0.0625F);
} }
else if(type == MachineType.ELECTROLYTIC_SEPARATOR) 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(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
GL11.glTranslated(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); electrolyticSeparator.render(0.0625F);
} }
else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); chemicalDissolutionChamber.render(0.0625F);
} }
else if(type == MachineType.CHEMICAL_WASHER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); chemicalWasher.render(0.0625F);
} }
else if(type == MachineType.CHEMICAL_CRYSTALLIZER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); chemicalCrystallizer.render(0.0625F);
} }
else if(type == MachineType.SEISMIC_VIBRATOR) 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.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glScalef(0.6F, 0.6F, 0.6F);
GL11.glTranslatef(0.0F, -0.55F, 0.0F); 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); seismicVibrator.render(0.0625F);
} }
else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); pressurizedReactionChamber.render(0.0625F);
} }
else if(type == MachineType.FLUIDIC_PLENISHER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.85F, 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); fluidicPlenisher.render(0.0560F);
} }
else if(type == MachineType.LASER) 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(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.85F, 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); laser.render(0.0560F);
} }
else if(type == MachineType.LASER_AMPLIFIER) 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(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.85F, 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); laserAmplifier.render(0.0560F);
} }
else if(type == MachineType.LASER_TRACTOR_BEAM) 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(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.85F, 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); laserAmplifier.render(0.0560F);
} }
else if(type == MachineType.RESISTIVE_HEATER) 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, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F);
GL11.glTranslatef(0.05F, -0.96F, 0.05F); 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); resistiveHeater.render(0.0625F);
} }
else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) 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.glRotatef(180F, 0.0F, 1.0F, 0.0F);
GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glScalef(0.6F, 0.6F, 0.6F);
GL11.glTranslatef(0.0F, -0.55F, 0.0F); 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); solarNeutronActivator.render(0.0625F);
} }
else { else {

2
src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java
View file

@ -52,7 +52,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer
} }
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); 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(); GL11.glPopMatrix();
if(tileEntity.clientRendering) if(tileEntity.clientRendering)

2
src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java
View file

@ -39,7 +39,7 @@ public class RenderSecurityDesk extends TileEntitySpecialRenderer
} }
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); 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(); GL11.glPopMatrix();
} }
} }

BIN
src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

0
src/main/resources/assets/mekanism/render/EnergyCube_Off.png → src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
src/main/resources/assets/mekanism/render/EnergyCube_On.png → src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/mekanism/render/MetallurgicInfuser.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 5 KiB

BIN
src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB