From 8c6a7c01efdf994daad0481235c4ce6097cdc723 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 3 May 2016 18:54:53 -0400 Subject: [PATCH] Fancy Energy Cube colors! --- .../client/render/tileentity/RenderEnergyCube.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index c4239399d..47d718ca3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -3,7 +3,6 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; -import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; @@ -26,6 +25,9 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer { + public static int[][] COLORS = new int[][] {new int[] {100, 210, 125}, new int[] {215, 85, 70}, new int[] {80, 125, 230}, + new int[] {154, 120, 200}, new int[] {0, 0, 0}}; + private ModelEnergyCube model = new ModelEnergyCube(); private ModelEnergyCore core = new ModelEnergyCore(); @@ -96,11 +98,11 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); - EnumColor c = tileEntity.tier.getBaseTier().getColor(); + int[] c = COLORS[tileEntity.tier.getBaseTier().ordinal()]; GL11.glPushMatrix(); GL11.glScalef(0.4F, 0.4F, 0.4F); - GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float)(tileEntity.getEnergy() / tileEntity.getMaxEnergy())); + GL11.glColor4f((float)c[0]/255F, (float)c[1]/255F, (float)c[2]/255F, (float)(tileEntity.getEnergy() / tileEntity.getMaxEnergy())); GL11.glTranslatef(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + partialTick) * 3)) / 7, 0); GL11.glRotatef((MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 0); GL11.glRotatef(36F + (MekanismClient.ticksPassed + partialTick) * 4, 0, 1, 1);