Update VV API usage

ViaVersion · Jul 22, 2024 · 0923ac7 · 0923ac7
1 parent 5eb1f57
commit 0923ac7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/bukkit/src/main/java/net/raphimc/viaaprilfools/BukkitPlugin.java b/bukkit/src/main/java/net/raphimc/viaaprilfools/BukkitPlugin.java
@@ -32,10 +32,10 @@ public BukkitPlugin() {
         final ViaManager manager = Via.getManager();
 
         manager.addEnableListener(() -> {
+            this.init(new File(getDataFolder(), "config.yml"));
+
             final VersionProvider delegate = manager.getProviders().get(VersionProvider.class);
             manager.getProviders().use(VersionProvider.class, new VAFServerVersionProvider(delegate));
-
-            this.init(new File(getDataFolder(), "config.yml"));
         });
     }
 

diff --git a/fabric/src/main/java/net/raphimc/viaaprilfools/ViaFabricAddon.java b/fabric/src/main/java/net/raphimc/viaaprilfools/ViaFabricAddon.java
@@ -42,9 +42,10 @@ public void run() {
         this.init(new File(getDataFolder(), "config.yml"));
 
         final ViaManager manager = Via.getManager();
-
-        final VersionProvider delegate = manager.getProviders().get(VersionProvider.class);
-        manager.getProviders().use(VersionProvider.class, new VAFServerVersionProvider(delegate));
+        manager.addPostEnableListener(() -> {
+            final VersionProvider delegate = manager.getProviders().get(VersionProvider.class);
+            manager.getProviders().use(VersionProvider.class, new VAFServerVersionProvider(delegate));
+        });
     }
 
     @Override

diff --git a/velocity/src/main/java/net/raphimc/viaaprilfools/VelocityPlugin.java b/velocity/src/main/java/net/raphimc/viaaprilfools/VelocityPlugin.java
@@ -63,10 +63,10 @@ public void onProxyStart(ProxyInitializeEvent e) {
         this.logger = new LoggerWrapper(loggerSlf4j);
         final ViaManager manager = Via.getManager();
 
-        manager.addEnableListener(() -> {
-            this.init(new File(getDataFolder(), "config.yml"));
-
-            manager.getProviders().use(VersionProvider.class, new VAFServerVersionProvider(new VelocityVersionProvider()));
+        manager.addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml")));
+        manager.addPostEnableListener(() -> {
+            final VersionProvider delegate = manager.getProviders().get(VersionProvider.class);
+            manager.getProviders().use(VersionProvider.class, new VAFServerVersionProvider(delegate));
         });
     }