Add import compat for MySQL import

TechnicallyCoded · Nov 4, 2021 · 586412e · 586412e
1 parent e7bd91b
commit 586412e
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/src/main/java/com/nuclyon/technicallycoded/inventoryrollback/util/BackupConversionUtil.java b/src/main/java/com/nuclyon/technicallycoded/inventoryrollback/util/BackupConversionUtil.java
@@ -4,6 +4,7 @@
 import me.danjono.inventoryrollback.config.ConfigData;
 import me.danjono.inventoryrollback.config.MessageData;
 import me.danjono.inventoryrollback.data.LogType;
+import me.danjono.inventoryrollback.data.PlayerData;
 import me.danjono.inventoryrollback.data.YAML;
 import me.danjono.inventoryrollback.inventory.RestoreInventory;
 import org.apache.commons.lang.Validate;
@@ -82,12 +83,9 @@ private static ArrayList<File> getFilesToConvert(File[] availableFiles) {
         // Sanity check files in the folder & add them to a list to process later
         for (File file : availableFiles) {
             String originalFileName = file.getName();
-            System.out.println(originalFileName);
             String[] fileParts = originalFileName.split("\\.");
             String fileUUIDStr = fileParts[0];
-            System.out.println(fileUUIDStr);
             String fileExtension = fileParts[1];
-            System.out.println(fileExtension);
 
             UUID playerUuid;
             try {
@@ -143,8 +141,6 @@ public static void convertBackupFile(Logger logger, File backupFile, LogType log
                     continue;
                 }
 
-                YAML loadedYamlBackup = new YAML(uuid, logTypeProcessing, timestamp);
-
                 // ---- Load all data from the old config ----
 
                 String packageVersion = oldBackupDataConfig.getString("data." + timestamp + ".version");
@@ -169,17 +165,19 @@ public static void convertBackupFile(Logger logger, File backupFile, LogType log
 
                 // ---- Process all loaded data ----
 
-                loadedYamlBackup.setMainInventory(mainInvItems);
-                loadedYamlBackup.setArmour(armorItems);
-                loadedYamlBackup.setEnderChest(enderChestItems);
-                loadedYamlBackup.setXP(xp);
-                loadedYamlBackup.setHealth(health);
-                loadedYamlBackup.setFoodLevel(foodLevel);
-                loadedYamlBackup.setSaturation(saturation);
-                loadedYamlBackup.setWorld(worldName);
-                loadedYamlBackup.setX(posX);
-                loadedYamlBackup.setY(posY);
-                loadedYamlBackup.setZ(posZ);
+                PlayerData importedData = new PlayerData(uuid, logTypeProcessing, timestamp);
+
+                importedData.setMainInventory(mainInvItems);
+                importedData.setArmour(armorItems);
+                importedData.setEnderChest(enderChestItems);
+                importedData.setXP(xp);
+                importedData.setHealth(health);
+                importedData.setFoodLevel(foodLevel);
+                importedData.setSaturation(saturation);
+                importedData.setWorld(worldName);
+                importedData.setX(posX);
+                importedData.setY(posY);
+                importedData.setZ(posZ);
 
                 // Sanity check log type
                 if (logTypeStoredString == null) {
@@ -205,12 +203,12 @@ public static void convertBackupFile(Logger logger, File backupFile, LogType log
                 }
 
                 // Apply last data after sanity checks & conversions
-                loadedYamlBackup.setLogType(logTypeStored);
-                loadedYamlBackup.setVersion(packageVersion);
-                if (deathReason != null) loadedYamlBackup.setDeathReason(deathReason);
+                importedData.setLogType(logTypeStored);
+                importedData.setVersion(packageVersion);
+                if (deathReason != null) importedData.setDeathReason(deathReason);
 
                 // Save the data to the new folder location
-                loadedYamlBackup.saveData();
+                importedData.saveData();
             } catch (Exception e) {
                 InventoryRollbackPlus.getPluginLogger().warning(
                         MessageData.getPluginPrefix() + "Error converting backup file at " +