Fix owner tooltip not being localized (#528)

11 files changed, 15 insertions, 13 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 1b08ee24b6..d78395057f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -247,7 +247,7 @@ public class BaseItemComponent extends Item {
                     }
 
                     if (this.componentMaterial.isRadioactive) {
-                        list.add(CORE.GT_Tooltip_Radioactive);
+                        list.add(CORE.GT_Tooltip_Radioactive.get());
                     }
 
                     if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
index 939f3c8e2a..56d7aa2d6f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
@@ -52,7 +52,7 @@ public class BaseItemLoot extends Item {
         list.add(this.lootQuality.getQuality());
 
         /*
-         * if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive); }
+         * if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive.get()); }
          */
 
         super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 4fc3c6936d..e4de7b038c 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -133,7 +133,7 @@ public class BaseItemDustUnique extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         if (this.sRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive);
+            list.add(CORE.GT_Tooltip_Radioactive.get());
         }
         if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("")
                 && !chemicalNotation.equals("NullFormula")) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
index db36c48f56..8c2278d50b 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
@@ -53,7 +53,7 @@ public class FluidItemBlock extends ItemBlock {
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         /*
          * list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K"); if
-         * (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); }
+         * (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive.get()); }
          */
         super.addInformation(stack, aPlayer, list, bool);
     }
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 4798434492..cde5ec3f24 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -152,7 +152,7 @@ public class ItemBlockGtBlock extends ItemBlock {
 
         if (this.mMaterial != null) {
             if (this.mMaterial.vRadiationLevel > 0) {
-                list.add(CORE.GT_Tooltip_Radioactive);
+                list.add(CORE.GT_Tooltip_Radioactive.get());
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 2c1dc932ff..914e39e2a5 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -52,7 +52,7 @@ public class ItemBlockGtFrameBox extends ItemBlock {
         if (this.mMaterial != null) {
             list.add(this.mMaterial.vChemicalFormula);
             if (this.mMaterial.vRadiationLevel > 0) {
-                list.add(CORE.GT_Tooltip_Radioactive);
+                list.add(CORE.GT_Tooltip_Radioactive.get());
             }
         } else {
             list.add("Material is Null.");
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index 51efe4cfd4..c8c6f01232 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -80,7 +80,7 @@ public class ItemBlockOre extends ItemBlock {
 
         // Radioactive?
         if (this.mThisRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive);
+            list.add(CORE.GT_Tooltip_Radioactive.get());
         }
 
         /**
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index fb2101b84d..18f277a1f4 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -140,7 +140,7 @@ public class BaseOreComponent extends Item {
                     list.add(temp);
                 }
                 if (this.componentMaterial.isRadioactive) {
-                    list.add(CORE.GT_Tooltip_Radioactive + " | Level: " + this.componentMaterial.vRadiationLevel);
+                    list.add(CORE.GT_Tooltip_Radioactive.get() + " | Level: " + this.componentMaterial.vRadiationLevel);
                 }
             } else {
                 String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase());
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
index a6d33f57a4..a66510fc73 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
@@ -78,7 +78,7 @@ public class BaseItemPlate_OLD extends Item {
     @Override
     public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
         if (this.sRadiation > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive);
+            list.add(CORE.GT_Tooltip_Radioactive.get());
         }
         if (StringUtils.containsSuperOrSubScript(this.chemicalNotation)) {
             list.add(this.chemicalNotation);
diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
index 95d90ac0dd..4644fdc8d2 100644
--- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -44,7 +44,7 @@ public class DustDecayable extends BaseItemTickable {
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
         super.addInformation(stack, player, list, bool);
         if (this.radLevel > 0) {
-            list.add(CORE.GT_Tooltip_Radioactive);
+            list.add(CORE.GT_Tooltip_Radioactive.get());
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index fcd58e6db5..870ccf733f 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.lib;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -69,9 +70,10 @@ public class CORE {
             "[GT++]");
     public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>();
     // Tooltips;
-    public static final String GT_Tooltip = StatCollector.translateToLocal("GTPP.core.GT_Tooltip");
-    public static final String GT_Tooltip_Builder = StatCollector.translateToLocal("GTPP.core.GT_Tooltip_Builder");
-    public static final String GT_Tooltip_Radioactive = StatCollector
+    public static final Supplier<String> GT_Tooltip = () -> StatCollector.translateToLocal("GTPP.core.GT_Tooltip");
+    public static final Supplier<String> GT_Tooltip_Builder = () -> StatCollector
+            .translateToLocal("GTPP.core.GT_Tooltip_Builder");
+    public static final Supplier<String> GT_Tooltip_Radioactive = () -> StatCollector
             .translateToLocal("GTPP.core.GT_Tooltip_Radioactive");
     public static final String noItem = "";