diff options
| author | miozune <miozune@gmail.com> | 2023-04-06 18:02:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:02:38 +0200 |
| commit | 8c24f1e20ab85502e7d6955be757531d2e6248fc (patch) | |
| tree | 671f6bb2dbaa097833bcaf9e35362bb78885bdc0 /src | |
| parent | 30b37d67b09475f8167cc5c44b63bf34c80302f6 (diff) | |
| download | GT5-Unofficial-8c24f1e20ab85502e7d6955be757531d2e6248fc.tar.gz GT5-Unofficial-8c24f1e20ab85502e7d6955be757531d2e6248fc.tar.bz2 GT5-Unofficial-8c24f1e20ab85502e7d6955be757531d2e6248fc.zip | |
Monthly disassembler fix (#1840)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java | 7 |
1 files changed, 5 insertions, 2 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 d46d02a761..aa7004cacf 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 @@ -1,7 +1,6 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.*; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.*; @@ -183,6 +182,8 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi addBlacklist(ItemList.Transformer_IV_EV.get(1L)); addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 6)); // endregion transformer + addBlacklist(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1L, 36)); + addBlacklist(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1L, 536)); } public static void addBlacklist(ItemStack stack) { @@ -572,6 +573,8 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi x.mOutputs) .anyMatch( y -> { + if (y == null) + return false; ItemStack out = is.copy(); out.stackSize = y.stackSize; boolean isDone = GT_Utility.areStacksEqual( |