refactor(Message):itemMetaFilter

Author: Takaranoao

build.gradle

@@ -62,7 +62,7 @@ dependencies {
     testImplementation(platform('org.junit:junit-bom:5.9.0'))
     testImplementation('org.junit.jupiter:junit-jupiter')
 //    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.122.0'
+    testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.132.3'
     testImplementation 'org.mockito:mockito-core:4.8.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0'
     testImplementation 'org.xerial:sqlite-jdbc:3.39.3.0'

src/main/java/cat/nyaa/nyaacore/Message.java

@@ -39,42 +39,53 @@ public static String getPlayerJson(OfflinePlayer player) {
 
     public static String getItemJsonStripped(ItemStack item) {
         ItemStack cloned = item.clone();
-        if (cloned.hasItemMeta() && cloned.getItemMeta() instanceof BookMeta) {
-            return ItemStackUtils.itemToJson(removeBookContent(cloned));
+        if (cloned.hasItemMeta()) {
+            var meta = cloned.getItemMeta();
+            if(meta instanceof BookMeta) {
+                return ItemStackUtils.itemToJson(removeBookContent(cloned));
+            }
+            if (meta != null) {
+                cloned.setItemMeta(filterItemMeta(meta));
+            }
         }
-        if (cloned.hasItemMeta() && cloned.getItemMeta() instanceof BlockStateMeta blockStateMeta) {
-            if (blockStateMeta.hasBlockState() && blockStateMeta.getBlockState() instanceof InventoryHolder inventoryHolder) {
-                ArrayList<ItemStack> items = new ArrayList<>();
-                for (int i = 0; i < inventoryHolder.getInventory().getSize(); i++) {
-                    ItemStack itemStack = inventoryHolder.getInventory().getItem(i);
-                    if (itemStack != null && itemStack.getType() != Material.AIR) {
-                        if (items.size() < 5) {
-                            if (itemStack.hasItemMeta()) {
-                                if (itemStack.getItemMeta().hasLore()) {
-                                    ItemMeta meta = itemStack.getItemMeta();
-                                    meta.setLore(new ArrayList<>());
-                                    itemStack.setItemMeta(meta);
-                                }
-                                if (itemStack.getItemMeta() instanceof BookMeta) {
-                                    itemStack = removeBookContent(itemStack);
-                                }
-                            }
-                            items.add(itemStack);
-                        } else {
-                            items.add(new ItemStack(Material.STONE));
+        return ItemStackUtils.itemToJson(cloned);
+    }
+
+
+    public static ItemMeta filterItemMeta(ItemMeta itemMeta) {
+        var cloned = itemMeta.clone();
+        if(!(cloned instanceof BlockStateMeta blockStateMeta))return cloned;
+        if(!(blockStateMeta.getBlockState() instanceof InventoryHolder inventoryHolder))return cloned;
+        ArrayList<ItemStack> items = new ArrayList<>();
+
+        for (int i = 0; i < inventoryHolder.getInventory().getSize(); i++) {
+            ItemStack itemStack = inventoryHolder.getInventory().getItem(i);
+            if (itemStack != null && itemStack.getType() != Material.AIR) {
+                if (items.size() < 5) {
+                    if (itemStack.hasItemMeta()) {
+                        if (itemStack.getItemMeta().hasLore()) {
+                            ItemMeta meta = itemStack.getItemMeta();
+                            meta.setLore(new ArrayList<>());
+                            itemStack.setItemMeta(meta);
+                        }
+                        if (itemStack.getItemMeta() instanceof BookMeta) {
+                            itemStack = removeBookContent(itemStack);
                         }
                     }
+                    items.add(itemStack);
+                } else {
+                    items.add(new ItemStack(Material.STONE));
                 }
-                inventoryHolder.getInventory().clear();
-                for (int i = 0; i < items.size(); i++) {
-                    inventoryHolder.getInventory().setItem(i, items.get(i));
-                }
-                blockStateMeta.setBlockState((BlockState) inventoryHolder);
-                cloned.setItemMeta(blockStateMeta);
-                return ItemStackUtils.itemToJson(cloned);
             }
         }
-        return ItemStackUtils.itemToJson(cloned);
+
+        inventoryHolder.getInventory().clear();
+        for (int i = 0; i < items.size(); i++) {
+            inventoryHolder.getInventory().setItem(i, items.get(i));
+        }
+        blockStateMeta.setBlockState((BlockState) inventoryHolder);
+        return blockStateMeta;
+
     }
 
     /**