Improve itemstack empty check

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java

@@ -103,7 +103,7 @@ public final void onEnable() {
         Sharables.init(this);
         Perm.register(this);
         ItemStackConverter.init(this);
-        Logging.fine("ItemStackConverter is using byte serialization: " + ItemStackConverter.hasByteSerializeSupport);
+        Logging.fine("ItemStackConverter is using byte serialization: " + ItemStackConverter.hasByteSerializeSupport());
         this.reloadConfig();
         inventoriesConfig.get().save().onFailure(e -> Logging.severe("Failed to save config file!"));
 

src/main/java/org/mvplugins/multiverse/inventories/share/InventorySerializer.java

@@ -33,11 +33,9 @@ public Object serialize(ItemStack[] itemStacks) {
     private Map<String, Object> mapSlots(ItemStack[] itemStacks) {
         Map<String, Object> result = new HashMap<>(itemStacks.length);
         for (int i = 0; i < itemStacks.length; i++) {
-            if (itemStacks[i] != null && itemStacks[i].getType() != Material.AIR) {
-                Object serialize = ItemStackConverter.serialize(itemStacks[i]);
-                if (serialize != null) {
-                    result.put(Integer.toString(i), serialize);
-                }
+            Object serialize = ItemStackConverter.serialize(itemStacks[i]);
+            if (serialize != null) {
+                result.put(Integer.toString(i), serialize);
             }
         }
         return result;

src/main/java/org/mvplugins/multiverse/inventories/util/ItemStackConverter.java

@@ -12,7 +12,7 @@
 
 public final class ItemStackConverter {
 
-    public final static boolean hasByteSerializeSupport;
+    private final static boolean hasByteSerializeSupport;
 
     static {
         hasByteSerializeSupport = Try.run(() -> ItemStack.class.getMethod("deserializeBytes", byte[].class))
@@ -27,6 +27,10 @@ public static void init(MultiverseInventories plugin) {
         config = plugin.getServiceLocator().getService(InventoriesConfig.class);
     }
 
+    public static boolean isEmptyItemStack(@Nullable ItemStack itemStack) {
+        return itemStack == null || itemStack.getType() == Material.AIR || itemStack.getAmount() == 0;
+    }
+
     @Nullable
     public static ItemStack deserialize(Object obj) {
         if (obj instanceof ItemStack itemStack) {
@@ -42,16 +46,20 @@ public static ItemStack deserialize(Object obj) {
 
     @Nullable
     public static Object serialize(ItemStack itemStack) {
-        if (config != null && config.getUseByteSerializationForInventoryData() && hasByteSerializeSupport) {
-            if (itemStack.getType() == Material.AIR) {
-                return null;
-            }
-            return Try.of(() -> Base64.getEncoder().encodeToString(itemStack.serializeAsBytes()))
-                    .onFailure(e -> Logging.severe("Could not serialize item stack: %s", e.getMessage()))
-                    .getOrNull();
+        if (isEmptyItemStack(itemStack)) {
+            return null;
+        }
+        if (config == null || !config.getUseByteSerializationForInventoryData() || !hasByteSerializeSupport) {
+            // let ConfigurationSerialization handle it
+            return itemStack;
         }
-        // let ConfigurationSerialization handle it
-        return itemStack;
+        return Try.of(() -> Base64.getEncoder().encodeToString(itemStack.serializeAsBytes()))
+                .onFailure(e -> Logging.severe("Could not byte serialize item stack: %s", e.getMessage()))
+                .getOrNull();
+    }
+
+    public static boolean hasByteSerializeSupport() {
+        return hasByteSerializeSupport;
     }
 
     private ItemStackConverter() {