Make bundle check more lenient, close #59

Author: NotRyken

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.4
+
+- Improved compatibility with modded bundles
+
 ## 2.1.3
 
 - Improved compatibility with Accessories mod

common/src/main/java/dev/terminalmc/clientsort/client/inventory/operator/client/ClientSurvivalOperator.java

@@ -27,6 +27,7 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.BundleItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
@@ -284,9 +285,9 @@ protected void sort(int[] sortedIds, boolean playSound) {
 
                 // Modify standard click if required for bundles
                 int mouseButton = 0;
-                boolean clickOnBundleWithItem = originScopeStacks[dstId].is(Items.BUNDLE)
+                boolean clickOnBundleWithItem = isBundle(originScopeStacks[dstId])
                         && !(carriedStack.isEmpty());
-                boolean clickOnItemWithBundle = carriedStack.is(Items.BUNDLE)
+                boolean clickOnItemWithBundle = isBundle(carriedStack)
                         && !(originScopeStacks[dstId].isEmpty());
                 if (options().bundlesUseLeftClick
                         && (clickOnBundleWithItem || clickOnItemWithBundle)) {
@@ -622,4 +623,14 @@ private InteractionEvent createClickEvent(
             return InteractionManager.TICK_WAITER;
         });
     }
+
+    /**
+     * Compatibility helper for non-vanilla bundle implementations.
+     *
+     * @param stack the stack to check.
+     * @return whether the stack is a bundle.
+     */
+    private static boolean isBundle(ItemStack stack) {
+        return stack.is(Items.BUNDLE) || stack.getItem() instanceof BundleItem;
+    }
 }

gradle.properties

@@ -10,7 +10,7 @@
 template_version=10
 
 # Mod Version
-mod_version=2.1.3
+mod_version=2.1.4
 # 'STABLE', 'BETA' or 'ALPHA'
 mod_version_type=STABLE