From c1b3bec67c34b4de99eacbbc91152d9ae229de84 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 1 Oct 2021 18:57:00 +0100 Subject: [PATCH] Moved adventure off to implementation and relocated --- build.gradle | 2 +- eco-core/core-plugin/build.gradle | 6 +++++- eco-core/core-plugin/src/main/resources/plugin.yml | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 946cac1f8..76f7ba28e 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ allprojects { shadowJar { relocate('org.bstats', 'com.willfp.eco.shaded.bstats') - relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage') + relocate('net.kyori.adventure', 'com.willfp.eco.shaded.adventure') } jar { diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 1c1359bc1..118adb679 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -4,6 +4,11 @@ version rootProject.version dependencies { implementation 'org.bstats:bstats-bukkit:1.7' implementation 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT' + implementation 'net.kyori:adventure-platform-bukkit:4.0.0' + implementation 'net.kyori:adventure-api:4.9.1' + implementation 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT' + implementation 'net.kyori:adventure-text-serializer-gson:4.8.1' + implementation 'net.kyori:adventure-text-serializer-legacy:4.8.1' compileOnly 'org.apache.maven:maven-artifact:3.0.3' compileOnly 'com.google.code.gson:gson:2.8.7' compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' @@ -24,7 +29,6 @@ dependencies { compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.2.0' compileOnly 'com.github.LoneDev6:API-ItemsAdder:2.4.7' compileOnly 'me.arcaniax:HeadDatabase-API:1.2.0' - compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0' // CombatLogX V10 + NewbieHelper Expansion compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT' diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index 0f64caa65..fcedc86e4 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -29,8 +29,4 @@ softdepend: libraries: - org.reflections:reflections:0.9.12 - org.apache.maven:maven-artifact:3.0.3 - - net.kyori:adventure-text-serializer-gson:4.8.1 - - net.kyori:adventure-text-serializer-legacy:4.8.1 - org.jetbrains.kotlin:kotlin-stdlib:1.5.31 - - net.kyori:adventure-platform-bukkit:4.0.0 - - net.kyori:adventure-api:4.9.1 \ No newline at end of file