From f976ff86ed6734478f31f675488258f473715dcc Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:08:51 +0500 Subject: [PATCH 01/11] Rename groupId --- Bukkit/build.gradle.kts | 2 ++ Bungee/build.gradle.kts | 2 ++ Velocity/build.gradle.kts | 2 +- build.gradle.kts | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 8ea4da0..5e14693 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -7,6 +7,8 @@ plugins { group = rootProject.group val rootDependencyDir = "${rootProject.group}.dependencies" val dependencyDir = "${group}.bukkit.dependencies" +val rootDependencyDir = "net.frankheijden.serverutils.dependencies" +val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies" version = rootProject.version base { archivesName.set("${rootProject.name}-bukkit") diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index 420993c..18ae4c6 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -7,6 +7,8 @@ plugins { group = rootProject.group val rootDependencyDir = "${group}.dependencies" val dependencyDir = "${group}.bungee.dependencies" +val rootDependencyDir = "net.frankheijden.serverutils.dependencies" +val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies" version = rootProject.version base { archivesName.set("${rootProject.name}-bungee") diff --git a/Velocity/build.gradle.kts b/Velocity/build.gradle.kts index ae56ff4..1791410 100644 --- a/Velocity/build.gradle.kts +++ b/Velocity/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "${rootProject.group}" -val dependencyDir = "${group}.velocity.dependencies" +val dependencyDir = "net.frankheijden.serverutils.velocity.dependencies" version = rootProject.version base { archivesName.set("${rootProject.name}-velocity") diff --git a/build.gradle.kts b/build.gradle.kts index f2be164..8a4d502 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,9 @@ plugins { group = "net.frankheijden.serverutils" val dependencyDir = "${group}.dependencies" version = "3.5.6-SNAPSHOT" +group = "org.zhdev.bukman" +val dependencyDir = "net.frankheijden.serverutils.dependencies" +version = "3.5.6" java { sourceCompatibility = JavaVersion.VERSION_1_8 From 217c57d8e64dcce92a3d8d1b6e3e5e1e3de2b443 Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:20 +0500 Subject: [PATCH 02/11] Rename groupId --- Bukkit/build.gradle.kts | 2 -- Bungee/build.gradle.kts | 2 -- build.gradle.kts | 3 --- 3 files changed, 7 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 5e14693..0222028 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -5,8 +5,6 @@ plugins { } group = rootProject.group -val rootDependencyDir = "${rootProject.group}.dependencies" -val dependencyDir = "${group}.bukkit.dependencies" val rootDependencyDir = "net.frankheijden.serverutils.dependencies" val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies" version = rootProject.version diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index 18ae4c6..3520a11 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -5,8 +5,6 @@ plugins { } group = rootProject.group -val rootDependencyDir = "${group}.dependencies" -val dependencyDir = "${group}.bungee.dependencies" val rootDependencyDir = "net.frankheijden.serverutils.dependencies" val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies" version = rootProject.version diff --git a/build.gradle.kts b/build.gradle.kts index 8a4d502..8ad0b0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,9 +6,6 @@ plugins { id("com.github.johnrengelman.shadow") version "7.1.2" } -group = "net.frankheijden.serverutils" -val dependencyDir = "${group}.dependencies" -version = "3.5.6-SNAPSHOT" group = "org.zhdev.bukman" val dependencyDir = "net.frankheijden.serverutils.dependencies" version = "3.5.6" From 98fc752bd475124ea4d1adb447ab1d978b71226d Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:33 +0500 Subject: [PATCH 03/11] Use TagResolver instead of Template --- .../serverutils/common/entities/results/WatchResult.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java index 9b8b1ad..120eead 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java @@ -5,7 +5,7 @@ import net.frankheijden.serverutils.common.config.ConfigKey; import net.frankheijden.serverutils.common.config.MessageKey; import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public enum WatchResult implements AbstractResult { START(MessageKey.WATCHPLUGIN_START), @@ -23,7 +23,7 @@ public enum WatchResult implements AbstractResult { this.key = key; } - public void sendTo(ServerUtilsAudience sender, Template... templates) { + public void sendTo(ServerUtilsAudience sender, TagResolver... templates) { Component component = ServerUtilsApp.getPlugin().getMessagesResource().get(key).toComponent(templates); sender.sendMessage(component); } From 5fd43070a139c8435b3211c97c97460a2474560d Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:45 +0500 Subject: [PATCH 04/11] Use newer adventure api version --- buildSrc/src/main/kotlin/VersionConstants.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 9cb5365..a45fe1c 100644 --- a/buildSrc/src/main/kotlin/VersionConstants.kt +++ b/buildSrc/src/main/kotlin/VersionConstants.kt @@ -1,7 +1,7 @@ object VersionConstants { const val cloudVersion = "1.8.5-SNAPSHOT" - const val adventureVersion = "4.11.0" - const val adventurePlatformVersion = "4.1.2" - const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" + const val adventureVersion = "4.14.0" + const val adventurePlatformVersion = "4.4.1" + const val adventureMinimessageVersion = "4.14.0" const val bstatsVersion = "3.0.0" } From 902104b326e2f7c6079e3faab4e0bc329880638a Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:49 +0500 Subject: [PATCH 05/11] Use TagResolver instead of Template --- .../common/tasks/UpdateCheckerTask.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java index 11bd745..bf61e42 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java @@ -25,7 +25,8 @@ import net.frankheijden.serverutils.common.utils.GitHubUtils; import net.frankheijden.serverutils.common.utils.VersionUtils; import net.frankheijden.serverutilsupdater.common.Updater; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public class UpdateCheckerTask, P> implements Runnable { @@ -136,9 +137,9 @@ public class UpdateCheckerTask, P> im if (!download || pluginAsset == null) { if (sender.isPlayer()) { Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_AVAILABLE).toComponent( - Template.of("old", ServerUtilsApp.VERSION), - Template.of("new", githubVersion), - Template.of("info", body) + TagResolver.resolver("old", Tag.inserting(Component.text(ServerUtilsApp.VERSION))), + TagResolver.resolver("new", Tag.inserting(Component.text(githubVersion))), + TagResolver.resolver("info", Tag.inserting(Component.text(body))) ); sender.sendMessage(component); } @@ -148,9 +149,9 @@ public class UpdateCheckerTask, P> im plugin.getLogger().log(Level.INFO, DOWNLOAD_START, pluginAsset.getDownloadUrl()); if (sender.isPlayer()) { Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_DOWNLOADING).toComponent( - Template.of("old", ServerUtilsApp.VERSION), - Template.of("new", githubVersion), - Template.of("info", body) + TagResolver.resolver("old", Tag.inserting(Component.text(ServerUtilsApp.VERSION))), + TagResolver.resolver("new", Tag.inserting(Component.text(githubVersion))), + TagResolver.resolver("info", Tag.inserting(Component.text(body))) ); sender.sendMessage(component); } @@ -286,7 +287,8 @@ public class UpdateCheckerTask, P> im private void broadcastDownloadStatus(String githubVersion, boolean isError) { ConfigKey key = isError ? MessageKey.UPDATE_DOWNLOAD_FAILED : MessageKey.UPDATE_DOWNLOAD_SUCCESS; - Component component = plugin.getMessagesResource().get(key).toComponent(Template.of("new", githubVersion)); + Component component = plugin.getMessagesResource().get(key).toComponent(TagResolver.resolver("new", + Tag.inserting(Component.text(githubVersion)))); plugin.getChatProvider().broadcast(component, "serverutils.notification.update"); } } From 5207686e3834fccfce689eb850c77c9d142d60ea Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:51 +0500 Subject: [PATCH 06/11] Use TagResolver instead of Template --- .../serverutils/common/tasks/PluginWatcherTask.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java index 26b084f..e4177c9 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java @@ -28,7 +28,9 @@ import net.frankheijden.serverutils.common.entities.results.PluginResults; import net.frankheijden.serverutils.common.entities.results.WatchResult; import net.frankheijden.serverutils.common.managers.AbstractPluginManager; import net.frankheijden.serverutils.common.utils.FileUtils; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public class PluginWatcherTask extends AbstractTask { @@ -116,7 +118,8 @@ public class PluginWatcherTask extends AbstractTask { ServerUtilsPluginDescription description = descriptionOptional.get(); WatchEntry foundEntry = pluginIdToWatchEntryMap.remove(description.getId()); if (foundEntry != null) { - send(WatchResult.DELETED_FILE_IS_CREATED, Template.of("plugin", foundEntry.pluginId)); + send(WatchResult.DELETED_FILE_IS_CREATED, TagResolver.resolver("plugin", + Tag.inserting(Component.text(foundEntry.pluginId)))); fileNameToWatchEntryMap.put(fileName, foundEntry); if (pluginIdToWatchEntryMap.isEmpty()) { @@ -139,7 +142,8 @@ public class PluginWatcherTask extends AbstractTask { AbstractPluginManager pluginManager = plugin.getPluginManager(); Optional fileOptional = pluginManager.getPluginFile(entry.pluginId); if (!fileOptional.isPresent()) { - send(WatchResult.FILE_DELETED, Template.of("plugin", entry.pluginId)); + send(WatchResult.FILE_DELETED, TagResolver.resolver("plugin", + Tag.inserting(Component.text(entry.pluginId)))); fileNameToWatchEntryMap.remove(fileName); pluginIdToWatchEntryMap.put(entry.pluginId, entry); @@ -183,7 +187,7 @@ public class PluginWatcherTask extends AbstractTask { }, 10L); } - private void send(WatchResult result, Template... templates) { + private void send(WatchResult result, TagResolver... templates) { result.sendTo(sender, templates); if (sender.isPlayer()) { result.sendTo(plugin.getChatProvider().getConsoleServerAudience(), templates); From 6597b2badee22940fd675918c9b2105e6d7ea9a7 Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:09:55 +0500 Subject: [PATCH 07/11] Use TagResolver instead of Template --- .../common/config/MessagesResource.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java b/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java index 652d6ec..1b22d00 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java @@ -7,7 +7,8 @@ import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin; 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.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public class MessagesResource extends ServerUtilsResource { @@ -22,7 +23,7 @@ public class MessagesResource extends ServerUtilsResource { public MessagesResource(ServerUtilsPlugin plugin) { super(plugin, MESSAGES_RESOURCE); this.messageMap = new HashMap<>(); - this.miniMessage = MiniMessage.get(); + this.miniMessage = MiniMessage.miniMessage(); } public Message get(String path) { @@ -54,31 +55,41 @@ public class MessagesResource extends ServerUtilsResource { public Message(PlaceholderConfigKey key) { this.key = key; this.messageString = getConfig().getString("messages." + key.getPath()); - this.component = key.hasPlaceholders() ? null : miniMessage.parse(messageString); + this.component = key.hasPlaceholders() ? null : miniMessage.deserialize(messageString); } /** * Creates a {@link Component}. */ public Component toComponent() { - return this.component == null ? miniMessage.parse(messageString) : this.component; + return this.component == null ? miniMessage.deserialize(messageString) : this.component; } /** * Creates a {@link Component}. */ - public Component toComponent(Template... templates) { - return this.component == null ? miniMessage.parse(messageString, templates) : this.component; + public Component toComponent(TagResolver... templates) { + return this.component == null ? miniMessage.deserialize(messageString, templates) : this.component; } /** * Creates a {@link Component}. */ public Component toComponent(String... placeholders) { - return this.component == null ? miniMessage.parse(messageString, placeholders) : this.component; + TagResolver.Builder builder = TagResolver.builder(); + String placeholderKey = null; + for (int i = 0; i < placeholders.length; i++) { + if (i % 2 == 0) { + placeholderKey = placeholders[i]; + } else { + String placeholderValue = placeholders[i]; + builder.tag(placeholderKey, Tag.inserting(Component.text(placeholderValue))); + } + } + return this.component == null ? miniMessage.deserialize(messageString, builder.build()) : this.component; } - public void sendTo(ServerUtilsAudience serverAudience, Template... placeholders) { + public void sendTo(ServerUtilsAudience serverAudience, TagResolver... placeholders) { serverAudience.sendMessage(toComponent(placeholders)); } } From d99f6fb11b8ce9b9b8245ed251721f293f03478e Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:10:03 +0500 Subject: [PATCH 08/11] Use TagResolver instead of Template --- .../utils/KeyValueComponentBuilder.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java b/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java index b2e0db3..9900c10 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java @@ -4,12 +4,13 @@ import java.util.ArrayList; import java.util.List; import net.frankheijden.serverutils.common.config.MessagesResource; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public class KeyValueComponentBuilder { private final MessagesResource.Message format; - private final List templatesList; + private final List templatesList; private final String keyPlaceholder; private final String valuePlaceholder; @@ -43,8 +44,8 @@ public class KeyValueComponentBuilder { return new KeyValuePair(key); } - private KeyValueComponentBuilder add(Template key, Template value) { - this.templatesList.add(new Template[]{ key, value }); + private KeyValueComponentBuilder add(TagResolver key, TagResolver value) { + this.templatesList.add(new TagResolver[]{ key, value }); return this; } @@ -54,7 +55,7 @@ public class KeyValueComponentBuilder { public List build() { List components = new ArrayList<>(templatesList.size()); - for (Template[] templates : templatesList) { + for (TagResolver[] templates : templatesList) { components.add(format.toComponent(templates)); } @@ -63,24 +64,24 @@ public class KeyValueComponentBuilder { public class KeyValuePair { - private final Template key; + private final TagResolver key; private KeyValuePair(String key) { - this.key = Template.of(keyPlaceholder, key); + this.key = TagResolver.resolver(keyPlaceholder, Tag.inserting(Component.text(key))); } private KeyValuePair(Component key) { - this.key = Template.of(keyPlaceholder, key); + this.key = TagResolver.resolver(keyPlaceholder, Tag.inserting(key)); } public KeyValueComponentBuilder value(String value) { if (value == null) return KeyValueComponentBuilder.this; - return add(key, Template.of(valuePlaceholder, value)); + return add(key, TagResolver.resolver(valuePlaceholder, Tag.inserting(Component.text(value)))); } public KeyValueComponentBuilder value(Component value) { if (value == null) return KeyValueComponentBuilder.this; - return add(key, Template.of(valuePlaceholder, value)); + return add(key, TagResolver.resolver(valuePlaceholder, Tag.inserting(value))); } } } From 400db548a06b3e2e3d0ee91162326e9de9f1ab20 Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:10:06 +0500 Subject: [PATCH 09/11] Use TagResolver instead of Template --- .../common/commands/CommandServerUtils.java | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java index 524feb7..72c581b 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java @@ -36,7 +36,8 @@ import net.frankheijden.serverutils.common.utils.ListComponentBuilder; import net.frankheijden.serverutils.common.utils.KeyValueComponentBuilder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; public abstract class CommandServerUtils, P, C extends ServerUtilsAudience> extends ServerUtilsCommand { @@ -117,8 +118,9 @@ public abstract class CommandServerUtils messages.get(MessageKey.DEPENDING_PLUGINS_FORMAT).toComponent( - Template.of("plugin", pluginManager.getPluginId(p)) + TagResolver.resolver("plugin", + Tag.inserting(Component.text(pluginManager.getPluginId(p)))) )) .separator(messages.get(MessageKey.DEPENDING_PLUGINS_SEPARATOR).toComponent()) .lastSeparator(messages.get(MessageKey.DEPENDING_PLUGINS_LAST_SEPARATOR).toComponent()) @@ -349,10 +359,12 @@ public abstract class CommandServerUtils { ListComponentBuilder listBuilder = ListComponentBuilder.create() - .format(str -> listFormatMessage.toComponent(Template.of("value", str))) + .format(str -> listFormatMessage.toComponent(TagResolver.resolver("value", + Tag.inserting(Component.text(str))))) .separator(separator) .lastSeparator(lastSeparator) .emptyValue(null); From 6541e4c93c13dbcfb35bf3564949d0c5371794ed Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:10:08 +0500 Subject: [PATCH 10/11] Use TagResolver instead of Template --- .../serverutils/common/commands/CommandPlugins.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java index 2a36699..91aa49d 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java @@ -14,7 +14,8 @@ import net.frankheijden.serverutils.common.managers.AbstractPluginManager; import net.frankheijden.serverutils.common.utils.ListComponentBuilder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; @SuppressWarnings("LineLength") public abstract class CommandPlugins, P, C extends ServerUtilsAudience, D extends ServerUtilsPluginDescription> @@ -49,7 +50,7 @@ public abstract class CommandPlugins, sender.sendMessage(messages.get(MessageKey.PLUGINS_HEADER).toComponent()); TextComponent.Builder builder = Component.text(); builder.append(messages.get(MessageKey.PLUGINS_PREFIX).toComponent( - Template.of("count", String.valueOf(filteredPlugins.size())) + TagResolver.resolver("count", Tag.inserting(Component.text(String.valueOf(filteredPlugins.size())))) )); builder.append(ListComponentBuilder.create(filteredPlugins) .separator(messages.get(MessageKey.PLUGINS_SEPARATOR).toComponent()) @@ -62,11 +63,11 @@ public abstract class CommandPlugins, ? MessageKey.PLUGINS_FORMAT : MessageKey.PLUGINS_FORMAT_DISABLED; formatBuilder.append(messages.get(formatKey).toComponent( - Template.of("plugin", description.getName()) + TagResolver.resolver("plugin", Tag.inserting(Component.text(description.getName()))) )); if (hasVersionFlag) { formatBuilder.append(messages.get(MessageKey.PLUGINS_VERSION).toComponent( - Template.of("version", description.getVersion()) + TagResolver.resolver("version", Tag.inserting(Component.text(description.getVersion()))) )); } From eb893d62c99817438d184f0d775a0f5a5de9f5dd Mon Sep 17 00:00:00 2001 From: Roman Zhuravlev Date: Sun, 2 Nov 2025 04:10:27 +0500 Subject: [PATCH 11/11] Use TagResolver instead of Template --- .../bukkit/commands/BukkitCommandServerUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java index ffaa7f4..9f44ca5 100644 --- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java +++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java @@ -28,7 +28,8 @@ import net.frankheijden.serverutils.common.utils.KeyValueComponentBuilder; import net.frankheijden.serverutils.common.utils.ForwardFilter; import net.frankheijden.serverutils.common.utils.ListComponentBuilder; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.Template; +import net.kyori.adventure.text.minimessage.tag.Tag; +import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.PluginIdentifiableCommand; @@ -126,7 +127,7 @@ public class BukkitCommandServerUtils extends CommandServerUtils max) { messages.get(BukkitMessageKey.RELOADCONFIG_NOT_SUPPORTED).sendTo( sender, - Template.of("config", config) + TagResolver.resolver("config", Tag.inserting(Component.text(config))) ); return; } @@ -153,7 +154,8 @@ public class BukkitCommandServerUtils extends CommandServerUtils