Tweak sortInventory logic

- Make colored block sort like creative tab

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

src/main/java/com/plusls/ommc/api/sortInventory/IDyeBlock.java

@@ -0,0 +1,7 @@
+package com.plusls.ommc.api.sortInventory;
+
+import net.minecraft.world.item.DyeColor;
+
+public interface IDyeBlock {
+    DyeColor ommc$getColor();
+}

src/main/java/com/plusls/ommc/feature/sortInventory/ShulkerBoxItemUtil.java

@@ -6,48 +6,60 @@
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.ShulkerBoxBlock;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import top.hendrixshen.magiclib.compat.minecraft.api.nbt.TagCompatApi;
 
 public class ShulkerBoxItemUtil {
     public static final int SHULKERBOX_MAX_STACK_AMOUNT = 64;
 
     public static boolean isEmptyShulkerBoxItem(ItemStack itemStack) {
-        if (isShulkerBoxBlockItem(itemStack)) {
-            CompoundTag nbt = itemStack.getTag();
-            if (nbt != null && nbt.contains("BlockEntityTag", 10)) {
-                CompoundTag tag = nbt.getCompound("BlockEntityTag");
-                if (tag.contains("Items", 9)) {
-                    ListTag tagList = tag.getList("Items", 10);
-                    return tagList.size() <= 0;
-                }
-            }
-            return true;
-        } else {
+        if (!ShulkerBoxItemUtil.isShulkerBoxBlockItem(itemStack)) {
             return false;
         }
+
+        CompoundTag nbt = itemStack.getTag();
+
+        if (nbt == null || !nbt.contains("BlockEntityTag", TagCompatApi.TAG_COMPOUND)) {
+            return true;
+        }
+
+        CompoundTag tag = nbt.getCompound("BlockEntityTag");
+
+        if (tag.contains("Items", TagCompatApi.TAG_LIST)) {
+            ListTag tagList = tag.getList("Items", TagCompatApi.TAG_COMPOUND);
+            return tagList.isEmpty();
+        }
+
+        return true;
     }
 
-    public static boolean isShulkerBoxBlockItem(ItemStack itemStack) {
-        return itemStack.getItem() instanceof BlockItem && ((BlockItem) itemStack.getItem()).getBlock() instanceof ShulkerBoxBlock;
+    public static boolean isShulkerBoxBlockItem(@NotNull ItemStack itemStack) {
+        return itemStack.getItem() instanceof BlockItem &&
+                ((BlockItem) itemStack.getItem()).getBlock() instanceof ShulkerBoxBlock;
     }
 
-    public static int cmpShulkerBox(@Nullable CompoundTag a, @Nullable CompoundTag b) {
+    public static int compareShulkerBox(@Nullable CompoundTag a, @Nullable CompoundTag b) {
         int aSize = 0, bSize = 0;
+
         if (a != null) {
             CompoundTag tag = a.getCompound("BlockEntityTag");
-            if (tag.contains("Items", 9)) {
-                ListTag tagList = tag.getList("Items", 10);
+
+            if (tag.contains("Items", TagCompatApi.TAG_LIST)) {
+                ListTag tagList = tag.getList("Items", TagCompatApi.TAG_COMPOUND);
                 aSize = tagList.size();
             }
         }
 
         if (b != null) {
             CompoundTag tag = b.getCompound("BlockEntityTag");
-            if (tag.contains("Items", 9)) {
-                ListTag tagList = tag.getList("Items", 10);
+
+            if (tag.contains("Items", TagCompatApi.TAG_LIST)) {
+                ListTag tagList = tag.getList("Items", TagCompatApi.TAG_COMPOUND);
                 bSize = tagList.size();
             }
         }
+
         return aSize - bSize;
     }