From a5e517bf2a55a8e8168f623931ca578ea1b222c3 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 31 May 2023 15:20:06 +0900
Subject: Fix item name color and tooltip for ItemGenericToken (#648)

---
 src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core')

diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
index 00ca884954..e413c0933a 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -81,7 +81,7 @@ public class ItemGenericToken extends CoreItem {
         for (int i = 0; i < aDescript.length; i++) {
             GT_LanguageManager.addStringLocalization(
                     "gtplusplus." + this.getUnlocalizedName() + "." + id + ".tooltip." + i,
-                    aDescript[0]);
+                    aDescript[i]);
         }
         mRarities.put(id, aRarity);
         mCustomNameColours.put(id, aCustomNameColour);
@@ -126,8 +126,13 @@ public class ItemGenericToken extends CoreItem {
 
     @Override
     public String getItemStackDisplayName(final ItemStack tItem) {
-        return GT_LanguageManager.getTranslation(
+        String ret = GT_LanguageManager.getTranslation(
                 "gtplusplus." + this.getUnlocalizedNameInefficiently(tItem) + "." + tItem.getItemDamage() + ".name");
+        EnumChatFormatting format = mCustomNameColours.get(tItem.getItemDamage());
+        if (format != null) {
+            ret = format + ret;
+        }
+        return ret;
     }
 
     @Override
-- 
cgit