diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-30 13:06:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 13:06:47 +0200 |
| commit | cee84d9882ae4f988891856eba8c31ebd383e7ff (patch) | |
| tree | bfde18f6d875e23ca0e4ecff3be3d04d1e87abfc /src/main/java/gregtech/api/objects | |
| parent | f798f8a8a6fb3ca13d35928d49525d384b6302cc (diff) | |
| parent | 64b07bba3aad35118bda5289aecc85cdccffbc27 (diff) | |
| download | GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.tar.gz GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.tar.bz2 GT5-Unofficial-cee84d9882ae4f988891856eba8c31ebd383e7ff.zip | |
Merge branch 'experimental' into Boxinator
Diffstat (limited to 'src/main/java/gregtech/api/objects')
| -rw-r--r-- | src/main/java/gregtech/api/objects/GT_ItemStack.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack.java b/src/main/java/gregtech/api/objects/GT_ItemStack.java index 7284854c5f..3e25454fa1 100644 --- a/src/main/java/gregtech/api/objects/GT_ItemStack.java +++ b/src/main/java/gregtech/api/objects/GT_ItemStack.java @@ -1,5 +1,6 @@ package gregtech.api.objects; +import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Utility; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -17,7 +18,11 @@ public class GT_ItemStack { } public GT_ItemStack(ItemStack aStack) { - this(aStack == null ? null : aStack.getItem(), aStack == null ? 0 : aStack.stackSize, aStack == null ? 0 : Items.feather.getDamage(aStack)); + this(aStack, false); + } + + public GT_ItemStack(ItemStack aStack, boolean wildcard) { + this(aStack == null ? null : aStack.getItem(), aStack == null ? 0 : aStack.stackSize, aStack == null ? 0 : wildcard ? GT_Values.W : Items.feather.getDamage(aStack)); } public GT_ItemStack(int aHashCode) { |