From 2b18d7d64c16161c759e04501547378e2cdc4e18 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Mon, 30 May 2022 16:50:19 +0200 Subject: [PATCH] Updated minimessage and galaxy --- build.gradle.kts | 3 +-- settings.gradle.kts | 2 +- .../com/alttd/commands/CommandManager.java | 8 +++---- .../com/alttd/commands/subcommands/Add.java | 21 +++++++++-------- .../com/alttd/commands/subcommands/Info.java | 23 ++++++++++--------- .../alttd/commands/subcommands/Remove.java | 22 +++++++----------- 6 files changed, 36 insertions(+), 43 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e9a62f..7a374a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,6 @@ tasks { } dependencies { - compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") //Galaxy - compileOnly("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT") // Minimessage + compileOnly("com.alttd:Galaxy-API:1.18.2-R0.1-SNAPSHOT") //Galaxy compileOnly("net.luckperms:api:5.3") // Luckperms } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 0020671..fee3ae9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ rootProject.name = "PlotPermissions" dependencyResolutionManagement { repositories { - mavenLocal() +// mavenLocal() mavenCentral() maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy maven("https://oss.sonatype.org/content/groups/public/") // Adventure diff --git a/src/main/java/com/alttd/commands/CommandManager.java b/src/main/java/com/alttd/commands/CommandManager.java index 04897d7..2717454 100644 --- a/src/main/java/com/alttd/commands/CommandManager.java +++ b/src/main/java/com/alttd/commands/CommandManager.java @@ -9,8 +9,7 @@ import com.alttd.config.Config; import com.alttd.util.Logger; 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 org.bukkit.command.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -110,8 +109,7 @@ public class CommandManager implements CommandExecutor, TabExecutor { if (stringBuilder.length() != 0) stringBuilder.replace(stringBuilder.length() - 1, stringBuilder.length(), ""); - return miniMessage.deserialize(Config.HELP_MESSAGE_WRAPPER, TemplateResolver.resolving( - Template.template("commands", miniMessage.deserialize(stringBuilder.toString())) - )); + return miniMessage.deserialize(Config.HELP_MESSAGE_WRAPPER, + Placeholder.component("commands", miniMessage.deserialize(stringBuilder.toString()))); } } \ No newline at end of file diff --git a/src/main/java/com/alttd/commands/subcommands/Add.java b/src/main/java/com/alttd/commands/subcommands/Add.java index 3b62e04..551c5f2 100644 --- a/src/main/java/com/alttd/commands/subcommands/Add.java +++ b/src/main/java/com/alttd/commands/subcommands/Add.java @@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand; import com.alttd.config.Config; import com.alttd.util.API; import com.alttd.util.Utility; -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 net.luckperms.api.LuckPerms; import net.luckperms.api.model.user.User; import org.bukkit.Bukkit; @@ -26,23 +27,23 @@ public class Add extends SubCommand { } OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) + commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver( + Placeholder.unparsed("player", args[1]) )); return true; } LuckPerms luckperms = API.getLuckperms(); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); if (user == null) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) + commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver( + Placeholder.unparsed("player", args[1]) )); return true; } World world = Bukkit.getWorld(args[2]); if (world == null) { - commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( - Template.template("world", args[2]) + commandSender.sendMiniMessage(Config.INVALID_WORLD, TagResolver.resolver( + Placeholder.unparsed("world", args[2]) )); return true; } @@ -56,9 +57,9 @@ public class Add extends SubCommand { int maxPlots = Utility.getMaxPlots(user, args[2]); Utility.removePlotPerms(user, world.getName()); Utility.setPlotAmount(user, world.getName(), maxPlots + plus); - commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, List.of( - Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), - Template.template("amount", String.valueOf(maxPlots + plus)) + commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, TagResolver.resolver( + Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), + Placeholder.unparsed("amount", String.valueOf(maxPlots + plus)) )); return true; } diff --git a/src/main/java/com/alttd/commands/subcommands/Info.java b/src/main/java/com/alttd/commands/subcommands/Info.java index 346bede..105458d 100644 --- a/src/main/java/com/alttd/commands/subcommands/Info.java +++ b/src/main/java/com/alttd/commands/subcommands/Info.java @@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand; import com.alttd.config.Config; import com.alttd.util.API; import com.alttd.util.Utility; -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 net.luckperms.api.LuckPerms; import net.luckperms.api.model.user.User; import org.bukkit.Bukkit; @@ -26,31 +27,31 @@ public class Info extends SubCommand { } OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) + commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver( + Placeholder.unparsed("player", args[1]) )); return true; } LuckPerms luckperms = API.getLuckperms(); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); if (user == null) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) + commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver( + Placeholder.unparsed("player", args[1]) )); return true; } World world = Bukkit.getWorld(args[2]); if (world == null) { - commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( - Template.template("world", args[2]) + commandSender.sendMiniMessage(Config.INVALID_WORLD, TagResolver.resolver( + Placeholder.unparsed("world", args[2]) )); return true; } int maxPlots = Utility.getMaxPlots(user, world.getName()); - commandSender.sendMiniMessage(Config.PLAYER_MAX_PLOTS, List.of( - Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), - Template.template("plots", String.valueOf(maxPlots)), - Template.template("world", world.getName()) + commandSender.sendMiniMessage(Config.PLAYER_MAX_PLOTS, TagResolver.resolver( + Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), + Placeholder.unparsed("plots", String.valueOf(maxPlots)), + Placeholder.unparsed("world", world.getName()) )); return true; } diff --git a/src/main/java/com/alttd/commands/subcommands/Remove.java b/src/main/java/com/alttd/commands/subcommands/Remove.java index 45550cf..ffe5c59 100644 --- a/src/main/java/com/alttd/commands/subcommands/Remove.java +++ b/src/main/java/com/alttd/commands/subcommands/Remove.java @@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand; import com.alttd.config.Config; import com.alttd.util.API; import com.alttd.util.Utility; -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 net.luckperms.api.LuckPerms; import net.luckperms.api.model.user.User; import org.bukkit.Bukkit; @@ -26,24 +27,18 @@ public class Remove extends SubCommand { } OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) - )); + commandSender.sendMiniMessage(Config.INVALID_USER, Placeholder.unparsed("player", args[1])); return true; } LuckPerms luckperms = API.getLuckperms(); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); if (user == null) { - commandSender.sendMiniMessage(Config.INVALID_USER, List.of( - Template.template("player", args[1]) - )); + commandSender.sendMiniMessage(Config.INVALID_USER, Placeholder.unparsed("player", args[1])); return true; } World world = Bukkit.getWorld(args[2]); if (world == null) { - commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( - Template.template("world", args[2]) - )); + commandSender.sendMiniMessage(Config.INVALID_WORLD, Placeholder.unparsed("world", args[2])); return true; } int minus; @@ -60,10 +55,9 @@ public class Remove extends SubCommand { Utility.setPlotAmount(user, world.getName(), newTotal); else newTotal = Config.DEFAULT_PLOTS; - commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, List.of( - Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), - Template.template("amount", String.valueOf(newTotal)) - )); + commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, TagResolver.resolver( + Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), + Placeholder.unparsed("amount", String.valueOf(newTotal)))); return true; }