diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/enums')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index f6db32fd5b..3b9e39208d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -5,6 +5,7 @@ import static gregtech.api.enums.GT_Values.W; import gregtech.api.util.*; import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -285,7 +286,7 @@ public enum GregtechItemList implements GregtechItemContainer { if (this.mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); } - return GT_Utility.getBlockFromStack(this.getItem()); + return getBlockFromStack(this.getItem()); } @Override @@ -305,6 +306,12 @@ public enum GregtechItemList implements GregtechItemContainer { } return GT_Utility.areUnificationsEqual((ItemStack)aStack, aWildcard?this.getWildcard(1):this.get(1), aIgnoreNBT); } + + public static Block getBlockFromStack(Object aStack) { + if (GT_Utility.isStackInvalid(aStack)) + return Blocks.air; + return Block.getBlockFromItem(((ItemStack) aStack).getItem()); + } @Override public ItemStack get(final long aAmount, final Object... aReplacements) { |