diff options
| author | Martin Robertz <dream-master@gmx.net> | 2017-12-26 11:25:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-26 11:25:06 +0100 |
| commit | 1ae0daf62275458941aab1d2857316a54e3e7c06 (patch) | |
| tree | d8509432783a6c4b5390cea9c94bfec6d1f7fa45 /src/main/java/gregtech/api/enums | |
| parent | 41ceb92a34b38cc264ee113b6724d1140d3afc44 (diff) | |
| parent | ee0b005dad7c8ad57191e7ba0743b884a40b22a9 (diff) | |
| download | GT5-Unofficial-1ae0daf62275458941aab1d2857316a54e3e7c06.tar.gz GT5-Unofficial-1ae0daf62275458941aab1d2857316a54e3e7c06.tar.bz2 GT5-Unofficial-1ae0daf62275458941aab1d2857316a54e3e7c06.zip | |
Merge pull request #66 from Antifluxfield/GTNH-l10n
Localization bugfix & improvement
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 4886cf8db7..31b1742ebe 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -2107,6 +2107,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { return this.mName;
}
+ public String getDefaultLocalizedNameForItem(String aFormat) {
+ return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), this.mDefaultLocalName).replace("%temp", "%s");
+ }
+
public String getLocalizedNameForItem(String aFormat) {
return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), this.mLocalizedName).replace("%temp", "%s");
}
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index a4670f33ab..5a776b60c4 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -911,9 +911,8 @@ public enum OrePrefixes { return name() + aMaterial;
}
- @Deprecated
public String getDefaultLocalNameForItem(Materials aMaterial) {
- return aMaterial.getLocalizedNameForItem(getDefaultLocalNameFormatForItem(aMaterial));
+ return aMaterial.getDefaultLocalizedNameForItem(getDefaultLocalNameFormatForItem(aMaterial));
}
@SuppressWarnings("incomplete-switch")
|