fix nei imc

2 files changed, 10 insertions, 3 deletions

diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java
index 3d3d36cee0..407c41114b 100644
--- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java
+++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java
@@ -18,6 +18,7 @@ public class IsotopeMaterial {
     public final String mLocalizedName;
     public final String mMaterialName;
     public final short[] mRGB;
+    public final short[] mRGBO;
     public final NuclearTextures mTexture;
 
     public IsotopeMaterial(int aID, String aName, String aMaterialName, String aLocalizedName, NuclearTextures aTexture, int aR, int aG, int aB, int aNeutron) {
@@ -26,7 +27,8 @@ public class IsotopeMaterial {
         this.mName = aName;
         this.mMaterialName = aMaterialName;
         this.mLocalizedName = aLocalizedName;
-        this.mRGB = new short[] {(short) aR,(short) aG,(short) aB, 0};
+        this.mRGB = new short[] {(short) (aR * 0.6), (short) (aG * 0.6), (short) (aB * 0.6), 0};
+        this.mRGBO = new short[] {(short) aR, (short) aG, (short) aB, 0};
         this.mTexture = aTexture;
         mIsotopeMaterial.add(this);
         mIDMap.put(this.mID, this);
diff --git a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java
index bd530699b3..32986786a7 100644
--- a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java
+++ b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 
 import java.util.List;
@@ -48,7 +49,7 @@ public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item {
                 String tOreName = tType.getValue();
                 ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset);
                 GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".name", String.format(tOreName, tIsotope.mLocalizedName));
-                GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".tooltip", String.format("§b%s's Isotope.§r", tIsotope.mMaterialName));
+                GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".tooltip", EnumChatFormatting.AQUA + String.format("%s's Isotope.", tIsotope.mMaterialName) + EnumChatFormatting.RESET);
             }
             for (Pair<Integer, String> tOreDict : OREPREFIX) {
                 int tOffset = tOreDict.getKey();
@@ -89,9 +90,13 @@ public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item {
     @Override
     public short[] getRGBa(ItemStack aStack) {
         int tID = aStack.getItemDamage() % 1000;
+        int tType = aStack.getItemDamage() / 1000;
         IsotopeMaterial tMaterial = mIDMap.get(tID);
         if (tMaterial != null) {
-            return tMaterial.mRGB;
+            if (tType == 1 || tType == 2)
+                return tMaterial.mRGB;
+            else
+                return tMaterial.mRGBO;
         }
         return null;
     }