From 35ea3a877677e9caf7940da647024695b74ea105 Mon Sep 17 00:00:00 2001
From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com>
Date: Sun, 9 Jan 2022 17:50:17 +0100
Subject: [PATCH] Removed deprecated yaml serialization

---
 .../virtualinventory/VirtualInventory.java    | 42 +------------------
 .../VirtualInventoryManager.java              | 11 +----
 2 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java b/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java
index 0e730ee..1aa41b9 100644
--- a/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java
+++ b/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java
@@ -9,13 +9,11 @@ import de.studiocode.invui.virtualinventory.event.UpdateReason;
 import de.studiocode.invui.window.Window;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.*;
 import java.util.function.Consumer;
@@ -24,7 +22,7 @@ import java.util.stream.Stream;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 
-public class VirtualInventory implements ConfigurationSerializable {
+public class VirtualInventory {
     
     private final UUID uuid;
     private final Set<Window> windows = new HashSet<>();
@@ -63,44 +61,6 @@ public class VirtualInventory implements ConfigurationSerializable {
         this(uuid, size, null, null);
     }
     
-    /**
-     * Deserializes to {@link VirtualInventory}
-     *
-     * @param args The args which contain the data to deserialize
-     * @return The deserialized {@link VirtualInventory}
-     * @deprecated Use {@link VirtualInventoryManager#serializeInventory(VirtualInventory, OutputStream)}
-     * and {@link VirtualInventoryManager#deserializeInventory(InputStream)} for serialization
-     */
-    @Deprecated
-    public static VirtualInventory deserialize(@NotNull Map<String, Object> args) {
-        //noinspection unchecked
-        return new VirtualInventory(
-            UUID.fromString((String) args.get("uuid")),
-            (int) args.get("size"),
-            ((ArrayList<ItemStack>) args.get("items")).toArray(new ItemStack[0]),
-            ((ArrayList<Integer>) args.get("stackSizes")).stream().mapToInt(Integer::intValue).toArray()
-        );
-    }
-    
-    /**
-     * Serializes this {@link VirtualInventory} to a {@link Map}
-     *
-     * @return A {@link Map} that contains the serialized data of this {@link VirtualInventory}
-     * @deprecated Use {@link VirtualInventoryManager#serializeInventory(VirtualInventory, OutputStream)}
-     * and {@link VirtualInventoryManager#deserializeInventory(InputStream)} for serialization
-     */
-    @Deprecated
-    @NotNull
-    @Override
-    public Map<String, Object> serialize() {
-        Map<String, Object> result = new LinkedHashMap<>();
-        result.put("uuid", uuid.toString());
-        result.put("size", size);
-        result.put("stackSizes", stackSizes);
-        result.put("items", items);
-        return result;
-    }
-    
     public byte[] toByteArray() {
         return VirtualInventoryManager.getInstance().serializeInventory(this);
     }
diff --git a/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java b/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java
index ebc2693..a198d0c 100644
--- a/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java
+++ b/InvUI/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java
@@ -3,8 +3,6 @@ package de.studiocode.invui.virtualinventory;
 import de.studiocode.inventoryaccess.version.InventoryAccess;
 import de.studiocode.invui.InvUI;
 import de.studiocode.invui.util.DataUtils;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,7 +24,6 @@ public class VirtualInventoryManager {
     private VirtualInventoryManager() {
         SAVE_DIR.mkdirs();
         
-        ConfigurationSerialization.registerClass(VirtualInventory.class);
         InvUI.getInstance().addDisableHandler(this::serializeAll);
         deserializeAll();
     }
@@ -82,13 +79,7 @@ public class VirtualInventoryManager {
         if (SAVE_DIR.exists()) {
             Arrays.stream(SAVE_DIR.listFiles())
                 .forEach(file -> {
-                    if (file.getName().endsWith(".vi")) {
-                        YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
-                        VirtualInventory virtualInventory = config.getSerializable("vi", VirtualInventory.class);
-                        inventories.put(virtualInventory.getUuid(), virtualInventory);
-                        
-                        file.delete();
-                    } else if (file.getName().endsWith(".vi2")) {
+                    if (file.getName().endsWith(".vi2")) {
                         try {
                             FileInputStream in = new FileInputStream(file);
                             VirtualInventory virtualInventory = deserializeInventory(in);