diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-10-26 01:44:42 +0100 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-10-26 01:44:42 +0100 |
| commit | 26bd0dc2c5f68ff9402c428cce8b8936880ae7a4 (patch) | |
| tree | 220aaaaf8214bd6203479f8ecb7a712b16d02198 /src/Java/gtPlusPlus/core/util | |
| parent | b9ad7d46f1f1993add94ad7b561e1fea94a4e0d1 (diff) | |
| download | GT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.tar.gz GT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.tar.bz2 GT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.zip | |
% More .08 Compatibility.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java | 10 |
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 |