diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 81816487f..fa38aa4a1 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,7 +1,9 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; @@ -9,6 +11,9 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -62,6 +67,12 @@ public class ModelEnergyCube extends ModelBase ModelRenderer ledRight1; ModelRenderer ledLeft1; ModelRenderer ledLeft2; + + public ModelRenderer[] leds1; + public ModelRenderer[] leds2; + + public ModelRenderer[] ports; + public ModelRenderer[] connectors; public ModelEnergyCube() { @@ -332,9 +343,15 @@ public class ModelEnergyCube extends ModelBase ledLeft2.setTextureSize(64, 64); ledLeft2.mirror = true; setRotation(ledLeft2, 0F, 0F, 0F); + + leds1 = new ModelRenderer[] {ledBottom1, ledTop1, ledFront1, ledBack1, ledLeft1, ledRight1}; + leds2 = new ModelRenderer[] {ledBottom2, ledTop2, ledFront2, ledBack2, ledLeft2, ledRight2}; + + ports = new ModelRenderer[] {portBottomToggle, portTopToggle, portFrontToggle, portBackToggle, portLeftToggle, portRightToggle}; + connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size) + public void render(float size, EnergyCubeTier tier, TextureManager manager) { frame12.render(size); frame11.render(size); @@ -349,7 +366,6 @@ public class ModelEnergyCube extends ModelBase frame2.render(size); frame1.render(size); - MekanismRenderer.glowOn(); corner8.render(size); corner7.render(size); corner6.render(size); @@ -358,112 +374,41 @@ public class ModelEnergyCube extends ModelBase corner3.render(size); corner2.render(size); corner1.render(size); + + GL11.glPushMatrix(); + GL11.glScalef(1.0001F, 1.0001F, 1.0001F); + GL11.glTranslatef(0, -0.00011F, 0); + manager.bindTexture(RenderEnergyCube.resources.get(tier)); + MekanismRenderer.glowOn(); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); } - @SuppressWarnings("incomplete-switch") - public void renderSide(float size, ForgeDirection side, IOState state, TextureManager renderer) + public void renderSide(float size, ForgeDirection side, IOState state, EnergyCubeTier tier, TextureManager renderer) { if(state != IOState.OFF) { - switch(side) + connectors[side.ordinal()].render(size); + ports[side.ordinal()].render(size); + + if(state == IOState.OUTPUT) { - case DOWN: - connectorBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case UP: - connectorTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case NORTH: - connectorFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case SOUTH: - connectorBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case WEST: - connectorLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case EAST: - connectorRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; + MekanismRenderer.glowOn(); + renderer.bindTexture(RenderEnergyCube.resources.get(tier)); + + ports[side.ordinal()].render(size); + + MekanismRenderer.glowOff(); } } @@ -474,39 +419,8 @@ public class ModelEnergyCube extends ModelBase MekanismRenderer.glowOn(); } - switch(side) - { - case DOWN: - ledBottom1.render(size); - ledBottom2.render(size); - - break; - case UP: - ledTop1.render(size); - ledTop2.render(size); - - break; - case NORTH: - ledFront1.render(size); - ledFront2.render(size); - - break; - case SOUTH: - ledBack1.render(size); - ledBack2.render(size); - - break; - case WEST: - ledLeft1.render(size); - ledLeft2.render(size); - - break; - case EAST: - ledRight1.render(size); - ledRight2.render(size); - - break; - } + leds1[side.ordinal()].render(size); + leds2[side.ordinal()].render(size); if(state == IOState.OUTPUT) { diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 95ce0ec47..38d3e7565 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -129,22 +129,23 @@ public class ItemRenderingHandler implements IItemRenderer { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); IEnergizedItem energized = (IEnergizedItem)item.getItem(); - mc.renderEngine.bindTexture(RenderEnergyCube.resources.get(tier)); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - energyCube.render(0.0625F); + energyCube.render(0.0625F, tier, mc.renderEngine); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, mc.renderEngine); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); } GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 368a69eaf..c4239399d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -30,6 +30,8 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer private ModelEnergyCore core = new ModelEnergyCore(); public static Map resources = new HashMap(); + public static ResourceLocation baseTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube.png"); + public static ResourceLocation coreTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png"); static { if(resources.isEmpty()) @@ -52,7 +54,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(resources.get(tileEntity.tier)); + bindTexture(baseTexture); switch(tileEntity.facing) { @@ -75,12 +77,12 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tileEntity.tier, field_147501_a.field_147553_e); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - bindTexture(resources.get(tileEntity.tier)); - model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, field_147501_a.field_147553_e); + bindTexture(baseTexture); + model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, tileEntity.tier, field_147501_a.field_147553_e); } GL11.glPopMatrix(); @@ -89,7 +91,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + bindTexture(coreTexture); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); diff --git a/src/main/resources/assets/mekanism/render/EnergyCube.png b/src/main/resources/assets/mekanism/render/EnergyCube.png new file mode 100644 index 000000000..558ed0bc1 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/EnergyCube.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png b/src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png index 698d981ff..f928fd6d1 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png and b/src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png index cd1a4c924..d96c1d6cc 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png and b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png index 4b9eb062d..c90b05671 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png and b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png b/src/main/resources/assets/mekanism/render/EnergyCubeElite.png index 063f76d1d..7c993a8e6 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png and b/src/main/resources/assets/mekanism/render/EnergyCubeElite.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png b/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png index 8cb4f6cb1..917e17d57 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png and b/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_Off.png index ab0c1a48b..946c86d09 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png and b/src/main/resources/assets/mekanism/render/EnergyCube_Off.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_On.png index ee63030a0..e8b82f291 100644 Binary files a/src/main/resources/assets/mekanism/render/EnergyCube_On.png and b/src/main/resources/assets/mekanism/render/EnergyCube_On.png differ