Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Address MiniMessage deprecations (#3354)

Browse Source 
* refactor: Address MiniMessage deprecations

* refactor: More MiniMessage deprecations

* Move away from our `Templates#of`

* Address comments

* style: Address migration style issues

* docs: Add javadoc link for MiniMessage
This commit is contained in:
Alex 2021-12-13 09:48:34 +01:00 committed by GitHub
parent 9c84dc2bc0
commit f086826942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
114 changed files with 953 additions and 836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bukkit/build.gradle.kts
View File

@ -98,6 +98,7 @@ tasks {
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/")
opt.links("https://jd.adventure.kyori.net/api/4.9.3/") opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
opt.links("https://notmyfault.github.io/MiniMessage-Javadocs/") // Temporary hosting for 4.2.0-SNAPSHOT, exchange when we jump to 4.10.0
opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/") opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
opt.links("https://checkerframework.org/api/") opt.links("https://checkerframework.org/api/")
} }

26
Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
View File

@ -283,15 +283,15 @@ public class BlockEventListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("height.height_limit"), TranslatableCaption.of("height.height_limit"),
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), Template.template("minHeight", String.valueOf(area.getMinBuildHeight())),
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) Template.template("maxHeight", String.valueOf(area.getMaxBuildHeight()))
); );
} }
if (!plot.hasOwner()) { if (!plot.hasOwner()) {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -308,7 +308,7 @@ public class BlockEventListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
plot.debug(player.getName() + " could not place " + event.getBlock().getType() plot.debug(player.getName() + " could not place " + event.getBlock().getType()
@ -335,7 +335,7 @@ public class BlockEventListener implements Listener {
} else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { } else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -357,7 +357,7 @@ public class BlockEventListener implements Listener {
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) { .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL))
); );
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -368,8 +368,8 @@ public class BlockEventListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("height.height_limit"), TranslatableCaption.of("height.height_limit"),
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), Template.template("minHeight", String.valueOf(area.getMinBuildHeight())),
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) Template.template("maxHeight", String.valueOf(area.getMaxBuildHeight()))
); );
} }
if (!plot.hasOwner()) { if (!plot.hasOwner()) {
@ -394,7 +394,7 @@ public class BlockEventListener implements Listener {
} }
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@ -420,7 +420,7 @@ public class BlockEventListener implements Listener {
} }
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1095,7 +1095,7 @@ public class BlockEventListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1103,7 +1103,7 @@ public class BlockEventListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1111,7 +1111,7 @@ public class BlockEventListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} }

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
View File

@ -302,7 +302,7 @@ public class PaperListener implements Listener {
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer()); final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("errors.tile_entity_cap_reached"), TranslatableCaption.of("errors.tile_entity_cap_reached"),
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES)) Template.template("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
); );
event.setCancelled(true); event.setCancelled(true);
event.setBuild(false); event.setBuild(false);

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener113.java
View File

@ -84,7 +84,7 @@ public class PaperListener113 extends PaperListener {
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer()); final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("errors.tile_entity_cap_reached"), TranslatableCaption.of("errors.tile_entity_cap_reached"),
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES)) Template.template("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
); );
event.setCancelled(true); event.setCancelled(true);
event.setBuild(false); event.setBuild(false);

94
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View File

@ -364,9 +364,9 @@ public class PlayerEventListener extends PlotListener implements Listener {
&& PremiumVerification.isPremium() && UpdateUtility.hasUpdate) { && PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
Caption boundary = TranslatableCaption.of("update.update_boundary"); Caption boundary = TranslatableCaption.of("update.update_boundary");
Caption updateNotification = TranslatableCaption.of("update.update_notification"); Caption updateNotification = TranslatableCaption.of("update.update_notification");
Template internalVersion = Template.of("p2version", UpdateUtility.internalVersion.versionString()); Template internalVersion = Template.template("p2version", UpdateUtility.internalVersion.versionString());
Template spigotVersion = Template.of("spigotversion", UpdateUtility.spigotVersion); Template spigotVersion = Template.template("spigotversion", UpdateUtility.spigotVersion);
Template downloadUrl = Template.of("downloadurl", "https://www.spigotmc.org/resources/77506/updates"); Template downloadUrl = Template.template("downloadurl", "https://www.spigotmc.org/resources/77506/updates");
pp.sendMessage(boundary); pp.sendMessage(boundary);
pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl); pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl);
pp.sendMessage(boundary); pp.sendMessage(boundary);
@ -419,7 +419,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
.equals(BukkitUtil.adaptComplete(to)))) { .equals(BukkitUtil.adaptComplete(to)))) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -535,7 +535,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
); );
this.tmpTeleport = false; this.tmpTeleport = false;
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) { if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@ -553,7 +553,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} else if (!plotEntry(pp, now) && this.tmpTeleport) { } else if (!plotEntry(pp, now) && this.tmpTeleport) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED))
); );
this.tmpTeleport = false; this.tmpTeleport = false;
to.setX(from.getBlockX()); to.setX(from.getBlockX());
@ -625,7 +625,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
); );
this.tmpTeleport = false; this.tmpTeleport = false;
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) { if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@ -643,7 +643,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} else if (!plotEntry(pp, now) && this.tmpTeleport) { } else if (!plotEntry(pp, now) && this.tmpTeleport) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_ENTRY_DENIED))
); );
this.tmpTeleport = false; this.tmpTeleport = false;
player.teleport(from); player.teleport(from);
@ -729,9 +729,9 @@ public class PlayerEventListener extends PlotListener implements Listener {
String worldName = plot.getWorldName(); String worldName = plot.getWorldName();
Caption msg = TranslatableCaption.of("chat.plot_chat_format"); Caption msg = TranslatableCaption.of("chat.plot_chat_format");
Template msgTemplate; Template msgTemplate;
Template worldNameTemplate = Template.of("world", worldName); Template worldNameTemplate = Template.template("world", worldName);
Template plotTemplate = Template.of("plot_id", id.toString()); Template plotTemplate = Template.template("plot_id", id.toString());
Template senderTemplate = Template.of("sender", sender); Template senderTemplate = Template.template("sender", sender);
// If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc. // If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc.
// In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose // In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose
// or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if // or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if
@ -746,7 +746,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
)) ))
); );
} else { } else {
msgTemplate = Template.of("msg", BukkitUtil.MINI_MESSAGE.deserialize( msgTemplate = Template.template("msg", BukkitUtil.MINI_MESSAGE.deserialize(
ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message))))); ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message)))));
} }
for (PlotPlayer<?> receiver : plotRecipients) { for (PlotPlayer<?> receiver : plotRecipients) {
@ -754,18 +754,18 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
if (!spies.isEmpty()) { if (!spies.isEmpty()) {
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format"); Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY()); Template plotidTemplate = Template.template("plot_id", id.getX() + ";" + id.getY());
Template spysenderTemplate = Template.of("sender", sender); Template spysenderTemplate = Template.template("sender", sender);
Template spymessageTemplate = Template.of("msg", Component.text(message)); Template spymessageTemplate = Template.template("msg", Component.text(message));
for (PlotPlayer<?> player : spies) { for (PlotPlayer<?> player : spies) {
player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate); player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate);
} }
} }
if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) { if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format"); Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY()); Template plotidTemplate = Template.template("plot_id", id.getX() + ";" + id.getY());
Template spysenderTemplate = Template.of("sender", sender); Template spysenderTemplate = Template.template("sender", sender);
Template spymessageTemplate = Template.of("msg", Component.text(message)); Template spymessageTemplate = Template.template("msg", Component.text(message));
ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate,
spymessageTemplate spymessageTemplate
); );
@ -921,7 +921,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
); );
cancelled = true; cancelled = true;
} }
@ -929,7 +929,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
); );
cancelled = true; cancelled = true;
} }
@ -939,7 +939,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
); );
cancelled = true; cancelled = true;
} }
@ -977,7 +977,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { .hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
); );
e.setCancelled(true); e.setCancelled(true);
} }
@ -995,7 +995,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) { if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
); );
e.setCancelled(true); e.setCancelled(true);
} }
@ -1010,7 +1010,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
); );
e.setCancelled(true); e.setCancelled(true);
plot.debug(pp.getName() + " could not interact with " + entity.getType() plot.debug(pp.getName() + " could not interact with " + entity.getType()
@ -1226,7 +1226,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (!plot.hasOwner()) { } else if (!plot.hasOwner()) {
@ -1235,7 +1235,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (!plot.isAdded(pp.getUUID())) { } else if (!plot.isAdded(pp.getUUID())) {
@ -1251,7 +1251,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@ -1298,7 +1298,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (!plot.hasOwner()) { } else if (!plot.hasOwner()) {
@ -1307,7 +1307,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (!plot.isAdded(plotPlayer.getUUID())) { } else if (!plot.isAdded(plotPlayer.getUUID())) {
@ -1324,7 +1324,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
} }
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@ -1356,7 +1356,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1365,7 +1365,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1376,7 +1376,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1405,7 +1405,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1413,7 +1413,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1424,7 +1424,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
plot.debug(p.getName() plot.debug(p.getName()
@ -1446,7 +1446,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1456,7 +1456,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
plot.debug(player.getName() plot.debug(player.getName()
@ -1488,7 +1488,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1496,7 +1496,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1554,7 +1554,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1576,7 +1576,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
); );
event.setCancelled(true); event.setCancelled(true);
} }
@ -1585,7 +1585,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED))
); );
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -1599,7 +1599,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
pp.sendMessage( pp.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER))
); );
event.setCancelled(true); event.setCancelled(true);
plot.debug(pp.getName() plot.debug(pp.getName()
@ -1624,7 +1624,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
); );
event.setHatching(false); event.setHatching(false);
} }
@ -1632,7 +1632,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
); );
event.setHatching(false); event.setHatching(false);
} }
@ -1640,7 +1640,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
); );
event.setHatching(false); event.setHatching(false);
} }

2
Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
View File

@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
* world creation by executing a console command * world creation by executing a console command
* *
* @deprecated Deprecated and scheduled for removal without replacement * @deprecated Deprecated and scheduled for removal without replacement
* in favor of the build in setup wizard. * in favor of the build in setup wizard.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
@Singleton @Singleton

16
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
View File

@ -188,7 +188,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
); );
return false; return false;
} }
@ -200,7 +200,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
); );
if (plot != null) { if (plot != null) {
plot.debug(player.getName() plot.debug(player.getName()
@ -221,7 +221,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
); );
if (plot != null) { if (plot != null) {
plot.debug(player.getName() + " could not attack " + entityType plot.debug(player.getName() + " could not attack " + entityType
@ -242,7 +242,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
); );
if (plot != null) { if (plot != null) {
plot.debug(player.getName() + " could not attack " + entityType plot.debug(player.getName() + " could not attack " + entityType
@ -256,7 +256,7 @@ public class BukkitEntityUtil {
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) { .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
); );
plot.debug(player.getName() + " could not attack " + entityType plot.debug(player.getName() + " could not attack " + entityType
+ " because pve = false"); + " because pve = false");
@ -270,7 +270,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
); );
return false; return false;
} }
@ -287,7 +287,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
); );
if (plot != null) { if (plot != null) {
plot.debug(player.getName() + " could not attack " + entityType plot.debug(player.getName() + " could not attack " + entityType
@ -309,7 +309,7 @@ public class BukkitEntityUtil {
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("permission.no_permission_event"), TranslatableCaption.of("permission.no_permission_event"),
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) Template.template("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
); );
if (plot != null) { if (plot != null) {
plot.debug(player.getName() + " could not attack " + entityType plot.debug(player.getName() + " could not attack " + entityType

4
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
View File

@ -54,6 +54,7 @@ import io.papermc.lib.PaperLib;
import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -369,7 +370,8 @@ public class BukkitUtil extends WorldUtil {
if (blockstate instanceof final Sign sign) { if (blockstate instanceof final Sign sign) {
for (int i = 0; i < lines.length; i++) { for (int i = 0; i < lines.length; i++) {
sign.setLine(i, LEGACY_COMPONENT_SERIALIZER sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
.serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements))); .serialize(MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()),
TemplateResolver.templates(replacements))));
} }
sign.update(true); sign.update(true);
} }

6
Core/build.gradle.kts
View File

@ -50,9 +50,9 @@ dependencies {
tasks.processResources { tasks.processResources {
filesMatching("plugin.properties") { filesMatching("plugin.properties") {
expand( expand(
"version" to project.version.toString(), "version" to project.version.toString(),
"commit" to rootProject.grgit.head().abbreviatedId, "commit" to rootProject.grgit.head().abbreviatedId,
"date" to rootProject.grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd")) "date" to rootProject.grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd"))
) )
} }
} }

2
Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
View File

@ -107,7 +107,7 @@ public class SimpleBackupManager implements BackupManager {
if (player != null) { if (player != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_automatic_started"), TranslatableCaption.of("backups.backup_automatic_started"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
profile.createBackup().whenComplete((backup, throwable) -> { profile.createBackup().whenComplete((backup, throwable) -> {

14
Core/src/main/java/com/plotsquared/core/command/Add.java
View File

@ -77,7 +77,7 @@ public class Add extends Command {
TranslatableCaption.of("permission.no_plot_perms") TranslatableCaption.of("permission.no_plot_perms")
); );
checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"), checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot add <player | *>") Template.template("value", "/plot add <player | *>")
); );
final CompletableFuture<Boolean> future = new CompletableFuture<>(); final CompletableFuture<Boolean> future = new CompletableFuture<>();
PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> { PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
@ -87,7 +87,7 @@ public class Add extends Command {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} }
future.completeExceptionally(throwable); future.completeExceptionally(throwable);
@ -95,7 +95,7 @@ public class Add extends Command {
} else { } else {
try { try {
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"), checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
Iterator<UUID> iterator = uuids.iterator(); Iterator<UUID> iterator = uuids.iterator();
int size = plot.getTrusted().size() + plot.getMembers().size(); int size = plot.getTrusted().size() + plot.getMembers().size();
@ -106,7 +106,7 @@ public class Add extends Command {
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", PlayerManager.getName(uuid)) Template.template("value", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -114,7 +114,7 @@ public class Add extends Command {
if (plot.isOwner(uuid)) { if (plot.isOwner(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_added"), TranslatableCaption.of("member.already_added"),
Template.of("player", PlayerManager.getName(uuid)) Template.template("player", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -122,7 +122,7 @@ public class Add extends Command {
if (plot.getMembers().contains(uuid)) { if (plot.getMembers().contains(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_added"), TranslatableCaption.of("member.already_added"),
Template.of("player", PlayerManager.getName(uuid)) Template.template("player", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -135,7 +135,7 @@ public class Add extends Command {
if (localAddSize >= maxAddSize) { if (localAddSize >= maxAddSize) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("members.plot_max_members_added"), TranslatableCaption.of("members.plot_max_members_added"),
Template.of("amount", String.valueOf(localAddSize)) Template.template("amount", String.valueOf(localAddSize))
); );
return; return;
} }

14
Core/src/main/java/com/plotsquared/core/command/Alias.java
View File

@ -99,7 +99,7 @@ public class Alias extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_SET)) Template.template("node", String.valueOf(Permission.PERMISSION_ALIAS_SET))
); );
} }
} }
@ -115,7 +115,7 @@ public class Alias extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE)) Template.template("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE))
); );
} }
} }
@ -156,13 +156,13 @@ public class Alias extends SubCommand {
.anyMatch()) { .anyMatch()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"), TranslatableCaption.of("alias.alias_is_taken"),
Template.of("alias", alias) Template.template("alias", alias)
); );
return; return;
} }
if (Settings.UUID.OFFLINE) { if (Settings.UUID.OFFLINE) {
plot.setAlias(alias); plot.setAlias(alias);
player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.of("alias", alias)); player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.template("alias", alias));
return; return;
} }
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> { PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
@ -171,13 +171,13 @@ public class Alias extends SubCommand {
} else if (uuid != null) { } else if (uuid != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"), TranslatableCaption.of("alias.alias_is_taken"),
Template.of("alias", alias) Template.template("alias", alias)
); );
} else { } else {
plot.setAlias(alias); plot.setAlias(alias);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("alias.alias_set_to"), TranslatableCaption.of("alias.alias_set_to"),
Template.of("alias", alias) Template.template("alias", alias)
); );
} }
})); }));
@ -189,7 +189,7 @@ public class Alias extends SubCommand {
if (!plot.getAlias().isEmpty()) { if (!plot.getAlias().isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("alias.alias_removed"), TranslatableCaption.of("alias.alias_removed"),
Template.of("alias", alias) Template.template("alias", alias)
); );
} else { } else {
player.sendMessage( player.sendMessage(

123
Core/src/main/java/com/plotsquared/core/command/Area.java
View File

@ -76,6 +76,7 @@ import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.io.File; import java.io.File;
@ -147,14 +148,14 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
); );
return false; return false;
} }
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("single.single_area_needs_name"), TranslatableCaption.of("single.single_area_needs_name"),
Template.of("command", "/plot area single <name>") Template.template("command", "/plot area single <name>")
); );
return false; return false;
} }
@ -285,7 +286,7 @@ public class Area extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.error_create"), TranslatableCaption.of("errors.error_create"),
Template.of("world", hybridPlotWorld.getWorldName()) Template.template("world", hybridPlotWorld.getWorldName())
); );
} }
}; };
@ -296,7 +297,7 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
); );
return false; return false;
} }
@ -329,12 +330,12 @@ public class Area extends SubCommand {
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("set.set_attribute"), TranslatableCaption.of("set.set_attribute"),
Template.of("attribute", "area_pos1"), Template.template("attribute", "area_pos1"),
Template.of("value", location.getX() + "," + location.getZ()) Template.template("value", location.getX() + "," + location.getZ())
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("area.set_pos2"), TranslatableCaption.of("area.set_pos2"),
Template.of("command", "/plot area create pos2") Template.template("command", "/plot area create pos2")
); );
return true; return true;
} }
@ -374,7 +375,7 @@ public class Area extends SubCommand {
if (!areas.isEmpty()) { if (!areas.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"), TranslatableCaption.of("cluster.cluster_intersection"),
Template.of("cluster", areas.iterator().next().toString()) Template.template("cluster", areas.iterator().next().toString())
); );
return false; return false;
} }
@ -413,7 +414,7 @@ public class Area extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.error_create"), TranslatableCaption.of("errors.error_create"),
Template.of("world", area.getWorldName()) Template.template("world", area.getWorldName())
); );
} }
}; };
@ -447,7 +448,7 @@ public class Area extends SubCommand {
if (other != null && Objects.equals(pa.getId(), other.getId())) { if (other != null && Objects.equals(pa.getId(), other.getId())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("setup.setup_world_taken"), TranslatableCaption.of("setup.setup_world_taken"),
Template.of("value", pa.toString()) Template.template("value", pa.toString())
); );
return false; return false;
} }
@ -462,8 +463,8 @@ public class Area extends SubCommand {
if (pair.length != 2) { if (pair.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"), TranslatableCaption.of("commandconfig.command_syntax_extended"),
Template.of("value1,", getCommandString()), Template.template("value1,", getCommandString()),
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...") Template.template("value2", " create [world[:id]] [<modifier>=<value>]...")
); );
return false; return false;
} }
@ -499,8 +500,8 @@ public class Area extends SubCommand {
default -> { default -> {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"), TranslatableCaption.of("commandconfig.command_syntax_extended"),
Template.of("value1", getCommandString()), Template.template("value1", getCommandString()),
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...") Template.template("value2", " create [world[:id]] [<modifier>=<value>]...")
); );
return false; return false;
} }
@ -510,7 +511,7 @@ public class Area extends SubCommand {
if (this.worldUtil.isWorld(pa.getWorldName())) { if (this.worldUtil.isWorld(pa.getWorldName())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("setup.setup_world_taken"), TranslatableCaption.of("setup.setup_world_taken"),
Template.of("value", pa.getWorldName()) Template.template("value", pa.getWorldName())
); );
return false; return false;
} }
@ -531,7 +532,7 @@ public class Area extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.error_create"), TranslatableCaption.of("errors.error_create"),
Template.of("world", pa.getWorldName()) Template.template("world", pa.getWorldName())
); );
} }
try { try {
@ -550,12 +551,12 @@ public class Area extends SubCommand {
if (pa.getId() == null) { if (pa.getId() == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", getUsage()) Template.template("value", getUsage())
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"), TranslatableCaption.of("commandconfig.command_syntax_extended"),
Template.of("value1", getCommandString()), Template.template("value1", getCommandString()),
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...") Template.template("value2", " create [world[:id]] [<modifier>=<value>]...")
); );
return false; return false;
} }
@ -572,7 +573,7 @@ public class Area extends SubCommand {
metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa); metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("single.get_position"), TranslatableCaption.of("single.get_position"),
Template.of("command", getCommandString()) Template.template("command", getCommandString())
); );
break; break;
} }
@ -582,7 +583,7 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_INFO))
); );
return false; return false;
} }
@ -593,15 +594,15 @@ public class Area extends SubCommand {
default -> { default -> {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"), TranslatableCaption.of("commandconfig.command_syntax_extended"),
Template.of("value1", getCommandString()), Template.template("value1", getCommandString()),
Template.of("value2", " info [area]") Template.template("value2", " info [area]")
); );
return false; return false;
} }
} }
if (area == null) { if (area == null) {
if (args.length == 2) { 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"), Template.template("value", args[1]));
} else { } else {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world")); player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
} }
@ -625,19 +626,19 @@ public class Area extends SubCommand {
percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE; percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
region = "N/A"; region = "N/A";
} }
Template headerTemplate = Template.of( Template headerTemplate = Template.template(
"header", "header",
TranslatableCaption.of("info.plot_info_header").getComponent(player) TranslatableCaption.of("info.plot_info_header").getComponent(player)
); );
Template nameTemplate = Template.of("name", name); Template nameTemplate = Template.template("name", name);
Template typeTemplate = Template.of("type", area.getType().name()); Template typeTemplate = Template.template("type", area.getType().name());
Template terrainTemplate = Template.of("terrain", area.getTerrain().name()); Template terrainTemplate = Template.template("terrain", area.getTerrain().name());
Template usageTemplate = Template.of("usage", String.format("%.2f", percent)); Template usageTemplate = Template.template("usage", String.format("%.2f", percent));
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed)); Template claimedTemplate = Template.template("claimed", String.valueOf(claimed));
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters)); Template clustersTemplate = Template.template("clusters", String.valueOf(clusters));
Template regionTemplate = Template.of("region", region); Template regionTemplate = Template.template("region", region);
Template generatorTemplate = Template.of("generator", generator); Template generatorTemplate = Template.template("generator", generator);
Template footerTemplate = Template.of( Template footerTemplate = Template.template(
"footer", "footer",
TranslatableCaption.of("info.plot_info_footer").getComponent(player) TranslatableCaption.of("info.plot_info_footer").getComponent(player)
); );
@ -660,7 +661,7 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_LIST))
); );
return false; return false;
} }
@ -677,13 +678,13 @@ public class Area extends SubCommand {
default: default:
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax_extended"), TranslatableCaption.of("commandconfig.command_syntax_extended"),
Template.of("value1", getCommandString()), Template.template("value1", getCommandString()),
Template.of("value2", " list [#]") Template.template("value2", " list [#]")
); );
return false; return false;
} }
final List<PlotArea> areas = new ArrayList<>(Arrays.asList(this.plotAreaManager.getAllPlotAreas())); final List<PlotArea> areas = new ArrayList<>(Arrays.asList(this.plotAreaManager.getAllPlotAreas()));
paginate(player, areas, 8, page, new RunnableVal3<Integer, PlotArea, CaptionHolder>() { paginate(player, areas, 8, page, new RunnableVal3<>() {
@Override @Override
public void run(Integer i, PlotArea area, CaptionHolder caption) { public void run(Integer i, PlotArea area, CaptionHolder caption) {
String name; String name;
@ -704,27 +705,27 @@ public class Area extends SubCommand {
percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE; percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
region = "N/A"; region = "N/A";
} }
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed)); Template claimedTemplate = Template.template("claimed", String.valueOf(claimed));
Template usageTemplate = Template.of("usage", String.format("%.2f", percent) + "%"); Template usageTemplate = Template.template("usage", String.format("%.2f", percent) + "%");
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters)); Template clustersTemplate = Template.template("clusters", String.valueOf(clusters));
Template regionTemplate = Template.of("region", region); Template regionTemplate = Template.template("region", region);
Template generatorTemplate = Template.of("generator", generator); Template generatorTemplate = Template.template("generator", generator);
String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("info.area_list_tooltip").getComponent(player), TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
claimedTemplate, TemplateResolver.templates(claimedTemplate,
usageTemplate, usageTemplate,
clustersTemplate, clustersTemplate,
regionTemplate, regionTemplate,
generatorTemplate generatorTemplate)
)); ));
Template tooltipTemplate = Template.of("hover_info", tooltip); Template tooltipTemplate = Template.template("hover_info", tooltip);
Template visitcmdTemplate = Template.of("command_tp", "/plot area tp " + area); Template visitcmdTemplate = Template.template("command_tp", "/plot area tp " + area);
Template infocmdTemplate = Template.of("command_info", "/plot area info " + area); Template infocmdTemplate = Template.template("command_info", "/plot area info " + area);
Template numberTemplate = Template.of("number", String.valueOf(i)); Template numberTemplate = Template.template("number", String.valueOf(i));
Template nameTemplate = Template.of("area_name", name); Template nameTemplate = Template.template("area_name", name);
Template typeTemplate = Template.of("area_type", area.getType().name()); Template typeTemplate = Template.template("area_type", area.getType().name());
Template terrainTemplate = Template.of("area_terrain", area.getTerrain().name()); Template terrainTemplate = Template.template("area_terrain", area.getTerrain().name());
caption.set(TranslatableCaption.of("info.area_list_item")); caption.set(TranslatableCaption.of("info.area_list_item"));
caption.setTemplates( caption.setTemplates(
tooltipTemplate, tooltipTemplate,
@ -743,7 +744,7 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_REGEN))
); );
return false; return false;
} }
@ -755,7 +756,7 @@ public class Area extends SubCommand {
if (area.getType() != PlotAreaType.PARTIAL) { if (area.getType() != PlotAreaType.PARTIAL) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("single.delete_world_region"), TranslatableCaption.of("single.delete_world_region"),
Template.of("world", area.getWorldName()) Template.template("world", area.getWorldName())
); );
return false; return false;
} }
@ -776,20 +777,20 @@ public class Area extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_TP)) Template.template("node", String.valueOf(Permission.PERMISSION_AREA_TP))
); );
return false; return false;
} }
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot area tp [area]") Template.template("value", "/plot area tp [area]")
); );
return false; return false;
} }
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]); PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]);
if (area == null) { 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"), Template.template("value", args[1]));
return false; return false;
} }
Location center; Location center;

