diff --git a/Bukkit/Plugin/build.gradle b/Bukkit/Plugin/build.gradle index f4f9960..27dc8e8 100644 --- a/Bukkit/Plugin/build.gradle +++ b/Bukkit/Plugin/build.gradle @@ -17,7 +17,6 @@ dependencies { shadowJar { archiveClassifier.set('') relocate 'org.bstats', 'dev.brighten.antivpn.bukkit.org.bstats' - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' } test { diff --git a/Bungee/BungeePlugin/build.gradle b/Bungee/BungeePlugin/build.gradle index 50fa42f..97d1a0d 100644 --- a/Bungee/BungeePlugin/build.gradle +++ b/Bungee/BungeePlugin/build.gradle @@ -24,7 +24,6 @@ test { shadowJar { archiveClassifier.set('') relocate 'org.bstats', 'dev.brighten.antivpn.bungee.org.bstats' - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' } tasks.build.dependsOn shadowJar diff --git a/Common/Source/build.gradle b/Common/Source/build.gradle index 6040092..a1ee46d 100644 --- a/Common/Source/build.gradle +++ b/Common/Source/build.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly 'com.mysql:mysql-connector-j:9.3.0' compileOnly 'com.h2database:h2:2.2.220' - compileOnly 'com.github.ben-manes.caffeine:caffeine:3.1.8' + implementation'com.github.ben-manes.caffeine:caffeine:3.1.8' compileOnly 'org.mongodb:mongo-java-driver:3.12.14' testImplementation 'org.mockito:mockito-core:5.11.0' @@ -28,14 +28,7 @@ dependencies { shadowJar { archiveClassifier.set('') - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' - relocate 'com.github.benmanes.caffeine', 'dev.brighten.antivpn.shaded.com.github.benmanes.caffeine' - relocate 'org.h2', 'dev.brighten.antivpn.shaded.org.h2' - relocate 'org.bson', 'dev.brighten.antivpn.shaded.org.bson' - relocate 'com.mongodb', 'dev.brighten.antivpn.shaded.com.mongodb' - relocate 'com.mysql.cj', 'dev.brighten.antivpn.shaded.com.mysql.cj' - relocate 'com.mysql.jdbc', 'dev.brighten.antivpn.shaded.com.mysql.jdbc' - + dependencies { exclude 'dev/brighten/antivpn/depends/Relocate*' exclude 'dev/brighten/antivpn/depends/MavenLibraries*' diff --git a/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java index 56a39f7..9ea28b0 100644 --- a/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java +++ b/Common/Source/src/main/java/dev/brighten/antivpn/AntiVPN.java @@ -27,7 +27,6 @@ import dev.brighten.antivpn.database.mongo.MongoVPN; import dev.brighten.antivpn.database.sql.MySqlVPN; import dev.brighten.antivpn.depends.LibraryLoader; import dev.brighten.antivpn.depends.MavenLibrary; -import dev.brighten.antivpn.depends.Relocate; import dev.brighten.antivpn.message.MessageHandler; import dev.brighten.antivpn.utils.ConfigDefault; import dev.brighten.antivpn.utils.MiscUtils; @@ -48,25 +47,13 @@ import java.util.List; @Getter @Setter(AccessLevel.PRIVATE) -@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.220", relocations = { - @Relocate(from ="org" + ".\\h2", to ="dev.brighten.antivpn.shaded.org.h2")}) -@MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.14", relocations = { - @Relocate(from = "com." + "\\mongodb", to = "dev.brighten.antivpn.shaded.com.mongodb"), - @Relocate(from = "org" + "\\.bson", to = "dev.brighten.antivpn.shaded.org.bson") -}) +@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.220") +@MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.14") @MavenLibrary( groupId = "com.mysql", artifactId = "mysql-connector-j", - version = "9.3.0", - relocations = { - @Relocate(from = "com.my\\" + "sql.cj", to = "dev.brighten.antivpn.shaded.com.mysql.cj"), - @Relocate(from = "com.my\\" + "sql.jdbc", to = "dev.brighten.antivpn.shaded.com.mysql.jdbc"), - } + version = "9.3.0" ) -@MavenLibrary(groupId = "com.\\github\\.ben-manes\\.caffeine", artifactId = "caffeine", version = "3.1.8", - relocations = { - @Relocate(from = "com\\.github\\.benmanes\\.caffeine", to = "dev.brighten.antivpn.shaded.com.github.benmanes.caffeine"), - }) public class AntiVPN { private static AntiVPN INSTANCE; diff --git a/Sponge/SpongePlugin/build.gradle b/Sponge/SpongePlugin/build.gradle index 3e50f0a..23bc9ca 100644 --- a/Sponge/SpongePlugin/build.gradle +++ b/Sponge/SpongePlugin/build.gradle @@ -29,14 +29,6 @@ shadowJar { exclude 'com/google/**' exclude 'org/objectweb/**' exclude 'org/checkerframework/**' - - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' - relocate 'com.github.benmanes.caffeine', 'dev.brighten.antivpn.shaded.com.github.benmanes.caffeine' - relocate 'org.h2', 'dev.brighten.antivpn.shaded.org.h2' - relocate 'org.bson', 'dev.brighten.antivpn.shaded.org.bson' - relocate 'com.mongodb', 'dev.brighten.antivpn.shaded.com.mongodb' - relocate 'com.mysql.cj', 'dev.brighten.antivpn.shaded.com.mysql.cj' - relocate 'com.mysql.jdbc', 'dev.brighten.antivpn.shaded.com.mysql.jdbc' } tasks.build.dependsOn shadowJar diff --git a/Velocity/VelocityPlugin/build.gradle b/Velocity/VelocityPlugin/build.gradle index 03f9d5b..1c99cfe 100644 --- a/Velocity/VelocityPlugin/build.gradle +++ b/Velocity/VelocityPlugin/build.gradle @@ -26,7 +26,6 @@ test { shadowJar { archiveClassifier.set('') relocate 'org.bstats', 'dev.brighten.antivpn.velocity.org.bstats' - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' } tasks.build.dependsOn shadowJar diff --git a/build.gradle b/build.gradle index 6c80399..9e7e0cf 100644 --- a/build.gradle +++ b/build.gradle @@ -87,10 +87,6 @@ shadowJar { from(project(':Common:Source').tasks.shadowJar) { rename { 'antivpn-source.jarinjar' } } - - relocate 'org.yaml.snakeyaml', 'dev.brighten.antivpn.shaded.org.yaml.snakeyaml' - relocate 'org.bstats', 'dev.brighten.antivpn.shaded.org.bstats' - relocate 'org.objectweb', 'dev.brighten.antivpn.shaded.org.objectweb' } tasks.named('shadowJar') {