From 1d410c5bd3add53f22fc802923cd5ec29c8a38f3 Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Tue, 12 Dec 2017 13:25:26 +1000
Subject: $ 5.08.33 Compatibility Fixes.

---
 .../core/util/materials/MaterialUtils.java         | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/util/materials')

diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index 010f7b0bf0..4a6f7c660e 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -2,6 +2,8 @@ package gtPlusPlus.core.util.materials;
 
 import java.util.List;
 
+import org.apache.commons.lang3.reflect.FieldUtils;
+
 import gregtech.api.enums.*;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -16,11 +18,11 @@ public class MaterialUtils {
 
 	@SuppressWarnings({ "rawtypes", "unused" })
 	private static Class[][] commonTypes =
-		{{Materials.class, int.class, TextureSet.class, float.class, int.class,
-			int.class, int.class, int.class, int.class, int.class, int.class,
-			String.class, int.class, int.class, int.class, int.class, boolean.class,
-			boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
-			List.class , List.class}};
+{{Materials.class, int.class, TextureSet.class, float.class, int.class,
+	int.class, int.class, int.class, int.class, int.class, int.class,
+	String.class, int.class, int.class, int.class, int.class, boolean.class,
+	boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
+	List.class , List.class}};
 
 	public static List<?> oreDictValuesForEntry(final String oredictName){
 		List<?> oredictItemNames;
@@ -209,4 +211,19 @@ public class MaterialUtils {
 		return null;
 	}*/
 
+
+	public static String getMaterialName(Materials mat){
+		String mName;
+		try {
+			mName = (String) FieldUtils.getDeclaredField(Materials.class, "mName", true).get(mat);
+		}
+		catch (IllegalArgumentException | IllegalAccessException e) {
+			mName = mat.name();
+		}
+		if (mName == null || mName.equals("") || mName == ""){
+			mName = mat.name();
+		}
+		return mName;
+	}
+
 }
-- 
cgit