From 34d3f7248fdbc82407046f8459efd8cb34715627 Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Tue, 16 Aug 2022 21:24:08 +0000 Subject: [PATCH] fix: Relocate and Download com.typesafe.config Velocity 3.0.x+ and Paper 1.19+ include this dependency, but earlier versions of Paper do not fixes #52 --- .../me/adrianed/authmevelocity/common/LibsManager.java | 10 ++++++++++ .../authmevelocity/common/configuration/Loader.java | 1 - gradle.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java index d34c2f7..c099866 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/LibsManager.java @@ -18,6 +18,8 @@ public final class LibsManager { = new Relocation("org{}spongepowered", "me.adrianed.authmevelocity.libs.sponge"); final Relocation geantyrefRelocation = new Relocation("io{}leangen{}geantyref", "me.adrianed.authmevelocity.libs.geantyref"); + final Relocation typesafeRelocation + = new Relocation("com{}typesafe", "me.adrianed.authmevelocity.libs.config"); final Library hocon = Library.builder() .groupId("org{}spongepowered") .artifactId("configurate-hocon") @@ -25,6 +27,7 @@ public final class LibsManager { .id("configurate-hocon") .relocate(configurateRelocation) .relocate(geantyrefRelocation) + .relocate(typesafeRelocation) .build(); final Library confCore = Library.builder() .groupId("org{}spongepowered") @@ -41,7 +44,14 @@ public final class LibsManager { .id("geantyref") .relocate(geantyrefRelocation) .build(); + final Library typesafe = Library.builder() + .groupId("com{}typesafe") + .artifactId("config") + .version("1.4.2") + .relocate(typesafeRelocation) + .build(); + manager.loadLibrary(typesafe); manager.loadLibrary(confCore); manager.loadLibrary(hocon); manager.loadLibrary(geantyref); diff --git a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java index a0a52e7..95bbb29 100644 --- a/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java +++ b/common/src/main/java/me/adrianed/authmevelocity/common/configuration/Loader.java @@ -9,7 +9,6 @@ import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.hocon.HoconConfigurationLoader; - public final class Loader { private Loader() {} public static ConfigurationContainer loadMainConfig(Path path, Class clazz, Logger logger) { diff --git a/gradle.properties b/gradle.properties index b2421e4..19b6146 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = me.adrianed.authmevelocity -version = 3.0.0 +version = 3.0.1 description = AuthMeReloaded Support for Velocity url = https://github.com/4drian3d/AuthMeVelocity id = authmevelocity