Move proxy online mode files to their own directory

Author: Lenni0451

src/main/java/net/lenni0451/miniconnect/proxy/event/ProxyOnlineModeHandler.java

@@ -2,16 +2,38 @@
 
 import net.lenni0451.lambdaevents.EventHandler;
 import net.lenni0451.miniconnect.Main;
+import net.lenni0451.miniconnect.server.model.PlayerConfig;
 import net.lenni0451.miniconnect.utils.UUIDUtils;
 import net.raphimc.viaproxy.ViaProxy;
 import net.raphimc.viaproxy.plugins.events.ShouldVerifyOnlineModeEvent;
 import net.raphimc.viaproxy.plugins.events.ViaProxyLoadedEvent;
+import net.raphimc.viaproxy.util.logging.Logger;
 
 import java.io.File;
 import java.util.UUID;
 
 public class ProxyOnlineModeHandler {
 
+    public ProxyOnlineModeHandler() {
+        try {
+            File dataDir = Main.getInstance().getDataFolder();
+            if (!dataDir.exists()) return;
+            for (File file : dataDir.listFiles()) {
+                if (!file.isFile()) continue;
+                if (!file.getName().endsWith(".dat")) continue;
+                File target = new File(PlayerConfig.baseDir(), file.getName());
+                if (target.exists()) {
+                    Logger.LOGGER.warn("Skipping migration of {} as it already exists in the target directory", file.getName());
+                    continue;
+                }
+                target.getParentFile().mkdirs();
+                file.renameTo(target);
+                Logger.LOGGER.info("Migrated online mode settings file {} to new directory", file.getName());
+            }
+        } catch (Throwable ignored) {
+        }
+    }
+
     @EventHandler
     public void onViaProxyLoaded(final ViaProxyLoadedEvent event) {
         ViaProxy.getConfig().setProxyOnlineMode(true);
@@ -24,7 +46,7 @@ public void onShouldVerifyOnlineMode(final ShouldVerifyOnlineModeEvent event) {
             event.setCancelled(false); //Enforce online mode verification
         } else {
             String hashedUUID = UUIDUtils.hash(uuid);
-            File settingsFile = new File(Main.getInstance().getDataFolder(), hashedUUID + ".dat");
+            File settingsFile = new File(PlayerConfig.baseDir(), hashedUUID + ".dat");
             if (!settingsFile.exists()) event.setCancelled(true);
         }
     }

src/main/java/net/lenni0451/miniconnect/server/model/PlayerConfig.java

@@ -23,6 +23,11 @@ public class PlayerConfig {
 
     private static final AESEncryption ENCRYPTION = new AESEncryption();
 
+    public static File baseDir() {
+        return new File(Main.getInstance().getDataFolder(), "online_mode_settings");
+    }
+
+
     public final UUID uuid;
     @Nullable
     public String serverAddress;
@@ -57,7 +62,7 @@ public ConnectionInfo toConnectionInfo() {
 
     public void load() throws Exception {
         String hashedUUID = UUIDUtils.hash(this.uuid);
-        File settingsFile = new File(Main.getInstance().getDataFolder(), hashedUUID + ".dat");
+        File settingsFile = new File(PlayerConfig.baseDir(), hashedUUID + ".dat");
         if (!settingsFile.exists()) return;
         this.isSaved = true;
 
@@ -74,7 +79,7 @@ public void load() throws Exception {
 
     public void save() throws Exception {
         String hashedUUID = UUIDUtils.hash(this.uuid);
-        File settingsFile = new File(Main.getInstance().getDataFolder(), hashedUUID + ".dat");
+        File settingsFile = new File(PlayerConfig.baseDir(), hashedUUID + ".dat");
         settingsFile.getParentFile().mkdirs();
         this.isSaved = true;
 
@@ -91,7 +96,7 @@ public void save() throws Exception {
 
     public void delete() {
         String hashedUUID = UUIDUtils.hash(this.uuid);
-        File settingsFile = new File(Main.getInstance().getDataFolder(), hashedUUID + ".dat");
+        File settingsFile = new File(PlayerConfig.baseDir(), hashedUUID + ".dat");
         if (settingsFile.exists()) settingsFile.delete();
         this.isSaved = false;
     }