32
Core/src/main/java/com/plotsquared/core/command/Auto.java
View File

@ -117,13 +117,13 @@ public class Auto extends SubCommand {
if (diff < 0 && grantedPlots < sizeX * sizeZ) { if (diff < 0 && grantedPlots < sizeX * sizeZ) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(diff + grantedPlots)) Template.template("amount", String.valueOf(diff + grantedPlots))
); );
return false; return false;
} else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) { } else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(diff + grantedPlots)) Template.template("amount", String.valueOf(diff + grantedPlots))
); );
return false; return false;
} else { } else {
@ -135,14 +135,14 @@ public class Auto extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_granted_plot"), TranslatableCaption.of("economy.removed_granted_plot"),
Template.of("usedGrants", String.valueOf(grantedPlots - left)), Template.template("usedGrants", String.valueOf(grantedPlots - left)),
Template.of("remainingGrants", String.valueOf(left)) Template.template("remainingGrants", String.valueOf(left))
); );
} }
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(player.getAllowedPlots()) Template.template("amount", String.valueOf(player.getAllowedPlots())
) )
); );
return false; return false;
@ -222,7 +222,7 @@ public class Auto extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", getUsage()) Template.template("value", getUsage())
); );
return true; return true;
} }
@ -245,7 +245,7 @@ public class Auto extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto claim") Template.template("value", "Auto claim")
); );
return true; return true;
} }
@ -256,13 +256,13 @@ public class Auto extends SubCommand {
if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) { if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA)) Template.template("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
); );
} }
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) { if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots_num"), TranslatableCaption.of("permission.cant_claim_more_plots_num"),
Template.of("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA)) Template.template("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA))
); );
return false; return false;
} }
@ -280,8 +280,8 @@ public class Auto extends SubCommand {
if (!plotarea.hasSchematic(schematic)) { if (!plotarea.hasSchematic(schematic)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid_named"), TranslatableCaption.of("schematics.schematic_invalid_named"),
Template.of("schemname", schematic), Template.template("schemname", schematic),
Template.of("reason", "non-existent") Template.template("reason", "non-existent")
); );
return true; return true;
} }
@ -292,7 +292,7 @@ public class Auto extends SubCommand {
.hasPermission(player, "plots.admin.command.schematic")) { .hasPermission(player, "plots.admin.command.schematic")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.claim.%s0") Template.template("node", "plots.claim.%s0")
); );
return true; return true;
} }
@ -311,15 +311,15 @@ public class Auto extends SubCommand {
if (!force && this.econHandler.getMoney(player) < cost) { if (!force && this.econHandler.getMoney(player) < cost) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_plot"), TranslatableCaption.of("economy.cannot_afford_plot"),
Template.of("money", this.econHandler.format(cost)), Template.template("money", this.econHandler.format(cost)),
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player))) Template.template("balance", this.econHandler.format(this.econHandler.getMoney(player)))
); );
return false; return false;
} }
this.econHandler.withdrawMoney(player, cost); this.econHandler.withdrawMoney(player, cost);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(cost)) Template.template("money", this.econHandler.format(cost))
); );
} }
} }
@ -353,7 +353,7 @@ public class Auto extends SubCommand {
if (!force && mergeEvent.getEventResult() == Result.DENY) { if (!force && mergeEvent.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge") Template.template("value", "Auto merge")
); );
return false; return false;
} }

48
Core/src/main/java/com/plotsquared/core/command/Backup.java
View File

@ -74,7 +74,7 @@ public final class Backup extends Command {
private static boolean sendMessage(PlotPlayer<?> player) { private static boolean sendMessage(PlotPlayer<?> player) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot backup <save | list | load>") Template.template("value", "/plot backup <save | list | load>")
); );
return true; return true;
} }
@ -142,34 +142,34 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) { } else if (!plot.hasOwner()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
); );
} else if (plot.getVolume() > Integer.MAX_VALUE) { } else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
} else if (plot.isMerged()) { } else if (plot.isMerged()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
); );
} else if (!plot.isOwner(player.getUUID()) && !Permissions } else if (!plot.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
); );
} else { } else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot)); final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
if (backupProfile instanceof NullBackupProfile) { if (backupProfile instanceof NullBackupProfile) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
); );
} else { } else {
backupProfile.createBackup().whenComplete((backup, throwable) -> { backupProfile.createBackup().whenComplete((backup, throwable) -> {
if (throwable != null) { if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_save_failed"), TranslatableCaption.of("backups.backup_save_failed"),
Template.of("reason", throwable.getMessage()) Template.template("reason", throwable.getMessage())
); );
throwable.printStackTrace(); throwable.printStackTrace();
} else { } else {
@ -196,12 +196,12 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) { } else if (!plot.hasOwner()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
); );
} else if (plot.isMerged()) { } else if (plot.isMerged()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
); );
} else if (plot.getVolume() > Integer.MAX_VALUE) { } else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
@ -209,34 +209,34 @@ public final class Backup extends Command {
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
); );
} else { } else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot)); final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
if (backupProfile instanceof NullBackupProfile) { if (backupProfile instanceof NullBackupProfile) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
); );
} else { } else {
backupProfile.listBackups().whenComplete((backups, throwable) -> { backupProfile.listBackups().whenComplete((backups, throwable) -> {
if (throwable != null) { if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_list_failed"), TranslatableCaption.of("backups.backup_list_failed"),
Template.of("reason", throwable.getMessage()) Template.template("reason", throwable.getMessage())
); );
throwable.printStackTrace(); throwable.printStackTrace();
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_list_header"), TranslatableCaption.of("backups.backup_list_header"),
Template.of("plot", plot.getId().toCommaSeparatedString()) Template.template("plot", plot.getId().toCommaSeparatedString())
); );
try { try {
for (int i = 0; i < backups.size(); i++) { for (int i = 0; i < backups.size(); i++) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_list_entry"), TranslatableCaption.of("backups.backup_list_entry"),
Template.of("number", Integer.toString(i + 1)), Template.template("number", Integer.toString(i + 1)),
Template.of("value", DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.ofInstant( Template.template("value", DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.ofInstant(
Instant.ofEpochMilli(backups.get(i).getCreationTime()), Instant.ofEpochMilli(backups.get(i).getCreationTime()),
ZoneId.systemDefault() ZoneId.systemDefault()
))) )))
@ -267,12 +267,12 @@ public final class Backup extends Command {
} else if (!plot.hasOwner()) { } else if (!plot.hasOwner()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
); );
} else if (plot.isMerged()) { } else if (plot.isMerged()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
); );
} else if (plot.getVolume() > Integer.MAX_VALUE) { } else if (plot.getVolume() > Integer.MAX_VALUE) {
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
@ -280,12 +280,12 @@ public final class Backup extends Command {
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
); );
} else if (args.length == 0) { } else if (args.length == 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Usage: /plot backup save/list/load") Template.template("value", "Usage: /plot backup save/list/load")
); );
} else { } else {
final int number; final int number;
@ -294,7 +294,7 @@ public final class Backup extends Command {
} catch (final Exception e) { } catch (final Exception e) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
return; return;
} }
@ -302,21 +302,21 @@ public final class Backup extends Command {
if (backupProfile instanceof NullBackupProfile) { if (backupProfile instanceof NullBackupProfile) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player)) Template.template("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
); );
} else { } else {
backupProfile.listBackups().whenComplete((backups, throwable) -> { backupProfile.listBackups().whenComplete((backups, throwable) -> {
if (throwable != null) { if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_load_failure"), TranslatableCaption.of("backups.backup_load_failure"),
Template.of("reason", throwable.getMessage()) Template.template("reason", throwable.getMessage())
); );
throwable.printStackTrace(); throwable.printStackTrace();
} else { } else {
if (number < 1 || number > backups.size()) { if (number < 1 || number > backups.size()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of( Template.template(
"plot", "plot",
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player) TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
) )
@ -328,7 +328,7 @@ public final class Backup extends Command {
.exists(backup.getFile())) { .exists(backup.getFile())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_impossible"), TranslatableCaption.of("backups.backup_impossible"),
Template.of( Template.template(
"plot", "plot",
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player) TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
) )
@ -340,7 +340,7 @@ public final class Backup extends Command {
if (error != null) { if (error != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("backups.backup_load_failure"), TranslatableCaption.of("backups.backup_load_failure"),
Template.of("reason", error.getMessage()) Template.template("reason", error.getMessage())
); );
} else { } else {
player.sendMessage(TranslatableCaption.of("backups.backup_load_success")); player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));

4
Core/src/main/java/com/plotsquared/core/command/Biome.java
View File

@ -63,7 +63,7 @@ public class Biome extends SetCommand {
player.sendMessage(TranslatableCaption.of("biome.need_biome")); player.sendMessage(TranslatableCaption.of("biome.need_biome"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.subcommand_set_options_header"), TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
Template.of("values", biomes) Template.template("values", biomes)
); );
return false; return false;
} }
@ -80,7 +80,7 @@ public class Biome extends SetCommand {
plot.removeRunning(); plot.removeRunning();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("biome.biome_set_to"), TranslatableCaption.of("biome.biome_set_to"),
Template.of("value", value.toLowerCase()) Template.template("value", value.toLowerCase())
); );
}); });
return true; return true;

16
Core/src/main/java/com/plotsquared/core/command/Buy.java
View File

@ -91,7 +91,7 @@ public class Buy extends Command {
checkTrue( checkTrue(
player.getPlotCount() + plots.size() <= player.getAllowedPlots(), player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(player.getAllowedPlots())) Template.template("amount", String.valueOf(player.getAllowedPlots()))
); );
double price = plot.getFlag(PriceFlag.class); double price = plot.getFlag(PriceFlag.class);
if (price <= 0) { if (price <= 0) {
@ -104,8 +104,8 @@ public class Buy extends Command {
checkTrue( checkTrue(
this.econHandler.getMoney(player) >= price, this.econHandler.getMoney(player) >= price,
TranslatableCaption.of("economy.cannot_afford_plot"), TranslatableCaption.of("economy.cannot_afford_plot"),
Template.of("money", this.econHandler.format(price)), Template.template("money", this.econHandler.format(price)),
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player))) Template.template("balance", this.econHandler.format(this.econHandler.getMoney(player)))
); );
this.econHandler.withdrawMoney(player, price); this.econHandler.withdrawMoney(player, price);
// Failure // Failure
@ -113,7 +113,7 @@ public class Buy extends Command {
confirm.run(this, () -> { confirm.run(this, () -> {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(price)) Template.template("money", this.econHandler.format(price))
); );
this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price); this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
@ -122,9 +122,9 @@ public class Buy extends Command {
if (owner != null) { if (owner != null) {
owner.sendMessage( owner.sendMessage(
TranslatableCaption.of("economy.plot_sold"), TranslatableCaption.of("economy.plot_sold"),
Template.of("plot", plot.getId().toString()), Template.template("plot", plot.getId().toString()),
Template.of("player", player.getName()), Template.template("player", player.getName()),
Template.of("price", this.econHandler.format(price)) Template.template("price", this.econHandler.format(price))
); );
} }
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class); PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
@ -135,7 +135,7 @@ public class Buy extends Command {
plot.setOwner(player.getUUID()); plot.setOwner(player.getUUID());
player.sendMessage( player.sendMessage(
TranslatableCaption.of("working.claimed"), TranslatableCaption.of("working.claimed"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
whenDone.run(Buy.this, CommandResult.SUCCESS); whenDone.run(Buy.this, CommandResult.SUCCESS);
}, () -> { }, () -> {

10
Core/src/main/java/com/plotsquared/core/command/Caps.java
View File

@ -62,7 +62,7 @@ public class Caps extends SubCommand {
.hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER))
); );
return false; return false;
} }
@ -94,10 +94,10 @@ public class Caps extends SubCommand {
: String.valueOf(max); : String.valueOf(max);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("info.plot_caps_format"), TranslatableCaption.of("info.plot_caps_format"),
Template.of("cap", name), Template.template("cap", name),
Template.of("current", String.valueOf(current)), Template.template("current", String.valueOf(current)),
Template.of("limit", maxBeautified), Template.template("limit", maxBeautified),
Template.of("percentage", percentage) Template.template("percentage", percentage)
); );
} }

4
Core/src/main/java/com/plotsquared/core/command/Chat.java
View File

