Fix library loading on Bungee and Velocity, bump to 1.2

build.gradle

@@ -11,7 +11,7 @@ plugins {
 
 allprojects {
     group 'me.William278'
-    version '1.2-dev'
+    version '1.2'
 
     compileJava { options.encoding = 'UTF-8' }
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
@@ -34,7 +34,6 @@ subprojects {
         mavenCentral()
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
         maven { url 'https://repo.velocitypowered.com/snapshots/' }
-        maven { url 'https://repo.alessiodp.com/releases/' }
         maven { url 'https://repo.minebench.de/' }
         maven { url 'https://repo.codemc.org/repository/maven-public' }
         maven { url 'https://jitpack.io' }

bukkit/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 
 shadowJar {
     relocate 'org.bstats', 'me.William278.husksync.libraries.plan'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown'
+    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.standard'
 }
 
 tasks.register('prepareKotlinBuildScriptModel'){}

bukkit/src/main/java/me/william278/husksync/bukkit/data/DataSerializer.java

@@ -17,7 +17,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class DataSerializer {
 
@@ -262,21 +261,21 @@ public class DataSerializer {
             switch (statistic.getType()) {
                 case ITEM -> {
                     HashMap<Material, Integer> itemValues = new HashMap<>();
-                    for (Material itemMaterial : Arrays.stream(Material.values()).filter(Material::isItem).collect(Collectors.toList())) {
+                    for (Material itemMaterial : Arrays.stream(Material.values()).filter(Material::isItem).toList()) {
                         itemValues.put(itemMaterial, player.getStatistic(statistic, itemMaterial));
                     }
                     itemStatisticValues.put(statistic, itemValues);
                 }
                 case BLOCK -> {
                     HashMap<Material, Integer> blockValues = new HashMap<>();
-                    for (Material blockMaterial : Arrays.stream(Material.values()).filter(Material::isBlock).collect(Collectors.toList())) {
+                    for (Material blockMaterial : Arrays.stream(Material.values()).filter(Material::isBlock).toList()) {
                         blockValues.put(blockMaterial, player.getStatistic(statistic, blockMaterial));
                     }
                     blockStatisticValues.put(statistic, blockValues);
                 }
                 case ENTITY -> {
                     HashMap<EntityType, Integer> entityValues = new HashMap<>();
-                    for (EntityType type : Arrays.stream(EntityType.values()).filter(EntityType::isAlive).collect(Collectors.toList())) {
+                    for (EntityType type : Arrays.stream(EntityType.values()).filter(EntityType::isAlive).toList()) {
                         entityValues.put(type, player.getStatistic(statistic, type));
                     }
                     entityStatisticValues.put(statistic, entityValues);

bungeecord/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     compileOnly 'redis.clients:jedis:3.7.0'
     implementation 'org.bstats:bstats-bungeecord:2.2.1'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
-    implementation 'net.byteflux:libby-bungee:1.1.4'
+    implementation 'com.github.WiIIiam278.libby:libby-bungee:1.1.5'
 
     compileOnly 'net.md-5:bungeecord-api:1.16-R0.5-SNAPSHOT'
 }
@@ -13,7 +13,7 @@ dependencies {
 shadowJar {
     relocate 'com.zaxxer', 'me.William278.husksync.libraries.hikari'
     relocate 'org.bstats', 'me.William278.husksync.libraries.plan'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown'
+    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.standard'
     relocate 'net.byteflux.libby', 'me.William278.husksync.libraries.libby.bungee'
 }
 

velocity/build.gradle

@@ -4,9 +4,8 @@ dependencies {
 
     compileOnly 'redis.clients:jedis:3.7.0'
     implementation 'org.bstats:bstats-velocity:2.2.1'
-    implementation 'com.zaxxer:HikariCP:5.0.0'
     implementation 'de.themoep:minedown-adventure:1.7.1-SNAPSHOT'
-    implementation 'net.byteflux:libby-velocity:1.1.4'
+    implementation 'com.github.WiIIiam278.libby:libby-velocity:1.1.5'
 
     compileOnly 'com.velocitypowered:velocity-api:3.1.0'
     annotationProcessor 'com.velocitypowered:velocity-api:3.1.0'
@@ -15,7 +14,7 @@ dependencies {
 shadowJar {
     relocate 'com.zaxxer', 'me.William278.husksync.libraries.hikari'
     relocate 'org.bstats', 'me.William278.husksync.libraries.plan'
-    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown'
+    relocate 'de.themoep', 'me.William278.husksync.libraries.minedown.adventure'
     relocate 'net.byteflux.libby', 'me.William278.husksync.libraries.libby.velocity'
 }
 

velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java

@@ -1,7 +1,6 @@
 package me.william278.husksync;
 
 import com.google.inject.Inject;
-import com.google.inject.Provides;
 import com.velocitypowered.api.command.CommandManager;
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
@@ -13,13 +12,13 @@ import com.velocitypowered.api.proxy.ProxyServer;
 import me.william278.husksync.migrator.MPDBMigrator;
 import me.william278.husksync.proxy.data.DataManager;
 import me.william278.husksync.redis.RedisMessage;
-import me.william278.husksync.velocity.util.VelocityUpdateChecker;
 import me.william278.husksync.velocity.command.VelocityCommand;
 import me.william278.husksync.velocity.config.ConfigLoader;
 import me.william278.husksync.velocity.config.ConfigManager;
 import me.william278.husksync.velocity.listener.VelocityEventListener;
 import me.william278.husksync.velocity.listener.VelocityRedisListener;
 import me.william278.husksync.velocity.util.VelocityLogger;
+import me.william278.husksync.velocity.util.VelocityUpdateChecker;
 import net.byteflux.libby.Library;
 import net.byteflux.libby.VelocityLibraryManager;
 import org.bstats.velocity.Metrics;
@@ -75,8 +74,6 @@ public class HuskSyncVelocity {
     private final ProxyServer server;
     private final Path dataDirectory;
 
-    private final VelocityLibraryManager<HuskSyncVelocity> manager;
-
     // Get the data folder
     public File getDataFolder() {
         return dataDirectory.toFile();
@@ -95,13 +92,11 @@ public class HuskSyncVelocity {
     }
 
     @Inject
-    public HuskSyncVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory,  VelocityLibraryManager<HuskSyncVelocity> manager) {
+    public HuskSyncVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) {
         this.server = server;
         this.logger = logger;
         this.dataDirectory = dataDirectory;
         this.metricsFactory = metricsFactory;
-        this.manager = manager;
-        fetchDependencies();
     }
 
     @Subscribe
@@ -109,6 +104,9 @@ public class HuskSyncVelocity {
         // Set instance
         instance = this;
 
+        // Load dependencies
+        fetchDependencies();
+
         // Setup logger
         velocityLogger = new VelocityLogger(logger);
 
@@ -205,6 +203,8 @@ public class HuskSyncVelocity {
 
     // Load dependencies
     private void fetchDependencies() {
+        VelocityLibraryManager<HuskSyncVelocity> manager = new VelocityLibraryManager<>(logger, dataDirectory, getProxyServer().getPluginManager(), getInstance(), "lib");
+
         Library mySqlLib = Library.builder()
                 .groupId("mysql")
                 .artifactId("mysql-connector-java")