aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 98b02078c6..ae43abe3c5 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -183,7 +183,7 @@ public class MaterialUtils {
}
}
- public static Materials getMaterialByName(String materialName) {
+ private static Materials getMaterialByName(String materialName) {
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
@@ -218,6 +218,14 @@ public class MaterialUtils {
TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
return o;
}
+
+ public static Materials getMaterial(String aMaterialName) {
+ Materials m = gtPlusPlus.xmod.gregtech.common.StaticFields59.getMaterial(aMaterialName);
+ if (m == null) {
+ m = getMaterialByName(aMaterialName);
+ }
+ return m;
+ }
} \ No newline at end of file