Finally fixed Adventure + MiniMessage shading / Dependency issues

This commit is contained in:
Auxilor
2021-10-03 12:54:38 +01:00
parent a692fbee01
commit 9aa465844d
5 changed files with 20 additions and 11 deletions

View File

@@ -87,7 +87,7 @@ allprojects {
shadowJar {
relocate('org.bstats', 'com.willfp.eco.shaded.bstats')
relocate('net.kyori.adventure', 'com.willfp.eco.shaded.adventure')
relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage')
}
jar {

View File

@@ -7,11 +7,11 @@ version rootProject.version
dependencies {
// Adventure
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-serializer-gson:4.8.1'
implementation 'net.kyori:adventure-text-serializer-legacy:4.8.1'
compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
compileOnly 'net.kyori:adventure-api:4.9.1'
compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
// Other
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'

View File

@@ -1,6 +1,7 @@
package com.willfp.eco.util;
import com.google.common.collect.ImmutableList;
import com.willfp.eco.core.Prerequisite;
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
import lombok.experimental.UtilityClass;
import net.kyori.adventure.text.Component;
@@ -251,9 +252,11 @@ public class StringUtils {
processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player);
}
processedMessage = translateGradients(processedMessage);
processedMessage = translateMiniMessage(processedMessage);
processedMessage = translateHexColorCodes(processedMessage);
processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
if (Prerequisite.HAS_PAPER.isMet()) {
processedMessage = translateMiniMessage(processedMessage);
}
return processedMessage;
}

View File

@@ -3,7 +3,9 @@ version rootProject.version
dependencies {
implementation 'org.bstats:bstats-bukkit:1.7'
compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
implementation('net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT') {
exclude group: 'net.kyori', module: 'adventure-api'
}
compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
compileOnly 'net.kyori:adventure-api:4.9.1'
compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'

View File

@@ -25,6 +25,10 @@ softdepend:
- ItemsAdder
- Oraxen
libraries:
- org.reflections:reflections:0.9.12
- org.apache.maven:maven-artifact:3.0.3
- org.jetbrains.kotlin:kotlin-stdlib:1.5.31
- 'org.reflections:reflections:0.9.12'
- 'org.apache.maven:maven-artifact:3.0.3'
- 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
- 'net.kyori:adventure-platform-bukkit:4.0.0'
- 'net.kyori:adventure-api:4.9.1'
- 'net.kyori:adventure-text-serializer-gson:4.8.1'
- 'net.kyori:adventure-text-serializer-legacy:4.8.1'