From 37f7d3ff6e09eed67fbf6a3fadc1c4997a655ced Mon Sep 17 00:00:00 2001
From: Antifluxfield <lyj_299792458@163.com>
Date: Tue, 26 Dec 2017 13:08:12 +0800
Subject: Config to disable placeholder "%material"

---
 src/main/java/gregtech/api/enums/Materials.java   | 4 ++++
 src/main/java/gregtech/api/enums/OrePrefixes.java | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/enums')

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")
-- 
cgit