{
+ val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
val opt = options as StandardJavadocDocletOptions
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
- opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
+ opt.links("https://jd.advntr.dev/api/4.14.0/")
+ opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
opt.links("https://checkerframework.org/api/")
opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
+ opt.isLinkSource = true
+ opt.bottom(File("$rootDir/javadocfooter.html").readText())
+ opt.isUse = true
opt.encoding("UTF-8")
+ opt.keyWords()
+ opt.addStringOption("-since", isRelease)
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/PlotAPI.java b/Core/src/main/java/com/plotsquared/core/PlotAPI.java
index 392759966..64f124e7f 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotAPI.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotAPI.java
@@ -30,7 +30,7 @@ import com.plotsquared.core.util.ChunkManager;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.query.PlotQuery;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -145,7 +145,7 @@ public class PlotAPI {
*/
public void sendConsoleMessage(
final @NonNull String message,
- final @NonNull Template @NonNull ... replacements
+ final @NonNull TagResolver @NonNull ... replacements
) {
ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
}
@@ -158,7 +158,7 @@ public class PlotAPI {
*/
public void sendConsoleMessage(
final @NonNull Caption caption,
- final @NonNull Template @NonNull ... replacements
+ final @NonNull TagResolver @NonNull ... replacements
) {
ConsolePlayer.getConsole().sendMessage(caption, replacements);
}
diff --git a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
index 75ceef94d..958468098 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
@@ -32,6 +32,7 @@ import com.plotsquared.core.inject.annotations.DefaultGenerator;
import com.plotsquared.core.location.World;
import com.plotsquared.core.permissions.PermissionHandler;
import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.core.util.ChunkManager;
@@ -75,6 +76,11 @@ public interface PlotPlatform extends LocaleHolder {
*/
void shutdown();
+ /**
+ * Completely shuts down the server.
+ */
+ void shutdownServer();
+
/**
* Get the name of the plugin
*
@@ -279,6 +285,16 @@ public interface PlotPlatform
extends LocaleHolder {
return injector().getInstance(ChunkManager.class);
}
+ /**
+ * Get the {@link ExpireManager} implementation for the platform
+ *
+ * @return Expire manager
+ * @since 6.10.2
+ */
+ default @NonNull ExpireManager expireManager() {
+ return injector().getInstance(ExpireManager.class);
+ }
+
/**
* Get the {@link PlotAreaManager} implementation.
*
diff --git a/Core/src/main/java/com/plotsquared/core/PlotSquared.java b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
index 9b8d2fd02..579abe1e8 100644
--- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
@@ -197,6 +197,9 @@ public class PlotSquared {
this.loadCaptionMap();
} catch (final Exception e) {
LOGGER.error("Failed to load caption map", e);
+ LOGGER.error("Shutting down server to prevent further issues");
+ this.platform.shutdownServer();
+ throw new RuntimeException("Abort loading PlotSquared");
}
// Setup the global flag container
@@ -267,7 +270,11 @@ public class PlotSquared {
captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang"));
} else {
String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
- captionMap = this.captionLoader.loadSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
+ captionMap = this.captionLoader.loadOrCreateSingle(this.platform
+ .getDirectory()
+ .toPath()
+ .resolve("lang")
+ .resolve(fileName));
}
this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
LOGGER.info(
@@ -287,11 +294,11 @@ public class PlotSquared {
public void startExpiryTasks() {
if (Settings.Enabled_Components.PLOT_EXPIRY) {
- ExpireManager.IMP = new ExpireManager(this.eventDispatcher);
- ExpireManager.IMP.runAutomatedTask();
+ ExpireManager expireManager = PlotSquared.platform().expireManager();
+ expireManager.runAutomatedTask();
for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
ExpiryTask task = new ExpiryTask(settings, this.getPlotAreaManager());
- ExpireManager.IMP.addTask(task);
+ expireManager.addTask(task);
}
}
}
@@ -642,7 +649,8 @@ public class PlotSquared {
} else {
list = new ArrayList<>(input);
}
- list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.getOwnerAbs())));
+ ExpireManager expireManager = PlotSquared.platform().expireManager();
+ list.sort(Comparator.comparingLong(a -> expireManager.getTimestamp(a.getOwnerAbs())));
return list;
}
@@ -786,7 +794,9 @@ public class PlotSquared {
if (world.equals("CheckingPlotSquaredGenerator")) {
return;
}
- this.getPlotAreaManager().addWorld(world);
+ if (!this.getPlotAreaManager().addWorld(world)) {
+ return;
+ }
Set worlds;
if (this.worldConfiguration.contains("worlds")) {
worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
@@ -1005,7 +1015,7 @@ public class PlotSquared {
/**
* Setup the configuration for a plot world based on world arguments.
- *
+ *
*
* e.g. /mv create <world> normal -g PlotSquared:<args>
*
diff --git a/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java b/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
index 69d9845f6..1725f5dc6 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
@@ -200,7 +200,7 @@ public class PlayerBackupProfile implements BackupProfile {
if (value) {
future.complete(null);
} else {
- future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
+ future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
TranslatableCaption
.of("schematics.schematic_paste_failed")
.getComponent(ConsolePlayer.getConsole()))));
diff --git a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
index 13fc66e5e..f9f670532 100644
--- a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
@@ -24,13 +24,14 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -100,7 +101,7 @@ public class SimpleBackupManager implements BackupManager {
if (player != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_automatic_started"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
}
profile.createBackup().whenComplete((backup, throwable) -> {
@@ -108,7 +109,7 @@ public class SimpleBackupManager implements BackupManager {
if (player != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_automatic_failure"),
- Templates.of("reason", throwable.getMessage())
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
);
}
throwable.printStackTrace();
@@ -135,13 +136,9 @@ public class SimpleBackupManager implements BackupManager {
return this.backupLimit;
}
- private static final class PlotCacheKey {
-
- private final Plot plot;
-
- private PlotCacheKey(Plot plot) {
- this.plot = plot;
- }
+ private record PlotCacheKey(
+ Plot plot
+ ) {
@Override
public boolean equals(final Object o) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java
index a457b6c50..45db5366d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Add.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Add.java
@@ -26,12 +26,13 @@ import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -58,19 +59,21 @@ public class Add extends Command {
@Override
public CompletableFuture execute(
- final PlotPlayer player, String[] args,
+ final PlotPlayer player,
+ String[] args,
RunnableVal3 confirm,
RunnableVal2 whenDone
) throws CommandException {
final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
checkTrue(plot.hasOwner(), TranslatableCaption.of("info.plot_unowned"));
checkTrue(
- plot.isOwner(player.getUUID()) || Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST),
+ plot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST),
TranslatableCaption.of("permission.no_plot_perms")
);
- checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot add ")
+ checkTrue(
+ args.length == 1,
+ TranslatableCaption.of("commandconfig.command_syntax"),
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot add ")))
);
final CompletableFuture future = new CompletableFuture<>();
PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
@@ -80,7 +83,7 @@ public class Add extends Command {
} else {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
}
future.completeExceptionally(throwable);
@@ -88,18 +91,19 @@ public class Add extends Command {
} else {
try {
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
Iterator iterator = uuids.iterator();
int size = plot.getTrusted().size() + plot.getMembers().size();
while (iterator.hasNext()) {
UUID uuid = iterator.next();
- if (uuid == DBFunc.EVERYONE && !(
- Permissions.hasPermission(player, Permission.PERMISSION_TRUST_EVERYONE) || Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
+ if (uuid == DBFunc.EVERYONE && !(player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(
+ Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
+ TagResolver.resolver("value", Tag.inserting(
+ PlayerManager.resolveName(uuid).toComponent(player)
+ ))
);
iterator.remove();
continue;
@@ -107,7 +111,9 @@ public class Add extends Command {
if (plot.isOwner(uuid)) {
player.sendMessage(
TranslatableCaption.of("member.already_added"),
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
+ TagResolver.resolver("player", Tag.inserting(
+ PlayerManager.resolveName(uuid).toComponent(player)
+ ))
);
iterator.remove();
continue;
@@ -115,7 +121,9 @@ public class Add extends Command {
if (plot.getMembers().contains(uuid)) {
player.sendMessage(
TranslatableCaption.of("member.already_added"),
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
+ TagResolver.resolver("player", Tag.inserting(
+ PlayerManager.resolveName(uuid).toComponent(player)
+ ))
);
iterator.remove();
continue;
@@ -124,11 +132,11 @@ public class Add extends Command {
}
checkTrue(!uuids.isEmpty(), null);
int localAddSize = plot.getMembers().size();
- int maxAddSize = Permissions.hasPermissionRange(player, Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS);
+ int maxAddSize = player.hasPermissionRange(Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS);
if (localAddSize >= maxAddSize) {
player.sendMessage(
TranslatableCaption.of("members.plot_max_members_added"),
- Template.of("amount", String.valueOf(localAddSize))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(localAddSize)))
);
return;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java
index 9063ede69..a52e47ef2 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Alias.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java
@@ -26,9 +26,10 @@ import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.query.PlotQuery;
-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;
import java.util.ArrayList;
import java.util.Collection;
@@ -92,7 +93,10 @@ public class Alias extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_SET))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ALIAS_SET)
+ )
);
}
}
@@ -108,7 +112,10 @@ public class Alias extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
+ )
);
}
}
@@ -149,13 +156,16 @@ public class Alias extends SubCommand {
.anyMatch()) {
player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"),
- Template.of("alias", alias)
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
);
return;
}
if (Settings.UUID.OFFLINE) {
plot.setAlias(alias);
- player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.of("alias", alias));
+ player.sendMessage(
+ TranslatableCaption.of("alias.alias_set_to"),
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
+ );
return;
}
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
@@ -164,13 +174,13 @@ public class Alias extends SubCommand {
} else if (uuid != null) {
player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"),
- Template.of("alias", alias)
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
);
} else {
plot.setAlias(alias);
player.sendMessage(
TranslatableCaption.of("alias.alias_set_to"),
- Template.of("alias", alias)
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
);
}
}));
@@ -182,7 +192,7 @@ public class Alias extends SubCommand {
if (!plot.getAlias().isEmpty()) {
player.sendMessage(
TranslatableCaption.of("alias.alias_removed"),
- Template.of("alias", alias)
+ TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
);
} else {
player.sendMessage(
@@ -194,7 +204,7 @@ public class Alias extends SubCommand {
}
private boolean isPermitted(PlotPlayer player, Permission permission) {
- return Permissions.hasPermission(player, permission);
+ return player.hasPermission(permission);
}
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java
index 4931d2cac..5897322b2 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Area.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Area.java
@@ -24,7 +24,6 @@ import com.plotsquared.core.configuration.ConfigurationSection;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.CaptionHolder;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.configuration.file.YamlConfiguration;
import com.plotsquared.core.events.TeleportCause;
@@ -48,7 +47,6 @@ import com.plotsquared.core.queue.QueueCoordinator;
import com.plotsquared.core.setup.PlotAreaBuilder;
import com.plotsquared.core.util.FileUtils;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.RegionUtil;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.SetupUtils;
@@ -57,6 +55,7 @@ import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.core.util.task.RunnableVal3;
import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.EditSessionBuilder;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.entity.Player;
@@ -69,7 +68,9 @@ import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.World;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.io.File;
@@ -138,17 +139,20 @@ public class Area extends SubCommand {
player.sendMessage(RequiredType.CONSOLE.getErrorMessage());
return false;
}
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_CREATE)
+ )
);
return false;
}
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("single.single_area_needs_name"),
- Template.of("command", "/plot area single ")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot area single ")))
);
return false;
}
@@ -229,10 +233,9 @@ public class Area extends SubCommand {
try (final ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(
file))) {
final BlockArrayClipboard clipboard = new BlockArrayClipboard(selectedRegion);
- final EditSession editSession = WorldEdit
- .getInstance()
- .getEditSessionFactory()
- .getEditSession(selectedRegion.getWorld(), -1);
+ EditSessionBuilder editSessionBuilder = WorldEdit.getInstance().newEditSessionBuilder();
+ editSessionBuilder.world(selectedRegion.getWorld());
+ final EditSession editSession = editSessionBuilder.build();
final ForwardExtentCopy forwardExtentCopy =
new ForwardExtentCopy(editSession, selectedRegion, clipboard, selectedRegion.getMinimumPoint());
forwardExtentCopy.setCopyingBiomes(true);
@@ -280,7 +283,7 @@ public class Area extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("errors.error_create"),
- Template.of("world", hybridPlotWorld.getWorldName())
+ TagResolver.resolver("world", Tag.inserting(Component.text(hybridPlotWorld.getWorldName())))
);
}
};
@@ -288,10 +291,13 @@ public class Area extends SubCommand {
return true;
}
case "c", "setup", "create" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_CREATE)
+ )
);
return false;
}
@@ -299,7 +305,10 @@ public class Area extends SubCommand {
case 1:
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Templates.of("value", "/plot area create [world[:id]] [=]...")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot area create [world[:id]] [=]..."))
+ )
);
return false;
case 2:
@@ -313,7 +322,11 @@ public class Area extends SubCommand {
if (area == null) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Templates.of("value", "/plot area create [world[:id]] [=]...")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text(
+ "/plot area create [world[:id]] [=]..."))
+ )
);
return false;
}
@@ -324,12 +337,18 @@ public class Area extends SubCommand {
);
player.sendMessage(
TranslatableCaption.of("set.set_attribute"),
- Template.of("attribute", "area_pos1"),
- Template.of("value", location.getX() + "," + location.getZ())
+ TagResolver.builder()
+ .tag("attribute", Tag.inserting(Component.text("area_pos1")))
+ .tag("value", Tag.inserting(
+ Component.text(location.getX())
+ .append(Component.text(","))
+ .append(Component.text(location.getZ()))
+ ))
+ .build()
);
player.sendMessage(
TranslatableCaption.of("area.set_pos2"),
- Template.of("command", "/plot area create pos2")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot area create pos2")))
);
return true;
}
@@ -343,7 +362,11 @@ public class Area extends SubCommand {
if (area == null) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Templates.of("value", "/plot area create [world[:id]] [=]...")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text(
+ "/plot area create [world[:id]] [=]..."))
+ )
);
return false;
}
@@ -370,7 +393,10 @@ public class Area extends SubCommand {
if (!areas.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"),
- Template.of("cluster", areas.iterator().next().toString())
+ TagResolver.resolver(
+ "cluster",
+ Tag.inserting(areas.iterator().next())
+ )
);
return false;
}
@@ -396,8 +422,7 @@ public class Area extends SubCommand {
player.sendMessage(TranslatableCaption.of("setup.setup_finished"));
if (area.getTerrain() != PlotAreaTerrainType.ALL) {
QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(world));
- queue.setChunkConsumer(chunk -> AugmentedUtils.generate(
- null,
+ queue.setChunkConsumer(chunk -> AugmentedUtils.generateChunk(
world,
chunk.getX(),
chunk.getZ(),
@@ -409,7 +434,7 @@ public class Area extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("errors.error_create"),
- Template.of("world", area.getWorldName())
+ TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
);
}
};
@@ -443,7 +468,7 @@ public class Area extends SubCommand {
if (other != null && Objects.equals(pa.getId(), other.getId())) {
player.sendMessage(
TranslatableCaption.of("setup.setup_world_taken"),
- Template.of("value", pa.toString())
+ TagResolver.resolver("value", Tag.inserting(Component.text(pa.getId())))
);
return false;
}
@@ -458,8 +483,13 @@ public class Area extends SubCommand {
if (pair.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"),
- Template.of("value1,", getCommandString()),
- Template.of("value2", " create [world[:id]] [=]...")
+ TagResolver.builder()
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
+ .tag(
+ "value2",
+ Tag.inserting(Component.text("create [world[:id]] [=]..."))
+ )
+ .build()
);
return false;
}
@@ -495,8 +525,14 @@ public class Area extends SubCommand {
default -> {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"),
- Template.of("value1", getCommandString()),
- Template.of("value2", " create [world[:id]] [=]...")
+ TagResolver.builder()
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
+ .tag(
+ "value2",
+ Tag.inserting(Component.text(
+ " create [world[:id]] [=]..."))
+ )
+ .build()
);
return false;
}
@@ -506,7 +542,7 @@ public class Area extends SubCommand {
if (this.worldUtil.isWorld(pa.getWorldName())) {
player.sendMessage(
TranslatableCaption.of("setup.setup_world_taken"),
- Template.of("value", pa.getWorldName())
+ TagResolver.resolver("value", Tag.inserting(Component.text(pa.getWorldName())))
);
return false;
}
@@ -527,7 +563,7 @@ public class Area extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("errors.error_create"),
- Template.of("world", pa.getWorldName())
+ TagResolver.resolver("world", Tag.inserting(Component.text(pa.getWorldName())))
);
}
try {
@@ -546,12 +582,18 @@ public class Area extends SubCommand {
if (pa.getId() == null) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", getUsage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
);
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"),
- Template.of("value1", getCommandString()),
- Template.of("value2", " create [world[:id]] [=]...")
+ TagResolver.builder()
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
+ .tag(
+ "value2",
+ Tag.inserting(Component.text(
+ " create [world[:id]] [=]..."))
+ )
+ .build()
);
return false;
}
@@ -568,17 +610,20 @@ public class Area extends SubCommand {
metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa);
player.sendMessage(
TranslatableCaption.of("single.get_position"),
- Template.of("command", getCommandString())
+ TagResolver.resolver("command", Tag.inserting(Component.text(getCommandString())))
);
break;
}
return true;
}
case "i", "info" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_INFO)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_INFO)
+ )
);
return false;
}
@@ -589,15 +634,20 @@ public class Area extends SubCommand {
default -> {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"),
- Template.of("value1", getCommandString()),
- Template.of("value2", " info [area]")
+ TagResolver.builder()
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
+ .tag("value2", Tag.inserting(Component.text(" info [area]")))
+ .build()
);
return false;
}
}
if (area == null) {
if (args.length == 2) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
+ player.sendMessage(
+ TranslatableCaption.of("errors.not_valid_plot_world"),
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
+ );
} else {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
}
@@ -621,42 +671,35 @@ public class Area extends SubCommand {
percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
region = "N/A";
}
- Template headerTemplate = Template.of(
- "header",
- TranslatableCaption.of("info.plot_info_header").getComponent(player)
- );
- Template nameTemplate = Template.of("name", name);
- Template typeTemplate = Template.of("type", area.getType().name());
- Template terrainTemplate = Template.of("terrain", area.getTerrain().name());
- Template usageTemplate = Template.of("usage", String.format("%.2f", percent));
- Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
- Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
- Template regionTemplate = Template.of("region", region);
- Template generatorTemplate = Template.of("generator", generator);
- Template footerTemplate = Template.of(
- "footer",
- TranslatableCaption.of("info.plot_info_footer").getComponent(player)
- );
- player.sendMessage(
- TranslatableCaption.of("info.area_info_format"),
- headerTemplate,
- nameTemplate,
- typeTemplate,
- terrainTemplate,
- usageTemplate,
- claimedTemplate,
- clustersTemplate,
- regionTemplate,
- generatorTemplate,
- footerTemplate
- );
+ TagResolver resolver = TagResolver.builder()
+ .tag(
+ "header",
+ Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player))
+ )
+ .tag("name", Tag.inserting(Component.text(name)))
+ .tag("type", Tag.inserting(Component.text(area.getType().name())))
+ .tag("terrain", Tag.inserting(Component.text(area.getTerrain().name())))
+ .tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent))))
+ .tag("claimed", Tag.inserting(Component.text(claimed)))
+ .tag("clusters", Tag.inserting(Component.text(clusters)))
+ .tag("region", Tag.inserting(Component.text(region)))
+ .tag("generator", Tag.inserting(Component.text(generator)))
+ .tag(
+ "footer",
+ Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player))
+ )
+ .build();
+ player.sendMessage(TranslatableCaption.of("info.area_info_format"), resolver);
return true;
}
case "l", "list" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_LIST)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_LIST)
+ )
);
return false;
}
@@ -673,8 +716,10 @@ public class Area extends SubCommand {
default:
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"),
- Template.of("value1", getCommandString()),
- Template.of("value2", " list [#]")
+ TagResolver.builder()
+ .tag("value1", Tag.inserting(Component.text(getCommandString())))
+ .tag("value2", Tag.inserting(Component.text(" list [#]")))
+ .build()
);
return false;
}
@@ -700,46 +745,39 @@ public class Area extends SubCommand {
percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
region = "N/A";
}
- Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
- Template usageTemplate = Template.of("usage", String.format("%.2f", percent) + "%");
- Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
- Template regionTemplate = Template.of("region", region);
- Template generatorTemplate = Template.of("generator", generator);
- String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE
- .parse(
- TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
- claimedTemplate,
- usageTemplate,
- clustersTemplate,
- regionTemplate,
- generatorTemplate
- ));
- Template tooltipTemplate = Template.of("hover_info", tooltip);
- Template visitcmdTemplate = Template.of("command_tp", "/plot area tp " + area);
- Template infocmdTemplate = Template.of("command_info", "/plot area info " + area);
- Template numberTemplate = Template.of("number", String.valueOf(i));
- Template nameTemplate = Template.of("area_name", name);
- Template typeTemplate = Template.of("area_type", area.getType().name());
- Template terrainTemplate = Template.of("area_terrain", area.getTerrain().name());
- caption.set(TranslatableCaption.of("info.area_list_item"));
- caption.setTemplates(
- tooltipTemplate,
- visitcmdTemplate,
- numberTemplate,
- nameTemplate,
- typeTemplate,
- terrainTemplate,
- infocmdTemplate
+ Component tooltip = MINI_MESSAGE.deserialize(
+ TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
+ TagResolver.builder()
+ .tag("claimed", Tag.inserting(Component.text(claimed)))
+ .tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent) + "%")))
+ .tag("clusters", Tag.inserting(Component.text(clusters)))
+ .tag("region", Tag.inserting(Component.text(region)))
+ .tag("generator", Tag.inserting(Component.text(generator)))
+ .build()
);
+ TagResolver resolver = TagResolver.builder()
+ .tag("hover_info", Tag.inserting(tooltip))
+ .tag("command_tp", Tag.preProcessParsed("/plot area tp " + name))
+ .tag("command_info", Tag.preProcessParsed("/plot area info " + name))
+ .tag("number", Tag.inserting(Component.text(i)))
+ .tag("area_name", Tag.inserting(Component.text(name)))
+ .tag("area_type", Tag.inserting(Component.text(area.getType().name())))
+ .tag("area_terrain", Tag.inserting(Component.text(area.getTerrain().name())))
+ .build();
+ caption.set(TranslatableCaption.of("info.area_list_item"));
+ caption.setTagResolvers(resolver);
}
}, "/plot area list", TranslatableCaption.of("list.area_list_header_paged"));
return true;
}
case "regen", "clear", "reset", "regenerate" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_REGEN)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_REGEN)
+ )
);
return false;
}
@@ -751,13 +789,12 @@ public class Area extends SubCommand {
if (area.getType() != PlotAreaType.PARTIAL) {
player.sendMessage(
TranslatableCaption.of("single.delete_world_region"),
- Template.of("world", area.getWorldName())
+ TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
);
return false;
}
QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
- queue.setChunkConsumer(chunk -> AugmentedUtils.generate(
- null,
+ queue.setChunkConsumer(chunk -> AugmentedUtils.generateChunk(
area.getWorldName(),
chunk.getX(),
chunk.getZ(),
@@ -769,23 +806,26 @@ public class Area extends SubCommand {
return true;
}
case "goto", "v", "teleport", "visit", "tp" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
+ if (!player.hasPermission(Permission.PERMISSION_AREA_TP)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AREA_TP))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AREA_TP))
);
return false;
}
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot area tp [area]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot area tp [area]")))
);
return false;
}
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]);
if (area == null) {
- player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
+ player.sendMessage(
+ TranslatableCaption.of("errors.not_valid_plot_world"),
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
+ );
return false;
}
Location center;
@@ -825,19 +865,19 @@ public class Area extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
completions.add("create");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_CREATE)) {
completions.add("single");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_LIST)) {
completions.add("list");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_INFO)) {
completions.add("info");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_TP)) {
completions.add("tp");
}
final List commands = completions.stream().filter(completion -> completion
@@ -852,7 +892,7 @@ public class Area extends SubCommand {
CommandCategory.ADMINISTRATION
) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_AREA) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java
index c59edbd64..a31d17c46 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Auto.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java
@@ -35,16 +35,18 @@ import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.services.plots.AutoQuery;
import com.plotsquared.core.services.plots.AutoService;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.task.AutoClaimFinishTask;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.TaskManager;
import io.leangen.geantyref.TypeToken;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -110,13 +112,13 @@ public class Auto extends SubCommand {
if (diff < 0 && grantedPlots < sizeX * sizeZ) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(diff + grantedPlots))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
);
return false;
} else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(diff + grantedPlots))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
);
return false;
} else {
@@ -128,15 +130,16 @@ public class Auto extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("economy.removed_granted_plot"),
- Template.of("usedGrants", String.valueOf(grantedPlots - left)),
- Template.of("remainingGrants", String.valueOf(left))
+ TagResolver.builder()
+ .tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
+ .tag("remainingGrants", Tag.inserting(Component.text(left)))
+ .build()
);
}
} else {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(player.getAllowedPlots())
- )
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
);
return false;
}
@@ -215,7 +218,7 @@ public class Auto extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", getUsage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
);
return true;
}
@@ -238,7 +241,7 @@ public class Auto extends SubCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Auto claim")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto claim")))
);
return true;
}
@@ -246,16 +249,17 @@ public class Auto extends SubCommand {
sizeX = event.getSizeX();
sizeZ = event.getSizeZ();
schematic = event.getSchematic();
- if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) {
+ if (!force && mega && !player.hasPermission(Permission.PERMISSION_AUTO_MEGA)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AUTO_MEGA))
);
+ return false;
}
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots_num"),
- Template.of("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Claim.MAX_AUTO_AREA)))
);
return false;
}
@@ -273,29 +277,32 @@ public class Auto extends SubCommand {
if (!plotarea.hasSchematic(schematic)) {
player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid_named"),
- Template.of("schemname", schematic),
- Template.of("reason", "non-existent")
+ TagResolver.builder()
+ .tag("schemname", Tag.inserting(Component.text(schematic)))
+ .tag("reason", Tag.inserting(Component.text("non-existent")))
+ .build()
);
return true;
}
- if (!force && !Permissions.hasPermission(
- player,
+ if (!force && !player.hasPermission(
Permission.PERMISSION_CLAIM_SCHEMATIC.format(schematic)
- ) && !Permissions
- .hasPermission(player, "plots.admin.command.schematic")) {
+ ) && !player.hasPermission("plots.admin.command.schematic")) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", "plots.claim.%s0")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.claim.%s0")))
);
return true;
}
}
if (this.econHandler != null && plotarea.useEconomy()) {
PlotExpression costExp = plotarea.getPrices().get("claim");
+ PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
+ int size = sizeX * sizeZ;
+ double mergeCost = size <= 1 || mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
player.getPlotCount() :
player.getPlotCount(plotarea.getWorldName()));
- cost = (sizeX * sizeZ) * cost;
+ cost = size * cost + mergeCost;
if (cost > 0d) {
if (!this.econHandler.isSupported()) {
player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
@@ -304,21 +311,26 @@ public class Auto extends SubCommand {
if (!force && this.econHandler.getMoney(player) < cost) {
player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_plot"),
- Template.of("money", this.econHandler.format(cost)),
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
+ TagResolver.builder()
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
+ .tag(
+ "balance",
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
+ )
+ .build()
);
return false;
}
this.econHandler.withdrawMoney(player, cost);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(cost))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
);
}
}
List plots = this.servicePipeline
- .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
+ .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
.through(AutoService.class)
.getResult();
@@ -346,7 +358,7 @@ public class Auto extends SubCommand {
if (!force && mergeEvent.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Auto merge")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge")))
);
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Backup.java b/Core/src/main/java/com/plotsquared/core/command/Backup.java
index adb832c61..3ccbb3f98 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Backup.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Backup.java
@@ -27,10 +27,11 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.nio.file.Files;
@@ -67,7 +68,7 @@ public final class Backup extends Command {
private static boolean sendMessage(PlotPlayer player) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot backup ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot backup ")))
);
return true;
}
@@ -135,34 +136,44 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
+ ))
);
} else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
} else if (plot.isMerged()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
+ ))
);
- } else if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
+ } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
+ )
);
} else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
if (backupProfile instanceof NullBackupProfile) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
+ TagResolver.resolver(
+ "plot", Tag.inserting(TranslatableCaption
+ .of("generic.generic_other")
+ .toComponent(player))
+ )
);
} else {
backupProfile.createBackup().whenComplete((backup, throwable) -> {
if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_save_failed"),
- Template.of("reason", throwable.getMessage())
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
);
throwable.printStackTrace();
} else {
@@ -189,50 +200,64 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
+ ))
);
} else if (plot.isMerged()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
+ ))
);
} else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
- } else if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
+ } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
+ )
);
} else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
if (backupProfile instanceof NullBackupProfile) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_other").toComponent(player)
+ ))
);
} else {
backupProfile.listBackups().whenComplete((backups, throwable) -> {
if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_list_failed"),
- Template.of("reason", throwable.getMessage())
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
);
throwable.printStackTrace();
} else {
player.sendMessage(
TranslatableCaption.of("backups.backup_list_header"),
- Template.of("plot", plot.getId().toCommaSeparatedString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toCommaSeparatedString())))
);
try {
for (int i = 0; i < backups.size(); i++) {
player.sendMessage(
TranslatableCaption.of("backups.backup_list_entry"),
- Template.of("number", Integer.toString(i + 1)),
- Template.of("value", DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.ofInstant(
- Instant.ofEpochMilli(backups.get(i).getCreationTime()),
- ZoneId.systemDefault()
- )))
+ TagResolver.builder()
+ .tag("number", Tag.inserting(Component.text(i + 1)))
+ .tag(
+ "value",
+ Tag.inserting(Component.text(DateTimeFormatter.RFC_1123_DATE_TIME.format(
+ ZonedDateTime.ofInstant(
+ Instant.ofEpochMilli(backups.get(i).getCreationTime()),
+ ZoneId.systemDefault()
+ ))))
+ )
+ .build()
);
}
} catch (final Exception e) {
@@ -260,25 +285,31 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_unowned").toComponent(player)
+ ))
);
} else if (plot.isMerged()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_merged").toComponent(player)
+ ))
);
} else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
- } else if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
+ } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
+ )
);
} else if (args.length == 0) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "Usage: /plot backup save/list/load")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Usage: /plot backup save/list/load")))
);
} else {
final int number;
@@ -287,7 +318,7 @@ public final class Backup extends Command {
} catch (final Exception e) {
player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
return;
}
@@ -295,23 +326,27 @@ public final class Backup extends Command {
if (backupProfile instanceof NullBackupProfile) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
+ TagResolver.resolver("plot", Tag.inserting(
+ TranslatableCaption.of("generic.generic_other").toComponent(player)
+ ))
);
} else {
backupProfile.listBackups().whenComplete((backups, throwable) -> {
if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_load_failure"),
- Template.of("reason", throwable.getMessage())
+ TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
);
throwable.printStackTrace();
} else {
if (number < 1 || number > backups.size()) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of(
+ TagResolver.resolver(
"plot",
- TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
+ Tag.inserting(TranslatableCaption
+ .of("generic.generic_invalid_choice")
+ .toComponent(player))
)
);
} else {
@@ -321,9 +356,11 @@ public final class Backup extends Command {
.exists(backup.getFile())) {
player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"),
- Template.of(
+ TagResolver.resolver(
"plot",
- TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
+ Tag.inserting(TranslatableCaption
+ .of("generic.generic_invalid_choice")
+ .toComponent(player))
)
);
} else {
@@ -333,7 +370,10 @@ public final class Backup extends Command {
if (error != null) {
player.sendMessage(
TranslatableCaption.of("backups.backup_load_failure"),
- Template.of("reason", error.getMessage())
+ TagResolver.resolver(
+ "reason",
+ Tag.inserting(Component.text(error.getMessage()))
+ )
);
} else {
player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Biome.java b/Core/src/main/java/com/plotsquared/core/command/Biome.java
index 2a909f49c..9e0aa1a77 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Biome.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Biome.java
@@ -18,6 +18,7 @@
*/
package com.plotsquared.core.command;
+import com.plotsquared.core.configuration.caption.StaticCaption;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
@@ -25,7 +26,9 @@ import com.plotsquared.core.util.StringMan;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
-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;
import java.util.Collection;
import java.util.Locale;
@@ -47,16 +50,13 @@ public class Biome extends SetCommand {
} catch (final Exception ignore) {
}
if (biome == null) {
- String biomes = StringMan.join(
- BiomeType.REGISTRY.values(),
- MINI_MESSAGE.serialize(MINI_MESSAGE.parse(TranslatableCaption
- .of("blocklist.block_list_separator")
- .getComponent(player)))
- );
+ String separator = TranslatableCaption.of("blocklist.block_list_separator").getComponent(player);
player.sendMessage(TranslatableCaption.of("biome.need_biome"));
player.sendMessage(
- TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
- Template.of("values", biomes)
+ StaticCaption.of(
+ TranslatableCaption.of("commandconfig.subcommand_set_options_header_only").getComponent(player)
+ + StringMan.join(BiomeType.REGISTRY.values(), separator)
+ )
);
return false;
}
@@ -73,7 +73,7 @@ public class Biome extends SetCommand {
plot.removeRunning();
player.sendMessage(
TranslatableCaption.of("biome.biome_set_to"),
- Template.of("value", value.toLowerCase())
+ TagResolver.resolver("value", Tag.inserting(Component.text(value.toLowerCase())))
);
});
return true;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Buy.java b/Core/src/main/java/com/plotsquared/core/command/Buy.java
index 089bfb1bf..49222b66d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Buy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java
@@ -32,7 +32,9 @@ import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Set;
@@ -84,7 +86,7 @@ public class Buy extends Command {
checkTrue(
player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
);
double price = plot.getFlag(PriceFlag.class);
if (price <= 0) {
@@ -97,8 +99,10 @@ public class Buy extends Command {
checkTrue(
this.econHandler.getMoney(player) >= price,
TranslatableCaption.of("economy.cannot_afford_plot"),
- Template.of("money", this.econHandler.format(price)),
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
+ TagResolver.builder()
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+ .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
+ .build()
);
this.econHandler.withdrawMoney(player, price);
// Failure
@@ -106,7 +110,7 @@ public class Buy extends Command {
confirm.run(this, () -> {
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(price))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
@@ -115,9 +119,11 @@ public class Buy extends Command {
if (owner != null) {
owner.sendMessage(
TranslatableCaption.of("economy.plot_sold"),
- Template.of("plot", plot.getId().toString()),
- Template.of("player", player.getName()),
- Template.of("price", this.econHandler.format(price))
+ TagResolver.builder()
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
+ .tag("player", Tag.inserting(Component.text(player.getName())))
+ .tag("price", Tag.inserting(Component.text(this.econHandler.format(price))))
+ .build()
);
}
PlotFlag plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
@@ -126,9 +132,10 @@ public class Buy extends Command {
plot.removeFlag(event.getFlag());
}
plot.setOwner(player.getUUID());
+ plot.getPlotModificationManager().setSign(player.getName());
player.sendMessage(
TranslatableCaption.of("working.claimed"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
whenDone.run(Buy.this, CommandResult.SUCCESS);
}, () -> {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Caps.java b/Core/src/main/java/com/plotsquared/core/command/Caps.java
index da99bcfb2..dd3cf7ec8 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Caps.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Caps.java
@@ -29,8 +29,10 @@ import com.plotsquared.core.plot.flag.implementations.HostileCapFlag;
import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
-import com.plotsquared.core.util.Permissions;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
@@ -51,11 +53,10 @@ public class Caps extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if (!plot.isAdded(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
+ if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_CAPS_OTHER))
);
return false;
}
@@ -82,15 +83,17 @@ public class Caps extends SubCommand {
final int current = countedEntities[type];
final int max = plot.getFlag(capFlag);
final String percentage = String.format("%.1f", 100 * ((float) current / max));
- String maxBeautified = max >= Integer.MAX_VALUE
- ? TranslatableCaption.of("info.infinite").getComponent(player)
- : String.valueOf(max);
+ ComponentLike maxBeautified = max >= Integer.MAX_VALUE
+ ? TranslatableCaption.of("info.infinite").toComponent(player)
+ : Component.text(max);
player.sendMessage(
TranslatableCaption.of("info.plot_caps_format"),
- Template.of("cap", name),
- Template.of("current", String.valueOf(current)),
- Template.of("limit", maxBeautified),
- Template.of("percentage", percentage)
+ TagResolver.builder()
+ .tag("cap", Tag.inserting(Component.text(name)))
+ .tag("current", Tag.inserting(Component.text(current)))
+ .tag("limit", Tag.inserting(maxBeautified))
+ .tag("percentage", Tag.inserting(Component.text(percentage)))
+ .build()
);
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Chat.java b/Core/src/main/java/com/plotsquared/core/command/Chat.java
deleted file mode 100644
index 3a70c654c..000000000
--- a/Core/src/main/java/com/plotsquared/core/command/Chat.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.plotsquared.core.command;
-
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.PlotArea;
-import net.kyori.adventure.text.minimessage.Template;
-
-/**
- * @deprecated In favor of "/plot toggle chat" and
- * scheduled for removal within the next major release.
- */
-@Deprecated(forRemoval = true, since = "6.0.0")
-@CommandDeclaration(command = "chat",
- usage = "/plot chat",
- permission = "plots.chat",
- category = CommandCategory.CHAT,
- requiredType = RequiredType.PLAYER)
-public class Chat extends SubCommand {
-
- @Override
- public boolean onCommand(PlotPlayer player, String[] args) {
- PlotArea area = player.getPlotAreaAbs();
- check(area, TranslatableCaption.of("errors.not_in_plot_world"));
- player.sendMessage(
- TranslatableCaption.of("errors.deprecated_commands"),
- Template.of("replacement", "/plot toggle chat")
- );
- if (player.getPlotAreaAbs().isForcingPlotChat()) {
- player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));
- return true;
- }
- MainCommand.getInstance().toggle.chat(this, player, args, null, null);
- return true;
- }
-
-}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java
index 821ade23d..e9848685c 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Claim.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java
@@ -35,10 +35,11 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
@@ -82,7 +83,7 @@ public class Claim extends SubCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Claim")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Claim")))
);
return true;
}
@@ -101,14 +102,14 @@ public class Claim extends SubCommand {
if (grants <= 0) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(grants))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(grants)))
);
metaDataAccess.remove();
}
} else {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
);
return false;
}
@@ -123,18 +124,19 @@ public class Claim extends SubCommand {
if (!area.hasSchematic(schematic)) {
player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid_named"),
- Template.of("schemname", schematic),
- Template.of("reason", "non-existent")
+ TagResolver.builder()
+ .tag("schemname", Tag.inserting(Component.text(schematic)))
+ .tag("reason", Tag.inserting(Component.text("non-existent")))
+ .build()
);
}
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC
- .format(schematic)) && !Permissions.hasPermission(
- player,
+ if (!player.hasPermission(Permission.PERMISSION_CLAIM_SCHEMATIC
+ .format(schematic)) && !player.hasPermission(
"plots.admin.command.schematic"
) && !force) {
player.sendMessage(
TranslatableCaption.of("permission.no_schematic_permission"),
- Template.of("value", schematic)
+ TagResolver.resolver("value", Tag.inserting(Component.text(schematic)))
);
}
}
@@ -150,16 +152,28 @@ public class Claim extends SubCommand {
if (this.econHandler.getMoney(player) < cost) {
player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_plot"),
- Template.of("money", this.econHandler.format(cost)),
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
+ TagResolver.builder()
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
+ .tag(
+ "balance",
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
+ player))))
+ )
+ .build()
);
return false;
}
this.econHandler.withdrawMoney(player, cost);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(cost)),
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
+ TagResolver.builder()
+ .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
+ .tag(
+ "balance",
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
+ player))))
+ )
+ .build()
);
}
}
@@ -171,12 +185,14 @@ public class Claim extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("economy.removed_granted_plot"),
- Template.of("usedGrants", String.valueOf((grants - 1))),
- Template.of("remainingGrants", String.valueOf(grants))
+ TagResolver.builder()
+ .tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
+ .tag("remainingGrants", Tag.inserting(Component.text(grants)))
+ .build()
);
}
}
- if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+ if (!player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
int border = area.getBorder();
if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) {
player.sendMessage(TranslatableCaption.of("border.denied"));
@@ -198,7 +214,7 @@ public class Claim extends SubCommand {
if (mergeEvent.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Auto merge on claim")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
);
} else {
if (plot.getPlotModificationManager().autoMerge(
diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java
index a8d50e223..68d97e380 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Clear.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java
@@ -32,11 +32,12 @@ import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.concurrent.CompletableFuture;
@@ -79,7 +80,7 @@ public class Clear extends Command {
if (eventResult == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Clear")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Clear")))
);
return CompletableFuture.completedFuture(true);
}
@@ -89,13 +90,14 @@ public class Clear extends Command {
}
boolean force = eventResult == Result.FORCE;
checkTrue(
- force || plot.isOwner(player.getUUID()) || Permissions
- .hasPermission(player, "plots.admin.command.clear"),
+ force || plot.isOwner(player.getUUID()) || player.hasPermission("plots.admin.command.clear"),
TranslatableCaption.of("permission.no_plot_perms")
);
checkTrue(plot.getRunning() == 0, TranslatableCaption.of("errors.wait_for_timer"));
- checkTrue(force || !Settings.Done.RESTRICT_BUILDING || !DoneFlag.isDone(plot) || Permissions
- .hasPermission(player, "plots.continue"), TranslatableCaption.of("done.done_already_done"));
+ checkTrue(
+ force || !Settings.Done.RESTRICT_BUILDING || !DoneFlag.isDone(plot) || player.hasPermission("plots.continue"),
+ TranslatableCaption.of("done.done_already_done")
+ );
confirm.run(this, () -> {
if (Settings.Teleport.ON_CLEAR) {
plot.getPlayersInPlot().forEach(playerInPlot -> plot.teleportPlayer(playerInPlot, TeleportCause.COMMAND_CLEAR,
@@ -105,36 +107,35 @@ public class Clear extends Command {
}
BackupManager.backup(player, plot, () -> {
final long start = System.currentTimeMillis();
- boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
- plot.getPlotModificationManager().unlink();
- TaskManager.runTask(() -> {
- plot.removeRunning();
- // If the state changes, then mark it as no longer done
- if (DoneFlag.isDone(plot)) {
- PlotFlag plotFlag =
- plot.getFlagContainer().getFlag(DoneFlag.class);
- PlotFlagRemoveEvent event = this.eventDispatcher
- .callFlagRemove(plotFlag, plot);
- if (event.getEventResult() != Result.DENY) {
- plot.removeFlag(event.getFlag());
- }
+ boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
+ plot.removeRunning();
+ // If the state changes, then mark it as no longer done
+ if (DoneFlag.isDone(plot)) {
+ PlotFlag plotFlag =
+ plot.getFlagContainer().getFlag(DoneFlag.class);
+ PlotFlagRemoveEvent event = this.eventDispatcher
+ .callFlagRemove(plotFlag, plot);
+ if (event.getEventResult() != Result.DENY) {
+ plot.removeFlag(event.getFlag());
}
- if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
- PlotFlag plotFlag =
- plot.getFlagContainer().getFlag(AnalysisFlag.class);
- PlotFlagRemoveEvent event = this.eventDispatcher
- .callFlagRemove(plotFlag, plot);
- if (event.getEventResult() != Result.DENY) {
- plot.removeFlag(event.getFlag());
- }
+ }
+ if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
+ PlotFlag plotFlag =
+ plot.getFlagContainer().getFlag(AnalysisFlag.class);
+ PlotFlagRemoveEvent event = this.eventDispatcher
+ .callFlagRemove(plotFlag, plot);
+ if (event.getEventResult() != Result.DENY) {
+ plot.removeFlag(event.getFlag());
}
- player.sendMessage(
- TranslatableCaption.of("working.clearing_done"),
- Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
- Template.of("plot", plot.getId().toString())
- );
- });
- });
+ }
+ player.sendMessage(
+ TranslatableCaption.of("working.clearing_done"),
+ TagResolver.builder()
+ .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
+ .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
+ .build()
+ );
+ }));
if (!result) {
player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
} else {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java
index 74d38407d..f52a56616 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java
@@ -32,20 +32,26 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotCluster;
import com.plotsquared.core.plot.PlotId;
-import com.plotsquared.core.util.Permissions;
+import com.plotsquared.core.util.ComponentHelper;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.query.PlotQuery;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@CommandDeclaration(command = "cluster",
aliases = "clusters",
@@ -54,36 +60,39 @@ import java.util.stream.Collectors;
permission = "plots.cluster")
public class Cluster extends SubCommand {
+ private static final Component[] AVAILABLE_ARGS = Stream.of(
+ "list", "create", "delete", "resize", "invite", "kick", "leave", "helpers", "tp", "sethome"
+ ).map(s -> Component.text(s).style(Style.style(NamedTextColor.DARK_AQUA))).toArray(Component[]::new);
+ private static final Component SEPARATOR = Component.text(", ").style(Style.style(NamedTextColor.GRAY));
+
+ // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
@Override
public boolean onCommand(PlotPlayer player, String[] args) {
-
- // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
if (args.length == 0) {
// return arguments
player.sendMessage(
TranslatableCaption.of("cluster.cluster_available_args"),
- Template.of(
- "list",
- "list, create, delete, resize, invite, kick, leave, members, info, tp, sethome"
- )
+ TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
);
return false;
}
String sub = args[0].toLowerCase();
switch (sub) {
- case "l":
- case "list": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
+ case "l", "list" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_LIST)
+ )
);
return false;
}
if (args.length != 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster list")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster list")))
);
return false;
}
@@ -95,7 +104,7 @@ public class Cluster extends SubCommand {
Set clusters = area.getClusters();
player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_heading"),
- Template.of("amount", clusters.size() + "")
+ TagResolver.resolver("amount", Tag.inserting(Component.text(clusters.size())))
);
for (PlotCluster cluster : clusters) {
// Ignore unmanaged clusters
@@ -103,33 +112,35 @@ public class Cluster extends SubCommand {
if (player.getUUID().equals(cluster.owner)) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_owner"),
- Template.of("cluster", name)
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
);
} else if (cluster.helpers.contains(player.getUUID())) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_helpers"),
- Template.of("cluster", name)
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
);
} else if (cluster.invited.contains(player.getUUID())) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_invited"),
- Template.of("cluster", name)
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
);
} else {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element"),
- Template.of("cluster", cluster.toString())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.toString())))
);
}
}
return true;
}
- case "c":
- case "create": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
+ case "c", "create" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE)
+ )
);
return false;
}
@@ -141,7 +152,10 @@ public class Cluster extends SubCommand {
if (args.length != 4) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster create ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot cluster create "))
+ )
);
return false;
}
@@ -151,7 +165,7 @@ public class Cluster extends SubCommand {
if (currentClusters >= player.getAllowedPlots()) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_clusters"),
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
);
}
PlotId pos1;
@@ -169,7 +183,7 @@ public class Cluster extends SubCommand {
if (area.getCluster(name) != null) {
player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"),
- Template.of("alias", name)
+ TagResolver.resolver("alias", Tag.inserting(Component.text(name)))
);
return false;
}
@@ -183,7 +197,7 @@ public class Cluster extends SubCommand {
if (cluster != null) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"),
- Template.of("cluster", cluster.getName())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
);
return false;
}
@@ -191,20 +205,22 @@ public class Cluster extends SubCommand {
if (!area.contains(pos1) || !area.contains(pos2)) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_outside"),
- Template.of("area", String.valueOf(area))
+ TagResolver.resolver("area", Tag.inserting(Component.text(area.toString())))
);
return false;
}
Set plots = area.getPlotSelectionOwned(pos1, pos2);
if (!plots.isEmpty()) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE_OTHER)) {
UUID uuid = player.getUUID();
for (Plot plot : plots) {
if (!plot.isOwner(uuid)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE_OTHER)
+ )
);
return false;
}
@@ -219,14 +235,17 @@ public class Cluster extends SubCommand {
} else {
current = player.getPlayerClusterCount(player.getLocation().getWorldName());
}
- int allowed = Permissions
- .hasPermissionRange(player, Permission.PERMISSION_CLUSTER_SIZE,
- Settings.Limit.MAX_PLOTS
- );
+ int allowed = player.hasPermissionRange(
+ Permission.PERMISSION_CLUSTER_SIZE,
+ Settings.Limit.MAX_PLOTS
+ );
if (current + cluster.getArea() > allowed) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea())))
+ )
);
return false;
}
@@ -245,24 +264,25 @@ public class Cluster extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("cluster.cluster_created"),
- Template.of("name", name)
+ TagResolver.resolver("name", Tag.inserting(Component.text(name)))
);
return true;
}
- case "disband":
- case "del":
- case "delete": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
+ case "disband", "del", "delete" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE)
+ )
);
return false;
}
if (args.length != 1 && args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster delete [name]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster delete [name]")))
);
return false;
}
@@ -277,7 +297,7 @@ public class Cluster extends SubCommand {
if (cluster == null) {
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"),
- Template.of("cluster", args[1])
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
);
return false;
}
@@ -289,35 +309,39 @@ public class Cluster extends SubCommand {
}
}
if (!cluster.owner.equals(player.getUUID())) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE_OTHER)
+ )
);
return false;
}
}
DBFunc.delete(cluster);
- player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.of(
+ player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), TagResolver.resolver(
"cluster",
- String.valueOf(cluster)
+ Tag.inserting(Component.text(cluster.toString()))
));
return true;
}
- case "res":
- case "resize": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
+ case "res", "resize" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE)
+ )
);
return false;
}
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster resize [name]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster resize [name]")))
);
return false;
}
@@ -347,11 +371,13 @@ public class Cluster extends SubCommand {
return false;
}
if (!cluster.hasHelperRights(player.getUUID())) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)
+ )
);
return false;
}
@@ -361,34 +387,37 @@ public class Cluster extends SubCommand {
if (intersect != null) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"),
- Template.of("cluster", intersect.getName())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(intersect.getName())))
);
return false;
}
Set existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
Set newPlots = area.getPlotSelectionOwned(pos1, pos2);
- // Set removed = (HashSet) existing.clone();
Set removed = new HashSet<>(existing);
removed.removeAll(newPlots);
// Check expand / shrink
if (!removed.isEmpty()) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)
+ )
);
return false;
}
}
newPlots.removeAll(existing);
if (!newPlots.isEmpty()) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)
+ )
);
return false;
}
@@ -401,13 +430,16 @@ public class Cluster extends SubCommand {
current = player.getPlayerClusterCount(player.getLocation().getWorldName());
}
current -= cluster.getArea() + (1 + pos2.getX() - pos1.getX()) * (1 + pos2.getY() - pos1.getY());
- int allowed = Permissions.hasPermissionRange(player, Permission.PERMISSION_CLUSTER,
+ int allowed = player.hasPermissionRange(
+ Permission.PERMISSION_CLUSTER,
Settings.Limit.MAX_PLOTS
);
if (current + cluster.getArea() > allowed) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea()))
+ TagResolver.resolver("node", Tag.inserting(Component.text(
+ Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea())
+ )))
);
return false;
}
@@ -416,20 +448,21 @@ public class Cluster extends SubCommand {
player.sendMessage(TranslatableCaption.of("cluster.cluster_resized"));
return true;
}
- case "add":
- case "inv":
- case "invite": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
+ case "add", "inv", "invite" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE)
+ )
);
return false;
}
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster invite ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster invite ")))
);
return false;
}
@@ -444,11 +477,13 @@ public class Cluster extends SubCommand {
return false;
}
if (!cluster.hasHelperRights(player.getUUID())) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE_OTHER)
+ )
);
return false;
}
@@ -461,7 +496,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
);
} else {
if (!cluster.isAdded(uuid)) {
@@ -473,7 +508,7 @@ public class Cluster extends SubCommand {
if (otherPlayer != null) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_invited"),
- Template.of("cluster", cluster.getName())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
);
}
}
@@ -482,20 +517,21 @@ public class Cluster extends SubCommand {
});
return true;
}
- case "k":
- case "remove":
- case "kick": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
+ case "k", "remove", "kick" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_KICK)
+ )
);
return false;
}
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster kick ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster kick ")))
);
return false;
}
@@ -509,11 +545,13 @@ public class Cluster extends SubCommand {
return false;
}
if (!cluster.hasHelperRights(player.getUUID())) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_KICK_OTHER)
+ )
);
return false;
}
@@ -526,7 +564,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
);
} else {
// Can't kick if the player is yourself, the owner, or not added to the cluster
@@ -534,7 +572,7 @@ public class Cluster extends SubCommand {
|| !cluster.isAdded(uuid)) {
player.sendMessage(
TranslatableCaption.of("cluster.cannot_kick_player"),
- Template.of("value", cluster.getName())
+ TagResolver.resolver("value", Tag.inserting(Component.text(cluster.getName())))
);
} else {
if (cluster.helpers.contains(uuid)) {
@@ -549,7 +587,7 @@ public class Cluster extends SubCommand {
if (player2 != null) {
player.sendMessage(
TranslatableCaption.of("cluster.cluster_removed"),
- Template.of("cluster", cluster.getName())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
);
}
removePlayerPlots(cluster, uuid, player2.getLocation().getWorldName());
@@ -559,19 +597,21 @@ public class Cluster extends SubCommand {
});
return true;
}
- case "quit":
- case "leave": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) {
+ case "quit", "leave" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_LEAVE)
+ )
);
return false;
}
if (args.length != 1 && args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster leave [name]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster leave [name]")))
);
return false;
}
@@ -585,7 +625,7 @@ public class Cluster extends SubCommand {
if (cluster == null) {
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"),
- Template.of("cluster", args[1])
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
);
return false;
}
@@ -613,23 +653,29 @@ public class Cluster extends SubCommand {
DBFunc.removeInvited(cluster, uuid);
player.sendMessage(
TranslatableCaption.of("cluster.cluster_removed"),
- Template.of("cluster", cluster.getName())
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
);
removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
return true;
}
- case "members": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
+ case "members" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_HELPERS.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_HELPERS.toString()))
+ )
);
return false;
}
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster members ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot cluster members "))
+ )
);
return false;
}
@@ -650,7 +696,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[2])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
);
} else {
if (args[1].equalsIgnoreCase("add")) {
@@ -664,27 +710,30 @@ public class Cluster extends SubCommand {
} else {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster members ")
+ TagResolver.resolver("value", Tag.inserting(Component.text(
+ "/plot cluster members "
+ )))
);
}
}
});
return true;
}
- case "spawn":
- case "home":
- case "tp": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
+ case "spawn", "home", "tp" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
+ )
);
return false;
}
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster tp ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster tp ")))
);
return false;
}
@@ -697,16 +746,19 @@ public class Cluster extends SubCommand {
if (cluster == null) {
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"),
- Template.of("cluster", args[1])
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
);
return false;
}
UUID uuid = player.getUUID();
if (!cluster.isAdded(uuid)) {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP_OTHER)
+ )
);
return false;
}
@@ -715,21 +767,21 @@ public class Cluster extends SubCommand {
player.sendMessage(TranslatableCaption.of("cluster.cluster_teleporting"));
return true;
}
- case "i":
- case "info":
- case "show":
- case "information": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
+ case "i", "info", "show", "information" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
+ )
);
return false;
}
if (args.length != 1 && args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster info [name]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster info [name]")))
);
}
PlotArea area = player.getApplicablePlotArea();
@@ -743,7 +795,7 @@ public class Cluster extends SubCommand {
if (cluster == null) {
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"),
- Template.of("cluster", args[1])
+ TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
);
return false;
}
@@ -762,47 +814,36 @@ public class Cluster extends SubCommand {
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
} else {
final String owner;
- if (username == null) {
- owner = "unknown";
- } else {
- owner = username;
- }
+ owner = Objects.requireNonNullElse(username, "unknown");
String name = cluster.getName();
String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
cluster.getP2().getY() - cluster.getP1().getY() + 1);
String rights = cluster.isAdded(player.getUUID()) + "";
Caption message = TranslatableCaption.of("cluster.cluster_info");
- Template idTemplate = Template.of("id", id);
- Template ownerTemplate = Template.of("owner", owner);
- Template nameTemplate = Template.of("name", name);
- Template sizeTemplate = Template.of("size", size);
- Template rightsTemplate = Template.of("rights", rights);
- player.sendMessage(
- message,
- idTemplate,
- ownerTemplate,
- nameTemplate,
- sizeTemplate,
- rightsTemplate
- );
+ TagResolver resolver = TagResolver.builder()
+ .tag("id", Tag.inserting(Component.text(id)))
+ .tag("owner", Tag.inserting(Component.text(owner)))
+ .tag("name", Tag.inserting(Component.text(name)))
+ .tag("size", Tag.inserting(Component.text(size)))
+ .tag("rights", Tag.inserting(Component.text(rights)))
+ .build();
+ player.sendMessage(message, resolver);
}
});
return true;
}
- case "sh":
- case "setspawn":
- case "sethome": {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
+ case "sh", "setspawn", "sethome" -> {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString())
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME))
);
return false;
}
if (args.length != 1 && args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot cluster sethome")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster sethome")))
);
return false;
}
@@ -816,11 +857,13 @@ public class Cluster extends SubCommand {
return false;
}
if (!cluster.hasHelperRights(player.getUUID())) {
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
+ if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)
+ )
);
return false;
}
@@ -839,10 +882,7 @@ public class Cluster extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("cluster.cluster_available_args"),
- Template.of(
- "list",
- "list, create, delete, resize, invite, kick, leave, members, info, tp, sethome"
- )
+ TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
);
return false;
}
@@ -869,37 +909,37 @@ public class Cluster extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
completions.add("list");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
completions.add("create");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
completions.add("delete");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
completions.add("resize");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
completions.add("invite");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
completions.add("kick");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
completions.add("leave");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
completions.add("members");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
completions.add("info");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
completions.add("tp");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
completions.add("sethome");
}
final List commands = completions.stream().filter(completion -> completion
@@ -914,7 +954,7 @@ public class Cluster extends SubCommand {
CommandCategory.ADMINISTRATION
) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_CLUSTER) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
index 374e9ec6e..0db2c3838 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
@@ -25,7 +25,9 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.task.TaskTime;
-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;
import org.checkerframework.checker.nullness.qual.Nullable;
public class CmdConfirm {
@@ -52,9 +54,11 @@ public class CmdConfirm {
if (commandStr != null) {
player.sendMessage(
TranslatableCaption.of("confirm.requires_confirm"),
- Template.of("command", commandStr),
- Template.of("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)),
- Template.of("value", "/plot confirm")
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text(commandStr)))
+ .tag("timeout", Tag.inserting(Component.text(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)))
+ .tag("value", Tag.inserting(Component.text("/plot confirm")))
+ .build()
);
}
TaskManager.runTaskLater(() -> {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java
index c3cd5ce36..9205a4fd5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Command.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Command.java
@@ -25,13 +25,14 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.permissions.PermissionHolder;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringComparison;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
+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;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.lang.reflect.InvocationTargetException;
@@ -256,10 +257,14 @@ public abstract class Command {
max = c.size();
}
// Send the header
- Template curTemplate = Template.of("cur", String.valueOf(page + 1));
- Template maxTemplate = Template.of("max", String.valueOf(totalPages + 1));
- Template amountTemplate = Template.of("amount", String.valueOf(c.size()));
- player.sendMessage(header, curTemplate, maxTemplate, amountTemplate);
+ player.sendMessage(
+ header,
+ TagResolver.builder()
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
+ .tag("max", Tag.inserting(Component.text(totalPages + 1)))
+ .tag("amount", Tag.inserting(Component.text(c.size())))
+ .build()
+ );
// Send the page content
List subList = c.subList(page * size, max);
int i = page * size;
@@ -267,13 +272,24 @@ public abstract class Command {
i++;
final CaptionHolder msg = new CaptionHolder();
add.run(i, obj, msg);
- player.sendMessage(msg.get(), msg.getTemplates());
+ player.sendMessage(msg.get(), msg.getTagResolvers());
}
// Send the footer
- Template command1 = Template.of("command1", baseCommand + " " + page);
- Template command2 = Template.of("command2", baseCommand + " " + (page + 2));
- Template clickable = Template.of("clickable", TranslatableCaption.of("list.clickable").getComponent(player));
- player.sendMessage(TranslatableCaption.of("list.page_turn"), command1, command2, clickable);
+ player.sendMessage(
+ TranslatableCaption.of("list.page_turn"),
+ TagResolver.builder()
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
+ .tag(
+ "command1",
+ Tag.preProcessParsed(baseCommand + " " + page)
+ )
+ .tag("command2", Tag.preProcessParsed(baseCommand + " " + (page + 2)))
+ .tag(
+ "clickable",
+ Tag.inserting(TranslatableCaption.of("list.clickable").toComponent(player))
+ )
+ .build()
+ );
}
/**
@@ -325,7 +341,7 @@ public abstract class Command {
if (commands.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"),
- Template.of("value", MainCommand.getInstance().help.getUsage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(MainCommand.getInstance().help.getUsage())))
);
return CompletableFuture.completedFuture(false);
}
@@ -346,7 +362,7 @@ public abstract class Command {
}
player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"),
- Template.of("value", cmd.getUsage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(cmd.getUsage())))
);
return CompletableFuture.completedFuture(false);
}
@@ -381,7 +397,7 @@ public abstract class Command {
// TODO improve or remove the Argument system
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", StringMan.join(fullSplit, " "))
+ TagResolver.resolver("value", Tag.inserting(Component.text(StringMan.join(fullSplit, " "))))
);
return false;
}
@@ -466,11 +482,11 @@ public abstract class Command {
if (message) {
player.sendMessage(this.required.getErrorMessage());
}
- } else if (!Permissions.hasPermission(player, getPermission())) {
+ } else if (!player.hasPermission(getPermission())) {
if (message) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", getPermission())
+ TagResolver.resolver("node", Tag.inserting(Component.text(getPermission())))
);
}
} else {
@@ -495,7 +511,7 @@ public abstract class Command {
public void sendUsage(PlotPlayer player) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", getUsage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
);
}
@@ -543,9 +559,10 @@ public abstract class Command {
public Collection tab(PlotPlayer player, String[] args, boolean space) {
switch (args.length) {
- case 0:
+ case 0 -> {
return this.allCommands;
- case 1:
+ }
+ case 1 -> {
String arg = args[0].toLowerCase();
if (space) {
Command cmd = getCommand(arg);
@@ -564,13 +581,15 @@ public abstract class Command {
}
return commands;
}
- default:
+ }
+ default -> {
Command cmd = getCommand(args[0]);
if (cmd != null) {
return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
} else {
return null;
}
+ }
}
}
@@ -599,13 +618,13 @@ public abstract class Command {
return this.getFullId().hashCode();
}
- public void checkTrue(boolean mustBeTrue, Caption message, Template... args) {
+ public void checkTrue(boolean mustBeTrue, Caption message, TagResolver... args) {
if (!mustBeTrue) {
throw new CommandException(message, args);
}
}
- public T check(T object, Caption message, Template... args) {
+ public T check(T object, Caption message, TagResolver... args) {
if (object == null) {
throw new CommandException(message, args);
}
@@ -621,10 +640,10 @@ public abstract class Command {
public static class CommandException extends RuntimeException {
- private final Template[] args;
private final Caption message;
+ private final TagResolver[] args;
- public CommandException(final @Nullable Caption message, final Template... args) {
+ public CommandException(final @Nullable Caption message, final TagResolver... args) {
this.message = message;
this.args = args;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
index 1e026ec8d..ff5066e84 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
@@ -19,7 +19,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.caption.Caption;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull;
/**
@@ -34,7 +34,7 @@ public interface CommandCaller {
* @param caption Caption to send
* @param replacements Variable replacements
*/
- void sendMessage(@NonNull Caption caption, @NonNull Template... replacements);
+ void sendMessage(@NonNull Caption caption, @NonNull TagResolver... replacements);
/**
* Check the player's permissions. Will be cached if permission caching is enabled.
diff --git a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
index 1613a443c..a76938577 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
@@ -22,6 +22,8 @@ import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.caption.LocaleHolder;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
import org.checkerframework.checker.nullness.qual.NonNull;
/**
@@ -90,6 +92,11 @@ public enum CommandCategory implements Caption {
return this.caption.getComponent(localeHolder);
}
+ @Override
+ public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
+ return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
+ }
+
/**
* Checks if a player has access to this command category
*
diff --git a/Core/src/main/java/com/plotsquared/core/command/Comment.java b/Core/src/main/java/com/plotsquared/core/command/Comment.java
index fd617e842..6d83376cb 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Comment.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Comment.java
@@ -27,7 +27,9 @@ import com.plotsquared.core.plot.comment.CommentInbox;
import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.core.plot.comment.PlotComment;
import com.plotsquared.core.util.StringMan;
-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;
import java.util.Arrays;
import java.util.Locale;
@@ -44,8 +46,10 @@ public class Comment extends SubCommand {
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"),
- Template.of("command", "/plot comment [X;Z]"),
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
+ .build()
);
return false;
}
@@ -64,8 +68,10 @@ public class Comment extends SubCommand {
if (args.length < 3) {
player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"),
- Template.of("command", "/plot comment [X;Z]"),
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
+ .build()
);
return false;
}
@@ -76,8 +82,10 @@ public class Comment extends SubCommand {
if (inbox == null) {
player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"),
- Template.of("command", "/plot comment [X;Z]"),
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
+ .build()
);
return false;
}
@@ -97,8 +105,10 @@ public class Comment extends SubCommand {
player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"),
- Template.of("command", "/plot comment [X;Z]"),
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
+ .tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
+ .build()
);
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Condense.java b/Core/src/main/java/com/plotsquared/core/command/Condense.java
index e25bd0b78..65bdb40ef 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Condense.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Condense.java
@@ -29,7 +29,9 @@ import com.plotsquared.core.util.MathMan;
import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.task.TaskTime;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList;
@@ -68,7 +70,9 @@ public class Condense extends SubCommand {
if (args.length != 2 && args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot condense [radius]")
+ TagResolver.resolver("value", Tag.inserting(Component.text(
+ "/plot condense [radius]"
+ )))
);
return false;
}
@@ -82,7 +86,10 @@ public class Condense extends SubCommand {
if (args.length == 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot condense" + area + " start ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot condense" + area + " start " + ""))
+ )
);
return false;
}
@@ -181,8 +188,10 @@ public class Condense extends SubCommand {
if (result.get()) {
player.sendMessage(
TranslatableCaption.of("condense.moving"),
- Template.of("origin", String.valueOf(origin)),
- Template.of("possible", String.valueOf(possible))
+ TagResolver.builder()
+ .tag("origin", Tag.inserting(Component.text(origin.toString())))
+ .tag("possible", Tag.inserting(Component.text(possible.toString())))
+ .build()
);
TaskManager.runTaskLater(task, TaskTime.ticks(1L));
}
@@ -202,7 +211,7 @@ public class Condense extends SubCommand {
if (i >= free.size()) {
player.sendMessage(
TranslatableCaption.of("condense.skipping"),
- Template.of("plot", String.valueOf(origin))
+ TagResolver.resolver("plot", Tag.inserting(Component.text(origin.toString())))
);
}
}
@@ -223,7 +232,10 @@ public class Condense extends SubCommand {
if (args.length == 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot condense " + area + " info ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot condense " + area + " info "))
+ )
);
return false;
}
@@ -244,20 +256,20 @@ public class Condense extends SubCommand {
player.sendMessage(TranslatableCaption.of("condense.default_eval"));
player.sendMessage(
TranslatableCaption.of("condense.minimum_radius"),
- Template.of("minimumRadius", String.valueOf(minimumRadius))
+ TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
);
player.sendMessage(
- TranslatableCaption.of("condense.minimum_radius"),
- Template.of("maxMove", String.valueOf(maxMove))
+ TranslatableCaption.of("condense.maximum_moved"),
+ TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
);
player.sendMessage(TranslatableCaption.of("condense.input_eval"));
player.sendMessage(
TranslatableCaption.of("condense.input_radius"),
- Template.of("radius", String.valueOf(radius))
+ TagResolver.resolver("radius", Tag.inserting(Component.text(radius)))
);
player.sendMessage(
TranslatableCaption.of("condense.estimated_moves"),
- Template.of("userMove", String.valueOf(userMove))
+ TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
);
player.sendMessage(TranslatableCaption.of("condense.eta"));
player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
@@ -266,7 +278,10 @@ public class Condense extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot condense " + area.getWorldName() + " [radius]")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot condense " + area.getWorldName() + " [radius]"))
+ )
);
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java
index 9db740575..1929b12c3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Continue.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java
@@ -29,8 +29,9 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
@CommandDeclaration(command = "continue",
@@ -53,11 +54,12 @@ public class Continue extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
+ if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player))
+ TagResolver.resolver("node", Tag.inserting(
+ TranslatableCaption.of("permission.no_plot_perms").toComponent(player)
+ ))
);
return false;
}
@@ -70,7 +72,7 @@ public class Continue extends SubCommand {
< player.getPlotCount() + size)) {
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"),
- Template.of("amount", String.valueOf(player.getAllowedPlots()))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
);
return false;
}
@@ -84,7 +86,7 @@ public class Continue extends SubCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Done flag removal")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Done flag removal")))
);
return true;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java
index 82afe0457..f281a4c4b 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Copy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java
@@ -23,8 +23,9 @@ import com.plotsquared.core.location.Location;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.util.Permissions;
-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;
@CommandDeclaration(command = "copy",
permission = "plots.copy",
@@ -42,15 +43,14 @@ public class Copy extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if (!plot1.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN.toString())) {
+ if (!plot1.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN.toString())) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
if (args.length != 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot copy ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot copy ")))
);
return false;
}
@@ -69,8 +69,12 @@ public class Copy extends SubCommand {
plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
if (result) {
- player.sendMessage(TranslatableCaption.of("move.copy_success"), Template.of("origin", String.valueOf(plot1)),
- Template.of("target", String.valueOf(plot2))
+ player.sendMessage(
+ TranslatableCaption.of("move.copy_success"),
+ TagResolver.builder()
+ .tag("origin", Tag.inserting(Component.text(plot1.toString())))
+ .tag("target", Tag.inserting(Component.text(plot2.toString())))
+ .build()
);
} else {
player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
index 8d24e1cf2..e4b6d0d38 100644
--- a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
@@ -25,7 +25,9 @@ import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
@CommandDeclaration(command = "createroadschematic",
@@ -61,7 +63,7 @@ public class CreateRoadSchematic extends SubCommand {
this.hybridUtils.setupRoadSchematic(plot);
player.sendMessage(
TranslatableCaption.of("schematics.schematic_road_created"),
- Template.of("command", "/plot debugroadregen")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugroadregen")))
);
return true;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
index 73b678e5b..5d24194c0 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
@@ -40,7 +40,9 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.FileUtils;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.io.File;
@@ -101,7 +103,10 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot database [area] ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot database [area] "))
+ )
);
return false;
}
@@ -116,7 +121,7 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot database [area] ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot database [area] ")))
);
player.sendMessage(TranslatableCaption.of("database.arg"));
return false;
@@ -129,7 +134,10 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot database import [prefix]")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot database import [prefix]"))
+ )
);
return false;
}
@@ -140,7 +148,7 @@ public class DatabaseCommand extends SubCommand {
if (!file.exists()) {
player.sendMessage(
TranslatableCaption.of("database.does_not_exist"),
- Template.of("value", String.valueOf(file))
+ TagResolver.resolver("value", Tag.inserting(Component.text(file.toString())))
);
return false;
}
@@ -176,7 +184,7 @@ public class DatabaseCommand extends SubCommand {
);
worldFile.renameTo(newFile);
}
- plot.setId(newId.copy());
+ plot.setId(newId);
plot.setArea(pa);
plots.add(plot);
continue;
@@ -184,8 +192,10 @@ public class DatabaseCommand extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("database.skipping_duplicated_plot"),
- Template.of("plot", String.valueOf(plot)),
- Template.of("id", String.valueOf(plot.temp))
+ TagResolver.builder()
+ .tag("plot", Tag.inserting(Component.text(plot.toString())))
+ .tag("id", Tag.inserting(Component.text(plot.temp)))
+ .build()
);
continue;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Debug.java b/Core/src/main/java/com/plotsquared/core/command/Debug.java
index 754c76063..1e0090e44 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Debug.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java
@@ -34,7 +34,8 @@ import com.plotsquared.core.uuid.UUIDMapping;
import com.sk89q.worldedit.world.entity.EntityType;
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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -68,7 +69,10 @@ public class Debug extends SubCommand {
if (args.length == 0) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot debug ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot debug "))
+ )
);
}
if (args.length > 0) {
@@ -95,7 +99,7 @@ public class Debug extends SubCommand {
final Collection mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
player.sendMessage(
TranslatableCaption.of("debug.cached_uuids"),
- Template.of("value", String.valueOf(mappings.size()))
+ TagResolver.resolver("value", Tag.inserting(Component.text(mappings.size())))
);
return true;
}
@@ -104,7 +108,7 @@ public class Debug extends SubCommand {
for (final PlotPlayer pp : PlotPlayer.getDebugModePlayers()) {
player.sendMessage(
TranslatableCaption.of("debug.player_in_debugmode_list"),
- Template.of("value", pp.getName())
+ TagResolver.resolver("value", Tag.inserting(Component.text(pp.getName())))
);
}
return true;
@@ -114,10 +118,11 @@ public class Debug extends SubCommand {
player.sendMessage(TranslatableCaption.of("debug.entity_categories"));
EntityCategory.REGISTRY.forEach(category -> {
final StringBuilder builder =
- new StringBuilder("§7- §6").append(category.getId()).append("§7: §6");
+ new StringBuilder("- ").append(category.getId()).append(": ");
for (final EntityType entityType : category.getAll()) {
builder.append(entityType.getId()).append(" ");
}
+ builder.append("");
player.sendMessage(StaticCaption.of("" + builder));
});
EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
@@ -137,28 +142,53 @@ public class Debug extends SubCommand {
.getCaptionMap(TranslatableCaption.DEFAULT_NAMESPACE)
.getCaptions();
TextComponent.Builder information = Component.text();
- Component header = MINI_MESSAGE.parse(TranslatableCaption.of("debug.debug_header").getComponent(player) + "\n");
+ Component header = TranslatableCaption.of("debug.debug_header").toComponent(player)
+ .append(Component.newline());
String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n";
String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n";
information.append(header);
- information.append(MINI_MESSAGE.parse(section, Template.of("val", "PlotArea")));
+ information.append(MINI_MESSAGE.deserialize(
+ section,
+ TagResolver.resolver("val", Tag.inserting(Component.text("PlotArea")))
+ ));
information.append(MINI_MESSAGE
- .parse(
+ .deserialize(
line,
- Template.of("var", "Plot Worlds"),
- Template.of("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", "))
+ TagResolver.builder()
+ .tag("var", Tag.inserting(Component.text("Plot Worlds")))
+ .tag(
+ "val",
+ Tag.inserting(Component.text(StringMan.join(
+ this.plotAreaManager.getAllPlotAreas(),
+ ", "
+ )))
+ )
+ .build()
));
information.append(
- MINI_MESSAGE.parse(
+ MINI_MESSAGE.deserialize(
line,
- Template.of("var", "Owned Plots"),
- Template.of("val", String.valueOf(PlotQuery.newQuery().allPlots().count()))
+ TagResolver.builder()
+ .tag("var", Tag.inserting(Component.text("Owned Plots")))
+ .tag(
+ "val",
+ Tag.inserting(Component.text(PlotQuery.newQuery().allPlots().count()))
+ )
+ .build()
));
- information.append(MINI_MESSAGE.parse(section, Template.of("val", "Messages")));
- information.append(MINI_MESSAGE.parse(
+ information.append(MINI_MESSAGE.deserialize(
+ section,
+ TagResolver.resolver("val", Tag.inserting(Component.text("Messages")))
+ ));
+ information.append(MINI_MESSAGE.deserialize(
line,
- Template.of("var", "Total Messages"),
- Template.of("val", String.valueOf(captions.size()))
+ TagResolver.builder()
+ .tag("var", Tag.inserting(Component.text("Total Messages")))
+ .tag(
+ "val",
+ Tag.inserting(Component.text(captions.size()))
+ )
+ .build()
));
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
return true;
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
index 7290a544c..054cad0c2 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java
@@ -19,6 +19,7 @@
package com.plotsquared.core.command;
import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.caption.StaticCaption;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
@@ -27,7 +28,6 @@ import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.expiration.PlotAnalysis;
import com.plotsquared.core.plot.flag.GlobalFlagContainer;
import com.plotsquared.core.plot.flag.PlotFlag;
@@ -36,12 +36,13 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.RunnableVal;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
@@ -96,7 +97,7 @@ public class DebugExec extends SubCommand {
if (analysis != null) {
player.sendMessage(
TranslatableCaption.of("debugexec.changes_column"),
- Template.of("value", String.valueOf(analysis.changes))
+ TagResolver.resolver("value", Tag.inserting(Component.text(analysis.changes)))
);
return true;
}
@@ -106,7 +107,7 @@ public class DebugExec extends SubCommand {
public void run(PlotAnalysis value) {
player.sendMessage(
TranslatableCaption.of("debugexec.analyze_done"),
- Template.of("command", "/plot debugexec analyze")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugexec analyze")))
);
}
});
@@ -116,7 +117,10 @@ public class DebugExec extends SubCommand {
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot debugexec analyze ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot debugexec analyze "))
+ )
);
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
return false;
@@ -127,7 +131,7 @@ public class DebugExec extends SubCommand {
} catch (NumberFormatException ignored) {
player.sendMessage(
TranslatableCaption.of("debugexec.invalid_threshold"),
- Template.of("value", args[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
);
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
return false;
@@ -139,10 +143,7 @@ public class DebugExec extends SubCommand {
return true;
}
case "start-expire" -> {
- if (ExpireManager.IMP == null) {
- ExpireManager.IMP = new ExpireManager(this.eventDispatcher);
- }
- if (ExpireManager.IMP.runAutomatedTask()) {
+ if (PlotSquared.platform().expireManager().runAutomatedTask()) {
player.sendMessage(TranslatableCaption.of("debugexec.expiry_started"));
} else {
player.sendMessage(TranslatableCaption.of("debugexec.expiry_already_started"));
@@ -150,7 +151,7 @@ public class DebugExec extends SubCommand {
return true;
}
case "stop-expire" -> {
- if (ExpireManager.IMP == null || !ExpireManager.IMP.cancelTask()) {
+ if (!PlotSquared.platform().expireManager().cancelTask()) {
player.sendMessage(TranslatableCaption.of("debugexec.task_halted"));
} else {
player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));
@@ -161,7 +162,7 @@ public class DebugExec extends SubCommand {
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot debugexec remove-flag ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot debugexec remove-flag ")))
);
return false;
}
@@ -179,7 +180,7 @@ public class DebugExec extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("debugexec.cleared_flag"),
- Template.of("value", flag)
+ TagResolver.resolver("value", Tag.inserting(Component.text(flag)))
);
return true;
}
@@ -187,7 +188,10 @@ public class DebugExec extends SubCommand {
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "Invalid syntax: /plot debugexec start-rgar ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("Invalid syntax: /plot debugexec start-rgar "))
+ )
);
return false;
}
@@ -195,7 +199,7 @@ public class DebugExec extends SubCommand {
if (area == null) {
player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"),
- Template.of("value", args[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
);
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
index b9b1b9711..ca9fe1482 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
@@ -31,7 +31,9 @@ import com.plotsquared.core.inject.annotations.WorldFile;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.PremiumVerification;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.io.File;
@@ -69,9 +71,9 @@ public class DebugPaste extends SubCommand {
StringBuilder b = new StringBuilder();
b.append(
"""
- # Welcome to this paste
- # It is meant to provide us at IntellectualSites with better information about your problem
- """
+ # Welcome to this paste
+ # It is meant to provide us at IntellectualSites with better information about your problem
+ """
);
b.append("# PlotSquared Information\n");
b.append("PlotSquared Version: ").append(PlotSquared.get().getVersion())
@@ -131,8 +133,10 @@ public class DebugPaste extends SubCommand {
} catch (IOException ignored) {
player.sendMessage(
TranslatableCaption.of("debugpaste.latest_log"),
- Template.of("file", "latest.log"),
- Template.of("size", "14MB")
+ TagResolver.builder()
+ .tag("file", Tag.inserting(Component.text("latest.log")))
+ .tag("size", Tag.inserting(Component.text("14MB")))
+ .build()
);
}
@@ -141,7 +145,7 @@ public class DebugPaste extends SubCommand {
} catch (final IllegalArgumentException ignored) {
player.sendMessage(
TranslatableCaption.of("debugpaste.empty_file"),
- Template.of("file", "settings.yml")
+ TagResolver.resolver("file", Tag.inserting(Component.text("settings.yml")))
);
}
try {
@@ -149,7 +153,7 @@ public class DebugPaste extends SubCommand {
} catch (final IllegalArgumentException ignored) {
player.sendMessage(
TranslatableCaption.of("debugpaste.empty_file"),
- Template.of("file", "worlds.yml")
+ TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
);
}
@@ -162,7 +166,7 @@ public class DebugPaste extends SubCommand {
} catch (final IOException ignored) {
player.sendMessage(
TranslatableCaption.of("debugpaste.skip_multiverse"),
- Template.of("file", "worlds.yml")
+ TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
);
}
@@ -177,20 +181,20 @@ public class DebugPaste extends SubCommand {
String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
player.sendMessage(
TranslatableCaption.of("debugpaste.debug_report_created"),
- Template.of("url", link)
+ TagResolver.resolver("url", Tag.preProcessParsed(link))
);
} else {
final String responseMessage = jsonObject.get("response").getAsString();
player.sendMessage(
TranslatableCaption.of("debugpaste.creation_failed"),
- Template.of("value", responseMessage)
+ TagResolver.resolver("value", Tag.inserting(Component.text(responseMessage)))
);
}
} catch (final Throwable throwable) {
throwable.printStackTrace();
player.sendMessage(
TranslatableCaption.of("debugpaste.creation_failed"),
- Template.of("value", throwable.getMessage())
+ TagResolver.resolver("value", Tag.inserting(Component.text(throwable.getMessage())))
);
}
} catch (IOException e) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
index 6f990cd9f..453494994 100644
--- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
@@ -28,7 +28,9 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotManager;
import com.plotsquared.core.queue.QueueCoordinator;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Arrays;
@@ -60,7 +62,7 @@ public class DebugRoadRegen extends SubCommand {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", DebugRoadRegen.USAGE)
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
);
return false;
}
@@ -73,16 +75,19 @@ public class DebugRoadRegen extends SubCommand {
}
String kind = args[0].toLowerCase();
switch (kind) {
- case "plot":
+ case "plot" -> {
return regenPlot(player);
- case "region":
+ }
+ case "region" -> {
return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
- default:
+ }
+ default -> {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", DebugRoadRegen.USAGE)
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
);
return false;
+ }
}
}
@@ -103,11 +108,11 @@ public class DebugRoadRegen extends SubCommand {
queue.setCompleteTask(() -> {
player.sendMessage(
TranslatableCaption.of("debugroadregen.regen_done"),
- Template.of("value", plot.getId().toString())
+ TagResolver.resolver("value", Tag.inserting(Component.text(plot.getId().toString())))
);
player.sendMessage(
TranslatableCaption.of("debugroadregen.regen_all"),
- Template.of("value", "/plot regenallroads")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads")))
);
});
manager.createRoadEast(plot, queue);
@@ -126,18 +131,18 @@ public class DebugRoadRegen extends SubCommand {
} catch (NumberFormatException ignored) {
player.sendMessage(
TranslatableCaption.of("invalid.not_valid_number"),
- Template.of("value", "0, 256")
+ TagResolver.resolver("value", Tag.inserting(Component.text("0, 256")))
);
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", DebugRoadRegen.USAGE)
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
);
return false;
}
} else if (args.length != 0) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", DebugRoadRegen.USAGE)
+ TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
);
return false;
}
@@ -155,11 +160,11 @@ public class DebugRoadRegen extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("debugroadregen.schematic"),
- Template.of("command", "/plot createroadschematic")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
);
player.sendMessage(
TranslatableCaption.of("debugroadregen.regenallroads"),
- Template.of("command", "/plot regenallroads")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot regenallroads")))
);
boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
if (!result) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java
index ba323673f..7932cf86b 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Delete.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java
@@ -30,10 +30,11 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
@@ -78,13 +79,12 @@ public class Delete extends SubCommand {
if (eventResult == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Delete")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Delete")))
);
return true;
}
boolean force = eventResult == Result.FORCE;
- if (!force && !plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DELETE)) {
+ if (!force && !plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DELETE)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
@@ -114,14 +114,17 @@ public class Delete extends SubCommand {
this.econHandler.depositMoney(player, value);
player.sendMessage(
TranslatableCaption.of("economy.added_balance"),
- Template.of("money", this.econHandler.format(value))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(value))))
);
}
}
player.sendMessage(
TranslatableCaption.of("working.deleting_done"),
- Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver(
+ "amount",
+ Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
+ ),
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
eventDispatcher.callPostDelete(plot);
});
diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java
index 70cdb6e2d..ec3811a94 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Deny.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java
@@ -30,12 +30,13 @@ import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.WorldUtil;
import com.sk89q.worldedit.world.gamemode.GameModes;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -79,18 +80,17 @@ public class Deny extends SubCommand {
player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
return false;
}
- if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY)) {
+ if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DENY)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return true;
}
- int maxDenySize = Permissions.hasPermissionRange(player, Permission.PERMISSION_DENY, Settings.Limit.MAX_PLOTS);
+ int maxDenySize = player.hasPermissionRange(Permission.PERMISSION_DENY, Settings.Limit.MAX_PLOTS);
int size = plot.getDenied().size();
if (size >= maxDenySize) {
player.sendMessage(
TranslatableCaption.of("members.plot_max_members_denied"),
- Template.of("amount", String.valueOf(size))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(size)))
);
return false;
}
@@ -101,16 +101,15 @@ public class Deny extends SubCommand {
} else if (throwable != null || uuids.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
} else {
for (UUID uuid : uuids) {
if (uuid == DBFunc.EVERYONE && !(
- Permissions.hasPermission(player, Permission.PERMISSION_DENY_EVERYONE) || Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
+ player.hasPermission(Permission.PERMISSION_DENY_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
} else if (plot.isOwner(uuid)) {
player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
@@ -118,7 +117,10 @@ public class Deny extends SubCommand {
} else if (plot.getDenied().contains(uuid)) {
player.sendMessage(
TranslatableCaption.of("member.already_added"),
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
+ TagResolver.resolver(
+ "player",
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+ )
);
return;
} else {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Desc.java b/Core/src/main/java/com/plotsquared/core/command/Desc.java
index 360561129..b1a95a1fb 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Desc.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Desc.java
@@ -27,7 +27,9 @@ import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
import com.plotsquared.core.util.EventDispatcher;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
@CommandDeclaration(command = "setdescription",
@@ -54,7 +56,7 @@ public class Desc extends SetCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Description removal")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Description removal")))
);
return false;
}
@@ -69,7 +71,7 @@ public class Desc extends SetCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Description set")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Description set")))
);
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Dislike.java b/Core/src/main/java/com/plotsquared/core/command/Dislike.java
index d11afa828..e2cd89e8f 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Dislike.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Dislike.java
@@ -21,7 +21,6 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.TabCompletions;
import org.checkerframework.checker.nullness.qual.NonNull;
@@ -54,7 +53,7 @@ public class Dislike extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
+ if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
completions.add("purge");
}
final List commands = completions.stream().filter(completion -> completion
@@ -62,7 +61,7 @@ public class Dislike extends SubCommand {
.startsWith(args[0].toLowerCase()))
.map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_RATE) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_RATE) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java
index 6537daeef..565890b62 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Done.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Done.java
@@ -19,6 +19,7 @@
package com.plotsquared.core.command;
import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotDoneEvent;
@@ -29,14 +30,14 @@ import com.plotsquared.core.location.Location;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.expiration.PlotAnalysis;
import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
@CommandDeclaration(command = "done",
@@ -70,13 +71,12 @@ public class Done extends SubCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Done")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Done")))
);
return true;
}
boolean force = event.getEventResult() == Result.FORCE;
- if (!force && !plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
+ if (!force && !plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
@@ -91,10 +91,10 @@ public class Done extends SubCommand {
plot.addRunning();
player.sendMessage(
TranslatableCaption.of("web.generating_link"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
- if (ExpireManager.IMP == null || doneRequirements == null) {
+ if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
finish(plot, player, true);
plot.removeRunning();
} else {
@@ -103,7 +103,7 @@ public class Done extends SubCommand {
public void run(PlotAnalysis value) {
plot.removeRunning();
boolean result =
- value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
+ value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
finish(plot, player, result);
}
});
diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java
index 5b23919ff..1de860586 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Download.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Download.java
@@ -27,14 +27,15 @@ import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotUploader;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.core.util.task.RunnableVal;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.net.URL;
@@ -87,13 +88,11 @@ public class Download extends SubCommand {
player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
return false;
}
- if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && !DoneFlag.isDone(plot)) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
+ if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && !DoneFlag.isDone(plot)) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
player.sendMessage(TranslatableCaption.of("done.done_not_done"));
return false;
}
- if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN.toString())) {
+ if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN.toString())) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
@@ -111,10 +110,13 @@ public class Download extends SubCommand {
upload(player, plot);
} else if (args.length == 1 && StringMan
.isEqualIgnoreCaseToAny(args[0], "mcr", "world", "mca")) {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
+ if (!player.hasPermission(Permission.PERMISSION_DOWNLOAD_WORLD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_DOWNLOAD_WORLD)
+ )
);
return false;
}
@@ -128,18 +130,24 @@ public class Download extends SubCommand {
if (url == null) {
player.sendMessage(
TranslatableCaption.of("web.generating_link_failed"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
return;
}
- player.sendMessage(TranslatableCaption.of("web.generation_link_success_legacy_world"), Template.of("url", url.toString()));
+ player.sendMessage(
+ TranslatableCaption.of("web.generation_link_success_legacy_world"),
+ TagResolver.resolver("url", Tag.inserting(Component.text(url.toString())))
+ );
}
});
} else {
sendUsage(player);
return false;
}
- player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.of("plot", plot.getId().toString()));
+ player.sendMessage(
+ TranslatableCaption.of("web.generating_link"),
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
+ );
return true;
}
@@ -147,10 +155,10 @@ public class Download extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD)) {
+ if (player.hasPermission(Permission.PERMISSION_DOWNLOAD)) {
completions.add("schem");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
+ if (player.hasPermission(Permission.PERMISSION_DOWNLOAD_WORLD)) {
completions.add("world");
}
final List commands = completions.stream().filter(completion -> completion
@@ -165,7 +173,7 @@ public class Download extends SubCommand {
CommandCategory.ADMINISTRATION
) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_DOWNLOAD) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
@@ -177,19 +185,25 @@ public class Download extends SubCommand {
if (Settings.Web.LEGACY_WEBINTERFACE) {
schematicHandler
.getCompoundTag(plot)
- .whenComplete((compoundTag, throwable) -> {
- schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
- @Override
- public void run(URL value) {
- player.sendMessage(
- TranslatableCaption.of("web.generation_link_success"),
- Template.of("download", value.toString()),
- Template.of("delete", "Not available")
- );
- player.sendMessage(StaticCaption.of(value.toString()));
+ .whenComplete((compoundTag, throwable) -> schematicHandler.upload(
+ compoundTag,
+ null,
+ null,
+ new RunnableVal<>() {
+ @Override
+ public void run(URL value) {
+ plot.removeRunning();
+ player.sendMessage(
+ TranslatableCaption.of("web.generation_link_success"),
+ TagResolver.builder()
+ .tag("download", Tag.preProcessParsed(value.toString()))
+ .tag("delete", Tag.preProcessParsed("Not available"))
+ .build()
+ );
+ player.sendMessage(StaticCaption.of(value.toString()));
+ }
}
- });
- });
+ ));
return;
}
// TODO legacy support
@@ -198,13 +212,15 @@ public class Download extends SubCommand {
if (throwable != null || !result.isSuccess()) {
player.sendMessage(
TranslatableCaption.of("web.generating_link_failed"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
} else {
player.sendMessage(
TranslatableCaption.of("web.generation_link_success"),
- Template.of("download", result.getDownloadUrl()),
- Template.of("delete", result.getDeletionUrl())
+ TagResolver.builder()
+ .tag("download", Tag.preProcessParsed(result.getDownloadUrl()))
+ .tag("delete", Tag.preProcessParsed(result.getDeletionUrl()))
+ .build()
);
}
});
diff --git a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
index 16d28c38a..9ab6ad340 100644
--- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
@@ -23,7 +23,6 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.CaptionUtility;
import com.plotsquared.core.configuration.caption.StaticCaption;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
@@ -40,7 +39,6 @@ import com.plotsquared.core.plot.flag.types.IntegerFlag;
import com.plotsquared.core.plot.flag.types.ListFlag;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringComparison;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.helpmenu.HelpMenu;
@@ -48,7 +46,9 @@ import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.minimessage.Template;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -85,7 +85,10 @@ public final class FlagCommand extends Command {
private static boolean sendMessage(PlotPlayer player) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot flag ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot flag "))
+ )
);
return true;
}
@@ -111,9 +114,9 @@ public final class FlagCommand extends Command {
if (!result) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of(
+ TagResolver.resolver(
"node",
- perm + "." + numeric
+ Tag.inserting(Component.text(perm + "." + numeric))
)
);
}
@@ -128,18 +131,23 @@ public final class FlagCommand extends Command {
key.toLowerCase(),
entry.toString().toLowerCase()
);
- final boolean result = Permissions.hasPermission(player, permission);
+ final boolean result = player.hasPermission(permission);
if (!result) {
- player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", permission));
+ player.sendMessage(
+ TranslatableCaption.of("permission.no_permission"),
+ TagResolver.resolver("node", Tag.inserting(Component.text(permission)))
+ );
return false;
}
}
} catch (final FlagParseException e) {
player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"),
- Template.of("flag_name", flag.getName()),
- Template.of("flag_value", e.getValue()),
- Template.of("error", e.getErrorMessage().getComponent(player))
+ TagResolver.builder()
+ .tag("flag_name", Tag.inserting(Component.text(flag.getName())))
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
+ .build()
);
return false;
} catch (final Exception e) {
@@ -150,13 +158,16 @@ public final class FlagCommand extends Command {
boolean result;
String basePerm = Permission.PERMISSION_SET_FLAG_KEY.format(key.toLowerCase());
if (flag.isValuedPermission()) {
- result = Permissions.hasKeyedPermission(player, basePerm, value);
+ result = player.hasKeyedPermission(basePerm, value);
} else {
- result = Permissions.hasPermission(player, basePerm);
+ result = player.hasPermission(basePerm);
perm = basePerm;
}
if (!result) {
- player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", perm));
+ player.sendMessage(
+ TranslatableCaption.of("permission.no_permission"),
+ TagResolver.resolver("node", Tag.inserting(Component.text(perm)))
+ );
}
return result;
}
@@ -177,11 +188,10 @@ public final class FlagCommand extends Command {
player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
return false;
}
- if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
+ if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_SET_FLAG_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_SET_FLAG_OTHER))
);
return false;
}
@@ -216,7 +226,7 @@ public final class FlagCommand extends Command {
if (best != null) {
player.sendMessage(
TranslatableCaption.of("flag.not_valid_flag_suggested"),
- Template.of("value", best)
+ TagResolver.resolver("value", Tag.inserting(Component.text(best)))
);
suggested = true;
}
@@ -325,7 +335,7 @@ public final class FlagCommand extends Command {
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot flag set ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag set ")))
);
return;
}
@@ -338,7 +348,7 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Flag set")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag set")))
);
return;
}
@@ -354,15 +364,21 @@ public final class FlagCommand extends Command {
} catch (final FlagParseException e) {
player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"),
- Template.of("flag_name", plotFlag.getName()),
- Template.of("flag_value", e.getValue()),
- Template.of("error", e.getErrorMessage().getComponent(player))
+ TagResolver.builder()
+ .tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
+ .build()
);
return;
}
plot.setFlag(parsed);
- player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
- Template.of("value", String.valueOf(parsed))
+ player.sendMessage(
+ TranslatableCaption.of("flag.flag_added"),
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text(args[0])))
+ .tag("value", Tag.inserting(Component.text(parsed.toString())))
+ .build()
);
}
@@ -384,7 +400,7 @@ public final class FlagCommand extends Command {
if (args.length < 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot flag add ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag add ")))
);
return;
}
@@ -397,7 +413,7 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Flag add")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag add")))
);
return;
}
@@ -418,9 +434,11 @@ public final class FlagCommand extends Command {
} catch (FlagParseException e) {
player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"),
- Template.of("flag_name", plotFlag.getName()),
- Template.of("flag_value", e.getValue()),
- Template.of("error", e.getErrorMessage().getComponent(player))
+ TagResolver.builder()
+ .tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
+ .build()
);
return;
}
@@ -430,8 +448,12 @@ public final class FlagCommand extends Command {
player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
return;
}
- player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
- Template.of("value", String.valueOf(parsed))
+ player.sendMessage(
+ TranslatableCaption.of("flag.flag_added"),
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text(args[0])))
+ .tag("value", Tag.inserting(Component.text(parsed.toString())))
+ .build()
);
}
@@ -453,7 +475,7 @@ public final class FlagCommand extends Command {
if (args.length != 1 && args.length != 2) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot flag remove [values]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag remove [values]")))
);
return;
}
@@ -467,17 +489,20 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Flag remove")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Flag remove")))
);
return;
}
boolean force = event.getEventResult() == Result.FORCE;
flag = event.getFlag();
- if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))) {
+ if (!force && !player.hasPermission(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))) {
if (args.length != 2) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Component.text(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase())))
+ )
);
return;
}
@@ -492,9 +517,11 @@ public final class FlagCommand extends Command {
} catch (final FlagParseException e) {
player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"),
- Template.of("flag_name", flag.getName()),
- Template.of("flag_value", e.getValue()),
- Template.of("error", String.valueOf(e.getErrorMessage()))
+ TagResolver.builder()
+ .tag("flag_name", Tag.inserting(Component.text(flag.getName())))
+ .tag("flag_value", Tag.inserting(Component.text(e.getValue())))
+ .tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
+ .build()
);
return;
}
@@ -505,10 +532,13 @@ public final class FlagCommand extends Command {
if (list.removeAll((List) parsedFlag.getValue())) {
if (list.isEmpty()) {
if (plot.removeFlag(flag)) {
- player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
- "value",
- String.valueOf(flagWithOldValue)
- ));
+ player.sendMessage(
+ TranslatableCaption.of("flag.flag_removed"),
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text(args[0])))
+ .tag("value", Tag.inserting(Component.text(flag.toString())))
+ .build()
+ );
return;
} else {
player.sendMessage(TranslatableCaption.of("flag.flag_not_removed"));
@@ -520,7 +550,10 @@ public final class FlagCommand extends Command {
if (addEvent.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Re-addition of " + plotFlag.getName())
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("Re-addition of " + plotFlag.getName()))
+ )
);
return;
}
@@ -543,10 +576,13 @@ public final class FlagCommand extends Command {
return;
}
}
- player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
- "value",
- String.valueOf(flagWithOldValue)
- ));
+ player.sendMessage(
+ TranslatableCaption.of("flag.flag_removed"),
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text(args[0])))
+ .tag("value", Tag.inserting(Component.text(flag.toString())))
+ .build()
+ );
}
@CommandDeclaration(command = "list",
@@ -564,34 +600,35 @@ public final class FlagCommand extends Command {
return;
}
- final Map> flags = new HashMap<>();
+ final Map> flags = new HashMap<>();
for (PlotFlag plotFlag : GlobalFlagContainer.getInstance().getRecognizedPlotFlags()) {
if (plotFlag instanceof InternalFlag) {
continue;
}
- final String category = MINI_MESSAGE.stripTokens(plotFlag.getFlagCategory().getComponent(player));
- final Collection flagList =
- flags.computeIfAbsent(category, k -> new ArrayList<>());
+ final Component category = plotFlag.getFlagCategory().toComponent(player);
+ final Collection flagList = flags.computeIfAbsent(category, k -> new ArrayList<>());
flagList.add(plotFlag.getName());
}
- for (final Map.Entry> entry : flags.entrySet()) {
+ for (final Map.Entry> entry : flags.entrySet()) {
Collections.sort(entry.getValue());
Component category =
- MINI_MESSAGE.parse(
+ MINI_MESSAGE.deserialize(
TranslatableCaption.of("flag.flag_list_categories").getComponent(player),
- Template.of("category", entry.getKey())
+ TagResolver.resolver("category", Tag.inserting(entry.getKey().style(Style.empty())))
);
TextComponent.Builder builder = Component.text().append(category);
final Iterator flagIterator = entry.getValue().iterator();
while (flagIterator.hasNext()) {
final String flag = flagIterator.next();
builder.append(MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("flag.flag_list_flag").getComponent(player),
- Template.of("command", "/plot flag info " + flag),
- Template.of("flag", flag),
- Template.of("suffix", flagIterator.hasNext() ? ", " : "")
+ TagResolver.builder()
+ .tag("command", Tag.preProcessParsed("/plot flag info " + flag))
+ .tag("flag", Tag.inserting(Component.text(flag)))
+ .tag("suffix", Tag.inserting(Component.text(flagIterator.hasNext() ? ", " : "")))
+ .build()
));
}
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@@ -615,7 +652,7 @@ public final class FlagCommand extends Command {
if (args.length < 1) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot flag info ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag info ")))
);
return;
}
@@ -623,11 +660,17 @@ public final class FlagCommand extends Command {
if (plotFlag != null) {
player.sendMessage(TranslatableCaption.of("flag.flag_info_header"));
// Flag name
- player.sendMessage(TranslatableCaption.of("flag.flag_info_name"), Template.of("flag", plotFlag.getName()));
+ player.sendMessage(
+ TranslatableCaption.of("flag.flag_info_name"),
+ TagResolver.resolver("flag", Tag.inserting(Component.text(plotFlag.getName())))
+ );
// Flag category
player.sendMessage(
TranslatableCaption.of("flag.flag_info_category"),
- Templates.of(player, "value", plotFlag.getFlagCategory())
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(plotFlag.getFlagCategory().toComponent(player))
+ )
);
// Flag description
// TODO maybe merge and \n instead?
@@ -636,16 +679,18 @@ public final class FlagCommand extends Command {
// Flag example
player.sendMessage(
TranslatableCaption.of("flag.flag_info_example"),
- Template.of("command", "/plot flag set"),
- Template.of("flag", plotFlag.getName()),
- Template.of("value", plotFlag.getExample())
+ TagResolver.builder()
+ .tag("command", Tag.preProcessParsed("/plot flag set"))
+ .tag("flag", Tag.preProcessParsed(plotFlag.getName()))
+ .tag("value", Tag.preProcessParsed(plotFlag.getExample()))
+ .build()
);
// Default value
final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
.getFlagErased(plotFlag.getClass()).toString();
player.sendMessage(
TranslatableCaption.of("flag.flag_info_default_value"),
- Template.of("value", defaultValue)
+ TagResolver.resolver("value", Tag.inserting(Component.text(defaultValue)))
);
// Footer. Done this way to prevent the duplicate-message-thingy from catching it
player.sendMessage(TranslatableCaption.of("flag.flag_info_footer"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java
index 4a96878b8..70c1a6614 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Grant.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java
@@ -26,20 +26,21 @@ import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.MetaDataAccess;
import com.plotsquared.core.player.PlayerMetaDataKeys;
import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-import com.plotsquared.core.uuid.UUIDMapping;
-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;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@@ -64,15 +65,15 @@ public class Grant extends Command {
checkTrue(
args.length >= 1 && args.length <= 2,
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot grant [player]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot grant [player]")))
);
final String arg0 = args[0].toLowerCase();
switch (arg0) {
case "add", "check" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) {
+ if (!player.hasPermission(Permission.PERMISSION_GRANT.format(arg0))) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_GRANT.format(arg0))
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_GRANT.format(arg0))))
);
return CompletableFuture.completedFuture(false);
}
@@ -85,25 +86,25 @@ public class Grant extends Command {
} else if (throwable != null || uuids.size() != 1) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", String.valueOf(uuids))
+ TagResolver.resolver("value", Tag.inserting(Component.text(String.valueOf(uuids))))
);
} else {
- final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
- PlotPlayer pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid.getUuid());
+ final UUID uuid = uuids.iterator().next();
+ PlotPlayer pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid);
if (pp != null) {
try (final MetaDataAccess access = pp.accessPersistentMetaData(
PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
if (args[0].equalsIgnoreCase("check")) {
player.sendMessage(
TranslatableCaption.of("grants.granted_plots"),
- Template.of("amount", String.valueOf(access.get().orElse(0)))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(access.get().orElse(0))))
);
} else {
access.set(access.get().orElse(0) + 1);
}
}
} else {
- DBFunc.getPersistentMeta(uuid.getUuid(), new RunnableVal<>() {
+ DBFunc.getPersistentMeta(uuid, new RunnableVal<>() {
@Override
public void run(Map value) {
final byte[] array = value.get("grantedPlots");
@@ -116,7 +117,7 @@ public class Grant extends Command {
}
player.sendMessage(
TranslatableCaption.of("grants.granted_plots"),
- Template.of("amount", String.valueOf(granted))
+ TagResolver.resolver("amount", Tag.inserting(Component.text(granted)))
);
} else { // add
int amount;
@@ -128,10 +129,10 @@ public class Grant extends Command {
boolean replace = array != null;
String key = "grantedPlots";
byte[] rawData = Ints.toByteArray(amount);
- DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
+ DBFunc.addPersistentMeta(uuid, key, rawData, replace);
player.sendMessage(
TranslatableCaption.of("grants.added"),
- Template.of("grants", String.valueOf(amount))
+ TagResolver.resolver("grants", Tag.inserting(Component.text(amount)))
);
}
}
@@ -150,10 +151,10 @@ public class Grant extends Command {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_ADD)) {
+ if (player.hasPermission(Permission.PERMISSION_GRANT_ADD)) {
completions.add("add");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_CHECK)) {
+ if (player.hasPermission(Permission.PERMISSION_GRANT_CHECK)) {
completions.add("check");
}
final List commands = completions.stream().filter(completion -> completion
@@ -168,7 +169,7 @@ public class Grant extends Command {
CommandCategory.ADMINISTRATION
) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_SINGLE) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_GRANT_SINGLE) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java
index 3b8b176a5..1b738e025 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Help.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Help.java
@@ -28,7 +28,8 @@ import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
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;
import java.util.ArrayList;
import java.util.Collection;
@@ -59,9 +60,10 @@ public class Help extends Command {
RunnableVal2 whenDone
) {
switch (args.length) {
- case 0:
+ case 0 -> {
return displayHelp(player, null, 0);
- case 1:
+ }
+ case 1 -> {
if (MathMan.isInteger(args[0])) {
try {
return displayHelp(player, null, Integer.parseInt(args[0]));
@@ -71,7 +73,8 @@ public class Help extends Command {
} else {
return displayHelp(player, args[0], 1);
}
- case 2:
+ }
+ case 2 -> {
if (MathMan.isInteger(args[1])) {
try {
return displayHelp(player, args[0], Integer.parseInt(args[1]));
@@ -80,8 +83,8 @@ public class Help extends Command {
}
}
return CompletableFuture.completedFuture(false);
- default:
- sendUsage(player);
+ }
+ default -> sendUsage(player);
}
return CompletableFuture.completedFuture(true);
}
@@ -110,27 +113,36 @@ public class Help extends Command {
}
if (cat == null && page == 0) {
TextComponent.Builder builder = Component.text();
- builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
+ builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
for (CommandCategory c : CommandCategory.values()) {
if (!c.canAccess(player)) {
continue;
}
builder.append(Component.newline()).append(MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("help.help_info_item").getComponent(player),
- Template.of("command", "/plot help"),
- Template.of("category", c.name().toLowerCase()),
- Template.of("category_desc", c.getComponent(player))
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot help")))
+ .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
+ .tag("category_desc", Tag.inserting(c.toComponent(player)))
+ .build()
));
}
builder.append(Component.newline()).append(MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("help.help_info_item").getComponent(player),
- Template.of("command", "/plot help"),
- Template.of("category", "all"),
- Template.of("category_desc", "Display all commands")
+ TagResolver.builder()
+ .tag("command", Tag.inserting(Component.text("/plot help")))
+ .tag("category", Tag.inserting(Component.text("all")))
+ .tag(
+ "category_desc",
+ Tag.inserting(TranslatableCaption
+ .of("help.help_display_all_commands")
+ .toComponent(player))
+ )
+ .build()
));
- builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption
+ builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
.of("help.help_footer")
.getComponent(player)));
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
diff --git a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
index 2218ba44e..26c1e5bc5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
@@ -29,13 +29,14 @@ import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotId;
import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.query.SortingStrategy;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList;
@@ -72,8 +73,10 @@ public class HomeCommand extends Command {
} else if (plots.size() < page || page < 1) {
player.sendMessage(
TranslatableCaption.of("invalid.number_not_in_range"),
- Template.of("min", "1"),
- Template.of("max", String.valueOf(plots.size()))
+ TagResolver.builder()
+ .tag("min", Tag.inserting(Component.text(1)))
+ .tag("max", Tag.inserting(Component.text(plots.size())))
+ .build()
);
return;
}
@@ -104,11 +107,10 @@ public class HomeCommand extends Command {
// /plot home <[area;]x;y>
// /plot home
// /plot home
- if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OWNED) && !Permissions
- .hasPermission(player, Permission.PERMISSION_HOME)) {
+ if (!player.hasPermission(Permission.PERMISSION_VISIT_OWNED) && !player.hasPermission(Permission.PERMISSION_HOME)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString())
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_VISIT_OWNED.toString())))
);
return CompletableFuture.completedFuture(false);
}
@@ -130,7 +132,7 @@ public class HomeCommand extends Command {
} catch (NumberFormatException ignored) {
player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"),
- Template.of("value", identifier)
+ TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
);
return CompletableFuture.completedFuture(false);
}
@@ -171,7 +173,7 @@ public class HomeCommand extends Command {
} catch (NumberFormatException ignored) {
player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"),
- Template.of("value", identifier)
+ TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
);
return CompletableFuture.completedFuture(false);
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java
index 8bdc4df41..efc75318b 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java
@@ -20,7 +20,6 @@ package com.plotsquared.core.command;
import com.google.inject.TypeLiteral;
import com.plotsquared.core.configuration.caption.StaticCaption;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.MetaDataAccess;
@@ -30,13 +29,13 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.comment.CommentInbox;
import com.plotsquared.core.plot.comment.CommentManager;
import com.plotsquared.core.plot.comment.PlotComment;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.task.RunnableVal;
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;
import java.util.Collection;
import java.util.Collections;
@@ -72,41 +71,44 @@ public class Inbox extends SubCommand {
max = comments.length;
}
TextComponent.Builder builder = Component.text();
- builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
- Template.of("amount", String.valueOf(comments.length)), Template.of("cur", String.valueOf(page + 1)),
- Template.of("max", String.valueOf(totalPages + 1)), Template.of("word", "all")
+ builder.append(MINI_MESSAGE.deserialize(
+ TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
+ TagResolver.builder()
+ .tag("amount", Tag.inserting(Component.text(comments.length)))
+ .tag("cur", Tag.inserting(Component.text(page + 1)))
+ .tag("max", Tag.inserting(Component.text(totalPages + 1)))
+ .tag("word", Tag.inserting(Component.text("all")))
+ .build()
));
// This might work xD
for (int x = page * 12; x < max; x++) {
PlotComment comment = comments[x];
Component commentColored;
- if (player.getName().equals(comment.senderName)) {
+ if (player.getName().equals(comment.senderName())) {
commentColored = MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
- Template.of("comment", comment.comment)
+ TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
);
} else {
commentColored = MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
- Template.of("comment", comment.comment)
+ TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
);
}
- Template number = Template.of("number", String.valueOf(x));
- Template world = Template.of("world", comment.world);
- Template plot_id = Template.of("plot_id", comment.id.getX() + ";" + comment.id.getY());
- Template commenter = Template.of("commenter", comment.senderName);
- Template commentTemplate = Template.of("comment", commentColored);
+ TagResolver resolver = TagResolver.builder()
+ .tag("number", Tag.inserting(Component.text(x)))
+ .tag("world", Tag.inserting(Component.text(comment.world())))
+ .tag("plot_id", Tag.inserting(Component.text(comment.id().getX() + ";" + comment.id().getY())))
+ .tag("commenter", Tag.inserting(Component.text(comment.senderName())))
+ .tag("comment", Tag.inserting(commentColored))
+ .build();
builder.append(MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("list.comment_list_comment").getComponent(player),
- number,
- world,
- plot_id,
- commenter,
- commentTemplate
+ resolver
));
}
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@@ -135,7 +137,7 @@ public class Inbox extends SubCommand {
int unread = 0;
for (PlotComment comment : value) {
total++;
- if (comment.timestamp > CommentManager
+ if (comment.timestamp() > CommentManager
.getTimestamp(player, inbox.toString())) {
unread++;
}
@@ -143,20 +145,23 @@ public class Inbox extends SubCommand {
if (total != 0) {
player.sendMessage(
TranslatableCaption.of("comment.inbox_item"),
- Template.of("value", inbox + " (" + total + '/' + unread + ')')
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text(inbox + " (" + total + '/' + unread + ')'))
+ )
);
return;
}
}
player.sendMessage(
TranslatableCaption.of("comment.inbox_item"),
- Template.of("value", inbox.toString())
+ TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
);
}
})) {
player.sendMessage(
TranslatableCaption.of("comment.inbox_item"),
- Template.of("value", inbox.toString())
+ TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
);
}
}
@@ -167,7 +172,10 @@ public class Inbox extends SubCommand {
if (inbox == null) {
player.sendMessage(
TranslatableCaption.of("comment.invalid_inbox"),
- Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), ", "))
+ TagResolver.resolver(
+ "list",
+ Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), ", ")))
+ )
);
return false;
}
@@ -182,7 +190,7 @@ public class Inbox extends SubCommand {
final int page;
if (args.length > 1) {
switch (args[1].toLowerCase()) {
- case "delete":
+ case "delete" -> {
if (!inbox.canModify(plot, player)) {
player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
return false;
@@ -190,7 +198,10 @@ public class Inbox extends SubCommand {
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot inbox " + inbox + " delete ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot inbox " + inbox + " delete "))
+ )
);
return true;
}
@@ -200,25 +211,27 @@ public class Inbox extends SubCommand {
if (index < 1) {
player.sendMessage(
TranslatableCaption.of("comment.not_valid_inbox_index"),
- Templates.of("number", index)
+ TagResolver.resolver("number", Tag.inserting(Component.text(index)))
);
return false;
}
} catch (NumberFormatException ignored) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot inbox " + inbox + " delete ")
+ TagResolver.resolver(
+ "value",
+ Tag.inserting(Component.text("/plot inbox " + inbox + " delete "))
+ )
);
return false;
}
-
if (!inbox.getComments(plot, new RunnableVal<>() {
@Override
public void run(List value) {
if (index > value.size()) {
player.sendMessage(
TranslatableCaption.of("comment.not_valid_inbox_index"),
- Templates.of("number", index)
+ TagResolver.resolver("number", Tag.inserting(Component.text(index)))
);
return;
}
@@ -228,7 +241,7 @@ public class Inbox extends SubCommand {
if (success) {
player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"),
- Template.of("value", comment.comment)
+ TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment())))
);
} else {
player.sendMessage(
@@ -240,7 +253,8 @@ public class Inbox extends SubCommand {
return false;
}
return true;
- case "clear":
+ }
+ case "clear" -> {
if (!inbox.canModify(plot, player)) {
player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
}
@@ -249,18 +263,20 @@ public class Inbox extends SubCommand {
if (!comments.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"),
- Template.of("value", String.valueOf(comments))
+ TagResolver.resolver("value", Tag.inserting(Component.text("*")))
);
plot.getPlotCommentContainer().removeComments(comments);
}
return true;
- default:
+ }
+ default -> {
try {
page = Integer.parseInt(args[1]);
} catch (NumberFormatException ignored) {
sendUsage(player);
return false;
}
+ }
}
} else {
page = 1;
@@ -285,13 +301,13 @@ public class Inbox extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_OWNER)) {
+ if (player.hasPermission(Permission.PERMISSION_INBOX_READ_OWNER)) {
completions.add("owner");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_PUBLIC)) {
+ if (player.hasPermission(Permission.PERMISSION_INBOX_READ_PUBLIC)) {
completions.add("public");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_REPORT)) {
+ if (player.hasPermission(Permission.PERMISSION_INBOX_READ_REPORT)) {
completions.add("report");
}
final List commands = completions.stream().filter(completion -> completion
@@ -299,7 +315,7 @@ public class Inbox extends SubCommand {
.startsWith(args[0].toLowerCase()))
.map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.CHAT) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_INBOX) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java
index 6f4c085ad..b7845ede8 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Info.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Info.java
@@ -27,9 +27,10 @@ import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.TabCompletions;
-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;
import java.util.Collection;
import java.util.Collections;
@@ -51,8 +52,9 @@ public class Info extends SubCommand {
arg = args[0];
switch (arg) {
// TODO: (re?)implement /plot info inv. (it was never properly implemented)
- case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> plot = Plot
- .getPlotFromString(player, null, false);
+ case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" ->
+ plot = Plot
+ .getPlotFromString(player, null, false);
default -> {
plot = Plot.getPlotFromString(player, arg, false);
if (args.length == 2) {
@@ -91,7 +93,10 @@ public class Info extends SubCommand {
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_AREA_INFO_FORCE)
+ )
);
return true;
}
@@ -113,7 +118,10 @@ public class Info extends SubCommand {
if (!hasOwner && !containsEveryone && !trustedEveryone) {
player.sendMessage(
TranslatableCaption.of("info.plot_info_unclaimed"),
- Template.of("plot", plot.getId().getX() + ";" + plot.getId().getY())
+ TagResolver.resolver(
+ "plot",
+ Tag.inserting(Component.text(plot.getId().getX() + ";" + plot.getId().getY()))
+ )
);
return true;
}
@@ -144,7 +152,7 @@ public class Info extends SubCommand {
@Override
public Collection tab(PlotPlayer player, String[] args, boolean space) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO_FORCE)) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE)) {
completions.add("-f");
}
@@ -154,7 +162,7 @@ public class Info extends SubCommand {
.map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO_FORCE) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java
index 111a29026..cf91f9ad2 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Kick.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java
@@ -27,11 +27,12 @@ import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.WorldUtil;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -70,8 +71,7 @@ public class Kick extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_KICK)) {
+ if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_KICK)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
@@ -82,15 +82,14 @@ public class Kick extends SubCommand {
} else if (throwable != null || uuids.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
} else {
Set> players = new HashSet<>();
for (UUID uuid : uuids) {
if (uuid == DBFunc.EVERYONE) {
for (PlotPlayer pp : plot.getPlayersInPlot()) {
- if (pp == player || Permissions
- .hasPermission(pp, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
+ if (pp == player || pp.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
continue;
}
players.add(pp);
@@ -106,22 +105,22 @@ public class Kick extends SubCommand {
if (players.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
);
return;
}
for (PlotPlayer player2 : players) {
if (!plot.equals(player2.getCurrentPlot())) {
player.sendMessage(
- TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", args[0])
+ TranslatableCaption.of("kick.player_not_in_plot"),
+ TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
);
return;
}
- if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
+ if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
player.sendMessage(
- TranslatableCaption.of("cluster.cannot_kick_player"),
- Template.of("name", player2.getName())
+ TranslatableCaption.of("kick.cannot_kick_player"),
+ TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
);
return;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Leave.java b/Core/src/main/java/com/plotsquared/core/command/Leave.java
index 9fc956f43..bb81c3342 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Leave.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Leave.java
@@ -25,7 +25,9 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID;
@@ -67,7 +69,7 @@ public class Leave extends Command {
}
player.sendMessage(
TranslatableCaption.of("member.plot_left"),
- Template.of("player", player.getName())
+ TagResolver.resolver("player", Tag.inserting(Component.text(player.getName())))
);
} else {
player.sendMessage(
diff --git a/Core/src/main/java/com/plotsquared/core/command/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java
index 9f93efe57..78a60327d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Like.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Like.java
@@ -30,11 +30,12 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.Rating;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -121,8 +122,7 @@ public class Like extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) {
+ if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) {
return false;
}
plot.clearRatings();
@@ -153,7 +153,7 @@ public class Like extends SubCommand {
if (oldRating != null) {
player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
return;
}
@@ -171,12 +171,12 @@ public class Like extends SubCommand {
if (like) {
player.sendMessage(
TranslatableCaption.of("ratings.rating_liked"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
} else {
player.sendMessage(
TranslatableCaption.of("ratings.rating_disliked"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
}
}
@@ -204,7 +204,7 @@ public class Like extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
+ if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
completions.add("purge");
}
final List commands = completions.stream().filter(completion -> completion
@@ -212,7 +212,7 @@ public class Like extends SubCommand {
.startsWith(args[0].toLowerCase()))
.map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_RATE) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_RATE) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
return commands;
diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
index b47a99e25..5ba5d1a00 100644
--- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
@@ -23,21 +23,18 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.Caption;
import com.plotsquared.core.configuration.caption.CaptionHolder;
-import com.plotsquared.core.configuration.caption.Templates;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.StringComparison;
import com.plotsquared.core.util.StringMan;
@@ -48,7 +45,8 @@ import com.plotsquared.core.util.task.RunnableVal3;
import com.plotsquared.core.uuid.UUIDMapping;
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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList;
@@ -83,40 +81,40 @@ public class ListCmd extends SubCommand {
private String[] getArgumentList(PlotPlayer player) {
List args = new ArrayList<>();
- if (this.econHandler != null && Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
+ if (this.econHandler != null && player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) {
args.add("forsale");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_MINE)) {
args.add("mine");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_SHARED)) {
args.add("shared");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
args.add("world");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_TOP)) {
args.add("top");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_ALL)) {
args.add("all");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) {
args.add("unowned");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_PLAYER)) {
args.add("");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
args.add("");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_DONE)) {
args.add("done");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) {
args.add("expired");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) {
args.add("fuzzy ");
}
return args.toArray(new String[args.size()]);
@@ -125,7 +123,7 @@ public class ListCmd extends SubCommand {
public void noArgs(PlotPlayer player) {
player.sendMessage(
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
- Templates.of("values", Arrays.toString(getArgumentList(player)))
+ TagResolver.resolver("values", Tag.inserting(Component.text(Arrays.toString(getArgumentList(player)))))
);
}
@@ -161,9 +159,14 @@ public class ListCmd extends SubCommand {
if (query == null) {
player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"),
- Template.of(
+ TagResolver.resolver(
"value",
- new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch()
+ Tag.inserting(Component.text(
+ new StringComparison<>(
+ args[0],
+ new String[]{"mine", "shared", "world", "all"}
+ ).getBestMatch()
+ ))
)
);
return;
@@ -188,10 +191,10 @@ public class ListCmd extends SubCommand {
switch (arg) {
case "mine" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_MINE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.mine")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.mine")))
);
return false;
}
@@ -203,10 +206,10 @@ public class ListCmd extends SubCommand {
.withSortingStrategy(SortingStrategy.SORT_BY_TEMP));
}
case "shared" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_SHARED)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.shared")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.shared")))
);
return false;
}
@@ -216,48 +219,48 @@ public class ListCmd extends SubCommand {
.thatPasses(plot -> !plot.isOwnerAbs(player.getUUID())));
}
case "world" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.world")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
);
return false;
}
- if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
+ if (!player.hasPermission("plots.list.world." + world)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.world." + world)
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
);
return false;
}
plotConsumer.accept(PlotQuery.newQuery().inWorld(world));
}
case "expired" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.expired")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.expired")))
);
return false;
}
- if (ExpireManager.IMP == null) {
+ if (PlotSquared.platform().expireManager() == null) {
plotConsumer.accept(PlotQuery.newQuery().noPlots());
} else {
plotConsumer.accept(PlotQuery.newQuery().expiredPlots());
}
}
case "area" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_AREA)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_AREA)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.area")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.area")))
);
return false;
}
- if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
+ if (!player.hasPermission("plots.list.world." + world)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.world." + world)
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
);
return false;
}
@@ -268,20 +271,20 @@ public class ListCmd extends SubCommand {
}
}
case "all" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_ALL)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.all")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.all")))
);
return false;
}
plotConsumer.accept(PlotQuery.newQuery().allPlots());
}
case "done" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_DONE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.done")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.done")))
);
return false;
}
@@ -293,10 +296,10 @@ public class ListCmd extends SubCommand {
.withSortingStrategy(SortingStrategy.SORT_BY_DONE));
}
case "top" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_TOP)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.top")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.top")))
);
return false;
}
@@ -304,10 +307,10 @@ public class ListCmd extends SubCommand {
plotConsumer.accept(PlotQuery.newQuery().allPlots().withSortingStrategy(SortingStrategy.SORT_BY_RATING));
}
case "forsale" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.forsale")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.forsale")))
);
return false;
}
@@ -317,27 +320,27 @@ public class ListCmd extends SubCommand {
plotConsumer.accept(PlotQuery.newQuery().allPlots().thatPasses(plot -> plot.getFlag(PriceFlag.class) > 0));
}
case "unowned" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.unowned")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.unowned")))
);
return false;
}
plotConsumer.accept(PlotQuery.newQuery().allPlots().thatPasses(plot -> plot.getOwner() == null));
}
case "fuzzy" -> {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.fuzzy")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.fuzzy")))
);
return false;
}
if (args.length < (page == -1 ? 2 : 3)) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Templates.of("value", "/plot list fuzzy [#]")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot list fuzzy [#]")))
);
return false;
}
@@ -352,17 +355,17 @@ public class ListCmd extends SubCommand {
}
default -> {
if (this.plotAreaManager.hasPlotArea(args[0])) {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.world")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
);
return false;
}
- if (!Permissions.hasPermission(player, "plots.list.world." + args[0])) {
+ if (!player.hasPermission("plots.list.world." + args[0])) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.world." + args[0])
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + args[0])))
);
return false;
}
@@ -381,12 +384,15 @@ public class ListCmd extends SubCommand {
}
}
if (uuid == null) {
- player.sendMessage(TranslatableCaption.of("errors.invalid_player"), Templates.of("value", args[0]));
+ player.sendMessage(
+ TranslatableCaption.of("errors.invalid_player"),
+ TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
+ );
} else {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) {
+ if (!player.hasPermission(Permission.PERMISSION_LIST_PLAYER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Templates.of("node", "plots.list.player")
+ TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.player")))
);
} else {
sort[0] = false;
@@ -422,32 +428,34 @@ public class ListCmd extends SubCommand {
} else {
color = TranslatableCaption.of("info.plot_list_default");
}
- Component trusted = MINI_MESSAGE.parse(
+ Component trusted = MINI_MESSAGE.deserialize(
TranslatableCaption.of("info.plot_info_trusted").getComponent(player),
- Template.of("trusted", PlayerManager.getPlayerList(plot.getTrusted(), player))
+ TagResolver.resolver("trusted", Tag.inserting(PlayerManager.getPlayerList(plot.getTrusted(), player)))
);
- Component members = MINI_MESSAGE.parse(
+ Component members = MINI_MESSAGE.deserialize(
TranslatableCaption.of("info.plot_info_members").getComponent(player),
- Template.of("members", PlayerManager.getPlayerList(plot.getMembers(), player))
+ TagResolver.resolver("members", Tag.inserting(PlayerManager.getPlayerList(plot.getMembers(), player)))
);
- Template command_tp = Template.of("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId());
- Template command_info = Template.of("command_info", "/plot info " + plot.getArea() + ";" + plot.getId());
- Template hover_info =
- Template.of(
- "hover_info",
- MINI_MESSAGE.serialize(Component
- .text()
- .append(trusted)
- .append(Component.newline())
- .append(members)
- .asComponent())
- );
- Template numberTemplate = Template.of("number", String.valueOf(i));
- Template plotTemplate = Template.of(
- "plot",
- MINI_MESSAGE.parse(color.getComponent(player), Template.of("plot", plot.toString()))
+ TagResolver.Builder finalResolver = TagResolver.builder();
+ finalResolver.tag(
+ "command_tp",
+ Tag.preProcessParsed("/plot visit " + plot.getArea() + ";" + plot.getId())
);
-
+ finalResolver.tag(
+ "command_info",
+ Tag.preProcessParsed("/plot info " + plot.getArea() + ";" + plot.getId())
+ );
+ finalResolver.tag("hover_info", Tag.inserting(
+ Component.text()
+ .append(trusted)
+ .append(Component.newline())
+ .append(members)
+ .asComponent()
+ ));
+ finalResolver.tag("number", Tag.inserting(Component.text(i)));
+ finalResolver.tag("plot", Tag.inserting(MINI_MESSAGE.deserialize(
+ color.getComponent(player), TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
+ )));
String prefix = "";
String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
@@ -456,35 +464,37 @@ public class ListCmd extends SubCommand {
String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
TextComponent.Builder builder = Component.text();
if (plot.getFlag(ServerPlotFlag.class)) {
- Template serverTemplate = Template.of(
+ TagResolver serverResolver = TagResolver.resolver(
"info.server",
- TranslatableCaption.of("info.server").getComponent(player)
+ Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
);
- builder.append(MINI_MESSAGE.parse(server, serverTemplate));
+ builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
} else {
try {
final List names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
for (final UUIDMapping uuidMapping : names) {
- PlotPlayer pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
- Template prefixTemplate = Template.of("prefix", prefix);
- Template playerTemplate = Template.of("player", uuidMapping.getUsername());
+ PlotPlayer pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid());
+ TagResolver resolver = TagResolver.builder()
+ .tag("prefix", Tag.inserting(Component.text(prefix)))
+ .tag("player", Tag.inserting(Component.text(uuidMapping.username())))
+ .build();
if (pp != null) {
- builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
- } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
- Template unknownTemplate = Template.of(
+ builder.append(MINI_MESSAGE.deserialize(online, resolver));
+ } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
+ TagResolver unknownResolver = TagResolver.resolver(
"info.unknown",
- TranslatableCaption.of("info.unknown").getComponent(player)
+ Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
);
- builder.append(MINI_MESSAGE.parse(unknown, unknownTemplate));
- } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
- Template everyoneTemplate = Template.of(
+ builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
+ } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
+ TagResolver everyoneResolver = TagResolver.resolver(
"info.everyone",
- TranslatableCaption.of("info.everyone").getComponent(player)
+ Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
);
- builder.append(MINI_MESSAGE.parse(everyone, everyoneTemplate));
+ builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
} else {
- builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
+ builder.append(MINI_MESSAGE.deserialize(offline, resolver));
}
prefix = ", ";
}
@@ -500,15 +510,15 @@ public class ListCmd extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Templates.of("value", playerBuilder.toString())
+ TagResolver.resolver("value", Tag.inserting(Component.text(playerBuilder.toString())))
);
} catch (TimeoutException e) {
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
}
}
- Template players = Template.of("players", builder.asComponent());
+ finalResolver.tag("players", Tag.inserting(builder.asComponent()));
caption.set(TranslatableCaption.of("info.plot_list_item"));
- caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);
+ caption.setTagResolvers(finalResolver.build());
}
}, "/plot list " + args[0], TranslatableCaption.of("list.plot_list_header_paged"));
}
@@ -516,31 +526,31 @@ public class ListCmd extends SubCommand {
@Override
public Collection tab(PlotPlayer player, String[] args, boolean space) {
final List completions = new LinkedList<>();
- if (this.econHandler.isSupported() && Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
+ if (this.econHandler.isSupported() && player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) {
completions.add("forsale");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_MINE)) {
completions.add("mine");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_SHARED)) {
completions.add("shared");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) {
completions.addAll(PlotSquared.platform().worldManager().getWorlds());
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_TOP)) {
completions.add("top");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_ALL)) {
completions.add("all");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) {
completions.add("unowned");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_DONE)) {
completions.add("done");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) {
completions.add("expired");
}
@@ -550,7 +560,7 @@ public class ListCmd extends SubCommand {
.map(completion -> new Command(null, true, completion, "", RequiredType.NONE, CommandCategory.TELEPORT) {
}).collect(Collectors.toCollection(LinkedList::new));
- if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER) && args[0].length() > 0) {
+ if (player.hasPermission(Permission.PERMISSION_LIST_PLAYER) && args[0].length() > 0) {
commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java
index f1b10ca73..4ead54146 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Load.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Load.java
@@ -31,12 +31,13 @@ import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.PlotId;
import com.plotsquared.core.plot.schematic.Schematic;
import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.TimeUtil;
import com.plotsquared.core.util.task.RunnableVal;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.net.MalformedURLException;
@@ -80,8 +81,7 @@ public class Load extends SubCommand {
player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
return false;
}
- if (!plot.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_LOAD)) {
+ if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_LOAD)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
}
@@ -99,7 +99,7 @@ public class Load extends SubCommand {
// No schematics found:
player.sendMessage(
TranslatableCaption.of("web.load_null"),
- Template.of("command", "/plot load")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot load")))
);
return false;
}
@@ -110,7 +110,7 @@ public class Load extends SubCommand {
// use /plot load
player.sendMessage(
TranslatableCaption.of("invalid.not_valid_number"),
- Template.of("value", "(1, " + schematics.size() + ')')
+ TagResolver.resolver("value", Tag.inserting(Component.text("(1, " + schematics.size() + ')')))
);
return false;
}
@@ -130,7 +130,10 @@ public class Load extends SubCommand {
plot.removeRunning();
player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid"),
- Template.of("reason", "non-existent or not in gzip format")
+ TagResolver.resolver(
+ "reason",
+ Tag.inserting(Component.text("non-existent or not in gzip format"))
+ )
);
return;
}
@@ -161,7 +164,7 @@ public class Load extends SubCommand {
plot.removeRunning();
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot load ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot load ")))
);
return false;
}
@@ -212,46 +215,9 @@ public class Load extends SubCommand {
}
player.sendMessage(
TranslatableCaption.of("web.load_list"),
- Template.of("command", "/plot load #")
+ TagResolver.resolver("command", Tag.inserting(Component.text("/plot load #")))
);
}
}
- /**
- * @deprecated Use {@link TimeUtil#secToTime(long)}
- */
- @Deprecated(forRemoval = true, since = "6.6.2")
- public String secToTime(long time) {
- StringBuilder toreturn = new StringBuilder();
- if (time >= 33868800) {
- int years = (int) (time / 33868800);
- time -= years * 33868800;
- toreturn.append(years).append("y ");
- }
- if (time >= 604800) {
- int weeks = (int) (time / 604800);
- time -= weeks * 604800;
- toreturn.append(weeks).append("w ");
- }
- if (time >= 86400) {
- int days = (int) (time / 86400);
- time -= days * 86400;
- toreturn.append(days).append("d ");
- }
- if (time >= 3600) {
- int hours = (int) (time / 3600);
- time -= hours * 3600;
- toreturn.append(hours).append("h ");
- }
- if (time >= 60) {
- int minutes = (int) (time / 60);
- time -= minutes * 60;
- toreturn.append(minutes).append("m ");
- }
- if (toreturn.length() == 0 || (time > 0)) {
- toreturn.append(time).append("s ");
- }
- return toreturn.toString().trim();
- }
-
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
index 77ebe94c3..1911f24e9 100644
--- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
@@ -32,10 +32,12 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.world.SinglePlotArea;
import com.plotsquared.core.util.EconHandler;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -72,7 +74,6 @@ public class MainCommand extends Command {
commands.add(Buy.class);
if (Settings.Web.LEGACY_WEBINTERFACE) {
LOGGER.warn("Legacy webinterface is used. Please note that it will be removed in future.");
- commands.add(Save.class);
}
commands.add(Load.class);
commands.add(Confirm.class);
@@ -121,7 +122,6 @@ public class MainCommand extends Command {
commands.add(Move.class);
commands.add(Condense.class);
commands.add(Copy.class);
- commands.add(Chat.class);
commands.add(Trim.class);
commands.add(Done.class);
commands.add(Continue.class);
@@ -244,8 +244,8 @@ public class MainCommand extends Command {
PlotArea area = player.getApplicablePlotArea();
Plot newPlot = Plot.fromString(area, args[0]);
if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
- .equals(area) || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN)
- || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_AREA_SUDO))
+ .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN)
+ || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
&& !newPlot.isDenied(player.getUUID())) {
final Location newLoc;
if (newPlot.getArea() instanceof SinglePlotArea) {
@@ -311,7 +311,7 @@ public class MainCommand extends Command {
if (message != null) {
player.sendMessage(
TranslatableCaption.of("errors.error"),
- net.kyori.adventure.text.minimessage.Template.of("value", message)
+ TagResolver.resolver("value", Tag.inserting(Component.text(message)))
);
} else {
player.sendMessage(
diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java
index 8c9976197..24e842645 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Merge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java
@@ -32,10 +32,11 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.util.EconHandler;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.StringMan;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID;
@@ -115,22 +116,24 @@ public class Merge extends SubCommand {
if (direction == null) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]")
+ TagResolver.resolver("value", Tag.inserting(Component.text(
+ "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+ )))
);
player.sendMessage(
TranslatableCaption.of("help.direction"),
- Template.of("dir", direction(location.getYaw()))
+ TagResolver.resolver("dir", Tag.inserting(Component.text(direction(location.getYaw()))))
);
return false;
}
final int size = plot.getConnectedPlots().size();
- int max = Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
+ int max = player.hasPermissionRange("plots.merge", Settings.Limit.MAX_PLOTS);
PlotMergeEvent event =
this.eventDispatcher.callMerge(plot, direction, max, player);
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Merge")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Merge")))
);
return false;
}
@@ -141,7 +144,7 @@ public class Merge extends SubCommand {
if (!force && size - 1 > maxSize) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", Permission.PERMISSION_MERGE + "." + (size + 1))
+ TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_MERGE + "." + (size + 1))))
);
return false;
}
@@ -152,7 +155,7 @@ public class Merge extends SubCommand {
UUID uuid = player.getUUID();
if (!force && !plot.isOwner(uuid)) {
- if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) {
+ if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_MERGE)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
} else {
@@ -164,11 +167,13 @@ public class Merge extends SubCommand {
if (args.length == 2) {
terrain = "true".equalsIgnoreCase(args[1]);
}
- if (!force && !terrain && !Permissions
- .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
+ if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD)
+ )
);
return true;
}
@@ -177,8 +182,11 @@ public class Merge extends SubCommand {
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(price)),
- Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))),
+ TagResolver.resolver(
+ "balance",
+ Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
+ )
);
}
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -192,7 +200,7 @@ public class Merge extends SubCommand {
&& this.econHandler.getMoney(player) < price) {
player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_merge"),
- Template.of("money", this.econHandler.format(price))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
return false;
}
@@ -202,11 +210,10 @@ public class Merge extends SubCommand {
} else {
terrain = true;
}
- if (!force && !terrain && !Permissions
- .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
+ if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD))
);
return true;
}
@@ -215,7 +222,7 @@ public class Merge extends SubCommand {
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(price))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
}
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -228,10 +235,10 @@ public class Merge extends SubCommand {
player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
return false;
}
- if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
+ if (!force && !player.hasPermission(Permission.PERMISSION_MERGE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER))
+ TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_OTHER))
);
return false;
}
@@ -256,14 +263,14 @@ public class Merge extends SubCommand {
if (!force && this.econHandler.getMoney(player) < price) {
player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_merge"),
- Template.of("money", this.econHandler.format(price))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
return;
}
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
- Template.of("money", this.econHandler.format(price))
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
}
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@@ -271,10 +278,15 @@ public class Merge extends SubCommand {
};
if (!force && hasConfirmation(player)) {
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
- .parse(
+ .deserialize(
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
- Template.of("player", player.getName()),
- Template.of("location", plot.getWorldName() + ";" + plot.getId())
+ TagResolver.builder()
+ .tag("player", Tag.inserting(Component.text(player.getName())))
+ .tag(
+ "location",
+ Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
+ )
+ .build()
)),
run
);
@@ -282,7 +294,34 @@ public class Merge extends SubCommand {
run.run();
}
}
- if (!force && !isOnline) {
+ if (force || !isOnline) {
+ if (force || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_MERGE_OTHER_OFFLINE)) {
+ if (plot.getPlotModificationManager().autoMerge(
+ direction,
+ maxSize - size,
+ uuids.iterator().next(),
+ player,
+ terrain
+ )) {
+ if (this.econHandler.isEnabled(plotArea) && price > 0d) {
+ if (!force && this.econHandler.getMoney(player) < price) {
+ player.sendMessage(
+ TranslatableCaption.of("economy.cannot_afford_merge"),
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+ );
+ return false;
+ }
+ this.econHandler.withdrawMoney(player, price);
+ player.sendMessage(
+ TranslatableCaption.of("economy.removed_balance"),
+ TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+ );
+ }
+ player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+ eventDispatcher.callPostMerge(player, plot);
+ return true;
+ }
+ }
player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
return false;
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java
index 602e29c19..161d12991 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Move.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Move.java
@@ -26,10 +26,11 @@ import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.concurrent.CompletableFuture;
@@ -60,8 +61,7 @@ public class Move extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return CompletableFuture.completedFuture(false);
}
- if (!plot1.isOwner(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN)) {
+ if (!plot1.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return CompletableFuture.completedFuture(false);
}
@@ -88,8 +88,7 @@ public class Move extends SubCommand {
player.sendMessage(TranslatableCaption.of("invalid.origin_cant_be_target"));
return CompletableFuture.completedFuture(false);
}
- if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN))) {
+ if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !player.hasPermission(Permission.PERMISSION_ADMIN))) {
player.sendMessage(TranslatableCaption.of("errors.plotworld_incompatible"));
return CompletableFuture.completedFuture(false);
}
@@ -107,8 +106,10 @@ public class Move extends SubCommand {
if (result) {
player.sendMessage(
TranslatableCaption.of("move.move_success"),
- Template.of("origin", p1),
- Template.of("target", p2)
+ TagResolver.builder()
+ .tag("origin", Tag.inserting(Component.text(p1)))
+ .tag("target", Tag.inserting(Component.text(p2)))
+ .build()
);
return true;
} else {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java
index f8a3af88d..d54d089d8 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -33,10 +33,11 @@ import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.core.plot.flag.implementations.MusicFlag;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.InventoryUtil;
-import com.plotsquared.core.util.Permissions;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import javax.annotation.Nullable;
@@ -55,7 +56,7 @@ public class Music extends SubCommand {
.asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
"music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
"music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
- "music_disc_pigstep", "music_disc_5"
+ "music_disc_pigstep", "music_disc_5", "music_disc_relic"
);
private final InventoryUtil inventoryUtil;
@@ -79,11 +80,13 @@ public class Music extends SubCommand {
player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
return false;
}
- if (!plot.isAdded(player.getUUID()) && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
+ if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
- Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER))
+ TagResolver.resolver(
+ "node",
+ Tag.inserting(Permission.PERMISSION_ADMIN_MUSIC_OTHER)
+ )
);
return true;
}
@@ -106,15 +109,17 @@ public class Music extends SubCommand {
if (event.getEventResult() == Result.DENY) {
getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Music removal")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Music removal")))
);
return true;
}
plot.removeFlag(event.getFlag());
getPlayer().sendMessage(
TranslatableCaption.of("flag.flag_removed"),
- Template.of("flag", "music"),
- Template.of("value", "music_disc")
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text("music")))
+ .tag("value", Tag.inserting(Component.text("music_disc")))
+ .build()
);
} else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
PlotFlag plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
@@ -123,13 +128,17 @@ public class Music extends SubCommand {
if (event.getEventResult() == Result.DENY) {
getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Music addition")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Music addition")))
);
return true;
}
plot.setFlag(event.getFlag());
- getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", "music"),
- Template.of("value", String.valueOf(event.getFlag().getValue()))
+ getPlayer().sendMessage(
+ TranslatableCaption.of("flag.flag_added"),
+ TagResolver.builder()
+ .tag("flag", Tag.inserting(Component.text("music")))
+ .tag("value", Tag.inserting(Component.text(event.getFlag().getValue().toString())))
+ .build()
);
} else {
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));
diff --git a/Core/src/main/java/com/plotsquared/core/command/Near.java b/Core/src/main/java/com/plotsquared/core/command/Near.java
index 449be991b..c415a5492 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Near.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Near.java
@@ -24,8 +24,11 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
-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;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration(command = "near",
@@ -48,9 +51,13 @@ public class Near extends Command {
final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
player.sendMessage(
TranslatableCaption.of("near.plot_near"),
- Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", "))
+ TagResolver.resolver("list", Tag.inserting(Component.text(StringMan.join(plot.getPlayersInPlot(), ", "))))
);
return CompletableFuture.completedFuture(true);
}
+ private List> getPlayersInPlotVisible(Plot plot, PlotPlayer executor) {
+ return plot.getPlayersInPlot().stream().filter(executor::canSee).toList();
+ }
+
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java
index bb44a4686..ee3c32eec 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Owner.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java
@@ -31,11 +31,12 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlayerManager;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -66,7 +67,7 @@ public class Owner extends SetCommand {
if (value == null || value.isEmpty()) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
- Template.of("value", "/plot setowner ")
+ TagResolver.resolver("value", Tag.inserting(Component.text("/plot setowner ")))
);
return false;
}
@@ -78,7 +79,7 @@ public class Owner extends SetCommand {
&& !value.equalsIgnoreCase("-")) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", value)
+ TagResolver.resolver("value", Tag.inserting(Component.text(value)))
);
return;
}
@@ -92,17 +93,17 @@ public class Owner extends SetCommand {
if (event.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Owner change")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Owner change")))
);
return;
}
uuid = event.getNewOwner();
boolean force = event.getEventResult() == Result.FORCE;
if (uuid == null) {
- if (!force && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER,
- true
- )) {
+ if (!force && !player.hasPermission(
+ Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER,
+ true
+ )) {
return;
}
PlotUnlinkEvent unlinkEvent = this.eventDispatcher.callUnlink(
@@ -115,7 +116,7 @@ public class Owner extends SetCommand {
if (unlinkEvent.getEventResult() == Result.DENY) {
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
- Template.of("value", "Unlink on owner change")
+ TagResolver.resolver("value", Tag.inserting(Component.text("Unlink on owner change")))
);
return;
}
@@ -135,16 +136,21 @@ public class Owner extends SetCommand {
if (plot.isOwner(uuid)) {
player.sendMessage(
TranslatableCaption.of("member.already_owner"),
- Template.of("player", PlayerManager.resolveName(uuid, false).getComponent(player))
+ TagResolver.resolver(
+ "player",
+ Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
+ )
);
return;
}
- if (!force && !Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER)) {
+ if (!force && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER)) {
if (other == null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player_offline"),
- Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
+ TagResolver.resolver(
+ "player",
+ Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+ )
);
return;
}
@@ -180,7 +186,10 @@ public class Owner extends SetCommand {
if (other != null) {
other.sendMessage(
TranslatableCaption.of("owner.now_owner"),
- Template.of("plot", plot.getArea() + ";" + plot.getId())
+ TagResolver.resolver(
+ "plot",
+ Tag.inserting(Component.text(plot.getArea() + ";" + plot.getId()))
+ )
);
}
} else {
diff --git a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
index 0e5f4b582..be78475b5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
@@ -23,7 +23,9 @@ import com.plotsquared.core.configuration.caption.StaticCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.PremiumVerification;
import com.plotsquared.core.util.task.TaskManager;
-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;
@CommandDeclaration(command = "plugin",
permission = "plots.use",
@@ -39,7 +41,7 @@ public class PluginCmd extends SubCommand {
StaticCaption.of(">> " + PlotSquared
.platform()
.pluginName() + " (Version: )"),
- Template.of("version", String.valueOf(PlotSquared.get().getVersion()))
+ TagResolver.resolver("version", Tag.inserting(Component.text(String.valueOf(PlotSquared.get().getVersion()))))
);
player.sendMessage(StaticCaption.of(
">> Authors: Citymonstret & Empire92 & MattBDev & dordsor21 & NotMyFault & SirYwell"));
@@ -49,7 +51,7 @@ public class PluginCmd extends SubCommand {
">> Discord: https://discord.gg/intellectualsites"));
player.sendMessage(
StaticCaption.of(">> Premium: "),
- Template.of("value", String.valueOf(PremiumVerification.isPremium()))
+ TagResolver.resolver("value", Tag.inserting(Component.text(PremiumVerification.isPremium())))
);
});
return true;
diff --git a/Core/src/main/java/com/plotsquared/core/command/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java
index 49f48ea03..873c732b9 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Purge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java
@@ -33,7 +33,9 @@ import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.uuid.UUIDMapping;
-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;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
@@ -88,72 +90,56 @@ public class Purge extends SubCommand {
return false;
}
switch (split[0].toLowerCase()) {
- case "world":
- case "w":
- world = split[1];
- break;
- case "area":
- case "a":
+ case "world", "w" -> world = split[1];
+ case "area", "a" -> {
area = this.plotAreaManager.getPlotAreaByString(split[1]);
if (area == null) {
player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"),
- Template.of("value", split[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
);
return false;
}
- break;
- case "plotid":
- case "id":
+ }
+ case "plotid", "id" -> {
try {
id = PlotId.fromString(split[1]);
} catch (IllegalArgumentException ignored) {
player.sendMessage(
TranslatableCaption.of("invalid.not_valid_plot_id"),
- Template.of("value", split[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
);
return false;
}
- break;
- case "owner":
- case "o":
+ }
+ case "owner", "o" -> {
UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
if (ownerMapping == null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", split[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
);
return false;
}
- owner = ownerMapping.getUuid();
- break;
- case "shared":
- case "s":
+ owner = ownerMapping.uuid();
+ }
+ case "shared", "s" -> {
UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
if (addedMapping == null) {
player.sendMessage(
TranslatableCaption.of("errors.invalid_player"),
- Template.of("value", split[1])
+ TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
);
return false;
}
- added = addedMapping.getUuid();
- break;
- case "clear":
- case "c":
- case "delete":
- case "d":
- case "del":
- clear = Boolean.parseBoolean(split[1]);
- break;
- case "unknown":
- case "?":
- case "u":
- unknown = Boolean.parseBoolean(split[1]);
- break;
- default:
+ added = addedMapping.uuid();
+ }
+ case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
+ case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
+ default -> {
sendUsage(player);
return false;
+ }
}
}
final HashSet toDelete = new HashSet<>();
@@ -234,9 +220,9 @@ public class Purge extends SubCommand {
try {
ids.add(plot.temp);
if (finalClear) {
- plot.getPlotModificationManager().clear(false, true, player, () -> {
- LOGGER.info("Plot {} cleared by purge", plot.getId());
- });
+ plot.getPlotModificationManager().clear(false, true, player,
+ () -> LOGGER.info("Plot {} cleared by purge", plot.getId())
+ );
} else {
plot.getPlotModificationManager().removeSign();
}
@@ -258,7 +244,10 @@ public class Purge extends SubCommand {
DBFunc.purgeIds(ids);
player.sendMessage(
TranslatableCaption.of("purge.purge_success"),
- Template.of("amount", ids.size() + "/" + toDelete.size())
+ TagResolver.resolver(
+ "amount",
+ Tag.inserting(Component.text(ids.size() + "/" + toDelete.size()))
+ )
);
});
}
diff --git a/Core/src/main/java/com/plotsquared/core/command/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java
index 0c7a446d5..6e1319cc8 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Rate.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java
@@ -34,11 +34,12 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.InventoryUtil;
import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.TabCompletions;
import com.plotsquared.core.util.query.PlotQuery;
import com.plotsquared.core.util.task.TaskManager;
-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;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
@@ -114,8 +115,7 @@ public class Rate extends SubCommand {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
- if (!Permissions
- .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) {
+ if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) {
return false;
}
plot.clearRatings();
@@ -148,7 +148,7 @@ public class Rate extends SubCommand {
if (plot.getRatings().containsKey(player.getUUID())) {
player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
return;
}
@@ -168,7 +168,7 @@ public class Rate extends SubCommand {
plot.addRating(this.getPlayer().getUUID(), event.getRating());
getPlayer().sendMessage(
TranslatableCaption.of("ratings.rating_applied"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
}
return false;
@@ -241,7 +241,7 @@ public class Rate extends SubCommand {
if (plot.getRatings().containsKey(uuid)) {
player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
return;
}
@@ -251,7 +251,7 @@ public class Rate extends SubCommand {
plot.addRating(uuid, event.getRating());
player.sendMessage(
TranslatableCaption.of("ratings.rating_applied"),
- Template.of("plot", plot.getId().toString())
+ TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
);
}
};
@@ -273,10 +273,10 @@ public class Rate extends SubCommand {
public Collection tab(final PlotPlayer player, final String[] args, final boolean space) {
if (args.length == 1) {
final List completions = new LinkedList<>();
- if (Permissions.hasPermission(player, Permission.PERMISSION_RATE)) {
+ if (player.hasPermission(Permission.PERMISSION_RATE)) {
completions.add("1 - 10");
}
- if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
+ if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) {
completions.add("purge");
}
final List