diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 6f4ba96d..9e0591fb 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -5,7 +5,6 @@ dependencies { implementation 'net.william278:hsldataconverter:1.0' implementation 'me.lucko:commodore:2.2' - compileOnly 'redis.clients:jedis:4.2.3' compileOnly 'commons-io:commons-io:2.11.0' compileOnly 'de.themoep:minedown:1.7.1-SNAPSHOT' compileOnly 'dev.dejvokep:boosted-yaml:1.3' @@ -20,16 +19,14 @@ shadowJar { exclude(dependency('com.mojang:brigadier')) } - relocate 'org.apache', 'net.william278.husksync.libraries' + relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io' + relocate 'com.google.gson', 'net.william278.husksync.libraries.gson' relocate 'de.themoep', 'net.william278.husksync.libraries' relocate 'org.jetbrains', 'net.william278.husksync.libraries' relocate 'org.intellij', 'net.william278.husksync.libraries' relocate 'com.zaxxer', 'net.william278.husksync.libraries' - relocate 'com.google', 'net.william278.husksync.libraries' - relocate 'redis.clients', 'net.william278.husksync.libraries' - relocate 'org.json', 'net.william278.husksync.libraries.json' - relocate 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore' + relocate 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore' relocate 'net.byteflux.libby', 'net.william278.husksync.libraries.libby' relocate 'org.bstats', 'net.william278.husksync.libraries.bstats' relocate 'net.william278.mpdbconverter', 'net.william278.husksync.libraries.mpdbconverter' diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index ead7c110..bc43f2b2 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -9,6 +9,7 @@ softdepend: - MysqlPlayerDataBridge - Plan libraries: + - 'redis.clients:jedis:4.2.3' - 'mysql:mysql-connector-java:8.0.30' - 'org.xerial.snappy:snappy-java:1.1.8.4' - 'dev.dejvokep:boosted-yaml:1.3' diff --git a/common/build.gradle b/common/build.gradle index 27584be3..056ed6c5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -2,13 +2,11 @@ dependencies { implementation 'commons-io:commons-io:2.11.0' implementation 'de.themoep:minedown:1.7.1-SNAPSHOT' implementation 'com.google.code.gson:gson:2.9.0' - implementation('redis.clients:jedis:4.2.3') { - exclude module: 'slf4j-api' - } implementation ('com.zaxxer:HikariCP:5.0.1') { exclude module: 'slf4j-api' } + compileOnly 'redis.clients:jedis:4.2.3' compileOnly 'dev.dejvokep:boosted-yaml:1.3' compileOnly 'org.xerial.snappy:snappy-java:1.1.8.4' compileOnly 'org.jetbrains:annotations:23.0.0' @@ -21,12 +19,10 @@ dependencies { } shadowJar { - relocate 'org.apache', 'net.william278.husksync.libraries' + relocate 'org.apache.commons.io', 'net.william278.husksync.libraries.commons.io' + relocate 'com.google.gson', 'net.william278.husksync.libraries.gson' relocate 'de.themoep', 'net.william278.husksync.libraries' relocate 'org.jetbrains', 'net.william278.husksync.libraries' relocate 'org.intellij', 'net.william278.husksync.libraries' relocate 'com.zaxxer', 'net.william278.husksync.libraries' - relocate 'com.google', 'net.william278.husksync.libraries' - relocate 'redis.clients', 'net.william278.husksync.libraries' - relocate 'org.json', 'net.william278.husksync.libraries.json' } \ No newline at end of file