From 26dadcb8f60fd085f1c59f76b64af0eda0f93603 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Tue, 6 Jun 2017 10:01:51 +0200
Subject: cherry pick: from Techlone 7cb51ae461815bfd767aa0bf64f8ff075de5624d
 c5402ee38998cc086ceb36fbce6c54aba6d9d79c
 7c48590a49242bb26eddafa26d2cd7b4ce3546d8
 75a33be210cda273ef9e6cc9cbbf739dd913907e
 b187410005771f1762f3bb5c94c0c5cd26dd06db

---
 src/main/java/gregtech/api/util/GT_Utility.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/api/util/GT_Utility.java')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 877a6a716e..d1158a29f8 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1025,9 +1025,12 @@ public class GT_Utility {
         return (Block) aBlock;
     }
 
-    public static Block getBlockFromStack(Object aStack) {
-        if (isStackInvalid(aStack)) return Blocks.air;
-        return Block.getBlockFromItem(((ItemStack) aStack).getItem());
+    public static Block getBlockFromStack(ItemStack itemStack) {
+        if (isStackInvalid(itemStack)) return Blocks.air;
+        return getBlockFromItem(itemStack.getItem());
+            }
+            public static Block getBlockFromItem(Item item) {
+            return Block.getBlockFromItem(item);
     }
 
     public static boolean isBlockValid(Object aBlock) {
-- 
cgit