aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-02-25 18:19:00 +0900
committerGitHub <noreply@github.com>2022-02-25 10:19:00 +0100
commit8a849f2b68a643bc16cee7a315e0a58c4f4c6975 (patch)
tree5ec7fa92856b201ba033061ef4b076198ff483ac /src/main/java/gregtech/common/tileentities/machines
parent2f79ba3a1dd0b96b7481bf7d2e149ba5f35318ad (diff)
downloadGT5-Unofficial-8a849f2b68a643bc16cee7a315e0a58c4f4c6975.tar.gz
GT5-Unofficial-8a849f2b68a643bc16cee7a315e0a58c4f4c6975.tar.bz2
GT5-Unofficial-8a849f2b68a643bc16cee7a315e0a58c4f4c6975.zip
Fix Disassemblers giving wildcard meta variant of stacks (#948)
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index a4e2c1892f..a5a75a4bcf 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -341,6 +341,8 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi
//Unification
output[i] = handleUnification(output[i]);
+ //Wildcard
+ output[i] = handleWildcard(output[i]);
}
}
@@ -356,6 +358,13 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi
return GT_OreDictUnificator.get(stack);
}
+ private static ItemStack handleWildcard(ItemStack stack) {
+ if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
+ stack.setItemDamage(0);
+ }
+ return stack;
+ }
+
private static void handleReplacement(Set<ItemStack[]> inputsStacks, ItemData data, ItemStack[] output, ItemStack input, int i){
AtomicReference<Materials> toRpl = new AtomicReference<>();
Materials first = data.mMaterial.mMaterial;