aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-06-06 10:01:51 +0200
committerDream-Master <dream-master@gmx.net>2017-06-06 10:01:51 +0200
commit26dadcb8f60fd085f1c59f76b64af0eda0f93603 (patch)
tree9ab19a448ac7d9e0bd52c9d126307f90bf8ea19c /src/main/java/gregtech/api/util
parent2a2d8e0f6254e1dad3892063b7030cf11bbb811f (diff)
downloadGT5-Unofficial-26dadcb8f60fd085f1c59f76b64af0eda0f93603.tar.gz
GT5-Unofficial-26dadcb8f60fd085f1c59f76b64af0eda0f93603.tar.bz2
GT5-Unofficial-26dadcb8f60fd085f1c59f76b64af0eda0f93603.zip
cherry pick: from Techlone
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java9
1 files changed, 6 insertions, 3 deletions
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) {