diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 9fa69f42..5c72f4f9 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -13,7 +13,7 @@ dependencies { compile project(':common') compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' - compileOnly'net.kyori:text-adapter-bukkit:1.0.0' + compileOnly'net.kyori:text-adapter-bukkit:1.0.1' compileOnly 'me.lucko:commodore:1.0' compileOnly('net.milkbowl.vault:VaultAPI:1.6') { exclude(module: 'bukkit') diff --git a/bungee/build.gradle b/bungee/build.gradle index fc96497c..28636dd3 100644 --- a/bungee/build.gradle +++ b/bungee/build.gradle @@ -6,6 +6,7 @@ dependencies { compile project(':common') compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT' + compileOnly 'net.kyori:text-adapter-bungeecord:1.0.1' compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4' // migration plugins diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java index 3662cd7a..79dc1996 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/BungeeSenderFactory.java @@ -33,10 +33,9 @@ import me.lucko.luckperms.common.sender.SenderFactory; import me.lucko.luckperms.common.util.TextUtils; import net.kyori.text.Component; -import net.kyori.text.serializer.ComponentSerializers; +import net.kyori.text.adapter.bungeecord.TextAdapter; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.chat.ComponentSerializer; import java.util.UUID; @@ -68,7 +67,7 @@ public class BungeeSenderFactory extends SenderFactory { @Override protected void sendMessage(CommandSender sender, Component message) { - sender.sendMessage(ComponentSerializer.parse(ComponentSerializers.JSON.serialize(message))); + TextAdapter.sendComponent(sender, message); } @Override diff --git a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java index b9c7634d..e33f1b83 100644 --- a/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java @@ -94,7 +94,7 @@ public class LPBungeePlugin extends AbstractLuckPermsPlugin { @Override protected Set getGlobalDependencies() { - return EnumSet.of(Dependency.TEXT, Dependency.CAFFEINE, Dependency.OKIO, Dependency.OKHTTP, Dependency.EVENT); + return EnumSet.of(Dependency.TEXT, Dependency.TEXT_ADAPTER_BUNGEECORD, Dependency.CAFFEINE, Dependency.OKIO, Dependency.OKHTTP, Dependency.EVENT); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java index 0ff1ec5a..7012eae8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java @@ -69,8 +69,15 @@ public enum Dependency { TEXT_ADAPTER_BUKKIT( "net{}kyori", "text-adapter-bukkit", - "1.0.0", - "2Ph9vLzuofbE4iMaTMOTaR+v0M1Dxn503ia9rwfn7x8=", + "1.0.1", + "WZp7wCp2+EJC+Q/hxGLh/FJJCrn5Zdi2A1z2hX67jAM=", + Relocation.of("text", "net{}kyori{}text") + ), + TEXT_ADAPTER_BUNGEECORD( + "net{}kyori", + "text-adapter-bungeecord", + "1.0.1", + "A5JCRyp8Y/TIuQEtdOslo28am36DQHsgeK6FLa8aJCU=", Relocation.of("text", "net{}kyori{}text") ), EVENT(