diff --git a/build.gradle.kts b/build.gradle.kts index 92ae70f..ad6cf25 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,10 +33,10 @@ allprojects { dependencies { // Minimessage - implementation("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") +// implementation("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Velocity - compileOnly("com.velocitypowered:velocity-api:3.0.1") // Velocity - annotationProcessor("com.velocitypowered:velocity-api:3.0.1") + compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") // Velocity + annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") // JDA implementation("net.dv8tion:JDA:5.0.0-alpha.3") { shadow("net.dv8tion:JDA:5.0.0-alpha.3") { @@ -55,8 +55,8 @@ dependencies { shadowJar { archiveFileName.set("${project.name}-${project.version}.jar") - exclude("net.kyori.adventure") - exclude("net.kyori.examination") +// exclude("net.kyori.adventure") +// exclude("net.kyori.examination") minimize { //exclude(dependency("net.kyori:.*:.*")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 5ad3eee..34105f2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,7 @@ dependencyResolutionManagement { // JDA maven("https://m2.dv8tion.net/releases/") // MiniMessage - maven("https://oss.sonatype.org/content/repositories/snapshots/") +// maven("https://oss.sonatype.org/content/repositories/snapshots/") // LiteBans maven("https://jitpack.io") } diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordRoleListener.java b/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordRoleListener.java index f4ae041..615f929 100644 --- a/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordRoleListener.java +++ b/src/main/java/com/alttd/proxydiscordlink/bot/listeners/DiscordRoleListener.java @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -23,7 +23,7 @@ public class DiscordRoleListener extends ListenerAdapter { public DiscordRoleListener() { plugin = DiscordLink.getPlugin(); bot = plugin.getBot(); - miniMessage = MiniMessage.get(); + miniMessage = MiniMessage.miniMessage(); } /** @@ -53,9 +53,10 @@ public class DiscordRoleListener extends ListenerAdapter { added_roles.forEach(discordRole -> { discordLinkPlayer.addRole(discordRole.getInternalName()); if (!discordRole.getAnnouncement().isEmpty()) { - Component component = miniMessage.parse( + Component component = miniMessage.deserialize( discordRole.getAnnouncement(), - Template.of("player", discordLinkPlayer.getUsername())); + + Placeholder.unparsed("player", discordLinkPlayer.getUsername())); DiscordLink.getPlugin().getProxy().getAllPlayers() .forEach(onlinePlayer -> onlinePlayer.sendMessage(component)); diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/MinecraftCommand.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/MinecraftCommand.java index 10936ff..f18e468 100644 --- a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/MinecraftCommand.java +++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/MinecraftCommand.java @@ -11,7 +11,7 @@ import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import java.util.ArrayList; import java.util.Arrays; @@ -24,7 +24,7 @@ public class MinecraftCommand implements SimpleCommand { public MinecraftCommand() { subCommands = Arrays.asList(new CheckLinked(), new Link(), new Unlink(), new Reload()); - miniMessage = MiniMessage.get(); + miniMessage = MiniMessage.miniMessage(); } @Override @@ -34,11 +34,11 @@ public class MinecraftCommand implements SimpleCommand { if (args.length < 1) { if (!source.hasPermission("discordlink.link")) - source.sendMessage(miniMessage.parse(Config.NO_PERMISSION)); + source.sendMessage(miniMessage.deserialize(Config.NO_PERMISSION)); else if (source instanceof Player) - source.sendMessage(miniMessage.parse(Config.DISCORD_LINK)); + source.sendMessage(miniMessage.deserialize(Config.DISCORD_LINK)); else - source.sendMessage(miniMessage.parse(Config.NO_CONSOLE)); + source.sendMessage(miniMessage.deserialize(Config.NO_CONSOLE)); return; } @@ -98,6 +98,6 @@ public class MinecraftCommand implements SimpleCommand { if (stringBuilder.length() != 0) stringBuilder.replace(stringBuilder.length() - 1, stringBuilder.length(), ""); - return miniMessage.parse(Config.HELP_MESSAGE, Template.of("commands", stringBuilder.toString())); + return miniMessage.deserialize(Config.HELP_MESSAGE, Placeholder.unparsed("commands", stringBuilder.toString())); } } diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/CheckLinked.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/CheckLinked.java index 0d6fe3f..df859f3 100644 --- a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/CheckLinked.java +++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/CheckLinked.java @@ -6,7 +6,8 @@ import com.alttd.proxydiscordlink.minecraft.commands.SubCommand; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import java.util.List; import java.util.Optional; @@ -22,7 +23,7 @@ public class CheckLinked implements SubCommand { public CheckLinked() { name = "checklinked"; permission = "discordlink.checklinked"; - miniMessage = MiniMessage.get(); + miniMessage = MiniMessage.miniMessage(); } public String getName() { @@ -36,11 +37,11 @@ public class CheckLinked implements SubCommand { @Override public void execute(String[] args, CommandSource source) { if (!source.hasPermission(getPermission())) { - source.sendMessage(miniMessage.parse(Config.NO_PERMISSION)); + source.sendMessage(miniMessage.deserialize(Config.NO_PERMISSION)); return; } if (args.length != 2 || !args[1].matches("\\w{3,16}")) { - source.sendMessage(miniMessage.parse(getHelpMessage())); + source.sendMessage(miniMessage.deserialize(getHelpMessage())); return; } @@ -53,7 +54,7 @@ public class CheckLinked implements SubCommand { .getPlayer(UUID.fromString(uuidFromName)); if (optionalPlayer.isEmpty()) { - source.sendMessage(miniMessage.parse(Config.INVALID_PLAYER, Template.of("player", args[1]))); + source.sendMessage(miniMessage.deserialize(Config.INVALID_PLAYER, Placeholder.unparsed("player", args[1]))); return; } } @@ -62,12 +63,12 @@ public class CheckLinked implements SubCommand { } private void isLinked(CommandSource source, Player player) { - List