diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-06-06 17:58:49 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-06 17:58:49 +0200 |
| commit | 86cc15786f4ff064b118784d12987b6fef969daa (patch) | |
| tree | f79c4cf7042ea7fa4fe13dbd476327c1a169fe2e /src/main/java/gregtech/api/util/GT_Utility.java | |
| parent | 2a2d8e0f6254e1dad3892063b7030cf11bbb811f (diff) | |
| parent | 4f02a06bbb9b62ac7e5aa6cb785dc22fedd361a4 (diff) | |
| download | GT5-Unofficial-86cc15786f4ff064b118784d12987b6fef969daa.tar.gz GT5-Unofficial-86cc15786f4ff064b118784d12987b6fef969daa.tar.bz2 GT5-Unofficial-86cc15786f4ff064b118784d12987b6fef969daa.zip | |
Merge branch 'OreDrills' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_Utility.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 9 |
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) { |