@ -32,7 +32,7 @@ import net.kyori.adventure.text.minimessage.Template;
/** /**
* @deprecated In favor of "/plot toggle chat" and * @deprecated In favor of "/plot toggle chat" and
* scheduled for removal within the next major release. * scheduled for removal within the next major release.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
@CommandDeclaration(command = "chat", @CommandDeclaration(command = "chat",
@ -48,7 +48,7 @@ public class Chat extends SubCommand {
check(area, TranslatableCaption.of("errors.not_in_plot_world")); check(area, TranslatableCaption.of("errors.not_in_plot_world"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.deprecated_commands"), TranslatableCaption.of("errors.deprecated_commands"),
Template.of("replacement", "/plot toggle chat") Template.template("replacement", "/plot toggle chat")
); );
if (player.getPlotAreaAbs().isForcingPlotChat()) { if (player.getPlotAreaAbs().isForcingPlotChat()) {
player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced")); player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));

26
Core/src/main/java/com/plotsquared/core/command/Claim.java
View File

@ -89,7 +89,7 @@ public class Claim extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Claim") Template.template("value", "Claim")
); );
return true; return true;
} }
@ -108,14 +108,14 @@ public class Claim extends SubCommand {
if (grants <= 0) { if (grants <= 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(grants)) Template.template("amount", String.valueOf(grants))
); );
metaDataAccess.remove(); metaDataAccess.remove();
} }
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(player.getAllowedPlots())) Template.template("amount", String.valueOf(player.getAllowedPlots()))
); );
return false; return false;
} }
@ -130,8 +130,8 @@ public class Claim extends SubCommand {
if (!area.hasSchematic(schematic)) { if (!area.hasSchematic(schematic)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid_named"), TranslatableCaption.of("schematics.schematic_invalid_named"),
Template.of("schemname", schematic), Template.template("schemname", schematic),
Template.of("reason", "non-existent") Template.template("reason", "non-existent")
); );
} }
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC
@ -141,7 +141,7 @@ public class Claim extends SubCommand {
) && !force) { ) && !force) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_schematic_permission"), TranslatableCaption.of("permission.no_schematic_permission"),
Template.of("value", schematic) Template.template("value", schematic)
); );
} }
} }
@ -157,16 +157,16 @@ public class Claim extends SubCommand {
if (this.econHandler.getMoney(player) < cost) { if (this.econHandler.getMoney(player) < cost) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_plot"), TranslatableCaption.of("economy.cannot_afford_plot"),
Template.of("money", this.econHandler.format(cost)), Template.template("money", this.econHandler.format(cost)),
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player))) Template.template("balance", this.econHandler.format(this.econHandler.getMoney(player)))
); );
return false; return false;
} }
this.econHandler.withdrawMoney(player, cost); this.econHandler.withdrawMoney(player, cost);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(cost)), Template.template("money", this.econHandler.format(cost)),
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player))) Template.template("balance", this.econHandler.format(this.econHandler.getMoney(player)))
); );
} }
} }
@ -178,8 +178,8 @@ public class Claim extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_granted_plot"), TranslatableCaption.of("economy.removed_granted_plot"),
Template.of("usedGrants", String.valueOf((grants - 1))), Template.template("usedGrants", String.valueOf((grants - 1))),
Template.of("remainingGrants", String.valueOf(grants)) Template.template("remainingGrants", String.valueOf(grants))
); );
} }
} }
@ -205,7 +205,7 @@ public class Claim extends SubCommand {
if (mergeEvent.getEventResult() == Result.DENY) { if (mergeEvent.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge on claim") Template.template("value", "Auto merge on claim")
); );
} else { } else {
if (plot.getPlotModificationManager().autoMerge( if (plot.getPlotModificationManager().autoMerge(

6
Core/src/main/java/com/plotsquared/core/command/Clear.java
View File

@ -85,7 +85,7 @@ public class Clear extends Command {
if (eventResult == Result.DENY) { if (eventResult == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Clear") Template.template("value", "Clear")
); );
return CompletableFuture.completedFuture(true); return CompletableFuture.completedFuture(true);
} }
@ -136,8 +136,8 @@ public class Clear extends Command {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("working.clearing_done"), TranslatableCaption.of("working.clearing_done"),
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)), Template.template("amount", String.valueOf(System.currentTimeMillis() - start)),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
}); });
}); });

128
Core/src/main/java/com/plotsquared/core/command/Cluster.java
View File

@ -69,7 +69,7 @@ public class Cluster extends SubCommand {
// return arguments // return arguments
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_available_args"), TranslatableCaption.of("cluster.cluster_available_args"),
Template.of( Template.template(
"list", "list",
"<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>" "<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
) )
@ -83,14 +83,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST))
); );
return false; return false;
} }
if (args.length != 1) { if (args.length != 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster list") Template.template("value", "/plot cluster list")
); );
return false; return false;
} }
@ -102,7 +102,7 @@ public class Cluster extends SubCommand {
Set<PlotCluster> clusters = area.getClusters(); Set<PlotCluster> clusters = area.getClusters();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_heading"), TranslatableCaption.of("cluster.cluster_list_heading"),
Template.of("amount", clusters.size() + "") Template.template("amount", clusters.size() + "")
); );
for (PlotCluster cluster : clusters) { for (PlotCluster cluster : clusters) {
// Ignore unmanaged clusters // Ignore unmanaged clusters
@ -110,22 +110,22 @@ public class Cluster extends SubCommand {
if (player.getUUID().equals(cluster.owner)) { if (player.getUUID().equals(cluster.owner)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_owner"), TranslatableCaption.of("cluster.cluster_list_element_owner"),
Template.of("cluster", name) Template.template("cluster", name)
); );
} else if (cluster.helpers.contains(player.getUUID())) { } else if (cluster.helpers.contains(player.getUUID())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_helpers"), TranslatableCaption.of("cluster.cluster_list_element_helpers"),
Template.of("cluster", name) Template.template("cluster", name)
); );
} else if (cluster.invited.contains(player.getUUID())) { } else if (cluster.invited.contains(player.getUUID())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element_invited"), TranslatableCaption.of("cluster.cluster_list_element_invited"),
Template.of("cluster", name) Template.template("cluster", name)
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_list_element"), TranslatableCaption.of("cluster.cluster_list_element"),
Template.of("cluster", cluster.toString()) Template.template("cluster", cluster.toString())
); );
} }
} }
@ -136,7 +136,7 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE))
); );
return false; return false;
} }
@ -148,7 +148,7 @@ public class Cluster extends SubCommand {
if (args.length != 4) { if (args.length != 4) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster create <name> <id-bot> <id-top>") Template.template("value", "/plot cluster create <name> <id-bot> <id-top>")
); );
return false; return false;
} }
@ -158,7 +158,7 @@ public class Cluster extends SubCommand {
if (currentClusters >= player.getAllowedPlots()) { if (currentClusters >= player.getAllowedPlots()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_clusters"), TranslatableCaption.of("permission.cant_claim_more_clusters"),
Template.of("amount", String.valueOf(player.getAllowedPlots())) Template.template("amount", String.valueOf(player.getAllowedPlots()))
); );
} }
PlotId pos1; PlotId pos1;
@ -176,7 +176,7 @@ public class Cluster extends SubCommand {
if (area.getCluster(name) != null) { if (area.getCluster(name) != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("alias.alias_is_taken"), TranslatableCaption.of("alias.alias_is_taken"),
Template.of("alias", name) Template.template("alias", name)
); );
return false; return false;
} }
@ -190,7 +190,7 @@ public class Cluster extends SubCommand {
if (cluster != null) { if (cluster != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"), TranslatableCaption.of("cluster.cluster_intersection"),
Template.of("cluster", cluster.getName()) Template.template("cluster", cluster.getName())
); );
return false; return false;
} }
@ -198,7 +198,7 @@ public class Cluster extends SubCommand {
if (!area.contains(pos1) || !area.contains(pos2)) { if (!area.contains(pos1) || !area.contains(pos2)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_outside"), TranslatableCaption.of("cluster.cluster_outside"),
Template.of("area", String.valueOf(area)) Template.template("area", String.valueOf(area))
); );
return false; return false;
} }
@ -211,7 +211,7 @@ public class Cluster extends SubCommand {
if (!plot.isOwner(uuid)) { if (!plot.isOwner(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER))
); );
return false; return false;
} }
@ -233,7 +233,7 @@ public class Cluster extends SubCommand {
if (current + cluster.getArea() > allowed) { if (current + cluster.getArea() > allowed) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea())) Template.template("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()))
); );
return false; return false;
} }
@ -252,7 +252,7 @@ public class Cluster extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_created"), TranslatableCaption.of("cluster.cluster_created"),
Template.of("name", name) Template.template("name", name)
); );
return true; return true;
} }
@ -262,14 +262,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE))
); );
return false; return false;
} }
if (args.length != 1 && args.length != 2) { if (args.length != 1 && args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster delete [name]") Template.template("value", "/plot cluster delete [name]")
); );
return false; return false;
} }
@ -284,7 +284,7 @@ public class Cluster extends SubCommand {
if (cluster == null) { if (cluster == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"), TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1]) Template.template("cluster", args[1])
); );
return false; return false;
} }
@ -300,13 +300,13 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER))
); );
return false; return false;
} }
} }
DBFunc.delete(cluster); DBFunc.delete(cluster);
player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.of( player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.template(
"cluster", "cluster",
String.valueOf(cluster) String.valueOf(cluster)
)); ));
@ -317,14 +317,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE))
); );
return false; return false;
} }
if (args.length != 3) { if (args.length != 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster resize [name]") Template.template("value", "/plot cluster resize [name]")
); );
return false; return false;
} }
@ -358,7 +358,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER))
); );
return false; return false;
} }
@ -368,7 +368,7 @@ public class Cluster extends SubCommand {
if (intersect != null) { if (intersect != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_intersection"), TranslatableCaption.of("cluster.cluster_intersection"),
Template.of("cluster", intersect.getName()) Template.template("cluster", intersect.getName())
); );
return false; return false;
} }
@ -384,7 +384,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK))
); );
return false; return false;
} }
@ -395,7 +395,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND))
); );
return false; return false;
} }
@ -414,7 +414,7 @@ public class Cluster extends SubCommand {
if (current + cluster.getArea() > allowed) { if (current + cluster.getArea() > allowed) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea())) Template.template("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea()))
); );
return false; return false;
} }
@ -429,14 +429,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE)) Template.template("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE))
); );
return false; return false;
} }
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster invite <player>") Template.template("value", "/plot cluster invite <player>")
); );
return false; return false;
} }
@ -455,7 +455,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString())
); );
return false; return false;
} }
@ -468,7 +468,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) { } else if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
} else { } else {
if (!cluster.isAdded(uuid)) { if (!cluster.isAdded(uuid)) {
@ -480,7 +480,7 @@ public class Cluster extends SubCommand {
if (otherPlayer != null) { if (otherPlayer != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_invited"), TranslatableCaption.of("cluster.cluster_invited"),
Template.of("cluster", cluster.getName()) Template.template("cluster", cluster.getName())
); );
} }
} }
@ -495,14 +495,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_KICK.toString())
); );
return false; return false;
} }
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster kick <player>") Template.template("value", "/plot cluster kick <player>")
); );
return false; return false;
} }
@ -520,7 +520,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString())
); );
return false; return false;
} }
@ -533,7 +533,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) { } else if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
} else { } else {
// Can't kick if the player is yourself, the owner, or not added to the cluster // Can't kick if the player is yourself, the owner, or not added to the cluster
@ -541,7 +541,7 @@ public class Cluster extends SubCommand {
|| !cluster.isAdded(uuid)) { || !cluster.isAdded(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cannot_kick_player"), TranslatableCaption.of("cluster.cannot_kick_player"),
Template.of("value", cluster.getName()) Template.template("value", cluster.getName())
); );
} else { } else {
if (cluster.helpers.contains(uuid)) { if (cluster.helpers.contains(uuid)) {
@ -556,7 +556,7 @@ public class Cluster extends SubCommand {
if (player2 != null) { if (player2 != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_removed"), TranslatableCaption.of("cluster.cluster_removed"),
Template.of("cluster", cluster.getName()) Template.template("cluster", cluster.getName())
); );
} }
for (final Plot plot : PlotQuery.newQuery().inWorld(player2.getLocation() for (final Plot plot : PlotQuery.newQuery().inWorld(player2.getLocation()
@ -577,14 +577,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_LEAVE.toString())
); );
return false; return false;
} }
if (args.length != 1 && args.length != 2) { if (args.length != 1 && args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster leave [name]") Template.template("value", "/plot cluster leave [name]")
); );
return false; return false;
} }
@ -598,7 +598,7 @@ public class Cluster extends SubCommand {
if (cluster == null) { if (cluster == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"), TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1]) Template.template("cluster", args[1])
); );
return false; return false;
} }
@ -626,7 +626,7 @@ public class Cluster extends SubCommand {
DBFunc.removeInvited(cluster, uuid); DBFunc.removeInvited(cluster, uuid);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_removed"), TranslatableCaption.of("cluster.cluster_removed"),
Template.of("cluster", cluster.getName()) Template.template("cluster", cluster.getName())
); );
for (final Plot plot : PlotQuery.newQuery().inWorld(player.getLocation().getWorldName()) for (final Plot plot : PlotQuery.newQuery().inWorld(player.getLocation().getWorldName())
.ownedBy(uuid)) { .ownedBy(uuid)) {
@ -641,14 +641,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_HELPERS.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_HELPERS.toString())
); );
return false; return false;
} }
if (args.length != 3) { if (args.length != 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster members <add | remove> <player>") Template.template("value", "/plot cluster members <add | remove> <player>")
); );
return false; return false;
} }
@ -669,7 +669,7 @@ public class Cluster extends SubCommand {
} else if (throwable != null) { } else if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[2]) Template.template("value", args[2])
); );
} else { } else {
if (args[1].equalsIgnoreCase("add")) { if (args[1].equalsIgnoreCase("add")) {
@ -683,7 +683,7 @@ public class Cluster extends SubCommand {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster members <add | remove> <player>") Template.template("value", "/plot cluster members <add | remove> <player>")
); );
} }
} }
@ -696,14 +696,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_TP.toString())
); );
return false; return false;
} }
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster tp <name>") Template.template("value", "/plot cluster tp <name>")
); );
return false; return false;
} }
@ -716,7 +716,7 @@ public class Cluster extends SubCommand {
if (cluster == null) { if (cluster == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"), TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1]) Template.template("cluster", args[1])
); );
return false; return false;
} }
@ -725,7 +725,7 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString())
); );
return false; return false;
} }
@ -741,14 +741,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_TP.toString())
); );
return false; return false;
} }
if (args.length != 1 && args.length != 2) { if (args.length != 1 && args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster info [name]") Template.template("value", "/plot cluster info [name]")
); );
} }
PlotArea area = player.getApplicablePlotArea(); PlotArea area = player.getApplicablePlotArea();
@ -762,7 +762,7 @@ public class Cluster extends SubCommand {
if (cluster == null) { if (cluster == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster_name"), TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1]) Template.template("cluster", args[1])
); );
return false; return false;
} }
@ -791,11 +791,11 @@ public class Cluster extends SubCommand {
cluster.getP2().getY() - cluster.getP1().getY() + 1); cluster.getP2().getY() - cluster.getP1().getY() + 1);
String rights = cluster.isAdded(player.getUUID()) + ""; String rights = cluster.isAdded(player.getUUID()) + "";
Caption message = TranslatableCaption.of("cluster.cluster_info"); Caption message = TranslatableCaption.of("cluster.cluster_info");
Template idTemplate = Template.of("id", id); Template idTemplate = Template.template("id", id);
Template ownerTemplate = Template.of("owner", owner); Template ownerTemplate = Template.template("owner", owner);
Template nameTemplate = Template.of("name", name); Template nameTemplate = Template.template("name", name);
Template sizeTemplate = Template.of("size", size); Template sizeTemplate = Template.template("size", size);
Template rightsTemplate = Template.of("rights", rights); Template rightsTemplate = Template.template("rights", rights);
player.sendMessage( player.sendMessage(
message, message,
idTemplate, idTemplate,
@ -814,14 +814,14 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_SETHOME.toString())
); );
return false; return false;
} }
if (args.length != 1 && args.length != 2) { if (args.length != 1 && args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster sethome") Template.template("value", "/plot cluster sethome")
); );
return false; return false;
} }
@ -839,7 +839,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) { .hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString()) Template.template("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString())
); );
return false; return false;
} }
@ -858,7 +858,7 @@ public class Cluster extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cluster_available_args"), TranslatableCaption.of("cluster.cluster_available_args"),
Template.of( Template.template(
"list", "list",
"<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>" "<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
) )

6
Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
View File

@ -59,9 +59,9 @@ public class CmdConfirm {
if (commandStr != null) { if (commandStr != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("confirm.requires_confirm"), TranslatableCaption.of("confirm.requires_confirm"),
Template.of("command", commandStr), Template.template("command", commandStr),
Template.of("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)), Template.template("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)),
Template.of("value", "/plot confirm") Template.template("value", "/plot confirm")
); );
} }
TaskManager.runTaskLater(() -> { TaskManager.runTaskLater(() -> {

24
Core/src/main/java/com/plotsquared/core/command/Command.java
View File

@ -263,9 +263,9 @@ public abstract class Command {
max = c.size(); max = c.size();
} }
// Send the header // Send the header
Template curTemplate = Template.of("cur", String.valueOf(page + 1)); Template curTemplate = Template.template("cur", String.valueOf(page + 1));
Template maxTemplate = Template.of("max", String.valueOf(totalPages + 1)); Template maxTemplate = Template.template("max", String.valueOf(totalPages + 1));
Template amountTemplate = Template.of("amount", String.valueOf(c.size())); Template amountTemplate = Template.template("amount", String.valueOf(c.size()));
player.sendMessage(header, curTemplate, maxTemplate, amountTemplate); player.sendMessage(header, curTemplate, maxTemplate, amountTemplate);
// Send the page content // Send the page content
List<T> subList = c.subList(page * size, max); List<T> subList = c.subList(page * size, max);
@ -277,9 +277,9 @@ public abstract class Command {
player.sendMessage(msg.get(), msg.getTemplates()); player.sendMessage(msg.get(), msg.getTemplates());
} }
// Send the footer // Send the footer
Template command1 = Template.of("command1", baseCommand + " " + page); Template command1 = Template.template("command1", baseCommand + " " + page);
Template command2 = Template.of("command2", baseCommand + " " + (page + 2)); Template command2 = Template.template("command2", baseCommand + " " + (page + 2));
Template clickable = Template.of("clickable", TranslatableCaption.of("list.clickable").getComponent(player)); Template clickable = Template.template("clickable", TranslatableCaption.of("list.clickable").getComponent(player));
player.sendMessage(TranslatableCaption.of("list.page_turn"), command1, command2, clickable); player.sendMessage(TranslatableCaption.of("list.page_turn"), command1, command2, clickable);
} }
@ -289,7 +289,7 @@ public abstract class Command {
* @param confirm Instance, Success, Failure * @param confirm Instance, Success, Failure
* @param whenDone task to run when done * @param whenDone task to run when done
* @return CompletableFuture true if the command executed fully, false in * @return CompletableFuture true if the command executed fully, false in
* any other case * any other case
*/ */
public CompletableFuture<Boolean> execute( public CompletableFuture<Boolean> execute(
PlotPlayer<?> player, String[] args, PlotPlayer<?> player, String[] args,
@ -332,7 +332,7 @@ public abstract class Command {
if (commands.isEmpty()) { if (commands.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"), TranslatableCaption.of("commandconfig.did_you_mean"),
Template.of("value", MainCommand.getInstance().help.getUsage()) Template.template("value", MainCommand.getInstance().help.getUsage())
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -353,7 +353,7 @@ public abstract class Command {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"), TranslatableCaption.of("commandconfig.did_you_mean"),
Template.of("value", cmd.getUsage()) Template.template("value", cmd.getUsage())
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -389,7 +389,7 @@ public abstract class Command {
// TODO improve or remove the Argument system // TODO improve or remove the Argument system
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", StringMan.join(fullSplit, " ")) Template.template("value", StringMan.join(fullSplit, " "))
); );
return false; return false;
} }
@ -478,7 +478,7 @@ public abstract class Command {
if (message) { if (message) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", getPermission()) Template.template("node", getPermission())
); );
} }
} else { } else {
@ -503,7 +503,7 @@ public abstract class Command {
public void sendUsage(PlotPlayer<?> player) { public void sendUsage(PlotPlayer<?> player) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", getUsage()) Template.template("value", getUsage())
); );
} }

16
Core/src/main/java/com/plotsquared/core/command/Comment.java
View File

@ -51,8 +51,8 @@ public class Comment extends SubCommand {
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"), TranslatableCaption.of("comment.comment_syntax"),
Template.of("command", "/plot comment [X;Z]"), Template.template("command", "/plot comment [X;Z]"),
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|")) Template.template("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
); );
return false; return false;
} }
@ -71,8 +71,8 @@ public class Comment extends SubCommand {
if (args.length < 3) { if (args.length < 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"), TranslatableCaption.of("comment.comment_syntax"),
Template.of("command", "/plot comment [X;Z]"), Template.template("command", "/plot comment [X;Z]"),
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|")) Template.template("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
); );
return false; return false;
} }
@ -83,8 +83,8 @@ public class Comment extends SubCommand {
if (inbox == null) { if (inbox == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"), TranslatableCaption.of("comment.comment_syntax"),
Template.of("command", "/plot comment [X;Z]"), Template.template("command", "/plot comment [X;Z]"),
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|")) Template.template("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
); );
return false; return false;
} }
@ -104,8 +104,8 @@ public class Comment extends SubCommand {
player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox")); player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_syntax"), TranslatableCaption.of("comment.comment_syntax"),
Template.of("command", "/plot comment [X;Z]"), Template.template("command", "/plot comment [X;Z]"),
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|")) Template.template("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
); );
return false; return false;
} }

22
Core/src/main/java/com/plotsquared/core/command/Condense.java
View File

@ -74,7 +74,7 @@ public class Condense extends SubCommand {
if (args.length != 2 && args.length != 3) { if (args.length != 2 && args.length != 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot condense <area> <start | stop | info> [radius]") Template.template("value", "/plot condense <area> <start | stop | info> [radius]")
); );
return false; return false;
} }
@ -88,7 +88,7 @@ public class Condense extends SubCommand {
if (args.length == 2) { if (args.length == 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot condense" + area + " start <radius>") Template.template("value", "/plot condense" + area + " start <radius>")
); );
return false; return false;
} }
@ -187,8 +187,8 @@ public class Condense extends SubCommand {
if (result.get()) { if (result.get()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.moving"), TranslatableCaption.of("condense.moving"),
Template.of("origin", String.valueOf(origin)), Template.template("origin", String.valueOf(origin)),
Template.of("possible", String.valueOf(possible)) Template.template("possible", String.valueOf(possible))
); );
TaskManager.runTaskLater(task, TaskTime.ticks(1L)); TaskManager.runTaskLater(task, TaskTime.ticks(1L));
} }
@ -208,7 +208,7 @@ public class Condense extends SubCommand {
if (i >= free.size()) { if (i >= free.size()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.skipping"), TranslatableCaption.of("condense.skipping"),
Template.of("plot", String.valueOf(origin)) Template.template("plot", String.valueOf(origin))
); );
} }
} }
@ -229,7 +229,7 @@ public class Condense extends SubCommand {
if (args.length == 2) { if (args.length == 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot condense " + area + " info <radius>") Template.template("value", "/plot condense " + area + " info <radius>")
); );
return false; return false;
} }
@ -250,20 +250,20 @@ public class Condense extends SubCommand {
player.sendMessage(TranslatableCaption.of("condense.default_eval")); player.sendMessage(TranslatableCaption.of("condense.default_eval"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.minimum_radius"), TranslatableCaption.of("condense.minimum_radius"),
Template.of("minimumRadius", String.valueOf(minimumRadius)) Template.template("minimumRadius", String.valueOf(minimumRadius))
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.minimum_radius"), TranslatableCaption.of("condense.minimum_radius"),
Template.of("maxMove", String.valueOf(maxMove)) Template.template("maxMove", String.valueOf(maxMove))
); );
player.sendMessage(TranslatableCaption.of("condense.input_eval")); player.sendMessage(TranslatableCaption.of("condense.input_eval"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.input_radius"), TranslatableCaption.of("condense.input_radius"),
Template.of("radius", String.valueOf(radius)) Template.template("radius", String.valueOf(radius))
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("condense.estimated_moves"), TranslatableCaption.of("condense.estimated_moves"),
Template.of("userMove", String.valueOf(userMove)) Template.template("userMove", String.valueOf(userMove))
); );
player.sendMessage(TranslatableCaption.of("condense.eta")); player.sendMessage(TranslatableCaption.of("condense.eta"));
player.sendMessage(TranslatableCaption.of("condense.radius_measured")); player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
@ -272,7 +272,7 @@ public class Condense extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot condense " + area.getWorldName() + " <start | stop | info> [radius]") Template.template("value", "/plot condense " + area.getWorldName() + " <start | stop | info> [radius]")
); );
return false; return false;
} }

6
Core/src/main/java/com/plotsquared/core/command/Continue.java
View File

@ -64,7 +64,7 @@ public class Continue extends SubCommand {
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) { .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player)) Template.template("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player))
); );
return false; return false;
} }
@ -77,7 +77,7 @@ public class Continue extends SubCommand {
< player.getPlotCount() + size)) { < player.getPlotCount() + size)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_plots"), TranslatableCaption.of("permission.cant_claim_more_plots"),
Template.of("amount", String.valueOf(player.getAllowedPlots())) Template.template("amount", String.valueOf(player.getAllowedPlots()))
); );
return false; return false;
} }
@ -91,7 +91,7 @@ public class Continue extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Done flag removal") Template.template("value", "Done flag removal")
); );
return true; return true;
} }

6
Core/src/main/java/com/plotsquared/core/command/Copy.java
View File

@ -57,7 +57,7 @@ public class Copy extends SubCommand {
if (args.length != 1) { if (args.length != 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot copy <X;Z>") Template.template("value", "/plot copy <X;Z>")
); );
return false; return false;
} }
@ -76,8 +76,8 @@ public class Copy extends SubCommand {
plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> { plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
if (result) { if (result) {
player.sendMessage(TranslatableCaption.of("move.copy_success"), Template.of("origin", String.valueOf(plot1)), player.sendMessage(TranslatableCaption.of("move.copy_success"), Template.template("origin", String.valueOf(plot1)),
Template.of("target", String.valueOf(plot2)) Template.template("target", String.valueOf(plot2))
); );
} else { } else {
player.sendMessage(TranslatableCaption.of("move.requires_unowned")); player.sendMessage(TranslatableCaption.of("move.requires_unowned"));

2
Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
View File

@ -68,7 +68,7 @@ public class CreateRoadSchematic extends SubCommand {
this.hybridUtils.setupRoadSchematic(plot); this.hybridUtils.setupRoadSchematic(plot);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_road_created"), TranslatableCaption.of("schematics.schematic_road_created"),
Template.of("command", "/plot debugroadregen") Template.template("command", "/plot debugroadregen")
); );
return true; return true;
} }

12
Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java
View File

@ -108,7 +108,7 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 1) { if (args.length < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot database [area] <sqlite | mysql | import>") Template.template("value", "/plot database [area] <sqlite | mysql | import>")
); );
return false; return false;
} }
@ -123,7 +123,7 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 1) { if (args.length < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot database [area] <sqlite|mysql|import>") Template.template("value", "/plot database [area] <sqlite|mysql|import>")
); );
player.sendMessage(TranslatableCaption.of("database.arg")); player.sendMessage(TranslatableCaption.of("database.arg"));
return false; return false;
@ -136,7 +136,7 @@ public class DatabaseCommand extends SubCommand {
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot database import <sqlite file> [prefix]") Template.template("value", "/plot database import <sqlite file> [prefix]")
); );
return false; return false;
} }
@ -147,7 +147,7 @@ public class DatabaseCommand extends SubCommand {
if (!file.exists()) { if (!file.exists()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("database.does_not_exist"), TranslatableCaption.of("database.does_not_exist"),
Template.of("value", String.valueOf(file)) Template.template("value", String.valueOf(file))
); );
return false; return false;
} }
@ -191,8 +191,8 @@ public class DatabaseCommand extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("database.skipping_duplicated_plot"), TranslatableCaption.of("database.skipping_duplicated_plot"),
Template.of("plot", String.valueOf(plot)), Template.template("plot", String.valueOf(plot)),
Template.of("id", String.valueOf(plot.temp)) Template.template("id", String.valueOf(plot.temp))
); );
continue; continue;
} }

