From 45ce9a560c49a68caa3a7a4edd7e50ee7057b6ec Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Sun, 22 May 2022 16:00:53 +0200 Subject: [PATCH] Update minimessage references for 1.18.2 --- pom.xml | 13 +++--- .../java/com/liteflags/auth/AuthTimer.java | 8 ++-- .../com/liteflags/auth/Authentication.java | 6 +-- .../liteflags/commands/CommandManager.java | 2 - .../commands/subcommands/CommandFlagList.java | 44 +++++++++---------- .../subcommands/CommandFlagPlayer.java | 34 +++++++------- .../subcommands/CommandFlagRemove.java | 32 +++++++------- .../commands/subcommands/CommandHelp.java | 2 - .../java/com/liteflags/events/ChatEvent.java | 8 ++-- .../java/com/liteflags/events/LoginEvent.java | 14 +++--- 10 files changed, 79 insertions(+), 84 deletions(-) diff --git a/pom.xml b/pom.xml index fe99f27..967e5db 100644 --- a/pom.xml +++ b/pom.xml @@ -35,16 +35,15 @@ - papermc - https://papermc.io/repo/repository/maven-public/ + Alttd-Nexus + https://repo.destro.xyz/snapshots - - io.papermc.paper - paper-api - 1.17.1-R0.1-SNAPSHOT - provided + + com.alttd + Galaxy-API + 1.18.2-R0.1-SNAPSHOT diff --git a/src/main/java/com/liteflags/auth/AuthTimer.java b/src/main/java/com/liteflags/auth/AuthTimer.java index 2641660..43a3659 100644 --- a/src/main/java/com/liteflags/auth/AuthTimer.java +++ b/src/main/java/com/liteflags/auth/AuthTimer.java @@ -3,14 +3,14 @@ package com.liteflags.auth; import com.liteflags.LiteFlags; import com.liteflags.config.Config; import com.liteflags.data.maps.MapCache; -import com.liteflags.util.Utilities; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -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 org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -36,8 +36,8 @@ public class AuthTimer { final String code = MapCache.reauthedPlayers.get(uuid); if (code == null) return; - player.sendMiniMessage(Config.AUTHENTICATE, List.of( - Template.template("code", code))); + player.sendMiniMessage(Config.AUTHENTICATE, TagResolver.resolver( + Placeholder.unparsed("code", code))); Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), Config.AUTH_MESSAGE_COMMAND .replaceAll("", player.getName()) .replaceAll("", code)); diff --git a/src/main/java/com/liteflags/auth/Authentication.java b/src/main/java/com/liteflags/auth/Authentication.java index f466793..7da9dc5 100644 --- a/src/main/java/com/liteflags/auth/Authentication.java +++ b/src/main/java/com/liteflags/auth/Authentication.java @@ -2,8 +2,8 @@ package com.liteflags.auth; import com.liteflags.data.maps.MapCache; import com.liteflags.config.Config; -import com.liteflags.util.Utilities; -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 org.bukkit.entity.Player; import java.util.List; @@ -30,7 +30,7 @@ public class Authentication { MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey()); AuthTimer.startTimer(player); player.sendMiniMessage(Config.AUTHENTICATE, - List.of(Template.template("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString())))); + TagResolver.resolver(Placeholder.unparsed("code", MapCache.reauthedPlayers.get(player.getUniqueId().toString())))); } } diff --git a/src/main/java/com/liteflags/commands/CommandManager.java b/src/main/java/com/liteflags/commands/CommandManager.java index 85e67e6..92f31f5 100644 --- a/src/main/java/com/liteflags/commands/CommandManager.java +++ b/src/main/java/com/liteflags/commands/CommandManager.java @@ -4,8 +4,6 @@ import com.liteflags.LiteFlags; import com.liteflags.commands.subcommands.*; import com.liteflags.config.Config; import com.liteflags.util.Logger; -import com.liteflags.util.Utilities; -import net.kyori.adventure.text.minimessage.Template; import org.bukkit.Bukkit; import org.bukkit.command.*; import org.bukkit.entity.Player; diff --git a/src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java b/src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java index 7638a1c..b0ce06b 100644 --- a/src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java +++ b/src/main/java/com/liteflags/commands/subcommands/CommandFlagList.java @@ -10,8 +10,8 @@ import com.liteflags.util.Logger; import com.liteflags.util.Utilities; 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.template.TemplateResolver; +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -36,11 +36,11 @@ public class CommandFlagList extends SubCommand { Logger.warning("% is not a flagged player", playerName); return; } - commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, List.of( - Template.template("player", player.getName() == null ? playerName : player.getName()), - Template.template("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))), - Template.template("console_flags", String.valueOf(Methods.consoleFlags)), - Template.template("staff_flags", String.valueOf(Methods.staffFlags)) + commandSender.sendMiniMessage(Config.ALERT_ACTIVE_FLAGS, TagResolver.resolver( + Placeholder.unparsed("player", player.getName() == null ? playerName : player.getName()), + Placeholder.unparsed("total_act_flags", String.valueOf( Methods.getTotalActiveFlags(player))), + Placeholder.unparsed("console_flags", String.valueOf(Methods.consoleFlags)), + Placeholder.unparsed("staff_flags", String.valueOf(Methods.staffFlags)) )); }); } else @@ -57,7 +57,7 @@ public class CommandFlagList extends SubCommand { body = Config.PLAYER_FLAG_LIST_SHORT; OfflinePlayer player = Bukkit.getServer().getOfflinePlayerIfCached(args[1]); if (player == null) { - commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, List.of(Template.template("player", args[1]))); + commandSender.sendMiniMessage(Config.UNKNOWN_PLAYER, TagResolver.resolver(Placeholder.unparsed("player", args[1]))); return true; } new BukkitRunnable() { @@ -106,9 +106,9 @@ public class CommandFlagList extends SubCommand { Component message = null; while (resultSet.next()) { if (message == null) { - message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TemplateResolver.templates(List.of( - Template.template("player", targetName), - Template.template("flag_amount", String.valueOf(resultSet.getString("total_flags"))) + message = miniMessage.deserialize(Config.PLAYER_FLAGS_HEADER, TagResolver.resolver(List.of( + Placeholder.unparsed("player", targetName), + Placeholder.unparsed("flag_amount", String.valueOf(resultSet.getString("total_flags"))) ))); } long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time")); @@ -117,15 +117,15 @@ public class CommandFlagList extends SubCommand { int convertedExpireTime = (int) expireTime - (int) currentTime; int convertedFlaggedTime = (int) currentTime - (int) timeFlagged; String id = String.valueOf(resultSet.getInt("id")); - List