diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
| commit | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (patch) | |
| tree | a05e9da0dfb6f14e89019fa1c38391b8f8dec949 /src/main/java/gregtech/api/util | |
| parent | 617f057dad27b8d9fc1dde0c669569b09453a0ed (diff) | |
| parent | 909149cd28dad31993837595d60e3df096b19437 (diff) | |
| download | GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.gz GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.bz2 GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.zip | |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 10 |
1 files changed, 7 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 2ab7fdbda3..1f8178aaa3 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1032,9 +1032,13 @@ 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) { |