39
Core/src/main/java/com/plotsquared/core/command/Debug.java
View File

@ -42,6 +42,7 @@ import com.sk89q.worldedit.world.entity.EntityType;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection; import java.util.Collection;
@ -75,7 +76,7 @@ public class Debug extends SubCommand {
if (args.length == 0) { if (args.length == 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot debug <loadedchunks | player | debug-players | entitytypes | msg>") Template.template("value", "/plot debug <loadedchunks | player | debug-players | entitytypes | msg>")
); );
} }
if (args.length > 0) { if (args.length > 0) {
@ -102,7 +103,7 @@ public class Debug extends SubCommand {
final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately(); final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debug.cached_uuids"), TranslatableCaption.of("debug.cached_uuids"),
Template.of("value", String.valueOf(mappings.size())) Template.template("value", String.valueOf(mappings.size()))
); );
return true; return true;
} }
@ -111,7 +112,7 @@ public class Debug extends SubCommand {
for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) { for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debug.player_in_debugmode_list"), TranslatableCaption.of("debug.player_in_debugmode_list"),
Template.of("value", pp.getName()) Template.template("value", pp.getName())
); );
} }
return true; return true;
@ -148,25 +149,29 @@ public class Debug extends SubCommand {
String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n"; String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n";
String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n"; String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n";
information.append(header); information.append(header);
information.append(MINI_MESSAGE.parse(section, Template.of("val", "PlotArea"))); information.append(MINI_MESSAGE.deserialize(section, TemplateResolver.templates(Template.template("val", "PlotArea"))));
information.append(MINI_MESSAGE information.append(MINI_MESSAGE
.parse( .deserialize(
line, line,
Template.of("var", "Plot Worlds"), TemplateResolver.templates(
Template.of("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", ")) Template.template("var", "Plot Worlds"),
)); Template.template("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", "))
)));
information.append( information.append(
MINI_MESSAGE.parse( MINI_MESSAGE.deserialize(
line, line,
Template.of("var", "Owned Plots"), TemplateResolver.templates(
Template.of("val", String.valueOf(PlotQuery.newQuery().allPlots().count())) Template.template("var", "Owned Plots"),
)); Template.template("val", String.valueOf(PlotQuery.newQuery().allPlots().count()))
information.append(MINI_MESSAGE.parse(section, Template.of("val", "Messages"))); )));
information.append(MINI_MESSAGE.parse( information.append(MINI_MESSAGE.deserialize(section,
TemplateResolver.templates(Template.template("val", "Messages"))));
information.append(MINI_MESSAGE.deserialize(
line, line,
Template.of("var", "Total Messages"), TemplateResolver.templates(
Template.of("val", String.valueOf(captions.size())) Template.template("var", "Total Messages"),
)); Template.template("val", String.valueOf(captions.size()))
)));
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build()))); player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
return true; return true;
} }

16
Core/src/main/java/com/plotsquared/core/command/DebugExec.java
View File

@ -102,7 +102,7 @@ public class DebugExec extends SubCommand {
if (analysis != null) { if (analysis != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugexec.changes_column"), TranslatableCaption.of("debugexec.changes_column"),
Template.of("value", String.valueOf(analysis.changes)) Template.template("value", String.valueOf(analysis.changes))
); );
return true; return true;
} }
@ -112,7 +112,7 @@ public class DebugExec extends SubCommand {
public void run(PlotAnalysis value) { public void run(PlotAnalysis value) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugexec.analyze_done"), TranslatableCaption.of("debugexec.analyze_done"),
Template.of("command", "/plot debugexec analyze") Template.template("command", "/plot debugexec analyze")
); );
} }
}); });
@ -122,7 +122,7 @@ public class DebugExec extends SubCommand {
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot debugexec analyze <threshold>") Template.template("value", "/plot debugexec analyze <threshold>")
); );
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default")); player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
return false; return false;
@ -133,7 +133,7 @@ public class DebugExec extends SubCommand {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugexec.invalid_threshold"), TranslatableCaption.of("debugexec.invalid_threshold"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double")); player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
return false; return false;
@ -167,7 +167,7 @@ public class DebugExec extends SubCommand {
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot debugexec remove-flag <flag>") Template.template("value", "/plot debugexec remove-flag <flag>")
); );
return false; return false;
} }
@ -185,7 +185,7 @@ public class DebugExec extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugexec.cleared_flag"), TranslatableCaption.of("debugexec.cleared_flag"),
Template.of("value", flag) Template.template("value", flag)
); );
return true; return true;
} }
@ -193,7 +193,7 @@ public class DebugExec extends SubCommand {
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Invalid syntax: /plot debugexec start-rgar <world>") Template.template("value", "Invalid syntax: /plot debugexec start-rgar <world>")
); );
return false; return false;
} }
@ -201,7 +201,7 @@ public class DebugExec extends SubCommand {
if (area == null) { if (area == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"), TranslatableCaption.of("errors.not_valid_plot_world"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
return false; return false;
} }

16
Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
View File

@ -133,8 +133,8 @@ public class DebugPaste extends SubCommand {
} catch (IOException ignored) { } catch (IOException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.latest_log"), TranslatableCaption.of("debugpaste.latest_log"),
Template.of("file", "latest.log"), Template.template("file", "latest.log"),
Template.of("size", "14MB") Template.template("size", "14MB")
); );
} }
@ -143,7 +143,7 @@ public class DebugPaste extends SubCommand {
} catch (final IllegalArgumentException ignored) { } catch (final IllegalArgumentException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.empty_file"), TranslatableCaption.of("debugpaste.empty_file"),
Template.of("file", "settings.yml") Template.template("file", "settings.yml")
); );
} }
try { try {
@ -151,7 +151,7 @@ public class DebugPaste extends SubCommand {
} catch (final IllegalArgumentException ignored) { } catch (final IllegalArgumentException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.empty_file"), TranslatableCaption.of("debugpaste.empty_file"),
Template.of("file", "worlds.yml") Template.template("file", "worlds.yml")
); );
} }
@ -164,7 +164,7 @@ public class DebugPaste extends SubCommand {
} catch (final IOException ignored) { } catch (final IOException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.skip_multiverse"), TranslatableCaption.of("debugpaste.skip_multiverse"),
Template.of("file", "worlds.yml") Template.template("file", "worlds.yml")
); );
} }
@ -179,20 +179,20 @@ public class DebugPaste extends SubCommand {
String.format("https://athion.net/ISPaster/paste/view/%s", pasteId); String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.debug_report_created"), TranslatableCaption.of("debugpaste.debug_report_created"),
Template.of("url", link) Template.template("url", link)
); );
} else { } else {
final String responseMessage = jsonObject.get("response").getAsString(); final String responseMessage = jsonObject.get("response").getAsString();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.creation_failed"), TranslatableCaption.of("debugpaste.creation_failed"),
Template.of("value", responseMessage) Template.template("value", responseMessage)
); );
} }
} catch (final Throwable throwable) { } catch (final Throwable throwable) {
throwable.printStackTrace(); throwable.printStackTrace();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugpaste.creation_failed"), TranslatableCaption.of("debugpaste.creation_failed"),
Template.of("value", throwable.getMessage()) Template.template("value", throwable.getMessage())
); );
} }
} catch (IOException e) { } catch (IOException e) {

18
Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
View File

@ -67,7 +67,7 @@ public class DebugRoadRegen extends SubCommand {
if (args.length < 1) { if (args.length < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", DebugRoadRegen.USAGE) Template.template("value", DebugRoadRegen.USAGE)
); );
return false; return false;
} }
@ -87,7 +87,7 @@ public class DebugRoadRegen extends SubCommand {
default: default:
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", DebugRoadRegen.USAGE) Template.template("value", DebugRoadRegen.USAGE)
); );
return false; return false;
} }
@ -110,11 +110,11 @@ public class DebugRoadRegen extends SubCommand {
queue.setCompleteTask(() -> { queue.setCompleteTask(() -> {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugroadregen.regen_done"), TranslatableCaption.of("debugroadregen.regen_done"),
Template.of("value", plot.getId().toString()) Template.template("value", plot.getId().toString())
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugroadregen.regen_all"), TranslatableCaption.of("debugroadregen.regen_all"),
Template.of("value", "/plot regenallroads") Template.template("value", "/plot regenallroads")
); );
}); });
manager.createRoadEast(plot, queue); manager.createRoadEast(plot, queue);
@ -133,18 +133,18 @@ public class DebugRoadRegen extends SubCommand {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_valid_number"), TranslatableCaption.of("invalid.not_valid_number"),
Template.of("value", "0, 256") Template.template("value", "0, 256")
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", DebugRoadRegen.USAGE) Template.template("value", DebugRoadRegen.USAGE)
); );
return false; return false;
} }
} else if (args.length != 0) { } else if (args.length != 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", DebugRoadRegen.USAGE) Template.template("value", DebugRoadRegen.USAGE)
); );
return false; return false;
} }
@ -162,11 +162,11 @@ public class DebugRoadRegen extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugroadregen.schematic"), TranslatableCaption.of("debugroadregen.schematic"),
Template.of("command", "/plot createroadschematic") Template.template("command", "/plot createroadschematic")
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugroadregen.regenallroads"), TranslatableCaption.of("debugroadregen.regenallroads"),
Template.of("command", "/plot regenallroads") Template.template("command", "/plot regenallroads")
); );
boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height); boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
if (!result) { if (!result) {

8
Core/src/main/java/com/plotsquared/core/command/Delete.java
View File

@ -85,7 +85,7 @@ public class Delete extends SubCommand {
if (eventResult == Result.DENY) { if (eventResult == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Delete") Template.template("value", "Delete")
); );
return true; return true;
} }
@ -121,14 +121,14 @@ public class Delete extends SubCommand {
this.econHandler.depositMoney(player, value); this.econHandler.depositMoney(player, value);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.added_balance"), TranslatableCaption.of("economy.added_balance"),
Template.of("money", this.econHandler.format(value)) Template.template("money", this.econHandler.format(value))
); );
} }
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("working.deleting_done"), TranslatableCaption.of("working.deleting_done"),
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)), Template.template("amount", String.valueOf(System.currentTimeMillis() - start)),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
eventDispatcher.callPostDelete(plot); eventDispatcher.callPostDelete(plot);
}); });

8
Core/src/main/java/com/plotsquared/core/command/Deny.java
View File

@ -97,7 +97,7 @@ public class Deny extends SubCommand {
if (size >= maxDenySize) { if (size >= maxDenySize) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("members.plot_max_members_denied"), TranslatableCaption.of("members.plot_max_members_denied"),
Template.of("amount", String.valueOf(size)) Template.template("amount", String.valueOf(size))
); );
return false; return false;
} }
@ -108,7 +108,7 @@ public class Deny extends SubCommand {
} else if (throwable != null || uuids.isEmpty()) { } else if (throwable != null || uuids.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} else { } else {
for (UUID uuid : uuids) { for (UUID uuid : uuids) {
@ -117,7 +117,7 @@ public class Deny extends SubCommand {
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) { .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} else if (plot.isOwner(uuid)) { } else if (plot.isOwner(uuid)) {
player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner")); player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
@ -125,7 +125,7 @@ public class Deny extends SubCommand {
} else if (plot.getDenied().contains(uuid)) { } else if (plot.getDenied().contains(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_added"), TranslatableCaption.of("member.already_added"),
Template.of("player", PlayerManager.getName(uuid)) Template.template("player", PlayerManager.getName(uuid))
); );
return; return;
} else { } else {

4
Core/src/main/java/com/plotsquared/core/command/Desc.java
View File

@ -61,7 +61,7 @@ public class Desc extends SetCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Description removal") Template.template("value", "Description removal")
); );
return false; return false;
} }
@ -76,7 +76,7 @@ public class Desc extends SetCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Description set") Template.template("value", "Description set")
); );
return false; return false;
} }

4
Core/src/main/java/com/plotsquared/core/command/Done.java
View File

@ -77,7 +77,7 @@ public class Done extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Done") Template.template("value", "Done")
); );
return true; return true;
} }
@ -98,7 +98,7 @@ public class Done extends SubCommand {
plot.addRunning(); plot.addRunning();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.generating_link"), TranslatableCaption.of("web.generating_link"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done"); final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
if (ExpireManager.IMP == null || doneRequirements == null) { if (ExpireManager.IMP == null || doneRequirements == null) {

18
Core/src/main/java/com/plotsquared/core/command/Download.java
View File

@ -121,7 +121,7 @@ public class Download extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString()) Template.template("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString())
); );
return false; return false;
} }
@ -135,18 +135,18 @@ public class Download extends SubCommand {
if (url == null) { if (url == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.generating_link_failed"), TranslatableCaption.of("web.generating_link_failed"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
return; 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"), Template.template("url", url.toString()));
} }
}); });
} else { } else {
sendUsage(player); sendUsage(player);
return false; return false;
} }
player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.of("plot", plot.getId().toString())); player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.template("plot", plot.getId().toString()));
return true; return true;
} }
@ -190,8 +190,8 @@ public class Download extends SubCommand {
public void run(URL value) { public void run(URL value) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.generation_link_success"), TranslatableCaption.of("web.generation_link_success"),
Template.of("download", value.toString()), Template.template("download", value.toString()),
Template.of("delete", "Not available") Template.template("delete", "Not available")
); );
player.sendMessage(StaticCaption.of(value.toString())); player.sendMessage(StaticCaption.of(value.toString()));
} }
@ -205,13 +205,13 @@ public class Download extends SubCommand {
if (throwable != null || !result.isSuccess()) { if (throwable != null || !result.isSuccess()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.generating_link_failed"), TranslatableCaption.of("web.generating_link_failed"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.generation_link_success"), TranslatableCaption.of("web.generation_link_success"),
Template.of("download", result.getDownloadUrl()), Template.template("download", result.getDownloadUrl()),
Template.of("delete", result.getDeletionUrl()) Template.template("delete", result.getDeletionUrl())
); );
} }
}); });

93
Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
View File

@ -54,6 +54,7 @@ import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@ -86,7 +87,7 @@ public final class FlagCommand extends Command {
private static boolean sendMessage(PlotPlayer<?> player) { private static boolean sendMessage(PlotPlayer<?> player) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot flag <set | remove | add | list | info> <flag> <value>") Template.template("value", "/plot flag <set | remove | add | list | info> <flag> <value>")
); );
return true; return true;
} }
@ -112,7 +113,7 @@ public final class FlagCommand extends Command {
if (!result) { if (!result) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of( Template.template(
"node", "node",
perm perm
) )
@ -131,16 +132,16 @@ public final class FlagCommand extends Command {
); );
final boolean result = Permissions.hasPermission(player, permission); final boolean result = Permissions.hasPermission(player, permission);
if (!result) { if (!result) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", permission)); player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.template("node", permission));
return false; return false;
} }
} }
} catch (final FlagParseException e) { } catch (final FlagParseException e) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"), TranslatableCaption.of("flag.flag_parse_error"),
Template.of("flag_name", flag.getName()), Template.template("flag_name", flag.getName()),
Template.of("flag_value", e.getValue()), Template.template("flag_value", e.getValue()),
Template.of("error", e.getErrorMessage().getComponent(player)) Template.template("error", e.getErrorMessage().getComponent(player))
); );
return false; return false;
} catch (final Exception e) { } catch (final Exception e) {
@ -157,7 +158,7 @@ public final class FlagCommand extends Command {
perm = basePerm; perm = basePerm;
} }
if (!result) { if (!result) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", perm)); player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.template("node", perm));
} }
return result; return result;
} }
@ -182,7 +183,7 @@ public final class FlagCommand extends Command {
.hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) { .hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER))
); );
return false; return false;
} }
@ -217,7 +218,7 @@ public final class FlagCommand extends Command {
if (best != null) { if (best != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.not_valid_flag_suggested"), TranslatableCaption.of("flag.not_valid_flag_suggested"),
Template.of("value", best) Template.template("value", best)
); );
suggested = true; suggested = true;
} }
@ -326,7 +327,7 @@ public final class FlagCommand extends Command {
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot flag set <flag> <value>") Template.template("value", "/plot flag set <flag> <value>")
); );
return; return;
} }
@ -339,7 +340,7 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag set") Template.template("value", "Flag set")
); );
return; return;
} }
@ -355,15 +356,15 @@ public final class FlagCommand extends Command {
} catch (final FlagParseException e) { } catch (final FlagParseException e) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"), TranslatableCaption.of("flag.flag_parse_error"),
Template.of("flag_name", plotFlag.getName()), Template.template("flag_name", plotFlag.getName()),
Template.of("flag_value", e.getValue()), Template.template("flag_value", e.getValue()),
Template.of("error", e.getErrorMessage().getComponent(player)) Template.template("error", e.getErrorMessage().getComponent(player))
); );
return; return;
} }
plot.setFlag(parsed); plot.setFlag(parsed);
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])), player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.template("flag", String.valueOf(args[0])),
Template.of("value", String.valueOf(parsed)) Template.template("value", String.valueOf(parsed))
); );
} }
@ -384,7 +385,7 @@ public final class FlagCommand extends Command {
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot flag add <flag> <values>") Template.template("value", "/plot flag add <flag> <values>")
); );
return; return;
} }
@ -397,7 +398,7 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag add") Template.template("value", "Flag add")
); );
return; return;
} }
@ -418,9 +419,9 @@ public final class FlagCommand extends Command {
} catch (FlagParseException e) { } catch (FlagParseException e) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"), TranslatableCaption.of("flag.flag_parse_error"),
Template.of("flag_name", plotFlag.getName()), Template.template("flag_name", plotFlag.getName()),
Template.of("flag_value", e.getValue()), Template.template("flag_value", e.getValue()),
Template.of("error", e.getErrorMessage().getComponent(player)) Template.template("error", e.getErrorMessage().getComponent(player))
); );
return; return;
} }
@ -430,8 +431,8 @@ public final class FlagCommand extends Command {
player.sendMessage(TranslatableCaption.of("flag.flag_not_added")); player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
return; return;
} }
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])), player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.template("flag", String.valueOf(args[0])),
Template.of("value", String.valueOf(parsed)) Template.template("value", String.valueOf(parsed))
); );
} }
@ -452,7 +453,7 @@ public final class FlagCommand extends Command {
if (args.length != 1 && args.length != 2) { if (args.length != 1 && args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot flag remove <flag> [values]") Template.template("value", "/plot flag remove <flag> [values]")
); );
return; return;
} }
@ -465,7 +466,7 @@ public final class FlagCommand extends Command {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag remove") Template.template("value", "Flag remove")
); );
return; return;
} }
@ -475,7 +476,7 @@ public final class FlagCommand extends Command {
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase())) Template.template("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))
); );
return; return;
} }
@ -490,9 +491,9 @@ public final class FlagCommand extends Command {
} catch (final FlagParseException e) { } catch (final FlagParseException e) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_parse_error"), TranslatableCaption.of("flag.flag_parse_error"),
Template.of("flag_name", flag.getName()), Template.template("flag_name", flag.getName()),
Template.of("flag_value", e.getValue()), Template.template("flag_value", e.getValue()),
Template.of("error", String.valueOf(e.getErrorMessage())) Template.template("error", String.valueOf(e.getErrorMessage()))
); );
return; return;
} }
@ -503,7 +504,7 @@ public final class FlagCommand extends Command {
if (list.removeAll((List) parsedFlag.getValue())) { if (list.removeAll((List) parsedFlag.getValue())) {
if (list.isEmpty()) { if (list.isEmpty()) {
if (plot.removeFlag(flag)) { if (plot.removeFlag(flag)) {
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of( player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.template("flag", args[0]), Template.template(
"value", "value",
String.valueOf(flag) String.valueOf(flag)
)); ));
@ -518,7 +519,7 @@ public final class FlagCommand extends Command {
if (addEvent.getEventResult() == Result.DENY) { if (addEvent.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Re-addition of " + plotFlag.getName()) Template.template("value", "Re-addition of " + plotFlag.getName())
); );
return; return;
} }
@ -541,7 +542,7 @@ public final class FlagCommand extends Command {
return; return;
} }
} }
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of( player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.template("flag", args[0]), Template.template(
"value", "value",
String.valueOf(flag) String.valueOf(flag)
)); ));
@ -576,20 +577,22 @@ public final class FlagCommand extends Command {
for (final Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) { for (final Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
Collections.sort(entry.getValue()); Collections.sort(entry.getValue());
Component category = Component category =
MINI_MESSAGE.parse( MINI_MESSAGE.deserialize(
TranslatableCaption.of("flag.flag_list_categories").getComponent(player), TranslatableCaption.of("flag.flag_list_categories").getComponent(player),
Template.of("category", entry.getKey()) TemplateResolver.templates(Template.template("category", entry.getKey()))
); );
TextComponent.Builder builder = Component.text().append(category); TextComponent.Builder builder = Component.text().append(category);
final Iterator<String> flagIterator = entry.getValue().iterator(); final Iterator<String> flagIterator = entry.getValue().iterator();
while (flagIterator.hasNext()) { while (flagIterator.hasNext()) {
final String flag = flagIterator.next(); final String flag = flagIterator.next();
builder.append(MINI_MESSAGE builder.append(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("flag.flag_list_flag").getComponent(player), TranslatableCaption.of("flag.flag_list_flag").getComponent(player),
Template.of("command", "/plot flag info " + flag), TemplateResolver.templates(
Template.of("flag", flag), Template.template("command", "/plot flag info " + flag),
Template.of("suffix", flagIterator.hasNext() ? ", " : "") Template.template("flag", flag),
Template.template("suffix", flagIterator.hasNext() ? ", " : "")
)
)); ));
} }
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build()))); player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@ -613,7 +616,7 @@ public final class FlagCommand extends Command {
if (args.length < 1) { if (args.length < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot flag info <flag>") Template.template("value", "/plot flag info <flag>")
); );
return; return;
} }
@ -621,11 +624,11 @@ public final class FlagCommand extends Command {
if (plotFlag != null) { if (plotFlag != null) {
player.sendMessage(TranslatableCaption.of("flag.flag_info_header")); player.sendMessage(TranslatableCaption.of("flag.flag_info_header"));
// Flag name // Flag name
player.sendMessage(TranslatableCaption.of("flag.flag_info_name"), Template.of("flag", plotFlag.getName())); player.sendMessage(TranslatableCaption.of("flag.flag_info_name"), Template.template("flag", plotFlag.getName()));
// Flag category // Flag category
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_info_category"), TranslatableCaption.of("flag.flag_info_category"),
Templates.of(player, "value", plotFlag.getFlagCategory()) Templates.template(player, "value", plotFlag.getFlagCategory())
); );
// Flag description // Flag description
// TODO maybe merge and \n instead? // TODO maybe merge and \n instead?
@ -634,16 +637,16 @@ public final class FlagCommand extends Command {
// Flag example // Flag example
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_info_example"), TranslatableCaption.of("flag.flag_info_example"),
Template.of("command", "/plot flag set"), Template.template("command", "/plot flag set"),
Template.of("flag", plotFlag.getName()), Template.template("flag", plotFlag.getName()),
Template.of("value", plotFlag.getExample()) Template.template("value", plotFlag.getExample())
); );
// Default value // Default value
final String defaultValue = player.getLocation().getPlotArea().getFlagContainer() final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
.getFlagErased(plotFlag.getClass()).toString(); .getFlagErased(plotFlag.getClass()).toString();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flag.flag_info_default_value"), TranslatableCaption.of("flag.flag_info_default_value"),
Template.of("value", defaultValue) Template.template("value", defaultValue)
); );
// Footer. Done this way to prevent the duplicate-message-thingy from catching it // Footer. Done this way to prevent the duplicate-message-thingy from catching it
player.sendMessage(TranslatableCaption.of("flag.flag_info_footer")); player.sendMessage(TranslatableCaption.of("flag.flag_info_footer"));

