From c3dd6dabe1d2ecc852ecf5d6dec2fc8fc0d1eb7d Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Tue, 22 Feb 2022 22:11:57 -0300 Subject: [PATCH] fix blocking mode again... --- .../java/appeng/util/inv/BlockingItemHandler.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/util/inv/BlockingItemHandler.java b/src/main/java/appeng/util/inv/BlockingItemHandler.java index ac21c4df5..41c089d71 100644 --- a/src/main/java/appeng/util/inv/BlockingItemHandler.java +++ b/src/main/java/appeng/util/inv/BlockingItemHandler.java @@ -4,7 +4,9 @@ import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.helpers.NonBlockingItems; +import appeng.util.Platform; import appeng.util.item.AEItemStack; +import gregtech.common.items.MetaTool; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; @@ -26,8 +28,16 @@ public class BlockingItemHandler extends BlockingInventoryAdaptor boolean isBlockableItem( ItemStack stack ) { IItemList itemList = NonBlockingItems.INSTANCE.getMap().get( domain ); - Collection item = itemList.findFuzzy( AEItemStack.fromItemStack( stack ), FuzzyMode.IGNORE_ALL ); - return item.isEmpty(); + if( stack.getItem().isDamageable() || ( Platform.isModLoaded( "gregtech" ) && stack.getItem() instanceof MetaTool ) ) + { + Collection item = itemList.findFuzzy( AEItemStack.fromItemStack( stack ), FuzzyMode.IGNORE_ALL ); + return item.isEmpty(); + } + else + { + IAEItemStack item = itemList.findPrecise( AEItemStack.fromItemStack( stack ) ); + return item == null; + } } @Override