+ Added a debug item for linking blocks.

% More project clean-up.
% Made fish trap 2x slower.
$ Fixed issue with fish trap name.
$ Fixed .08 issue getting powder barrels.

2 files changed, 14 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 0af72661e9..6c15c06b1d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -10,6 +10,7 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import gregtech.api.enums.*;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
@@ -173,9 +174,19 @@ public class MaterialUtils {
 		}
 	}
 
-	static Class<Materials> materialsEnum = Materials.class;
 	public static Materials getMaterialByName(String materialName) {
-		return EnumUtils.getValue(materialsEnum, materialName);
+		
+		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+			return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);			
+		}
+		else {
+			for (Materials m : Materials.values()) {
+				if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
+					return m;
+				}
+			}
+			return null;
+		}
 	}
 	
 	@SuppressWarnings("deprecation")
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/UtilsMining.java b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index eb6044fcd7..d44bf69253 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/UtilsMining.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -6,7 +6,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public class UtilsMining {
+public class MiningUtils {
 
 	private static boolean durabilityDamage = false;
 	private static ItemStack stack;