12
Core/src/main/java/com/plotsquared/core/command/Grant.java
View File

@ -71,7 +71,7 @@ public class Grant extends Command {
checkTrue( checkTrue(
args.length >= 1 && args.length <= 2, args.length >= 1 && args.length <= 2,
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot grant <check | add> [player]") Template.template("value", "/plot grant <check | add> [player]")
); );
final String arg0 = args[0].toLowerCase(); final String arg0 = args[0].toLowerCase();
switch (arg0) { switch (arg0) {
@ -79,7 +79,7 @@ public class Grant extends Command {
if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) { if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_GRANT.format(arg0)) Template.template("node", Permission.PERMISSION_GRANT.format(arg0))
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -92,7 +92,7 @@ public class Grant extends Command {
} else if (throwable != null || uuids.size() != 1) { } else if (throwable != null || uuids.size() != 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", String.valueOf(uuids)) Template.template("value", String.valueOf(uuids))
); );
} else { } else {
final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0]; final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
@ -103,7 +103,7 @@ public class Grant extends Command {
if (args[0].equalsIgnoreCase("check")) { if (args[0].equalsIgnoreCase("check")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("grants.granted_plots"), TranslatableCaption.of("grants.granted_plots"),
Template.of("amount", String.valueOf(access.get().orElse(0))) Template.template("amount", String.valueOf(access.get().orElse(0)))
); );
} else { } else {
access.set(access.get().orElse(0) + 1); access.set(access.get().orElse(0) + 1);
@ -123,7 +123,7 @@ public class Grant extends Command {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("grants.granted_plots"), TranslatableCaption.of("grants.granted_plots"),
Template.of("amount", String.valueOf(granted)) Template.template("amount", String.valueOf(granted))
); );
} else { // add } else { // add
int amount; int amount;
@ -138,7 +138,7 @@ public class Grant extends Command {
DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace); DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("grants.added"), TranslatableCaption.of("grants.added"),
Template.of("grants", String.valueOf(amount)) Template.template("grants", String.valueOf(amount))
); );
} }
} }

21
Core/src/main/java/com/plotsquared/core/command/Help.java
View File

@ -36,6 +36,7 @@ import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import java.util.Collection; import java.util.Collection;
import java.util.Locale; import java.util.Locale;
@ -120,19 +121,23 @@ public class Help extends Command {
builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player))); builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
for (CommandCategory c : CommandCategory.values()) { for (CommandCategory c : CommandCategory.values()) {
builder.append(Component.newline()).append(MINI_MESSAGE builder.append(Component.newline()).append(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("help.help_info_item").getComponent(player), TranslatableCaption.of("help.help_info_item").getComponent(player),
Template.of("command", "/plot help"), TemplateResolver.templates(
Template.of("category", c.name().toLowerCase()), Template.template("command", "/plot help"),
Template.of("category_desc", c.getComponent(player)) Template.template("category", c.name().toLowerCase()),
Template.template("category_desc", c.getComponent(player))
)
)); ));
} }
builder.append(Component.newline()).append(MINI_MESSAGE builder.append(Component.newline()).append(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("help.help_info_item").getComponent(player), TranslatableCaption.of("help.help_info_item").getComponent(player),
Template.of("command", "/plot help"), TemplateResolver.templates(
Template.of("category", "all"), Template.template("command", "/plot help"),
Template.of("category_desc", "Display all commands") Template.template("category", "all"),
Template.template("category_desc", "Display all commands")
)
)); ));
builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption
.of("help.help_footer") .of("help.help_footer")

10
Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
View File

@ -79,8 +79,8 @@ public class HomeCommand extends Command {
} else if (plots.size() < page || page < 1) { } else if (plots.size() < page || page < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.number_not_in_range"), TranslatableCaption.of("invalid.number_not_in_range"),
Template.of("min", "1"), Template.template("min", "1"),
Template.of("max", String.valueOf(plots.size())) Template.template("max", String.valueOf(plots.size()))
); );
return; return;
} }
@ -115,7 +115,7 @@ public class HomeCommand extends Command {
.hasPermission(player, Permission.PERMISSION_HOME)) { .hasPermission(player, Permission.PERMISSION_HOME)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString()) Template.template("node", Permission.PERMISSION_VISIT_OWNED.toString())
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -137,7 +137,7 @@ public class HomeCommand extends Command {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", identifier) Template.template("value", identifier)
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -178,7 +178,7 @@ public class HomeCommand extends Command {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", identifier) Template.template("value", identifier)
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }

55
Core/src/main/java/com/plotsquared/core/command/Inbox.java
View File

@ -44,6 +44,7 @@ import com.plotsquared.core.util.task.RunnableVal;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -79,9 +80,9 @@ public class Inbox extends SubCommand {
max = comments.length; max = comments.length;
} }
TextComponent.Builder builder = Component.text(); TextComponent.Builder builder = Component.text();
builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n', builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
Template.of("amount", String.valueOf(comments.length)), Template.of("cur", String.valueOf(page + 1)), TemplateResolver.templates(Template.template("amount", String.valueOf(comments.length)), Template.template("cur", String.valueOf(page + 1)),
Template.of("max", String.valueOf(totalPages + 1)), Template.of("word", "all") Template.template("max", String.valueOf(totalPages + 1)), Template.template("word", "all"))
)); ));
// This might work xD // This might work xD
@ -90,30 +91,32 @@ public class Inbox extends SubCommand {
Component commentColored; Component commentColored;
if (player.getName().equals(comment.senderName)) { if (player.getName().equals(comment.senderName)) {
commentColored = MINI_MESSAGE commentColored = MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("list.comment_list_by_lister").getComponent(player), TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
Template.of("comment", comment.comment) TemplateResolver.templates(Template.template("comment", comment.comment))
); );
} else { } else {
commentColored = MINI_MESSAGE commentColored = MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("list.comment_list_by_other").getComponent(player), TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
Template.of("comment", comment.comment) TemplateResolver.templates(Template.template("comment", comment.comment))
); );
} }
Template number = Template.of("number", String.valueOf(x)); Template number = Template.template("number", String.valueOf(x));
Template world = Template.of("world", comment.world); Template world = Template.template("world", comment.world);
Template plot_id = Template.of("plot_id", comment.id.getX() + ";" + comment.id.getY()); Template plot_id = Template.template("plot_id", comment.id.getX() + ";" + comment.id.getY());
Template commenter = Template.of("commenter", comment.senderName); Template commenter = Template.template("commenter", comment.senderName);
Template commentTemplate = Template.of("comment", commentColored); Template commentTemplate = Template.template("comment", commentColored);
builder.append(MINI_MESSAGE builder.append(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("list.comment_list_comment").getComponent(player), TranslatableCaption.of("list.comment_list_comment").getComponent(player),
number, TemplateResolver.templates(
world, number,
plot_id, world,
commenter, plot_id,
commentTemplate commenter,
commentTemplate
)
)); ));
} }
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build()))); player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
@ -150,20 +153,20 @@ public class Inbox extends SubCommand {
if (total != 0) { if (total != 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.inbox_item"), TranslatableCaption.of("comment.inbox_item"),
Template.of("value", inbox + " (" + total + '/' + unread + ')') Template.template("value", inbox + " (" + total + '/' + unread + ')')
); );
return; return;
} }
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.inbox_item"), TranslatableCaption.of("comment.inbox_item"),
Template.of("value", inbox.toString()) Template.template("value", inbox.toString())
); );
} }
})) { })) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.inbox_item"), TranslatableCaption.of("comment.inbox_item"),
Template.of("value", inbox.toString()) Template.template("value", inbox.toString())
); );
} }
} }
@ -174,7 +177,7 @@ public class Inbox extends SubCommand {
if (inbox == null) { if (inbox == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.invalid_inbox"), TranslatableCaption.of("comment.invalid_inbox"),
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), ", ")) Template.template("list", StringMan.join(CommentManager.inboxes.keySet(), ", "))
); );
return false; return false;
} }
@ -197,7 +200,7 @@ public class Inbox extends SubCommand {
if (args.length != 3) { if (args.length != 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot inbox " + inbox + " delete <index>") Template.template("value", "/plot inbox " + inbox + " delete <index>")
); );
return true; return true;
} }
@ -214,7 +217,7 @@ public class Inbox extends SubCommand {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot inbox " + inbox + " delete <index>") Template.template("value", "/plot inbox " + inbox + " delete <index>")
); );
return false; return false;
} }
@ -235,7 +238,7 @@ public class Inbox extends SubCommand {
if (success) { if (success) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"), TranslatableCaption.of("comment.comment_removed_success"),
Template.of("value", comment.comment) Template.template("value", comment.comment)
); );
} else { } else {
player.sendMessage( player.sendMessage(
@ -256,7 +259,7 @@ public class Inbox extends SubCommand {
if (!comments.isEmpty()) { if (!comments.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("comment.comment_removed_success"), TranslatableCaption.of("comment.comment_removed_success"),
Template.of("value", String.valueOf(comments)) Template.template("value", String.valueOf(comments))
); );
plot.getPlotCommentContainer().removeComments(comments); plot.getPlotCommentContainer().removeComments(comments);
} }

4
Core/src/main/java/com/plotsquared/core/command/Info.java
View File

@ -97,7 +97,7 @@ public class Info extends SubCommand {
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) { .hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString()) Template.template("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
); );
return true; return true;
} }
@ -119,7 +119,7 @@ public class Info extends SubCommand {
if (!hasOwner && !containsEveryone && !trustedEveryone) { if (!hasOwner && !containsEveryone && !trustedEveryone) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("info.plot_info_unclaimed"), TranslatableCaption.of("info.plot_info_unclaimed"),
Template.of("plot", plot.getId().getX() + ";" + plot.getId().getY()) Template.template("plot", plot.getId().getX() + ";" + plot.getId().getY())
); );
return true; return true;
} }

8
Core/src/main/java/com/plotsquared/core/command/Kick.java
View File

@ -89,7 +89,7 @@ public class Kick extends SubCommand {
} else if (throwable != null || uuids.isEmpty()) { } else if (throwable != null || uuids.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} else { } else {
Set<PlotPlayer<?>> players = new HashSet<>(); Set<PlotPlayer<?>> players = new HashSet<>();
@ -113,7 +113,7 @@ public class Kick extends SubCommand {
if (players.isEmpty()) { if (players.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
return; return;
} }
@ -121,14 +121,14 @@ public class Kick extends SubCommand {
if (!plot.equals(player2.getCurrentPlot())) { if (!plot.equals(player2.getCurrentPlot())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
return; return;
} }
if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) { if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("cluster.cannot_kick_player"), TranslatableCaption.of("cluster.cannot_kick_player"),
Template.of("name", player2.getName()) Template.template("name", player2.getName())
); );
return; return;
} }

2
Core/src/main/java/com/plotsquared/core/command/Leave.java
View File

@ -74,7 +74,7 @@ public class Leave extends Command {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.plot_left"), TranslatableCaption.of("member.plot_left"),
Template.of("player", player.getName()) Template.template("player", player.getName())
); );
} else { } else {
player.sendMessage( player.sendMessage(

6
Core/src/main/java/com/plotsquared/core/command/Like.java
View File

@ -160,7 +160,7 @@ public class Like extends SubCommand {
if (oldRating != null) { if (oldRating != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"), TranslatableCaption.of("ratings.rating_already_exists"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
return; return;
} }
@ -178,12 +178,12 @@ public class Like extends SubCommand {
if (like) { if (like) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_liked"), TranslatableCaption.of("ratings.rating_liked"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_disliked"), TranslatableCaption.of("ratings.rating_disliked"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
} }

33
Core/src/main/java/com/plotsquared/core/command/ListCmd.java
View File

@ -54,6 +54,7 @@ import com.plotsquared.core.uuid.UUIDMapping;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.ArrayList; import java.util.ArrayList;
@ -166,7 +167,7 @@ public class ListCmd extends SubCommand {
if (query == null) { if (query == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.did_you_mean"), TranslatableCaption.of("commandconfig.did_you_mean"),
Template.of( Template.template(
"value", "value",
new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch() new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch()
) )
@ -426,18 +427,18 @@ public class ListCmd extends SubCommand {
} else { } else {
color = TranslatableCaption.of("info.plot_list_default"); 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), TranslatableCaption.of("info.plot_info_trusted").getComponent(player),
Template.of("trusted", PlayerManager.getPlayerList(plot.getTrusted(), player)) TemplateResolver.templates(Template.template("trusted", PlayerManager.getPlayerList(plot.getTrusted(), player)))
); );
Component members = MINI_MESSAGE.parse( Component members = MINI_MESSAGE.deserialize(
TranslatableCaption.of("info.plot_info_members").getComponent(player), TranslatableCaption.of("info.plot_info_members").getComponent(player),
Template.of("members", PlayerManager.getPlayerList(plot.getMembers(), player)) TemplateResolver.templates(Template.template("members", PlayerManager.getPlayerList(plot.getMembers(), player)))
); );
Template command_tp = Template.of("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId()); Template command_tp = Template.template("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId());
Template command_info = Template.of("command_info", "/plot info " + plot.getArea() + ";" + plot.getId()); Template command_info = Template.template("command_info", "/plot info " + plot.getArea() + ";" + plot.getId());
Template hover_info = Template hover_info =
Template.of( Template.template(
"hover_info", "hover_info",
MINI_MESSAGE.serialize(Component MINI_MESSAGE.serialize(Component
.text() .text()
@ -446,10 +447,10 @@ public class ListCmd extends SubCommand {
.append(members) .append(members)
.asComponent()) .asComponent())
); );
Template numberTemplate = Template.of("number", String.valueOf(i)); Template numberTemplate = Template.template("number", String.valueOf(i));
Template plotTemplate = Template.of( Template plotTemplate = Template.template(
"plot", "plot",
MINI_MESSAGE.parse(color.getComponent(player), Template.of("plot", plot.toString())) MINI_MESSAGE.deserialize(color.getComponent(player), TemplateResolver.templates(Template.template("plot", plot.toString())))
); );
String prefix = ""; String prefix = "";
@ -461,12 +462,12 @@ public class ListCmd extends SubCommand {
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS); .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
for (final UUIDMapping uuidMapping : names) { for (final UUIDMapping uuidMapping : names) {
PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid()); PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
Template prefixTemplate = Template.of("prefix", prefix); Template prefixTemplate = Template.template("prefix", prefix);
Template playerTemplate = Template.of("player", uuidMapping.getUsername()); Template playerTemplate = Template.template("player", uuidMapping.getUsername());
if (pp != null) { if (pp != null) {
builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate)); builder.append(MINI_MESSAGE.deserialize(online, TemplateResolver.templates(prefixTemplate, playerTemplate)));
} else { } else {
builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate)); builder.append(MINI_MESSAGE.deserialize(offline, TemplateResolver.templates(prefixTemplate, playerTemplate)));
} }
prefix = ", "; prefix = ", ";
} }
@ -487,7 +488,7 @@ public class ListCmd extends SubCommand {
} catch (TimeoutException e) { } catch (TimeoutException e) {
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout")); player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
} }
Template players = Template.of("players", builder.asComponent()); Template players = Template.template("players", builder.asComponent());
caption.set(TranslatableCaption.of("info.plot_list_item")); caption.set(TranslatableCaption.of("info.plot_list_item"));
caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players); caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);
} }

10
Core/src/main/java/com/plotsquared/core/command/Load.java
View File

@ -105,7 +105,7 @@ public class Load extends SubCommand {
// No schematics found: // No schematics found:
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.load_null"), TranslatableCaption.of("web.load_null"),
Template.of("command", "/plot load") Template.template("command", "/plot load")
); );
return false; return false;
} }
@ -116,7 +116,7 @@ public class Load extends SubCommand {
// use /plot load <index> // use /plot load <index>
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_valid_number"), TranslatableCaption.of("invalid.not_valid_number"),
Template.of("value", "(1, " + schematics.size() + ')') Template.template("value", "(1, " + schematics.size() + ')')
); );
return false; return false;
} }
@ -136,7 +136,7 @@ public class Load extends SubCommand {
plot.removeRunning(); plot.removeRunning();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid"), TranslatableCaption.of("schematics.schematic_invalid"),
Template.of("reason", "non-existent or not in gzip format") Template.template("reason", "non-existent or not in gzip format")
); );
return; return;
} }
@ -167,7 +167,7 @@ public class Load extends SubCommand {
plot.removeRunning(); plot.removeRunning();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot load <index>") Template.template("value", "/plot load <index>")
); );
return false; return false;
} }
@ -218,7 +218,7 @@ public class Load extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("web.load_list"), TranslatableCaption.of("web.load_list"),
Template.of("command", "/plot load #") Template.template("command", "/plot load #")
); );
} }
} }

2
Core/src/main/java/com/plotsquared/core/command/MainCommand.java
View File

@ -318,7 +318,7 @@ public class MainCommand extends Command {
if (message != null) { if (message != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.error"), TranslatableCaption.of("errors.error"),
net.kyori.adventure.text.minimessage.Template.of("value", message) net.kyori.adventure.text.minimessage.Template.template("value", message)
); );
} else { } else {
player.sendMessage( player.sendMessage(

35
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@ -43,6 +43,7 @@ import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.PlotExpression;
import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.StringMan;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID; import java.util.UUID;
@ -122,11 +123,11 @@ public class Merge extends SubCommand {
if (direction == null) { if (direction == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]") Template.template("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]")
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("help.direction"), TranslatableCaption.of("help.direction"),
Template.of("dir", direction(location.getYaw())) Template.template("dir", direction(location.getYaw()))
); );
return false; return false;
} }
@ -137,7 +138,7 @@ public class Merge extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Merge") Template.template("value", "Merge")
); );
return false; return false;
} }
@ -148,7 +149,7 @@ public class Merge extends SubCommand {
if (!force && size - 1 > maxSize) { if (!force && size - 1 > maxSize) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_MERGE + "." + (size + 1)) Template.template("node", Permission.PERMISSION_MERGE + "." + (size + 1))
); );
return false; return false;
} }
@ -175,7 +176,7 @@ public class Merge extends SubCommand {
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) { .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
); );
return true; return true;
} }
@ -184,8 +185,8 @@ public class Merge extends SubCommand {
this.econHandler.withdrawMoney(player, price); this.econHandler.withdrawMoney(player, price);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(price)), Template.template("money", this.econHandler.format(price)),
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player))) Template.template("balance", this.econHandler.format(this.econHandler.getMoney(player)))
); );
} }
player.sendMessage(TranslatableCaption.of("merge.success_merge")); player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@ -199,7 +200,7 @@ public class Merge extends SubCommand {
&& this.econHandler.getMoney(player) < price) { && this.econHandler.getMoney(player) < price) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_merge"), TranslatableCaption.of("economy.cannot_afford_merge"),
Template.of("money", this.econHandler.format(price)) Template.template("money", this.econHandler.format(price))
); );
return false; return false;
} }
@ -213,7 +214,7 @@ public class Merge extends SubCommand {
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) { .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD)) Template.template("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
); );
return true; return true;
} }
@ -222,7 +223,7 @@ public class Merge extends SubCommand {
this.econHandler.withdrawMoney(player, price); this.econHandler.withdrawMoney(player, price);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(price)) Template.template("money", this.econHandler.format(price))
); );
} }
player.sendMessage(TranslatableCaption.of("merge.success_merge")); player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@ -238,7 +239,7 @@ public class Merge extends SubCommand {
if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) { if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER))
); );
return false; return false;
} }
@ -263,14 +264,14 @@ public class Merge extends SubCommand {
if (!force && this.econHandler.getMoney(player) < price) { if (!force && this.econHandler.getMoney(player) < price) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_merge"), TranslatableCaption.of("economy.cannot_afford_merge"),
Template.of("money", this.econHandler.format(price)) Template.template("money", this.econHandler.format(price))
); );
return; return;
} }
this.econHandler.withdrawMoney(player, price); this.econHandler.withdrawMoney(player, price);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", this.econHandler.format(price)) Template.template("money", this.econHandler.format(price))
); );
} }
player.sendMessage(TranslatableCaption.of("merge.success_merge")); player.sendMessage(TranslatableCaption.of("merge.success_merge"));
@ -278,10 +279,12 @@ public class Merge extends SubCommand {
}; };
if (!force && hasConfirmation(player)) { if (!force && hasConfirmation(player)) {
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
.parse( .deserialize(
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player), TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
Template.of("player", player.getName()), TemplateResolver.templates(
Template.of("location", plot.getWorldName() + ";" + plot.getId()) Template.template("player", player.getName()),
Template.template("location", plot.getWorldName() + ";" + plot.getId())
)
)), )),
run run
); );

