From 263695053d997e75ec4a10f0de3ea0cb8a0de80c Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 6 Sep 2024 23:02:34 -0400 Subject: 1.21 ... maybe (still testing) Special thanks to Xenapte for the 1.20.6 patch. --- .../java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java') diff --git a/src/main/java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java b/src/main/java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java index 41910c7..2d5be7e 100644 --- a/src/main/java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java +++ b/src/main/java/org/chrisoft/trashyaddon/modules/MatchedItemHighlight.java @@ -48,8 +48,8 @@ public class MatchedItemHighlight extends Module { for (int j = firstInventorySlot; j < screenHandler.slots.size(); ++ j) { if (screenHandler.getSlot(j).getStack().isEmpty()) continue; - if (ItemStack.canCombine(screenHandler.getSlot(i).getStack(), screenHandler.getSlot(j).getStack()) || - ItemStack.canCombine(screenHandler.getSlot(j).getStack(), screenHandler.getSlot(i).getStack())) { + if (ItemStack.areItemsAndComponentsEqual(screenHandler.getSlot(i).getStack(), screenHandler.getSlot(j).getStack()) || + ItemStack.areItemsAndComponentsEqual(screenHandler.getSlot(j).getStack(), screenHandler.getSlot(i).getStack())) { Color c; if (!slotColors.get(i).equals(transparent)) c = new Color(slotColors.get(i)); -- cgit v1.2.3