From c5189e5888e6d3452f7ce05952f21cfe21ed491a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Wed, 15 Jan 2020 17:17:23 +0000
Subject: + Added Transmission Components. % Adjusted recipe for Chemical Plant
 controller, to now use T2 Frames instead of ambiguously tiered Stainless
 Steel Frames. % Adjusted a few recipes using Sensors & Emitters to now use
 TransComps. % Chunkloaders now have different textures and more informative
 tooltips. % Chunkloaders now have better ranges. % Renamed Fluid Reactor to
 Chemical Plant. $ Fixed Chemical Plant NEI handler.

---
 .../gregtech/api/items/Gregtech_MetaItem_X32.java  | 43 +++++++++++++---------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/items')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index ef92f9919d..a5430846a9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -192,22 +192,9 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
 
 	@Override
 	public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
-		if (stack.getDisplayName().contains("ULV")){
-			HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 180, 180);
-		}
-		else if (stack.getDisplayName().contains("LuV")){
-			HEX_OxFFFFFF = 0xffffcc;
-		}
-		else if (stack.getDisplayName().contains("ZPM")){
-			HEX_OxFFFFFF = 0xffe600;
-		}
-		else if (stack.getDisplayName().contains("UV")){
-			HEX_OxFFFFFF = 0xffb300;
-		}
-		else if (stack.getDisplayName().contains("MAX")){
-			HEX_OxFFFFFF = Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
-		}
-		else if (stack.getDisplayName().contains("Sodium")){
+		
+		int aMeta = stack.getItemDamage();		
+		if (stack.getDisplayName().contains("Sodium")){
 			HEX_OxFFFFFF = Utils.rgbtoHexValue(90, 90, 255);
 		}
 		else if (stack.getDisplayName().contains("Cadmium")){
@@ -228,8 +215,28 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
 		else if (stack.getDisplayName().contains("Invar")){
 			HEX_OxFFFFFF = Utils.rgbtoHexValue(180, 180, 120);
 		}
-		else {
-			HEX_OxFFFFFF = 0xffffff;
+		else {			
+			if (aMeta > 50 && aMeta != 150) {
+				HEX_OxFFFFFF = 0xffffff;
+			}
+			else if (stack.getDisplayName().contains("ULV")){
+				HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 180, 180);
+			}
+			else if (stack.getDisplayName().contains("LuV")){
+				HEX_OxFFFFFF = 0xffffcc;
+			}
+			else if (stack.getDisplayName().contains("ZPM")){
+				HEX_OxFFFFFF = 0xffe600;
+			}
+			else if (stack.getDisplayName().contains("UV")){
+				HEX_OxFFFFFF = 0xffb300;
+			}
+			else if (stack.getDisplayName().contains("MAX")){
+				HEX_OxFFFFFF = Utils.rgbtoHexValue(MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
+			}
+			else {
+				HEX_OxFFFFFF = 0xffffff;
+			}
 		}
 		return HEX_OxFFFFFF;
 	}
-- 
cgit