4
Core/src/main/java/com/plotsquared/core/command/Move.java
View File

@ -110,8 +110,8 @@ public class Move extends SubCommand {
if (result) { if (result) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("move.move_success"), TranslatableCaption.of("move.move_success"),
Template.of("origin", plot1.toString()), Template.template("origin", plot1.toString()),
Template.of("target", plot2.toString()) Template.template("target", plot2.toString())
); );
return true; return true;
} else { } else {

14
Core/src/main/java/com/plotsquared/core/command/Music.java
View File

@ -80,7 +80,7 @@ public class Music extends SubCommand {
.hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) { .hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER)) Template.template("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER))
); );
return true; return true;
} }
@ -103,15 +103,15 @@ public class Music extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
getPlayer().sendMessage( getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music removal") Template.template("value", "Music removal")
); );
return true; return true;
} }
plot.removeFlag(event.getFlag()); plot.removeFlag(event.getFlag());
getPlayer().sendMessage( getPlayer().sendMessage(
TranslatableCaption.of("flag.flag_removed"), TranslatableCaption.of("flag.flag_removed"),
Template.of("flag", "music"), Template.template("flag", "music"),
Template.of("value", "music_disc") Template.template("value", "music_disc")
); );
} else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) { } else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class) PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
@ -120,13 +120,13 @@ public class Music extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
getPlayer().sendMessage( getPlayer().sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music addition") Template.template("value", "Music addition")
); );
return true; return true;
} }
plot.setFlag(event.getFlag()); plot.setFlag(event.getFlag());
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", "music"), getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"), Template.template("flag", "music"),
Template.of("value", String.valueOf(event.getFlag().getValue())) Template.template("value", String.valueOf(event.getFlag().getValue()))
); );
} else { } else {
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added")); getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));

2
Core/src/main/java/com/plotsquared/core/command/Near.java
View File

@ -55,7 +55,7 @@ public class Near extends Command {
final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot")); final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("near.plot_near"), TranslatableCaption.of("near.plot_near"),
Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", ")) Template.template("list", StringMan.join(plot.getPlayersInPlot(), ", "))
); );
return CompletableFuture.completedFuture(true); return CompletableFuture.completedFuture(true);
} }

14
Core/src/main/java/com/plotsquared/core/command/Owner.java
View File

@ -73,7 +73,7 @@ public class Owner extends SetCommand {
if (value == null || value.isEmpty()) { if (value == null || value.isEmpty()) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot setowner <owner>") Template.template("value", "/plot setowner <owner>")
); );
return false; return false;
} }
@ -85,7 +85,7 @@ public class Owner extends SetCommand {
&& !value.equalsIgnoreCase("-")) { && !value.equalsIgnoreCase("-")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", value) Template.template("value", value)
); );
return; return;
} }
@ -99,7 +99,7 @@ public class Owner extends SetCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Owner change") Template.template("value", "Owner change")
); );
return; return;
} }
@ -122,7 +122,7 @@ public class Owner extends SetCommand {
if (unlinkEvent.getEventResult() == Result.DENY) { if (unlinkEvent.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Unlink on owner change") Template.template("value", "Unlink on owner change")
); );
return; return;
} }
@ -142,7 +142,7 @@ public class Owner extends SetCommand {
if (plot.isOwner(uuid)) { if (plot.isOwner(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_owner"), TranslatableCaption.of("member.already_owner"),
Template.of("player", PlayerManager.getName(uuid, false)) Template.template("player", PlayerManager.getName(uuid, false))
); );
return; return;
} }
@ -151,7 +151,7 @@ public class Owner extends SetCommand {
if (other == null) { if (other == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player_offline"), TranslatableCaption.of("errors.invalid_player_offline"),
Template.of("player", PlayerManager.getName(uuid)) Template.template("player", PlayerManager.getName(uuid))
); );
return; return;
} }
@ -187,7 +187,7 @@ public class Owner extends SetCommand {
if (other != null) { if (other != null) {
other.sendMessage( other.sendMessage(
TranslatableCaption.of("owner.now_owner"), TranslatableCaption.of("owner.now_owner"),
Template.of("plot", plot.getArea() + ";" + plot.getId()) Template.template("plot", plot.getArea() + ";" + plot.getId())
); );
} }
} else { } else {

4
Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
View File

@ -46,7 +46,7 @@ public class PluginCmd extends SubCommand {
StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared
.platform() .platform()
.pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"), .pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"),
Template.of("version", String.valueOf(PlotSquared.get().getVersion())) Template.template("version", String.valueOf(PlotSquared.get().getVersion()))
); );
player.sendMessage(StaticCaption.of( player.sendMessage(StaticCaption.of(
"<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>")); "<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
@ -56,7 +56,7 @@ public class PluginCmd extends SubCommand {
"<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>")); "<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
player.sendMessage( player.sendMessage(
StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"), StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"),
Template.of("value", String.valueOf(PremiumVerification.isPremium())) Template.template("value", String.valueOf(PremiumVerification.isPremium()))
); );
}); });
return true; return true;

10
Core/src/main/java/com/plotsquared/core/command/Purge.java
View File

@ -103,7 +103,7 @@ public class Purge extends SubCommand {
if (area == null) { if (area == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"), TranslatableCaption.of("errors.not_valid_plot_world"),
Template.of("value", split[1]) Template.template("value", split[1])
); );
return false; return false;
} }
@ -115,7 +115,7 @@ public class Purge extends SubCommand {
} catch (IllegalArgumentException ignored) { } catch (IllegalArgumentException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_valid_plot_id"), TranslatableCaption.of("invalid.not_valid_plot_id"),
Template.of("value", split[1]) Template.template("value", split[1])
); );
return false; return false;
} }
@ -126,7 +126,7 @@ public class Purge extends SubCommand {
if (ownerMapping == null) { if (ownerMapping == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", split[1]) Template.template("value", split[1])
); );
return false; return false;
} }
@ -138,7 +138,7 @@ public class Purge extends SubCommand {
if (addedMapping == null) { if (addedMapping == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", split[1]) Template.template("value", split[1])
); );
return false; return false;
} }
@ -243,7 +243,7 @@ public class Purge extends SubCommand {
DBFunc.purgeIds(ids); DBFunc.purgeIds(ids);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("purge.purge_success"), TranslatableCaption.of("purge.purge_success"),
Template.of("amount", ids.size() + "/" + toDelete.size()) Template.template("amount", ids.size() + "/" + toDelete.size())
); );
}); });
} }

8
Core/src/main/java/com/plotsquared/core/command/Rate.java
View File

@ -155,7 +155,7 @@ public class Rate extends SubCommand {
if (plot.getRatings().containsKey(player.getUUID())) { if (plot.getRatings().containsKey(player.getUUID())) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"), TranslatableCaption.of("ratings.rating_already_exists"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
return; return;
} }
@ -175,7 +175,7 @@ public class Rate extends SubCommand {
plot.addRating(this.getPlayer().getUUID(), event.getRating()); plot.addRating(this.getPlayer().getUUID(), event.getRating());
getPlayer().sendMessage( getPlayer().sendMessage(
TranslatableCaption.of("ratings.rating_applied"), TranslatableCaption.of("ratings.rating_applied"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
return false; return false;
@ -248,7 +248,7 @@ public class Rate extends SubCommand {
if (plot.getRatings().containsKey(uuid)) { if (plot.getRatings().containsKey(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_already_exists"), TranslatableCaption.of("ratings.rating_already_exists"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
return; return;
} }
@ -258,7 +258,7 @@ public class Rate extends SubCommand {
plot.addRating(uuid, event.getRating()); plot.addRating(uuid, event.getRating());
player.sendMessage( player.sendMessage(
TranslatableCaption.of("ratings.rating_applied"), TranslatableCaption.of("ratings.rating_applied"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
}; };

10
Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java
View File

@ -65,18 +65,18 @@ public class RegenAllRoads extends SubCommand {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_valid_number"), TranslatableCaption.of("invalid.not_valid_number"),
Template.of("value", "(0, 256)") Template.template("value", "(0, 256)")
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot regenallroads <world> [height]") Template.template("value", "/plot regenallroads <world> [height]")
); );
return false; return false;
} }
} else if (args.length != 1) { } else if (args.length != 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot regenallroads <world> [height]") Template.template("value", "/plot regenallroads <world> [height]")
); );
return false; return false;
} }
@ -84,7 +84,7 @@ public class RegenAllRoads extends SubCommand {
if (area == null) { if (area == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"), TranslatableCaption.of("errors.not_valid_plot_world"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
return false; return false;
} }
@ -96,7 +96,7 @@ public class RegenAllRoads extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("debugroadregen.schematic"), TranslatableCaption.of("debugroadregen.schematic"),
Template.of("command", "/plot createroadschematic") Template.template("command", "/plot createroadschematic")
); );
player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started")); player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started"));
boolean result = this.hybridUtils.scheduleRoadUpdate(area, height); boolean result = this.hybridUtils.scheduleRoadUpdate(area, height);

6
Core/src/main/java/com/plotsquared/core/command/Remove.java
View File

@ -86,7 +86,7 @@ public class Remove extends SubCommand {
} else if (throwable != null) { } else if (throwable != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
return; return;
} else if (!uuids.isEmpty()) { } else if (!uuids.isEmpty()) {
@ -123,12 +123,12 @@ public class Remove extends SubCommand {
if (count == 0) { if (count == 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.removed_players"), TranslatableCaption.of("member.removed_players"),
Template.of("amount", count + "") Template.template("amount", count + "")
); );
} }
}); });

4
Core/src/main/java/com/plotsquared/core/command/Save.java
View File

@ -48,7 +48,7 @@ import java.util.UUID;
/** /**
* @deprecated In favor of "/plot download" (Arkitektonika) and scheduled * @deprecated In favor of "/plot download" (Arkitektonika) and scheduled
* for removal within the next major release. * for removal within the next major release.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
@CommandDeclaration(command = "save", @CommandDeclaration(command = "save",
@ -123,7 +123,7 @@ public class Save extends SubCommand {
player.sendMessage(TranslatableCaption.of("web.save_success")); player.sendMessage(TranslatableCaption.of("web.save_success"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.deprecated_commands"), TranslatableCaption.of("errors.deprecated_commands"),
Template.of("replacement", "/plot download") Template.template("replacement", "/plot download")
); );
try (final MetaDataAccess<List<String>> schematicAccess = try (final MetaDataAccess<List<String>> schematicAccess =
player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) { player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {

26
Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
View File

@ -80,7 +80,7 @@ public class SchematicCmd extends SubCommand {
if (args.length < 1) { if (args.length < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Possible values: save, paste, exportall, list") Template.template("value", "Possible values: save, paste, exportall, list")
); );
return true; return true;
} }
@ -90,14 +90,14 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_PASTE)) Template.template("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_PASTE))
); );
return false; return false;
} }
if (args.length < 2) { if (args.length < 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Possible values: save, paste, exportall, list") Template.template("value", "Possible values: save, paste, exportall, list")
); );
break; break;
} }
@ -138,7 +138,7 @@ public class SchematicCmd extends SubCommand {
e.printStackTrace(); e.printStackTrace();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid"), TranslatableCaption.of("schematics.schematic_invalid"),
Template.of("reason", "non-existent url: " + location) Template.template("reason", "non-existent url: " + location)
); );
SchematicCmd.this.running = false; SchematicCmd.this.running = false;
return; return;
@ -154,7 +154,7 @@ public class SchematicCmd extends SubCommand {
SchematicCmd.this.running = false; SchematicCmd.this.running = false;
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_invalid"), TranslatableCaption.of("schematics.schematic_invalid"),
Template.of("reason", "non-existent or not in gzip format") Template.template("reason", "non-existent or not in gzip format")
); );
return; return;
} }
@ -191,7 +191,7 @@ public class SchematicCmd extends SubCommand {
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args")); player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Use /plot schematic exportall <area>") Template.template("value", "Use /plot schematic exportall <area>")
); );
return false; return false;
} }
@ -199,7 +199,7 @@ public class SchematicCmd extends SubCommand {
if (area == null) { if (area == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"), TranslatableCaption.of("errors.not_valid_plot_world"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
return false; return false;
} }
@ -208,7 +208,7 @@ public class SchematicCmd extends SubCommand {
player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world")); player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Use /plot sch exportall <area>") Template.template("value", "Use /plot sch exportall <area>")
); );
return false; return false;
} }
@ -222,7 +222,7 @@ public class SchematicCmd extends SubCommand {
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started")); player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.plot_to_schem"), TranslatableCaption.of("schematics.plot_to_schem"),
Template.of("amount", String.valueOf(plots.size())) Template.template("amount", String.valueOf(plots.size()))
); );
} }
} }
@ -230,7 +230,7 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE)) Template.template("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE))
); );
return false; return false;
} }
@ -273,19 +273,19 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_LIST)) Template.template("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_LIST))
); );
return false; return false;
} }
final String string = StringMan.join(this.schematicHandler.getSchematicNames(), "$2, $1"); final String string = StringMan.join(this.schematicHandler.getSchematicNames(), "$2, $1");
player.sendMessage( player.sendMessage(
TranslatableCaption.of("schematics.schematic_list"), TranslatableCaption.of("schematics.schematic_list"),
Template.of("list", string) Template.template("list", string)
); );
} }
default -> player.sendMessage( default -> player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Possible values: save, paste, exportall, list") Template.template("value", "Possible values: save, paste, exportall, list")
); );
} }
return true; return true;

6
Core/src/main/java/com/plotsquared/core/command/Set.java
View File

@ -130,7 +130,7 @@ public class Set extends SubCommand {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.component_illegal_block"), TranslatableCaption.of("invalid.component_illegal_block"),
Template.of("value", forbiddenType) Template.template("value", forbiddenType)
); );
return true; return true;
} }
@ -142,7 +142,7 @@ public class Set extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) { if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_SET_COMPONENT.format(component)) Template.template("node", Permission.PERMISSION_SET_COMPONENT.format(component))
); );
return false; return false;
} }
@ -165,7 +165,7 @@ public class Set extends SubCommand {
plot.removeRunning(); plot.removeRunning();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("working.component_complete"), TranslatableCaption.of("working.component_complete"),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
}); });
if (Settings.QUEUE.NOTIFY_PROGRESS) { if (Settings.QUEUE.NOTIFY_PROGRESS) {

4
Core/src/main/java/com/plotsquared/core/command/SetCommand.java
View File

@ -48,7 +48,7 @@ public abstract class SetCommand extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())) Template.template("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))
); );
player.sendMessage(TranslatableCaption.of("working.plot_not_claimed")); player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
return false; return false;
@ -58,7 +58,7 @@ public abstract class SetCommand extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())) Template.template("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))
); );
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false; return false;

2
Core/src/main/java/com/plotsquared/core/command/SetHome.java
View File

@ -67,7 +67,7 @@ public class SetHome extends SetCommand {
default -> { default -> {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Use /plot set home [none]") Template.template("value", "Use /plot set home [none]")
); );
return false; return false;
} }

2
Core/src/main/java/com/plotsquared/core/command/Setup.java
View File

@ -85,7 +85,7 @@ public class Setup extends SubCommand {
player.sendMessage(TranslatableCaption.of("setup.setup_not_started")); player.sendMessage(TranslatableCaption.of("setup.setup_not_started"));
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "Use /plot setup to start a setup process.") Template.template("value", "Use /plot setup to start a setup process.")
); );
return true; return true;
} }

4
Core/src/main/java/com/plotsquared/core/command/Swap.java
View File

@ -85,8 +85,8 @@ public class Swap extends SubCommand {
return plot1.getPlotModificationManager().move(plot2, player, () -> { return plot1.getPlotModificationManager().move(plot2, player, () -> {
}, true).thenApply(result -> { }, true).thenApply(result -> {
if (result) { if (result) {
player.sendMessage(TranslatableCaption.of("swap.swap_success"), Template.of("origin", String.valueOf(plot1)), player.sendMessage(TranslatableCaption.of("swap.swap_success"), Template.template("origin", String.valueOf(plot1)),
Template.of("target", String.valueOf(plot2)) Template.template("target", String.valueOf(plot2))
); );
return true; return true;
} else { } else {

4
Core/src/main/java/com/plotsquared/core/command/Target.java
View File

@ -59,7 +59,7 @@ public class Target extends SubCommand {
if (args.length == 0) { if (args.length == 0) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot target <<X;Z> | nearest>") Template.template("value", "/plot target <<X;Z> | nearest>")
); );
return false; return false;
} }
@ -83,7 +83,7 @@ public class Target extends SubCommand {
target.getCenter(player::setCompassTarget); target.getCenter(player::setCompassTarget);
player.sendMessage( player.sendMessage(
TranslatableCaption.of("compass.compass_target"), TranslatableCaption.of("compass.compass_target"),
Template.of("target", target.toString()) Template.template("target", target.toString())
); );
return true; return true;
} }

16
Core/src/main/java/com/plotsquared/core/command/Template.java
View File

@ -176,13 +176,13 @@ public class Template extends SubCommand {
if (args[0].equalsIgnoreCase("export")) { if (args[0].equalsIgnoreCase("export")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template export <world>") net.kyori.adventure.text.minimessage.Template.template("value", "/plot template export <world>")
); );
return true; return true;
} else if (args[0].equalsIgnoreCase("import")) { } else if (args[0].equalsIgnoreCase("import")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template import <world> <template>") net.kyori.adventure.text.minimessage.Template.template("value", "/plot template import <world> <template>")
); );
return true; return true;
} }
@ -196,14 +196,14 @@ public class Template extends SubCommand {
if (args.length != 3) { if (args.length != 3) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template import <world> <template>") net.kyori.adventure.text.minimessage.Template.template("value", "/plot template import <world> <template>")
); );
return false; return false;
} }
if (this.plotAreaManager.hasPlotArea(world)) { if (this.plotAreaManager.hasPlotArea(world)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("setup.setup_world_taken"), TranslatableCaption.of("setup.setup_world_taken"),
net.kyori.adventure.text.minimessage.Template.of("value", world) net.kyori.adventure.text.minimessage.Template.template("value", world)
); );
return false; return false;
} }
@ -211,7 +211,7 @@ public class Template extends SubCommand {
if (!result) { if (!result) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("template.invalid_template"), TranslatableCaption.of("template.invalid_template"),
net.kyori.adventure.text.minimessage.Template.of("value", args[2]) net.kyori.adventure.text.minimessage.Template.template("value", args[2])
); );
return false; return false;
} }
@ -249,7 +249,7 @@ public class Template extends SubCommand {
if (args.length != 2) { if (args.length != 2) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template export <world>") net.kyori.adventure.text.minimessage.Template.template("value", "/plot template export <world>")
); );
return false; return false;
} }
@ -257,7 +257,7 @@ public class Template extends SubCommand {
if (area == null) { if (area == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.not_valid_plot_world"), TranslatableCaption.of("errors.not_valid_plot_world"),
net.kyori.adventure.text.minimessage.Template.of("value", args[1]) net.kyori.adventure.text.minimessage.Template.template("value", args[1])
); );
return false; return false;
} }
@ -269,7 +269,7 @@ public class Template extends SubCommand {
e.printStackTrace(); e.printStackTrace();
player.sendMessage( player.sendMessage(
TranslatableCaption.of("template.template_failed"), TranslatableCaption.of("template.template_failed"),
net.kyori.adventure.text.minimessage.Template.of("value", e.getMessage()) net.kyori.adventure.text.minimessage.Template.template("value", e.getMessage())
); );
return; return;
} }

28
Core/src/main/java/com/plotsquared/core/command/Toggle.java
View File

@ -54,12 +54,12 @@ public class Toggle extends Command {
if (toggle(player, "chatspy")) { if (toggle(player, "chatspy")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -75,12 +75,12 @@ public class Toggle extends Command {
if (toggle(player, "worldedit")) { if (toggle(player, "worldedit")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -95,12 +95,12 @@ public class Toggle extends Command {
if (toggle(player, "chat")) { if (toggle(player, "chat")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -115,12 +115,12 @@ public class Toggle extends Command {
if (toggle(player, "ignoreExpireTask")) { if (toggle(player, "ignoreExpireTask")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -135,12 +135,12 @@ public class Toggle extends Command {
if (toggle(player, "disabletitles")) { if (toggle(player, "disabletitles")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -155,12 +155,12 @@ public class Toggle extends Command {
if (toggle(player, "disabletime")) { if (toggle(player, "disabletime")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
} }
@ -175,12 +175,12 @@ public class Toggle extends Command {
if (toggle(player, "debug")) { if (toggle(player, "debug")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_disabled"), TranslatableCaption.of("toggle.toggle_disabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("toggle.toggle_enabled"), TranslatableCaption.of("toggle.toggle_enabled"),
Template.of("setting", command.toString()) Template.template("setting", command.toString())
); );
} }
player.refreshDebug(); player.refreshDebug();

10
Core/src/main/java/com/plotsquared/core/command/Trust.java
View File

@ -93,7 +93,7 @@ public class Trust extends Command {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", args[0]) Template.template("value", args[0])
); );
} }
future.completeExceptionally(throwable); future.completeExceptionally(throwable);
@ -112,7 +112,7 @@ public class Trust extends Command {
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", PlayerManager.getName(uuid)) Template.template("value", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -120,7 +120,7 @@ public class Trust extends Command {
if (currentPlot.isOwner(uuid)) { if (currentPlot.isOwner(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_added"), TranslatableCaption.of("member.already_added"),
Template.of("value", PlayerManager.getName(uuid)) Template.template("value", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -128,7 +128,7 @@ public class Trust extends Command {
if (currentPlot.getTrusted().contains(uuid)) { if (currentPlot.getTrusted().contains(uuid)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("member.already_added"), TranslatableCaption.of("member.already_added"),
Template.of("value", PlayerManager.getName(uuid)) Template.template("value", PlayerManager.getName(uuid))
); );
iterator.remove(); iterator.remove();
continue; continue;
@ -141,7 +141,7 @@ public class Trust extends Command {
if (localTrustSize >= maxTrustSize) { if (localTrustSize >= maxTrustSize) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("members.plot_max_members_trusted"), TranslatableCaption.of("members.plot_max_members_trusted"),
Template.of("amount", String.valueOf(localTrustSize)) Template.template("amount", String.valueOf(localTrustSize))
); );
return; return;
} }

2
Core/src/main/java/com/plotsquared/core/command/Unlink.java
View File

@ -93,7 +93,7 @@ public class Unlink extends SubCommand {
if (event.getEventResult() == Result.DENY) { if (event.getEventResult() == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Unlink") Template.template("value", "Unlink")
); );
return true; return true;
} }

12
Core/src/main/java/com/plotsquared/core/command/Visit.java
View File

@ -107,8 +107,8 @@ public class Visit extends Command {
} else if (plots.size() < page || page < 1) { } else if (plots.size() < page || page < 1) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.number_not_in_range"), TranslatableCaption.of("invalid.number_not_in_range"),
Template.of("min", "1"), Template.template("min", "1"),
Template.of("max", String.valueOf(plots.size())) Template.template("max", String.valueOf(plots.size()))
); );
return; return;
} }
@ -143,7 +143,7 @@ public class Visit extends Command {
// allow visit, if UntrustedVisit flag is set, or if the player has either the plot.visit.other or // allow visit, if UntrustedVisit flag is set, or if the player has either the plot.visit.other or
// plot.admin.visit.untrusted permission // plot.admin.visit.untrusted permission
if (!plot.getFlag(UntrustedVisitFlag.class) && !Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OTHER) if (!plot.getFlag(UntrustedVisitFlag.class) && !Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OTHER)
&& !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) { && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Templates.of("node", "plots.visit.other") Templates.of("node", "plots.visit.other")
@ -154,7 +154,7 @@ public class Visit extends Command {
if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) { if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
Template.of("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED)) Template.template("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED))
); );
return; return;
} }
@ -257,7 +257,7 @@ public class Visit extends Command {
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", args[1]) Template.template("value", args[1])
); );
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
@ -290,7 +290,7 @@ public class Visit extends Command {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("errors.invalid_player"), TranslatableCaption.of("errors.invalid_player"),
Template.of("value", finalArgs[0]) Template.template("value", finalArgs[0])
); );
} }
} else { } else {

13
Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
View File

@ -47,6 +47,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.item.ItemTypes; import com.sk89q.worldedit.world.item.ItemTypes;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
@ -217,7 +218,7 @@ public class ComponentPresetManager {
econHandler.withdrawMoney(getPlayer(), componentPreset.getCost()); econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
getPlayer().sendMessage( getPlayer().sendMessage(
TranslatableCaption.of("economy.removed_balance"), TranslatableCaption.of("economy.removed_balance"),
Template.of("money", econHandler.format(componentPreset.getCost())) Template.template("money", econHandler.format(componentPreset.getCost()))
); );
} }
} }
@ -246,15 +247,15 @@ public class ComponentPresetManager {
final ComponentPreset preset = allowedPresets.get(i); final ComponentPreset preset = allowedPresets.get(i);
final List<String> lore = new ArrayList<>(); final List<String> lore = new ArrayList<>();
if (preset.getCost() > 0 && this.econHandler.isEnabled(plot.getArea())) { if (preset.getCost() > 0 && this.econHandler.isEnabled(plot.getArea())) {
lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse( lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
TranslatableCaption.of("preset.preset_lore_cost").getComponent(player), TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
Template.of("cost", String.format("%.2f", preset.getCost())) TemplateResolver.templates(Template.template("cost", String.format("%.2f", preset.getCost())))
))); )));
} }
lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse( lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
TranslatableCaption.of("preset.preset_lore_component").getComponent(player), TranslatableCaption.of("preset.preset_lore_component").getComponent(player),
Template.of("component", preset.getComponent().name().toLowerCase()), TemplateResolver.templates(Template.template("component", preset.getComponent().name().toLowerCase()),
Template.of("prefix", TranslatableCaption.of("core.prefix").getComponent(player)) Template.template("prefix", TranslatableCaption.of("core.prefix").getComponent(player)))
))); )));
lore.removeIf(String::isEmpty); lore.removeIf(String::isEmpty);
lore.addAll(preset.getDescription()); lore.addAll(preset.getDescription());

4
Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java
View File

@ -74,7 +74,7 @@ public interface ConfigurationSection {
* *
* @param path Path to check for existence. * @param path Path to check for existence.
* @return True if this section contains the requested path, either via * @return True if this section contains the requested path, either via
* default or being set. * default or being set.
* @throws IllegalArgumentException Thrown when path is {@code null}. * @throws IllegalArgumentException Thrown when path is {@code null}.
*/ */
boolean contains(String path); boolean contains(String path);
@ -88,7 +88,7 @@ public interface ConfigurationSection {
* *
* @param path Path to check for existence. * @param path Path to check for existence.
* @return True if this section contains the requested path, regardless of * @return True if this section contains the requested path, regardless of
* having a default. * having a default.
* @throws IllegalArgumentException Thrown when path is {@code null}. * @throws IllegalArgumentException Thrown when path is {@code null}.
*/ */
boolean isSet(String path); boolean isSet(String path);

5
Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java
View File

@ -61,6 +61,7 @@ public class CaptionUtility {
) )
); );
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
/** /**
* Format a chat message but keep the formatting keys * Format a chat message but keep the formatting keys
@ -106,9 +107,9 @@ public class CaptionUtility {
*/ */
public static String stripClickEvents(final @NonNull String miniMessageString) { public static String stripClickEvents(final @NonNull String miniMessageString) {
// parse, transform and serialize again // parse, transform and serialize again
Component component = MiniMessage.get().parse(miniMessageString); Component component = MINI_MESSAGE.parse(miniMessageString);
component = CLICK_STRIP_TRANSFORM.transform(component); component = CLICK_STRIP_TRANSFORM.transform(component);
return MiniMessage.get().serialize(component); return MINI_MESSAGE.serialize(component);
} }
/** /**

33
Core/src/main/java/com/plotsquared/core/configuration/caption/Templates.java
View File

@ -29,6 +29,7 @@ import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.PlayerManager;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID; import java.util.UUID;
@ -53,13 +54,35 @@ public final class Templates {
* @param caption Caption object * @param caption Caption object
* @param replacements Replacements * @param replacements Replacements
* @return Generated template * @return Generated template
* @deprecated Use {@link #template(LocaleHolder, String, Caption, Template...)} instead. This method is going to
* be removed once MiniMessage drops {@link MiniMessage#parse(String, Template...)}
*/ */
@Deprecated(forRemoval = true, since = "6.2.0")
public static @NonNull Template of( public static @NonNull Template of(
final @NonNull LocaleHolder localeHolder, final @NonNull LocaleHolder localeHolder,
final @NonNull String key, final @NonNull Caption caption, final @NonNull String key, final @NonNull Caption caption,
final @NonNull Template... replacements final @NonNull Template... replacements
) { ) {
return Template.of(key, MINI_MESSAGE.parse(caption.getComponent(localeHolder), replacements)); return Template.template(key, MINI_MESSAGE.parse(caption.getComponent(localeHolder), replacements));
}
/**
* Create a {@link net.kyori.adventure.text.minimessage.Template} from a PlotSquared {@link Caption}
*
* @param localeHolder Locale holder
* @param key Template key
* @param caption Caption object
* @param replacements Replacements
* @return Generated template
* @since 6.2.0
*/
public static @NonNull Template template(
final @NonNull LocaleHolder localeHolder,
final @NonNull String key, final @NonNull Caption caption,
final @NonNull Template... replacements
) {
return Template.template(key, MINI_MESSAGE.deserialize(caption.getComponent(localeHolder),
TemplateResolver.templates(replacements)));
} }
/** /**
@ -71,7 +94,7 @@ public final class Templates {
*/ */
public static @NonNull Template of(final @NonNull String key, final @NonNull UUID uuid) { public static @NonNull Template of(final @NonNull String key, final @NonNull UUID uuid) {
final String username = PlayerManager.getName(uuid); final String username = PlayerManager.getName(uuid);
return Template.of(key, username); return Template.template(key, username);
} }
/** /**
@ -82,7 +105,7 @@ public final class Templates {
* @return Generated template * @return Generated template
*/ */
public static @NonNull Template of(final @NonNull String key, final @NonNull String value) { public static @NonNull Template of(final @NonNull String key, final @NonNull String value) {
return Template.of(key, value); return Template.template(key, value);
} }
/** /**
@ -93,7 +116,7 @@ public final class Templates {
* @return Generated template * @return Generated template
*/ */
public static @NonNull Template of(final @NonNull String key, final @NonNull PlotArea area) { public static @NonNull Template of(final @NonNull String key, final @NonNull PlotArea area) {
return Template.of(key, area.toString()); return Template.template(key, area.toString());
} }
/** /**
@ -104,7 +127,7 @@ public final class Templates {
* @return Generated template * @return Generated template
*/ */
public static @NonNull Template of(final @NonNull String key, final @NonNull Number number) { public static @NonNull Template of(final @NonNull String key, final @NonNull Number number) {
return Template.of(key, number.toString()); return Template.template(key, number.toString());
} }
} }

