Fix YAML implementation using Velocity YAML library

ActualPlayer · Jun 30, 2020 · 56d8254 · 56d8254
1 parent 45c2629
commit 56d8254
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,8 +36,6 @@ dependencies {
     compileOnly("com.velocitypowered:velocity-api:1.1.0-SNAPSHOT")
     annotationProcessor("com.velocitypowered:velocity-api:1.1.0-SNAPSHOT")
 
-    implementation("org.yaml:snakeyaml:1.18")
-
     testImplementation("junit", "junit", "4.12")
 }
 

diff --git a/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java b/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java
@@ -5,6 +5,9 @@
 import com.actualplayer.rememberme.util.FileUtils;
 import com.actualplayer.rememberme.util.YamlUtils;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import ninja.leaping.configurate.ConfigurationNode;
+import ninja.leaping.configurate.gson.GsonConfigurationLoader;
+import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +28,7 @@ public FileHandler(RememberMe rememberMe) {
     public CompletableFuture<String> getLastServerName(UUID uuid) {
         try {
             File userFile = FileUtils.getOrCreate(rememberMe.getDataFolderPath().resolve("data"), uuid.toString() + ".yml");
-            UserServer userServer = YamlUtils.readFile(userFile, com.actualplayer.rememberme.models.UserServer.class);
+            UserServer userServer = YamlUtils.readFile(userFile, UserServer.class);
 
             if(userServer == null) return null;
 

diff --git a/src/main/java/com/actualplayer/rememberme/util/YamlUtils.java b/src/main/java/com/actualplayer/rememberme/util/YamlUtils.java
@@ -3,13 +3,14 @@
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
 
 import java.io.*;
 
 public class YamlUtils {
 
     public static <T> T readFile(File file, Class<T> clazz) throws FileNotFoundException {
-        Yaml yaml = new Yaml(new Constructor(clazz));
+        Yaml yaml = new Yaml(new CustomClassLoaderConstructor(clazz.getClassLoader()));
         InputStream stream = new FileInputStream(file);
 
         return yaml.loadAs(stream, clazz);