Fix vCompat not working if loaded on startup

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sourcewriters.minecraft</groupId>
 	<artifactId>vcompat-parent</artifactId>
-	<version>3.0.5</version>
+	<version>3.0.6</version>
 	<packaging>pom</packaging>
 
 	<distributionManagement>

vcompat-1_17_R1/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-		<version>3.0.5</version>
+		<version>3.0.6</version>
 	</parent>
 	<artifactId>vcompat-1_17_R1</artifactId>
 

vcompat-1_17_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_17_R1/tools/ServerTools1_17_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_17_R1 getConsole() {

vcompat-1_18_R1/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-		<version>3.0.5</version>
+		<version>3.0.6</version>
 	</parent>
 	<artifactId>vcompat-1_18_R1</artifactId>
 

vcompat-1_18_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R1/tools/ServerTools1_18_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_18_R1 getConsole() {

vcompat-1_18_R2/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-		<version>3.0.5</version>
+		<version>3.0.6</version>
 	</parent>
 	<artifactId>vcompat-1_18_R2</artifactId>
 

vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/tools/ServerTools1_18_R2.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_18_R2 getConsole() {

vcompat-1_19_R1/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-        <version>3.0.5</version>
+		<version>3.0.6</version>
 	</parent>
 	<artifactId>vcompat-1_19_R1</artifactId>
 

vcompat-1_19_R1/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_19_R1/tools/ServerTools1_19_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_19_R1 getConsole() {

vcompat-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.5</version>
+		<version>3.0.6</version>
     </parent>
     <artifactId>vcompat-api</artifactId>
 

vcompat-api/src/main/java/net/sourcewriters/minecraft/vcompat/provider/tools/ServerTools.java

@@ -1,13 +1,29 @@
 package net.sourcewriters.minecraft.vcompat.provider.tools;
 
+import java.io.File;
+
+import org.bukkit.Bukkit;
+
 import net.sourcewriters.minecraft.vcompat.provider.wrapper.ConsoleReaderWrapper;
 
 public abstract class ServerTools {
+
+    private final File worldFolder;
+
+    public ServerTools() {
+        this.worldFolder = new File(Bukkit.getServer().getWorldContainer(), getLevelName());
+    }
 
     public abstract void setMotd(String text);
 
     public abstract String getMotd();
 
+    public abstract String getLevelName();
+
+    public final File getWorldFolder() {
+        return worldFolder;
+    }
+
     public abstract ConsoleReaderWrapper getConsole();
 
 }

vcompat-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.5</version>
+		<version>3.0.6</version>
     </parent>
     <artifactId>vcompat</artifactId>
 

vcompat-core/src/main/java/net/sourcewriters/minecraft/vcompat/VersionCompat.java

@@ -1,7 +1,9 @@
 package net.sourcewriters.minecraft.vcompat;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
 import net.sourcewriters.minecraft.vcompat.provider.VersionControl;
-import net.sourcewriters.minecraft.vcompat.provider.lookup.handle.ClassLookup;
 import net.sourcewriters.minecraft.vcompat.shaded.syntaxapi.utils.java.tools.Container;
 import net.sourcewriters.minecraft.vcompat.version.Versions;
 
@@ -24,18 +26,21 @@ protected final void init() throws Exception {
 
     @Override
     protected final void shutdown() {
-        if(!init) {
+        if (!init) {
             return;
         }
         control.ifPresent(VersionControl::shutdown);
     }
 
     private final VersionControl initControl() {
-        Object object = ClassLookup.of(VERSION_PATH).searchMethod("init", "init").run("init");
-        if (object == null || !(object instanceof VersionControl)) {
-            throw new IllegalStateException("Can't initialize VersionControl");
+        try {
+            Class<?> clazz = Class.forName(VERSION_PATH, true, getClass().getClassLoader());
+            Object object = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup())
+                .findStatic(clazz, "init", MethodType.methodType(clazz)).invoke();
+            return (VersionControl) object;
+        } catch (Throwable e) {
+            throw new IllegalStateException("Couldn't initialize VersionControl", e);
         }
-        return (VersionControl) object;
     }
 
     @Override

vcompat-legacy/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.sourcewriters.minecraft</groupId>
         <artifactId>vcompat-parent</artifactId>
-        <version>3.0.5</version>
+		<version>3.0.6</version>
     </parent>
     <artifactId>vcompat-legacy</artifactId>
 

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_10_R1/PlayerProvider1_10_R1.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import net.sourcewriters.minecraft.vcompat.provider.impl.v1_10_R1.entity.Player1_10_R1;
@@ -18,8 +17,9 @@ public class PlayerProvider1_10_R1 extends PlayerProvider<VersionControl1_10_R1>
 
     protected PlayerProvider1_10_R1(VersionControl1_10_R1 versionControl) {
         super(versionControl);
-        distributor = versionControl.getDataProvider().createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata"),
-            uuid -> "custom_" + uuid.toString(), DataProvider.DEFAULT_RANDOM);
+        distributor = versionControl.getDataProvider().createDistributor(
+            new File(versionControl.getToolProvider().getServerTools().getWorldFolder(), "playerdata"), uuid -> "custom_" + uuid.toString(),
+            DataProvider.DEFAULT_RANDOM);
     }
 
     @Override

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_10_R1/tools/ServerTools1_10_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getPropertyManager().getString("level-name", "world");
+    }
 
     @Override
     public ConsoleReaderWrapper1_10_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_11_R1/PlayerProvider1_11_R1.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import net.sourcewriters.minecraft.vcompat.provider.impl.v1_11_R1.entity.Player1_11_R1;
@@ -18,8 +17,9 @@ public class PlayerProvider1_11_R1 extends PlayerProvider<VersionControl1_11_R1>
 
     protected PlayerProvider1_11_R1(VersionControl1_11_R1 versionControl) {
         super(versionControl);
-        distributor = versionControl.getDataProvider().createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata"),
-            uuid -> "custom_" + uuid.toString(), DataProvider.DEFAULT_RANDOM);
+        distributor = versionControl.getDataProvider().createDistributor(
+            new File(versionControl.getToolProvider().getServerTools().getWorldFolder(), "playerdata"), uuid -> "custom_" + uuid.toString(),
+            DataProvider.DEFAULT_RANDOM);
     }
 
     @Override

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_11_R1/tools/ServerTools1_11_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getPropertyManager().getString("level-name", "world");
+    }
 
     @Override
     public ConsoleReaderWrapper1_11_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_12_R1/PlayerProvider1_12_R1.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import net.sourcewriters.minecraft.vcompat.provider.impl.v1_12_R1.entity.Player1_12_R1;
@@ -18,8 +17,9 @@ public class PlayerProvider1_12_R1 extends PlayerProvider<VersionControl1_12_R1>
 
     protected PlayerProvider1_12_R1(VersionControl1_12_R1 versionControl) {
         super(versionControl);
-        distributor = versionControl.getDataProvider().createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata"),
-            uuid -> "custom_" + uuid.toString(), DataProvider.DEFAULT_RANDOM);
+        distributor = versionControl.getDataProvider().createDistributor(
+            new File(versionControl.getToolProvider().getServerTools().getWorldFolder(), "playerdata"), uuid -> "custom_" + uuid.toString(),
+            DataProvider.DEFAULT_RANDOM);
     }
 
     @Override

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_12_R1/tools/ServerTools1_12_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getPropertyManager().getString("level-name", "world");
+    }
 
     @Override
     public ConsoleReaderWrapper1_12_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_13_R1/PlayerProvider1_13_R1.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import net.sourcewriters.minecraft.vcompat.provider.impl.v1_13_R1.entity.Player1_13_R1;