62
Core/src/main/java/com/plotsquared/core/configuration/caption/package-info.java Normal file
View File

@ -0,0 +1,62 @@
/*
* _____ _ _ _____ _
* | __ \| | | | / ____| | |
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
* | |
* |_|
* PlotSquared plot management system for Minecraft
* Copyright (C) 2021 IntellectualSites
*
* 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 <https://www.gnu.org/licenses/>.
*/
/**
* Future versions of MiniMessage, starting of 4.10.0, have a different naming convention. If PlotSquared updates
* MiniMessage, certain methods are going to be renamed to keep up consistency with the new naming convention.
* <br>
* The existing methods have not been deprecated yet, since we don't know when we will update MiniMessage, but we know
* it likely will be a major update, because MiniMessage 4.10.0 did not retain backwards compatibility.
* <br>
* <table border="1">
* <caption>MiniMessage naming convention relevant for PlotSquared API</caption>
* <tr>
* <td>Current method</td>
* <td>Future change</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.Template}</td> <td>{@code Placeholder}</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.Template#template(java.lang.String, java.lang.String)}</td> <td>{@code Placeholder#component(String, ComponentLike)}</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.template.TemplateResolver}</td> <td>{@code PlaceholderResolver}</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.template.TemplateResolver#templates(net.kyori.adventure.text.minimessage.Template...)}</td> <td>{@code PlaceholderResolver#placeholders}</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.MiniMessage#parse(java.lang.String)}</td> <td>{@code MiniMessage#deserialize()}</td>
* </tr>
* <tr>
* <td>{@link net.kyori.adventure.text.minimessage.MiniMessage#get()}</td> <td>{@code MiniMessage#miniMessage()}</td>
* </tr>
* </table>
* <br>
* This table has been added in 6.2.0
*
*/
package com.plotsquared.core.configuration.caption;

1
Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
View File

@ -46,7 +46,6 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;

2
Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
View File

@ -334,7 +334,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
LOGGER.info("- plot schematic: {}", schematic3File.getPath()); LOGGER.info("- plot schematic: {}", schematic3File.getPath());
} }
} }
if ((schematic1 == null&& schematic2 == null) || this.ROAD_WIDTH == 0) { if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
if (Settings.DEBUG) { if (Settings.DEBUG) {
LOGGER.info("- schematic: false"); LOGGER.info("- schematic: false");
} }

62
Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
View File

@ -146,7 +146,7 @@ public class PlotListener {
.hasPermission(player, "plots.admin.entry.denied")) { .hasPermission(player, "plots.admin.entry.denied")) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("deny.no_enter"), TranslatableCaption.of("deny.no_enter"),
Template.of("plot", plot.toString()) Template.template("plot", plot.toString())
); );
return false; return false;
} }
@ -176,18 +176,18 @@ public class PlotListener {
if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) { if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flags.greeting_flag_format"), TranslatableCaption.of("flags.greeting_flag_format"),
Template.of("world", plot.getWorldName()), Template.template("world", plot.getWorldName()),
Template.of("plot_id", plot.getId().toString()), Template.template("plot_id", plot.getId().toString()),
Template.of("alias", plot.getAlias()), Template.template("alias", plot.getAlias()),
Template.of("greeting", greeting) Template.template("greeting", greeting)
); );
} else { } else {
player.sendActionBar( player.sendActionBar(
TranslatableCaption.of("flags.greeting_flag_format"), TranslatableCaption.of("flags.greeting_flag_format"),
Template.of("world", plot.getWorldName()), Template.template("world", plot.getWorldName()),
Template.of("plot_id", plot.getId().toString()), Template.template("plot_id", plot.getId().toString()),
Template.of("alias", plot.getAlias()), Template.template("alias", plot.getAlias()),
Template.of("greeting", greeting) Template.template("greeting", greeting)
); );
} }
} }
@ -198,8 +198,8 @@ public class PlotListener {
final PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid); final PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid);
if (owner != null && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) { if (owner != null && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) {
Caption caption = TranslatableCaption.of("notification.notify_enter"); Caption caption = TranslatableCaption.of("notification.notify_enter");
Template playerTemplate = Template.of("player", player.getName()); Template playerTemplate = Template.template("player", player.getName());
Template plotTemplate = Template.of("plot", plot.getId().toString()); Template plotTemplate = Template.template("plot", plot.getId().toString());
if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) { if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
owner.sendMessage(caption, playerTemplate, plotTemplate); owner.sendMessage(caption, playerTemplate, plotTemplate);
} else { } else {
@ -232,8 +232,8 @@ public class PlotListener {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("gamemode.gamemode_was_bypassed"), TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
Template.of("gamemode", String.valueOf(gameMode)), Template.template("gamemode", String.valueOf(gameMode)),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
} }
@ -247,8 +247,8 @@ public class PlotListener {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("gamemode.gamemode_was_bypassed"), TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
Template.of("gamemode", String.valueOf(guestGameMode)), Template.template("gamemode", String.valueOf(guestGameMode)),
Template.of("plot", plot.getId().toString()) Template.template("plot", plot.getId().toString())
); );
} }
} }
@ -332,10 +332,10 @@ public class PlotListener {
".title_entered_plot"); ".title_entered_plot");
Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" + Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
".title_entered_plot_sub"); ".title_entered_plot_sub");
Template plotTemplate = Template.of("plot", lastPlot.getId().toString()); Template plotTemplate = Template.template("plot", lastPlot.getId().toString());
Template worldTemplate = Template.of("world", player.getLocation().getWorldName()); Template worldTemplate = Template.template("world", player.getLocation().getWorldName());
Template ownerTemplate = Template.of("owner", owner); Template ownerTemplate = Template.template("owner", owner);
Template aliasTemplate = Template.of("alias", plot.getAlias()); Template aliasTemplate = Template.template("alias", plot.getAlias());
final Consumer<String> userConsumer = user -> { final Consumer<String> userConsumer = user -> {
if (Settings.Titles.TITLES_AS_ACTIONBAR) { if (Settings.Titles.TITLES_AS_ACTIONBAR) {
@ -409,8 +409,8 @@ public class PlotListener {
} else { } else {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("gamemode.gamemode_was_bypassed"), TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
Template.of("gamemode", pw.getGameMode().getName().toLowerCase()), Template.template("gamemode", pw.getGameMode().getName().toLowerCase()),
Template.of("plot", plot.toString()) Template.template("plot", plot.toString())
); );
} }
} }
@ -421,18 +421,18 @@ public class PlotListener {
if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) { if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("flags.farewell_flag_format"), TranslatableCaption.of("flags.farewell_flag_format"),
Template.of("world", plot.getWorldName()), Template.template("world", plot.getWorldName()),
Template.of("plot_id", plot.getId().toString()), Template.template("plot_id", plot.getId().toString()),
Template.of("alias", plot.getAlias()), Template.template("alias", plot.getAlias()),
Template.of("farewell", farewell) Template.template("farewell", farewell)
); );
} else { } else {
player.sendActionBar( player.sendActionBar(
TranslatableCaption.of("flags.farewell_flag_format"), TranslatableCaption.of("flags.farewell_flag_format"),
Template.of("world", plot.getWorldName()), Template.template("world", plot.getWorldName()),
Template.of("plot_id", plot.getId().toString()), Template.template("plot_id", plot.getId().toString()),
Template.of("alias", plot.getAlias()), Template.template("alias", plot.getAlias()),
Template.of("farewell", farewell) Template.template("farewell", farewell)
); );
} }
} }
@ -443,8 +443,8 @@ public class PlotListener {
final PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid); final PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid);
if ((owner != null) && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) { if ((owner != null) && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) {
Caption caption = TranslatableCaption.of("notification.notify_leave"); Caption caption = TranslatableCaption.of("notification.notify_leave");
Template playerTemplate = Template.of("player", player.getName()); Template playerTemplate = Template.template("player", player.getName());
Template plotTemplate = Template.of("plot", plot.getId().toString()); Template plotTemplate = Template.template("plot", plot.getId().toString());
if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) { if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
owner.sendMessage(caption, playerTemplate, plotTemplate); owner.sendMessage(caption, playerTemplate, plotTemplate);
} else { } else {

2
Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java
View File

@ -98,7 +98,7 @@ public class WESubscriber {
if (Permissions.hasPermission(plotPlayer, "plots.worldedit.bypass")) { if (Permissions.hasPermission(plotPlayer, "plots.worldedit.bypass")) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("worldedit.worldedit_bypass"), TranslatableCaption.of("worldedit.worldedit_bypass"),
Template.of("command", "/plot toggle worldedit") Template.template("command", "/plot toggle worldedit")
); );
} }
if (this.plotAreaManager.hasPlotArea(world)) { if (this.plotAreaManager.hasPlotArea(world)) {

4
Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
View File

@ -50,6 +50,7 @@ import com.sk89q.worldedit.world.item.ItemType;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID; import java.util.UUID;
@ -161,7 +162,8 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
.replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&') .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
.replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this)); .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
// Parse the message // Parse the message
PlotSquared.platform().consoleAudience().sendMessage(MINI_MESSAGE.parse(message, replacements)); PlotSquared.platform().consoleAudience().sendMessage(MINI_MESSAGE.deserialize(message,
TemplateResolver.templates(replacements)));
} }
@Override @Override

2
Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java
View File

