aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-05-31 15:20:06 +0900
committerGitHub <noreply@github.com>2023-05-31 08:20:06 +0200
commita5e517bf2a55a8e8168f623931ca578ea1b222c3 (patch)
tree764debe4ba44bce45681e22676d196be14a4ad01
parent97c5b791ce841fd98c6bbf03e00961e4b2938ca3 (diff)
downloadGT5-Unofficial-a5e517bf2a55a8e8168f623931ca578ea1b222c3.tar.gz
GT5-Unofficial-a5e517bf2a55a8e8168f623931ca578ea1b222c3.tar.bz2
GT5-Unofficial-a5e517bf2a55a8e8168f623931ca578ea1b222c3.zip
Fix item name color and tooltip for ItemGenericToken (#648)
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java9
1 files changed, 7 insertions, 2 deletions
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