Merge pull request #7 from iouter/GT-NH-Mod

Add lang key for localize dimension, and fix an issue.

2 files changed, 8 insertions, 14 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
index 88775c3e14..00107e12c1 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5Base.java
@@ -19,7 +19,7 @@ public class PluginGT5Base extends PluginBase {
     protected boolean ttDisplayed = false;
 
     protected static String getLocalizedNameForItem(Materials aMaterial, String aFormat) {
-        return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), aMaterial.mDefaultLocalName).replace("%temp", "%s");
+        return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), aMaterial.mLocalizedName).replace("%temp", "%s");
     }
 
     protected static int calculateMaxW(List L) {
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
index 13f9b02545..75b227d8a4 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
@@ -3,6 +3,7 @@ package pers.gwyog.gtneioreplugin.util;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import net.minecraft.client.resources.I18n;
 
 public class DimensionHelper {
 
@@ -94,15 +95,9 @@ public class DimensionHelper {
             s = s.trim();
             for (int i = 0; i < DimNameDisplayed.length; i++) {
                 if (s.equals(DimNameDisplayed[i])) {
-                    s = DimName[i].replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "").replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla ");
-                    if (s.equals("Twilight"))
-                        s = "Twilight Forrest";
-                    else if (s.equals("Underdark"))
-                        s = "Deep Dark";
-                    else if (s.equals("EndAsteroid"))
-                        s = "Far End Asteroids";
-                    
-                    switch (s) {
+                    s = I18n.format("gtnop.world." + DimName[i].replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "").replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla "));
+                    String k = DimName[i].replaceAll("GalacticraftCore_", "").replaceAll("GalacticraftMars_", "").replaceAll("GalaxySpace_", "").replaceAll("Vanilla_", "Vanilla ");
+                    switch (k) {
                         case "Moon":
                             s = s + " (T1)";
                             break;
@@ -139,8 +134,7 @@ public class DimensionHelper {
                         case "MakeMake":
                             s = s + " (T7)";
                             break;
-                        case "Deep Dark":
-                        case "CentauriBb":
+                        case "Underdark":
                         case "CentauriA":
                         case "VegaB":
                         case "BarnardC":
@@ -150,7 +144,7 @@ public class DimensionHelper {
                             s = s + " (T8)";
                             break;
                     }
-                    
+
                     dims[j] = s;
                 }
             }
@@ -161,4 +155,4 @@ public class DimensionHelper {
     public static List<String> convertCondensedStringToToolTip(String line) {
         return tooltipBuffer.computeIfAbsent(line, (String tmp) -> computeString(line));
     }
-}
+}
\ No newline at end of file