diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java index d637697..b851912 100644 --- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java +++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java @@ -31,7 +31,6 @@ import net.frankheijden.serverutils.common.entities.results.Result; import net.frankheijden.serverutils.common.entities.exceptions.InvalidPluginDescriptionException; import net.frankheijden.serverutils.common.events.PluginEvent; import net.frankheijden.serverutils.common.managers.AbstractPluginManager; -import net.kyori.adventure.text.minimessage.Template; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.PluginCommand; @@ -69,7 +68,7 @@ public class BukkitPluginManager extends AbstractPluginManager serverAudience, Template... placeholders) { diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResult.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResult.java index 6e68b83..4882ab6 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResult.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResult.java @@ -4,7 +4,6 @@ import java.io.Closeable; import java.io.IOException; import java.util.Collections; import java.util.List; -import net.kyori.adventure.text.minimessage.Template; public class CloseablePluginResult extends PluginResult implements Closeable { @@ -20,9 +19,9 @@ public class CloseablePluginResult extends PluginResult implements Closeab T plugin, Result result, List closeables, - Template... templates + String... placeholders ) { - super(pluginId, plugin, result, templates); + super(pluginId, plugin, result, placeholders); this.closeables = closeables; } diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResults.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResults.java index 457d1e5..34e5278 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResults.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/CloseablePluginResults.java @@ -3,7 +3,6 @@ package net.frankheijden.serverutils.common.entities.results; import java.io.Closeable; import java.io.IOException; import java.util.List; -import net.kyori.adventure.text.minimessage.Template; public class CloseablePluginResults extends PluginResults implements Closeable { @@ -17,21 +16,21 @@ public class CloseablePluginResults extends PluginResults implements Close } @Override - public CloseablePluginResults addResult(String pluginId, Result result, Template... templates) { - super.addResult(pluginId, result, templates); + public CloseablePluginResults addResult(String pluginId, Result result, String... placeholders) { + super.addResult(pluginId, result, placeholders); return this; } @Override - public CloseablePluginResults addResult(String pluginId, T plugin, Template... templates) { - super.addResult(pluginId, plugin, templates); + public CloseablePluginResults addResult(String pluginId, T plugin, String... placeholders) { + super.addResult(pluginId, plugin, placeholders); return this; } @Override - protected CloseablePluginResults addResult(String pluginId, T plugin, Result result, Template... templates + protected CloseablePluginResults addResult(String pluginId, T plugin, Result result, String... placeholders ) { - super.addResult(pluginId, plugin, result, templates); + super.addResult(pluginId, plugin, result, placeholders); return this; } @@ -39,9 +38,9 @@ public class CloseablePluginResults extends PluginResults implements Close String pluginId, T plugin, List closeables, - Template... templates + String... placeholders ) { - return addResult(new CloseablePluginResult<>(pluginId, plugin, Result.SUCCESS, closeables, templates)); + return addResult(new CloseablePluginResult<>(pluginId, plugin, Result.SUCCESS, closeables, placeholders)); } @Override diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResult.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResult.java index 0bfda9c..b6a2c28 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResult.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResult.java @@ -3,14 +3,13 @@ package net.frankheijden.serverutils.common.entities.results; import net.frankheijden.serverutils.common.ServerUtilsApp; import net.frankheijden.serverutils.common.config.ConfigKey; import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; -import net.kyori.adventure.text.minimessage.Template; public class PluginResult implements AbstractResult { private final String pluginId; private final T plugin; private final Result result; - private final Template[] templates; + private final String[] placeholders; public PluginResult(String pluginId, Result result) { this(pluginId, null, result); @@ -19,13 +18,14 @@ public class PluginResult implements AbstractResult { /** * Constructs a new PluginResult. */ - public PluginResult(String pluginId, T plugin, Result result, Template... templates) { + public PluginResult(String pluginId, T plugin, Result result, String... placeholders) { this.pluginId = pluginId; this.plugin = plugin; this.result = result; - this.templates = new Template[templates.length + 1]; - this.templates[0] = Template.of("plugin", pluginId); - System.arraycopy(templates, 0, this.templates, 1, templates.length); + this.placeholders = new String[placeholders.length + 2]; + this.placeholders[0] = "plugin"; + this.placeholders[1] = pluginId; + System.arraycopy(placeholders, 0, this.placeholders, 2, placeholders.length); } public String getPluginId() { @@ -40,8 +40,8 @@ public class PluginResult implements AbstractResult { return result; } - public Template[] getTemplates() { - return templates; + public String[] getPlaceholders() { + return placeholders; } public boolean isSuccess() { @@ -50,7 +50,7 @@ public class PluginResult implements AbstractResult { public void sendTo(ServerUtilsAudience sender, ConfigKey successKey) { ConfigKey key = isSuccess() ? successKey : result.getKey(); - sender.sendMessage(ServerUtilsApp.getPlugin().getMessagesResource().get(key).toComponent(templates)); + sender.sendMessage(ServerUtilsApp.getPlugin().getMessagesResource().get(key).toComponent(placeholders)); } @Override diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResults.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResults.java index fb8420f..4869ed7 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResults.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginResults.java @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.List; import net.frankheijden.serverutils.common.config.ConfigKey; import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; -import net.kyori.adventure.text.minimessage.Template; public class PluginResults implements Iterable> { @@ -15,18 +14,18 @@ public class PluginResults implements Iterable> { this.results = new ArrayList<>(); } - public PluginResults addResult(String pluginId, Result result, Template... templates) { - addResult(pluginId, null, result, templates); + public PluginResults addResult(String pluginId, Result result, String... placeholders) { + addResult(pluginId, null, result, placeholders); return this; } - public PluginResults addResult(String pluginId, T plugin, Template... templates) { - addResult(pluginId, plugin, Result.SUCCESS, templates); + public PluginResults addResult(String pluginId, T plugin, String... placeholders) { + addResult(pluginId, plugin, Result.SUCCESS, placeholders); return this; } - protected PluginResults addResult(String pluginId, T plugin, Result result, Template... templates) { - addResult(new PluginResult<>(pluginId, plugin, result, templates)); + protected PluginResults addResult(String pluginId, T plugin, Result result, String... placeholders) { + addResult(new PluginResult<>(pluginId, plugin, result, placeholders)); return this; } diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResult.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResult.java index f80b6de..7c5c152 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResult.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResult.java @@ -1,24 +1,23 @@ package net.frankheijden.serverutils.common.entities.results; import net.frankheijden.serverutils.common.config.ConfigKey; -import net.kyori.adventure.text.minimessage.Template; public class PluginWatchResult implements AbstractResult { private final WatchResult result; - private final Template[] templates; + private final String[] placeholders; - public PluginWatchResult(WatchResult result, Template... templates) { + public PluginWatchResult(WatchResult result, String... placeholders) { this.result = result; - this.templates = templates; + this.placeholders = placeholders; } public WatchResult getResult() { return result; } - public Template[] getTemplates() { - return templates; + public String[] getPlaceholders() { + return placeholders; } @Override diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResults.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResults.java index 60665e3..28d03f4 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResults.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/PluginWatchResults.java @@ -6,7 +6,6 @@ import java.util.List; import net.frankheijden.serverutils.common.ServerUtilsApp; import net.frankheijden.serverutils.common.config.MessagesResource; import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; -import net.kyori.adventure.text.minimessage.Template; public class PluginWatchResults implements Iterable { @@ -16,8 +15,8 @@ public class PluginWatchResults implements Iterable { this.watchResults = new ArrayList<>(); } - public PluginWatchResults add(WatchResult result, Template... templates) { - return add(new PluginWatchResult(result, templates)); + public PluginWatchResults add(WatchResult result, String... placeholders) { + return add(new PluginWatchResult(result, placeholders)); } public PluginWatchResults add(PluginWatchResult watchResult) { @@ -32,7 +31,7 @@ public class PluginWatchResults implements Iterable { MessagesResource messages = ServerUtilsApp.getPlugin().getMessagesResource(); for (PluginWatchResult watchResult : watchResults) { - sender.sendMessage(messages.get(watchResult.getKey()).toComponent(watchResult.getTemplates())); + sender.sendMessage(messages.get(watchResult.getKey()).toComponent(watchResult.getPlaceholders())); } } diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java b/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java index 3d40c3c..3fb8263 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/managers/WatchManager.java @@ -10,7 +10,6 @@ import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin; import net.frankheijden.serverutils.common.entities.results.PluginWatchResults; import net.frankheijden.serverutils.common.entities.results.WatchResult; import net.frankheijden.serverutils.common.tasks.PluginWatcherTask; -import net.kyori.adventure.text.minimessage.Template; public class WatchManager { @@ -30,7 +29,7 @@ public class WatchManager { for (P watchPlugin : plugins) { String pluginId = plugin.getPluginManager().getPluginId(watchPlugin); if (watchTasks.containsKey(pluginId)) { - return new PluginWatchResults().add(WatchResult.ALREADY_WATCHING, Template.of("plugin", pluginId)); + return new PluginWatchResults().add(WatchResult.ALREADY_WATCHING, "plugin", pluginId); } pluginIds.add(plugin.getPluginManager().getPluginId(watchPlugin)); @@ -49,7 +48,7 @@ public class WatchManager { PluginWatchResults watchResults = new PluginWatchResults(); for (String pluginId : pluginIds) { - watchResults.add(WatchResult.START, Template.of("plugin", pluginId)); + watchResults.add(WatchResult.START, "plugin", pluginId); } return watchResults; } @@ -64,11 +63,11 @@ public class WatchManager { PluginWatchResults watchResults = new PluginWatchResults(); for (String pluginId : task.pluginIds) { - watchResults.add(WatchResult.START, Template.of("plugin", pluginId)); + watchResults.add(WatchResult.START, "plugin", pluginId); } return watchResults; } - return new PluginWatchResults().add(WatchResult.NOT_WATCHING, Template.of("plugin", associatedPluginId)); + return new PluginWatchResults().add(WatchResult.NOT_WATCHING, "plugin", associatedPluginId); } private static final class WatchTask { diff --git a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java index 33af57f..15ea2c3 100644 --- a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java +++ b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java @@ -44,7 +44,6 @@ import net.frankheijden.serverutils.velocity.reflection.RVelocityEventManager; import net.frankheijden.serverutils.velocity.reflection.RVelocityPluginContainer; import net.frankheijden.serverutils.velocity.reflection.RVelocityPluginManager; import net.frankheijden.serverutils.velocity.reflection.RVelocityScheduler; -import net.kyori.adventure.text.minimessage.Template; import org.slf4j.Logger; public class VelocityPluginManager extends AbstractPluginManager { @@ -93,7 +92,7 @@ public class VelocityPluginManager extends AbstractPluginManager