better serialisation of itemstacks

Brokkonaut · May 19, 2024 · 9cd5e01 · 9cd5e01
1 parent 0f73267
commit 9cd5e01
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Containers/AdminInventory.java b/src/main/java/com/Acrobot/ChestShop/Containers/AdminInventory.java
@@ -170,10 +170,12 @@ public ListIterator<ItemStack> iterator(int i) {
         return null;
     }
 
+    @Override
     public InventoryHolder getHolder(boolean useSnapshot) {
         return null;
     }
 
+    @Override
     public HashMap<Integer, ItemStack> removeItemAnySlot(ItemStack... items) throws IllegalArgumentException {
         return new HashMap<Integer, ItemStack>();
     }
@@ -182,4 +184,9 @@ public HashMap<Integer, ItemStack> removeItemAnySlot(ItemStack... items) throws
     public boolean isEmpty() {
         return false;
     }
+
+    @Override
+    public int close() {
+        return 0;
+    }
 }
diff --git a/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopMetaData.java b/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopMetaData.java
@@ -59,8 +59,9 @@ public boolean canAccess(OfflinePlayer player) {
 
     public boolean canAccess(UUID player) {
 
-        if (isOwner(player))
+        if (isOwner(player)) {
             return true;
+        }
 
         return isAccessor(player);
     }
@@ -117,7 +118,7 @@ public Map<String, Object> serialize() {
         data.put("amount", quantity);
         data.put("buyPrice", buyPrice);
         data.put("sellPrice", sellPrice);
-        data.put("itemStack", itemStack.serialize());
+        data.put("itemStack", itemStack == null ? null : itemStack.serializeAsBytes());
         return data;
     }
 
@@ -127,7 +128,8 @@ public static ChestShopMetaData deserialize(Map<String, Object> map) {
         int amount = (int) map.get("amount");
         double sellPrice = (double) map.get("sellPrice");
         double buyPrice = (double) map.get("buyPrice");
-        ItemStack itemStack = ItemStack.deserialize((Map<String, Object>) map.get("itemStack"));
+        Object stackSerialized = map.get("itemStack");
+        ItemStack itemStack = stackSerialized instanceof Map<?, ?> stackMap ? ItemStack.deserialize((Map<String, Object>) stackMap) : stackSerialized instanceof byte[] bytes ? ItemStack.deserializeBytes(bytes) : null;
 
         Set<String> accessorsString = (HashSet<String>) map.get("accessors");
         Set<UUID> accessors = new HashSet<>();