@ -62,7 +62,7 @@ public abstract class MetaDataAccess<T> implements AutoCloseable {
* Check if the player has meta data stored with the given key * Check if the player has meta data stored with the given key
* *
* @return {@code true} if player has meta data with this key, or * @return {@code true} if player has meta data with this key, or
* {@code false} * {@code false}
*/ */
public abstract boolean isPresent(); public abstract boolean isPresent();

10
Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
View File

@ -67,6 +67,7 @@ import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -105,6 +106,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
Collections.synchronizedSet(new HashSet<>()); Collections.synchronizedSet(new HashSet<>());
private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>(); private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
private final LockRepository lockRepository = new LockRepository(); private final LockRepository lockRepository = new LockRepository();
private final PlotAreaManager plotAreaManager; private final PlotAreaManager plotAreaManager;
private final EventDispatcher eventDispatcher; private final EventDispatcher eventDispatcher;
@ -866,9 +868,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
final int fadeIn, final int stay, final int fadeOut, final int fadeIn, final int stay, final int fadeOut,
final @NonNull Template... replacements final @NonNull Template... replacements
) { ) {
final Component titleComponent = MiniMessage.get().parse(title.getComponent(this), replacements); final Component titleComponent = MINI_MESSAGE.deserialize(title.getComponent(this), TemplateResolver.templates(replacements));
final Component subtitleComponent = final Component subtitleComponent =
MiniMessage.get().parse(subtitle.getComponent(this), replacements); MINI_MESSAGE.deserialize(subtitle.getComponent(this), TemplateResolver.templates(replacements));
final Title.Times times = Title.Times.of( final Title.Times times = Title.Times.of(
Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS), Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS),
Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS), Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS),
@ -906,7 +908,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
.replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this)); .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
final Component component = MiniMessage.get().parse(message, replacements); final Component component = MINI_MESSAGE.deserialize(message, TemplateResolver.templates(replacements));
getAudience().sendActionBar(component); getAudience().sendActionBar(component);
} }
@ -932,7 +934,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
.replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&') .replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&')
.replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this)); .replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
// Parse the message // Parse the message
final Component component = MiniMessage.get().parse(message, replacements); final Component component = MINI_MESSAGE.deserialize(message, TemplateResolver.templates(replacements));
if (!Objects.equal(component, this.getMeta("lastMessage")) if (!Objects.equal(component, this.getMeta("lastMessage"))
|| System.currentTimeMillis() - this.<Long>getMeta("lastMessageTime") > 5000) { || System.currentTimeMillis() - this.<Long>getMeta("lastMessageTime") > 5000) {
setMeta("lastMessage", component); setMeta("lastMessage", component);

141
Core/src/main/java/com/plotsquared/core/plot/Plot.java
View File

@ -40,7 +40,6 @@ import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.core.events.TeleportCause; import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.core.generator.ClassicPlotWorld; import com.plotsquared.core.generator.ClassicPlotWorld;
import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.core.listener.PlotListener; import com.plotsquared.core.listener.PlotListener;
import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.BlockLoc;
import com.plotsquared.core.location.Direction; import com.plotsquared.core.location.Direction;
@ -80,6 +79,7 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
@ -449,7 +449,7 @@ public class Plot {
* that could alter the de facto owner of the plot. * that could alter the de facto owner of the plot.
* *
* @return The plot owner of this particular (sub-)plot * @return The plot owner of this particular (sub-)plot
* as stored in the database, if one exists. Else, null. * as stored in the database, if one exists. Else, null.
*/ */
public @Nullable UUID getOwnerAbs() { public @Nullable UUID getOwnerAbs() {
return this.owner; return this.owner;
@ -1201,12 +1201,12 @@ public class Plot {
* *
* @return array of entity counts * @return array of entity counts
* @see RegionManager#countEntities(Plot) * @see RegionManager#countEntities(Plot)
* 0 = Entity * 0 = Entity
* 1 = Animal * 1 = Animal
* 2 = Monster * 2 = Monster
* 3 = Mob * 3 = Mob
* 4 = Boat * 4 = Boat
* 5 = Misc * 5 = Misc
*/ */
public int[] countEntities() { public int[] countEntities() {
int[] count = new int[6]; int[] count = new int[6];
@ -1564,7 +1564,7 @@ public class Plot {
x = bot.getX() + loc.getX(); x = bot.getX() + loc.getX();
z = bot.getZ() + loc.getZ(); z = bot.getZ() + loc.getZ();
} }
if (loc.getY() == Integer.MIN_VALUE) { if (loc.getY() == Integer.MIN_VALUE) {
if (isLoaded()) { if (isLoaded()) {
this.worldUtil.getHighestBlock( this.worldUtil.getHighestBlock(
plot.getWorldName(), plot.getWorldName(),
@ -1707,7 +1707,7 @@ public class Plot {
updateWorldBorder(); updateWorldBorder();
} }
this.getPlotModificationManager().setSign(player.getName()); this.getPlotModificationManager().setSign(player.getName());
player.sendMessage(TranslatableCaption.of("working.claimed"), Template.of("plot", this.getId().toString())); player.sendMessage(TranslatableCaption.of("working.claimed"), Template.template("plot", this.getId().toString()));
if (teleport) { if (teleport) {
if (!auto && Settings.Teleport.ON_CLAIM) { if (!auto && Settings.Teleport.ON_CLAIM) {
teleportPlayer(player, TeleportCause.COMMAND_CLAIM, result -> { teleportPlayer(player, TeleportCause.COMMAND_CLAIM, result -> {
@ -2575,8 +2575,8 @@ public class Plot {
return; return;
} }
Caption caption = TranslatableCaption.of("debug.plot_debug"); Caption caption = TranslatableCaption.of("debug.plot_debug");
Template plotTemplate = Template.of("plot", this.toString()); Template plotTemplate = Template.template("plot", this.toString());
Template messageTemplate = Template.of("message", message); Template messageTemplate = Template.template("message", message);
for (final PlotPlayer<?> player : players) { for (final PlotPlayer<?> player : players) {
if (isOwner(player.getUUID()) || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_DEBUG_OTHER)) { if (isOwner(player.getUUID()) || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_DEBUG_OTHER)) {
player.sendMessage(caption, plotTemplate, messageTemplate); player.sendMessage(caption, plotTemplate, messageTemplate);
@ -2609,7 +2609,7 @@ public class Plot {
if (result == Result.DENY) { if (result == Result.DENY) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Teleport") Template.template("value", "Teleport")
); );
resultConsumer.accept(false); resultConsumer.accept(false);
return; return;
@ -2624,7 +2624,7 @@ public class Plot {
} }
player.sendMessage( player.sendMessage(
TranslatableCaption.of("teleport.teleport_in_seconds"), TranslatableCaption.of("teleport.teleport_in_seconds"),
Template.of("amount", String.valueOf(Settings.Teleport.DELAY)) Template.template("amount", String.valueOf(Settings.Teleport.DELAY))
); );
final String name = player.getName(); final String name = player.getName();
TaskManager.addToTeleportQueue(name); TaskManager.addToTeleportQueue(name);
@ -2845,13 +2845,12 @@ public class Plot {
} else { } else {
value = flag.toString(); value = flag.toString();
} }
Component snip = MINI_MESSAGE.parse( Component snip = MINI_MESSAGE.deserialize(
prefix + CaptionUtility.format( prefix + CaptionUtility.format(
player, player,
TranslatableCaption.of("info.plot_flag_list").getComponent(player) TranslatableCaption.of("info.plot_flag_list").getComponent(player)),
), TemplateResolver.templates(Template.template("flag", flag.getName()),
Template.of("flag", flag.getName()), Template.template("value", CaptionUtility.formatRaw(player, value.toString())))
Template.of("value", CaptionUtility.formatRaw(player, value.toString()))
); );
flagBuilder.append(snip); flagBuilder.append(snip);
prefix = ", "; prefix = ", ";
@ -2869,51 +2868,51 @@ public class Plot {
} else { } else {
owner = PlayerManager.getPlayerList(this.getOwners(), player); owner = PlayerManager.getPlayerList(this.getOwners(), player);
} }
Template headerTemplate = Template.of( Template headerTemplate = Template.template(
"header", "header",
TranslatableCaption.of("info.plot_info_header").getComponent(player) TranslatableCaption.of("info.plot_info_header").getComponent(player)
); );
Template footerTemplate = Template.of( Template footerTemplate = Template.template(
"footer", "footer",
TranslatableCaption.of("info.plot_info_footer").getComponent(player) TranslatableCaption.of("info.plot_info_footer").getComponent(player)
); );
Template areaTemplate; Template areaTemplate;
if (this.getArea() != null) { if (this.getArea() != null) {
areaTemplate = areaTemplate =
Template.of( Template.template(
"area", "area",
this.getArea().getWorldName() + (this.getArea().getId() == null this.getArea().getWorldName() + (this.getArea().getId() == null
? "" ? ""
: "(" + this.getArea().getId() + ")") : "(" + this.getArea().getId() + ")")
); );
} else { } else {
areaTemplate = Template.of("area", TranslatableCaption.of("info.none").getComponent(player)); areaTemplate = Template.template("area", TranslatableCaption.of("info.none").getComponent(player));
} }
long creationDate = Long.parseLong(String.valueOf(timestamp)); long creationDate = Long.parseLong(String.valueOf(timestamp));
SimpleDateFormat sdf = new SimpleDateFormat(Settings.Timeformat.DATE_FORMAT); SimpleDateFormat sdf = new SimpleDateFormat(Settings.Timeformat.DATE_FORMAT);
sdf.setTimeZone(TimeZone.getTimeZone(Settings.Timeformat.TIME_ZONE)); sdf.setTimeZone(TimeZone.getTimeZone(Settings.Timeformat.TIME_ZONE));
String newDate = sdf.format(creationDate); String newDate = sdf.format(creationDate);
Template idTemplate = Template.of("id", this.getId().toString()); Template idTemplate = Template.template("id", this.getId().toString());
Template aliasTemplate = Template.of("alias", alias); Template aliasTemplate = Template.template("alias", alias);
Template numTemplate = Template.of("num", String.valueOf(num)); Template numTemplate = Template.template("num", String.valueOf(num));
Template descTemplate = Template.of("desc", description); Template descTemplate = Template.template("desc", description);
Template biomeTemplate = Template.of("biome", biome.toString().toLowerCase()); Template biomeTemplate = Template.template("biome", biome.toString().toLowerCase());
Template ownerTemplate = Template.of("owner", owner); Template ownerTemplate = Template.template("owner", owner);
Template membersTemplate = Template.of("members", members); Template membersTemplate = Template.template("members", members);
Template playerTemplate = Template.of("player", player.getName()); Template playerTemplate = Template.template("player", player.getName());
Template trustedTemplate = Template.of("trusted", trusted); Template trustedTemplate = Template.template("trusted", trusted);
Template helpersTemplate = Template.of("helpers", members); Template helpersTemplate = Template.template("helpers", members);
Template deniedTemplate = Template.of("denied", denied); Template deniedTemplate = Template.template("denied", denied);
Template seenTemplate = Template.of("seen", seen); Template seenTemplate = Template.template("seen", seen);
Template flagsTemplate = Template.of("flags", flags); Template flagsTemplate = Template.template("flags", flags);
Template creationTemplate = Template.of("creationdate", newDate); Template creationTemplate = Template.template("creationdate", newDate);
Template buildTemplate = Template.of("build", String.valueOf(build)); Template buildTemplate = Template.template("build", String.valueOf(build));
if (iInfo.getComponent(player).contains("<rating>")) { if (iInfo.getComponent(player).contains("<rating>")) {
TaskManager.runTaskAsync(() -> { TaskManager.runTaskAsync(() -> {
Template ratingTemplate; Template ratingTemplate;
if (Settings.Ratings.USE_LIKES) { if (Settings.Ratings.USE_LIKES) {
ratingTemplate = Template.of( ratingTemplate = Template.template(
"rating", "rating",
String.format("%.0f%%", Like.getLikesPercentage(this) * 100D) String.format("%.0f%%", Like.getLikesPercentage(this) * 100D)
); );
@ -2931,13 +2930,13 @@ public class Plot {
.append(String.format("%.1f", ratings[i])); .append(String.format("%.1f", ratings[i]));
prefix = ","; prefix = ",";
} }
ratingTemplate = Template.of("rating", rating.toString()); ratingTemplate = Template.template("rating", rating.toString());
} else { } else {
double rating = this.getAverageRating(); double rating = this.getAverageRating();
if (Double.isFinite(rating)) { if (Double.isFinite(rating)) {
ratingTemplate = Template.of("rating", String.format("%.1f", rating) + '/' + max); ratingTemplate = Template.template("rating", String.format("%.1f", rating) + '/' + max);
} else { } else {
ratingTemplate = Template.of( ratingTemplate = Template.template(
"rating", "rating",
TranslatableCaption.of("info.none").getComponent(player) TranslatableCaption.of("info.none").getComponent(player)
); );
@ -2945,9 +2944,35 @@ public class Plot {
} }
} }
future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
.parse( .deserialize(
iInfo.getComponent(player), iInfo.getComponent(player),
headerTemplate, TemplateResolver.templates(headerTemplate,
areaTemplate,
idTemplate,
aliasTemplate,
numTemplate,
descTemplate,
biomeTemplate,
ownerTemplate,
membersTemplate,
playerTemplate,
trustedTemplate,
helpersTemplate,
deniedTemplate,
seenTemplate,
flagsTemplate,
buildTemplate,
ratingTemplate,
creationTemplate,
footerTemplate)
))));
});
return;
}
future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
.deserialize(
iInfo.getComponent(player),
TemplateResolver.templates(headerTemplate,
areaTemplate, areaTemplate,
idTemplate, idTemplate,
aliasTemplate, aliasTemplate,
@ -2963,33 +2988,7 @@ public class Plot {
seenTemplate, seenTemplate,
flagsTemplate, flagsTemplate,
buildTemplate, buildTemplate,
ratingTemplate, footerTemplate)
creationTemplate,
footerTemplate
))));
});
return;
}
future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
.parse(
iInfo.getComponent(player),
headerTemplate,
areaTemplate,
idTemplate,
aliasTemplate,
numTemplate,
descTemplate,
biomeTemplate,
ownerTemplate,
membersTemplate,
playerTemplate,
trustedTemplate,
helpersTemplate,
deniedTemplate,
seenTemplate,
flagsTemplate,
buildTemplate,
footerTemplate
)))); ))));
} }
); );

15
Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
View File

@ -71,6 +71,7 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
@ -411,7 +412,7 @@ public abstract class PlotArea {
this.getFlagContainer().addAll(parseFlags(flags)); this.getFlagContainer().addAll(parseFlags(flags));
ConsolePlayer.getConsole().sendMessage( ConsolePlayer.getConsole().sendMessage(
TranslatableCaption.of("flags.area_flags"), TranslatableCaption.of("flags.area_flags"),
Template.of("flags", flags.toString()) Template.template("flags", flags.toString())
); );
this.spawnEggs = config.getBoolean("event.spawn.egg"); this.spawnEggs = config.getBoolean("event.spawn.egg");
@ -432,7 +433,7 @@ public abstract class PlotArea {
this.getRoadFlagContainer().addAll(parseFlags(roadflags)); this.getRoadFlagContainer().addAll(parseFlags(roadflags));
ConsolePlayer.getConsole().sendMessage( ConsolePlayer.getConsole().sendMessage(
TranslatableCaption.of("flags.road_flags"), TranslatableCaption.of("flags.road_flags"),
Template.of("flags", roadflags.toString()) Template.template("flags", roadflags.toString())
); );
loadConfiguration(config); loadConfiguration(config);
@ -450,14 +451,14 @@ public abstract class PlotArea {
} else { } else {
value = flag.toString(); value = flag.toString();
} }
Component snip = MINI_MESSAGE.parse( Component snip = MINI_MESSAGE.deserialize(
prefix + CaptionUtility prefix + CaptionUtility
.format( .format(
ConsolePlayer.getConsole(), ConsolePlayer.getConsole(),
TranslatableCaption.of("info.plot_flag_list").getComponent(LocaleHolder.console()) TranslatableCaption.of("info.plot_flag_list").getComponent(LocaleHolder.console())
), ),
Template.of("flag", flag.getName()), TemplateResolver.templates(Template.template("flag", flag.getName()),
Template.of("value", CaptionUtility.formatRaw(ConsolePlayer.getConsole(), value.toString())) Template.template("value", CaptionUtility.formatRaw(ConsolePlayer.getConsole(), value.toString())))
); );
if (flagsComponent != null) { if (flagsComponent != null) {
flagsComponent.append(snip); flagsComponent.append(snip);
@ -1305,8 +1306,8 @@ public abstract class PlotArea {
* *
* @return the legacy sign material. * @return the legacy sign material.
* @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and * @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and
* will be removed without replacement in favor of {@link #signMaterial()} * will be removed without replacement in favor of {@link #signMaterial()}
* once we remove the support for 1.13. * once we remove the support for 1.13.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
public String getLegacySignMaterial() { public String getLegacySignMaterial() {

4
Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java
View File

@ -387,7 +387,7 @@ public final class PlotModificationManager {
Caption[] lines = new Caption[]{TranslatableCaption.of("signs.owner_sign_line_1"), TranslatableCaption.of( Caption[] lines = new Caption[]{TranslatableCaption.of("signs.owner_sign_line_1"), TranslatableCaption.of(
"signs.owner_sign_line_2"), "signs.owner_sign_line_2"),
TranslatableCaption.of("signs.owner_sign_line_3"), TranslatableCaption.of("signs.owner_sign_line_4")}; TranslatableCaption.of("signs.owner_sign_line_3"), TranslatableCaption.of("signs.owner_sign_line_4")};
PlotSquared.platform().worldUtil().setSign(location, lines, Template.of("id", id), Template.of("owner", name)); PlotSquared.platform().worldUtil().setSign(location, lines, Template.template("id", id), Template.template("owner", name));
} }
} }
@ -497,7 +497,7 @@ public final class PlotModificationManager {
if (player != null) { if (player != null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("events.event_denied"), TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge on claim") Template.template("value", "Auto merge on claim")
); );
} }
return; return;

4
Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
View File

@ -77,8 +77,8 @@ public class CommentManager {
player.sendTitle( player.sendTitle(
StaticCaption.of(""), StaticCaption.of(""),
TranslatableCaption.of("comment.inbox_notification"), TranslatableCaption.of("comment.inbox_notification"),
Template.of("amount", Integer.toString(total)), Template.template("amount", Integer.toString(total)),
Template.of("command", "/plot inbox") Template.template("command", "/plot inbox")
); );
} }
} }

16
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
View File

@ -152,14 +152,14 @@ public class ExpireManager {
current.getCenter(pp::teleport); current.getCenter(pp::teleport);
metaDataAccess.remove(); metaDataAccess.remove();
Caption msg = TranslatableCaption.of("expiry.expired_options_clicky"); Caption msg = TranslatableCaption.of("expiry.expired_options_clicky");
Template numTemplate = Template.of("num", String.valueOf(num)); Template numTemplate = Template.template("num", String.valueOf(num));
Template areIsTemplate = Template.of("are_or_is", (num > 1 ? "plots are" : "plot is")); Template areIsTemplate = Template.template("are_or_is", (num > 1 ? "plots are" : "plot is"));
Template list_cmd = Template.of("list_cmd", "/plot list expired"); Template list_cmd = Template.template("list_cmd", "/plot list expired");
Template plot = Template.of("plot", current.toString()); Template plot = Template.template("plot", current.toString());
Template cmd_del = Template.of("cmd_del", "/plot delete"); Template cmd_del = Template.template("cmd_del", "/plot delete");
Template cmd_keep_1d = Template.of("cmd_keep_1d", "/plot flag set keep 1d"); Template cmd_keep_1d = Template.template("cmd_keep_1d", "/plot flag set keep 1d");
Template cmd_keep = Template.of("cmd_keep", "/plot flag set keep true"); Template cmd_keep = Template.template("cmd_keep", "/plot flag set keep true");
Template cmd_no_show_expir = Template.of("cmd_no_show_expir", "/plot toggle clear-confirmation"); Template cmd_no_show_expir = Template.template("cmd_no_show_expir", "/plot toggle clear-confirmation");
pp.sendMessage( pp.sendMessage(
msg, msg,
numTemplate, numTemplate,

2
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java
View File

@ -89,7 +89,7 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
final DeniedGroup group = DeniedGroup.fromString(input); final DeniedGroup group = DeniedGroup.fromString(input);
if (group == null) { if (group == null) {
throw new FlagParseException(this, input, TranslatableCaption.of("flags.flag_error_enum"), throw new FlagParseException(this, input, TranslatableCaption.of("flags.flag_error_enum"),
Template.of("list", "members, nonmembers, trusted, nontrusted, nonowners") Template.template("list", "members, nonmembers, trusted, nontrusted, nonowners")
); );
} }
return flagOf(group); return flagOf(group);

4
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FeedFlag.java
View File

@ -49,7 +49,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
this, this,
input, input,
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", input) Template.template("value", input)
); );
} }
if (parsed < 1) { if (parsed < 1) {
@ -57,7 +57,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
this, this,
input, input,
TranslatableCaption.of("invalid.number_not_positive"), TranslatableCaption.of("invalid.number_not_positive"),
Template.of("value", String.valueOf(parsed)) Template.template("value", String.valueOf(parsed))
); );
} }
return parsed; return parsed;

4
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/HealFlag.java
View File

@ -49,7 +49,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
this, this,
input, input,
TranslatableCaption.of("invalid.not_a_number"), TranslatableCaption.of("invalid.not_a_number"),
Template.of("value", input) Template.template("value", input)
); );
} }
if (parsed < 1) { if (parsed < 1) {
@ -57,7 +57,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
this, this,
input, input,
TranslatableCaption.of("invalid.number_not_positive"), TranslatableCaption.of("invalid.number_not_positive"),
Template.of("value", String.valueOf(parsed)) Template.template("value", String.valueOf(parsed))
); );
} }
return parsed; return parsed;

2
Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java
View File

@ -54,7 +54,7 @@ public class TitlesFlag extends PlotFlag<TitlesFlag.TitlesFlagValue, TitlesFlag>
this, this,
input, input,
TranslatableCaption.of("flags.flag_error_enum"), TranslatableCaption.of("flags.flag_error_enum"),
Template.of("list", "none, true, false") Template.template("list", "none, true, false")
); );
} }
return flagOf(titlesFlagValue); return flagOf(titlesFlagValue);

11
Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
View File

@ -39,23 +39,20 @@ import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import java.util.concurrent.atomic.AtomicBoolean;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer; import java.util.function.Consumer;
public abstract class QueueCoordinator { public abstract class QueueCoordinator {
private final AtomicBoolean enqueued = new AtomicBoolean();
private boolean forceSync = false; private boolean forceSync = false;
@Nullable @Nullable
private Object chunkObject; private Object chunkObject;
private final AtomicBoolean enqueued = new AtomicBoolean();
@Inject @Inject
private GlobalBlockQueue blockQueue; private GlobalBlockQueue blockQueue;
@ -205,8 +202,8 @@ public abstract class QueueCoordinator {
* @param biome biome * @param biome biome
* @return success or not * @return success or not
* @deprecated Biomes now take XYZ, see {@link #setBiome(int, int, int, BiomeType)} * @deprecated Biomes now take XYZ, see {@link #setBiome(int, int, int, BiomeType)}
* <br> * <br>
* Scheduled for removal once we drop the support for versions not supporting 3D biomes. * Scheduled for removal once we drop the support for versions not supporting 3D biomes.
*/ */
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)
public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome); public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome);

2
Core/src/main/java/com/plotsquared/core/queue/subscriber/DefaultProgressSubscriber.java
View File

@ -120,7 +120,7 @@ public class DefaultProgressSubscriber implements ProgressSubscriber {
} }
actor.sendMessage( actor.sendMessage(
caption, caption,
Template.of("progress", String.format("%.2f", this.progress.doubleValue() * 100)) Template.template("progress", String.format("%.2f", this.progress.doubleValue() * 100))
); );
}, interval), wait); }, interval), wait);
} }

2
Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java
View File

@ -213,7 +213,7 @@ public enum CommonSetupSteps implements SetupStep {
} }
if (PlotSquared.platform().worldUtil().isWorld(argument)) { if (PlotSquared.platform().worldUtil().isWorld(argument)) {
if (PlotSquared.get().getPlotAreaManager().hasPlotArea(argument)) { if (PlotSquared.get().getPlotAreaManager().hasPlotArea(argument)) {
plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_taken"), Template.of("value", argument)); plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_taken"), Template.template("value", argument));
return this; return this;
} }
plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_apply_plotsquared")); plotPlayer.sendMessage(TranslatableCaption.of("setup.setup_world_apply_plotsquared"));

8
Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java
View File

@ -84,10 +84,10 @@ public class SettingsNodeStep implements SetupStep {
public void announce(PlotPlayer<?> plotPlayer) { public void announce(PlotPlayer<?> plotPlayer) {
plotPlayer.sendMessage( plotPlayer.sendMessage(
TranslatableCaption.of("setup.setup_step"), TranslatableCaption.of("setup.setup_step"),
Template.of("step", String.valueOf(this.getId() + 1)), Template.template("step", String.valueOf(this.getId() + 1)),
Template.of("description", this.configurationNode.getDescription().getComponent(plotPlayer)), Template.template("description", this.configurationNode.getDescription().getComponent(plotPlayer)),
Template.of("type", this.configurationNode.getType().getType()), Template.template("type", this.configurationNode.getType().getType()),
Template.of("value", String.valueOf(this.configurationNode.getDefaultValue())) Template.template("value", String.valueOf(this.configurationNode.getDefaultValue()))
); );
} }

6
Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java
View File

@ -71,9 +71,9 @@ public final class LockRepository {
* @param runnable Action to run when the lock is available * @param runnable Action to run when the lock is available
*/ */
public void useLock(final @NonNull LockKey key, final @NonNull Runnable runnable) { public void useLock(final @NonNull LockKey key, final @NonNull Runnable runnable) {
try (LockAccess ignored = lock(key)) { try (LockAccess ignored = lock(key)) {
runnable.run(); runnable.run();
} }
} }
/** /**

Some files were not shown because too many files have changed in this diff Show More