zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Use TagResolver instead of Template

Browse source
This commit is contained in:
Roman Zhuravlev 2025-11-02 04:09:51 +05:00
parent 902104b326
commit 5207686e38
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
View file

@ -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.entities.results.WatchResult;
import net.frankheijden.serverutils.common.managers.AbstractPluginManager; import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
import net.frankheijden.serverutils.common.utils.FileUtils; 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<P, T> extends AbstractTask { public class PluginWatcherTask<P, T> extends AbstractTask {
@ -116,7 +118,8 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
ServerUtilsPluginDescription description = descriptionOptional.get(); ServerUtilsPluginDescription description = descriptionOptional.get();
WatchEntry foundEntry = pluginIdToWatchEntryMap.remove(description.getId()); WatchEntry foundEntry = pluginIdToWatchEntryMap.remove(description.getId());
if (foundEntry != null) { 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); fileNameToWatchEntryMap.put(fileName, foundEntry);
if (pluginIdToWatchEntryMap.isEmpty()) { if (pluginIdToWatchEntryMap.isEmpty()) {
@ -139,7 +142,8 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
AbstractPluginManager<P, ?> pluginManager = plugin.getPluginManager(); AbstractPluginManager<P, ?> pluginManager = plugin.getPluginManager();
Optional<File> fileOptional = pluginManager.getPluginFile(entry.pluginId); Optional<File> fileOptional = pluginManager.getPluginFile(entry.pluginId);
if (!fileOptional.isPresent()) { 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); fileNameToWatchEntryMap.remove(fileName);
pluginIdToWatchEntryMap.put(entry.pluginId, entry); pluginIdToWatchEntryMap.put(entry.pluginId, entry);
@ -183,7 +187,7 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
}, 10L); }, 10L);
} }
private void send(WatchResult result, Template... templates) { private void send(WatchResult result, TagResolver... templates) {
result.sendTo(sender, templates); result.sendTo(sender, templates);
if (sender.isPlayer()) { if (sender.isPlayer()) {
result.sendTo(plugin.getChatProvider().getConsoleServerAudience(), templates); result.sendTo(plugin.getChatProvider().getConsoleServerAudience(), templates);