aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2017-12-26 13:08:12 +0800
committerAntifluxfield <lyj_299792458@163.com>2017-12-26 13:08:12 +0800
commit37f7d3ff6e09eed67fbf6a3fadc1c4997a655ced (patch)
tree7e97054e3579740cdf17b4634fc2dc13542a6661 /src/main/java/gregtech/api/enums
parent31e6940e83ff0ed28503de0a6914ced4f1f42b93 (diff)
downloadGT5-Unofficial-37f7d3ff6e09eed67fbf6a3fadc1c4997a655ced.tar.gz
GT5-Unofficial-37f7d3ff6e09eed67fbf6a3fadc1c4997a655ced.tar.bz2
GT5-Unofficial-37f7d3ff6e09eed67fbf6a3fadc1c4997a655ced.zip
Config to disable placeholder "%material"
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java4
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java3
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")