@@ -18,8 +17,9 @@ public class PlayerProvider1_13_R1 extends PlayerProvider<VersionControl1_13_R1>
 
     protected PlayerProvider1_13_R1(VersionControl1_13_R1 versionControl) {
         super(versionControl);
-        distributor = versionControl.getDataProvider().createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata"),
-            uuid -> "custom_" + uuid.toString(), DataProvider.DEFAULT_RANDOM);
+        distributor = versionControl.getDataProvider().createDistributor(
+            new File(versionControl.getToolProvider().getServerTools().getWorldFolder(), "playerdata"), uuid -> "custom_" + uuid.toString(),
+            DataProvider.DEFAULT_RANDOM);
     }
 
     @Override

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_13_R1/tools/ServerTools1_13_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getPropertyManager().getString("level-name", "world");
+    }
 
     @Override
     public ConsoleReaderWrapper1_13_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_13_R2/PlayerProvider1_13_R2.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import net.sourcewriters.minecraft.vcompat.provider.impl.v1_13_R2.entity.Player1_13_R2;
@@ -18,8 +17,9 @@ public class PlayerProvider1_13_R2 extends PlayerProvider<VersionControl1_13_R2>
 
     protected PlayerProvider1_13_R2(VersionControl1_13_R2 versionControl) {
         super(versionControl);
-        distributor = versionControl.getDataProvider().createDistributor(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "playerdata"),
-            uuid -> "custom_" + uuid.toString(), DataProvider.DEFAULT_RANDOM);
+        distributor = versionControl.getDataProvider().createDistributor(
+            new File(versionControl.getToolProvider().getServerTools().getWorldFolder(), "playerdata"), uuid -> "custom_" + uuid.toString(),
+            DataProvider.DEFAULT_RANDOM);
     }
 
     @Override

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_13_R2/tools/ServerTools1_13_R2.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getPropertyManager().getString("level-name", "world");
+    }
 
     @Override
     public ConsoleReaderWrapper1_13_R2 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_14_R1/tools/ServerTools1_14_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getDedicatedServerProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_14_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_15_R1/tools/ServerTools1_15_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getDedicatedServerProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_15_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_16_R1/tools/ServerTools1_16_R1.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getDedicatedServerProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_16_R1 getConsole() {

vcompat-legacy/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_16_R2/tools/ServerTools1_16_R2.java

@@ -17,6 +17,11 @@ public void setMotd(String text) {
     public String getMotd() {
         return ((CraftServer) Bukkit.getServer()).getServer().getMotd();
     }
+
+    @Override
+    public String getLevelName() {
+        return ((CraftServer) Bukkit.getServer()).getServer().getDedicatedServerProperties().levelName;
+    }
 
     @Override
     public ConsoleReaderWrapper1_16_R2 getConsole() {