Storage rework

LMBishop · Nov 16, 2024 · e8328ba · e8328ba
1 parent 6e53537
commit e8328ba
Show file tree

Hide file tree

Showing 20 changed files with 1,857 additions and 1,129 deletions.
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -59,8 +59,8 @@
 import com.leonardobishop.quests.bukkit.scheduler.WrappedTask;
 import com.leonardobishop.quests.bukkit.scheduler.bukkit.BukkitServerSchedulerAdapter;
 import com.leonardobishop.quests.bukkit.scheduler.folia.FoliaServerScheduler;
-import com.leonardobishop.quests.bukkit.storage.MySqlStorageProvider;
-import com.leonardobishop.quests.bukkit.storage.YamlStorageProvider;
+import com.leonardobishop.quests.bukkit.storage.ModernMySQLStorageProvider;
+import com.leonardobishop.quests.bukkit.storage.ModernYAMLStorageProvider;
 import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskTypeManager;
 import com.leonardobishop.quests.bukkit.tasktype.type.BarteringTaskType;
 import com.leonardobishop.quests.bukkit.tasktype.type.BlockItemdroppingTaskType;
@@ -291,14 +291,14 @@ public void onEnable() {
             default:
                 questsLogger.warning("No valid storage provider is configured - Quests will use YAML storage as a default");
             case "yaml":
-                this.storageProvider = new YamlStorageProvider(this);
+                this.storageProvider = new ModernYAMLStorageProvider(this);
                 break;
             case "mysql":
                 ConfigurationSection section = this.getConfig().getConfigurationSection("options.storage.database-settings");
                 if (section == null) {
                     questsLogger.warning("No database settings are configured - default values will be used");
                 }
-                this.storageProvider = new MySqlStorageProvider(this, section);
+                this.storageProvider = new ModernMySQLStorageProvider(this, section);
         }
 
         try {

diff --git a/...it/src/main/java/com/leonardobishop/quests/bukkit/command/AdminMigrateCommandHandler.java b/...it/src/main/java/com/leonardobishop/quests/bukkit/command/AdminMigrateCommandHandler.java
@@ -1,8 +1,9 @@
 package com.leonardobishop.quests.bukkit.command;
 
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
-import com.leonardobishop.quests.bukkit.storage.MySqlStorageProvider;
-import com.leonardobishop.quests.bukkit.storage.YamlStorageProvider;
+import com.leonardobishop.quests.bukkit.storage.ModernMySQLStorageProvider;
+import com.leonardobishop.quests.bukkit.storage.ModernYAMLStorageProvider;
+import com.leonardobishop.quests.common.player.QPlayerData;
 import com.leonardobishop.quests.common.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.common.storage.StorageProvider;
 import org.bukkit.ChatColor;
@@ -87,15 +88,15 @@ public void handle(CommandSender sender, String[] args) {
                 }
 
                 sender.sendMessage(ChatColor.GRAY + "Loading quest progress files from '" + fromProvider.getName() + "'...");
-                List<QuestProgressFile> files = fromProvider.loadAllProgressFiles();
+                List<QPlayerData> files = fromProvider.loadAllPlayerData();
                 sender.sendMessage(ChatColor.GRAY.toString() + files.size() + " files loaded.");
 
-                for (QuestProgressFile file : files) {
+                for (QPlayerData file : files) {
                     file.setModified(true);
                 }
 
                 sender.sendMessage(ChatColor.GRAY + "Writing quest progress files to '" + toProvider.getName() + "'...");
-                toProvider.saveAllProgressFiles(files);
+                toProvider.saveAllPlayerData(files);
                 sender.sendMessage(ChatColor.GRAY + "Done.");
 
                 shutdownProvider(sender, fromProvider);
@@ -151,11 +152,11 @@ private StorageProvider getStorageProvider(ConfigurationSection configurationSec
         switch (configuredProvider.toLowerCase()) {
             default:
             case "yaml":
-                storageProvider = new YamlStorageProvider(plugin);
+                storageProvider = new ModernYAMLStorageProvider(plugin);
                 break;
             case "mysql":
                 ConfigurationSection section = configurationSection.getConfigurationSection("database-settings");
-                storageProvider = new MySqlStorageProvider(plugin, section);
+                storageProvider = new ModernMySQLStorageProvider(plugin, section);
         }
         return storageProvider;
     }

diff --git a/...ain/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java b/...ain/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java
@@ -34,7 +34,7 @@ public void handle(CommandSender sender, String[] args) {
                 qPlayer.completeQuest(quest);
                 Messages.COMMAND_QUEST_ADMIN_COMPLETE_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId());
 
-                CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                CommandUtils.doSafeSave(this.plugin, qPlayer);
             });
             return;
         }

diff --git a/...in/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java b/...in/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java
@@ -27,7 +27,7 @@ public void handle(CommandSender sender, String[] args) {
                 questProgressFile.reset();
                 Messages.COMMAND_QUEST_ADMIN_FULLRESET.send(sender, "{player}", args[3]);
 
-                CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                CommandUtils.doSafeSave(this.plugin, qPlayer);
             });
 
             return;

diff --git a/.../main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java b/.../main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java
@@ -78,7 +78,7 @@ public void handle(CommandSender sender, String[] args) {
                             "{quest}", quest.getId());
                 }
 
-                CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                CommandUtils.doSafeSave(this.plugin, qPlayer);
             });
         }
 

diff --git a/...c/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java b/...c/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java
@@ -34,7 +34,7 @@ public void handle(CommandSender sender, String[] args) {
                 questProgressFile.generateBlankQuestProgress(quest, true);
                 Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId());
 
-                CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                CommandUtils.doSafeSave(this.plugin, qPlayer);
             });
             return;
         }

diff --git a/...c/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java b/...c/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java
@@ -59,7 +59,7 @@ public void handle(CommandSender sender, String[] args) {
 
                 Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId());
 
-                CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                CommandUtils.doSafeSave(this.plugin, qPlayer);
             });
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ public void handle(CommandSender sender, String[] args) { @@
                                 "{quest}", quest.getId());
                     }
-                    CommandUtils.doSafeSave(qPlayer, questProgressFile, plugin);
+                    CommandUtils.doSafeSave(this.plugin, qPlayer);
                 });
             }
@@ Expand Down @@