Revert "refactor: Address MiniMessage deprecations (#3354)" (#3371)

This reverts commit f086826942.

Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java

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

Core/src/main/java/com/plotsquared/core/command/Add.java

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

Core/src/main/java/com/plotsquared/core/command/Alias.java

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

Core/src/main/java/com/plotsquared/core/command/Area.java

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

Core/src/main/java/com/plotsquared/core/command/Auto.java

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

Core/src/main/java/com/plotsquared/core/command/Backup.java

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

Core/src/main/java/com/plotsquared/core/command/Biome.java

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

Core/src/main/java/com/plotsquared/core/command/Buy.java

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

Core/src/main/java/com/plotsquared/core/command/Caps.java

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

Core/src/main/java/com/plotsquared/core/command/Chat.java

@@ -32,7 +32,7 @@ import net.kyori.adventure.text.minimessage.Template;
 
 /**
  * @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)
 @CommandDeclaration(command = "chat",
@@ -48,7 +48,7 @@ public class Chat extends SubCommand {
         check(area, TranslatableCaption.of("errors.not_in_plot_world"));
         player.sendMessage(
                 TranslatableCaption.of("errors.deprecated_commands"),
-                Template.template("replacement", "/plot toggle chat")
+                Template.of("replacement", "/plot toggle chat")
         );
         if (player.getPlotAreaAbs().isForcingPlotChat()) {
             player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));

Core/src/main/java/com/plotsquared/core/command/Claim.java

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

Core/src/main/java/com/plotsquared/core/command/Clear.java

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

Core/src/main/java/com/plotsquared/core/command/Cluster.java

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

Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java

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

Core/src/main/java/com/plotsquared/core/command/Command.java

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

Core/src/main/java/com/plotsquared/core/command/Comment.java

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

Core/src/main/java/com/plotsquared/core/command/Condense.java

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

Core/src/main/java/com/plotsquared/core/command/Continue.java

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

Core/src/main/java/com/plotsquared/core/command/Copy.java

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

Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java

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

Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java

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

Core/src/main/java/com/plotsquared/core/command/Debug.java

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

Core/src/main/java/com/plotsquared/core/command/DebugExec.java

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

Core/src/main/java/com/plotsquared/core/command/DebugPaste.java

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

Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java

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

Core/src/main/java/com/plotsquared/core/command/Delete.java

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

Core/src/main/java/com/plotsquared/core/command/Deny.java

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

Core/src/main/java/com/plotsquared/core/command/Desc.java

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

Core/src/main/java/com/plotsquared/core/command/Done.java

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

Core/src/main/java/com/plotsquared/core/command/Download.java

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

Core/src/main/java/com/plotsquared/core/command/FlagCommand.java

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

Core/src/main/java/com/plotsquared/core/command/Grant.java

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

Core/src/main/java/com/plotsquared/core/command/Help.java

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

Core/src/main/java/com/plotsquared/core/command/HomeCommand.java

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

Core/src/main/java/com/plotsquared/core/command/Inbox.java

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

Core/src/main/java/com/plotsquared/core/command/Info.java

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

Core/src/main/java/com/plotsquared/core/command/Kick.java

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

Core/src/main/java/com/plotsquared/core/command/Leave.java

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

Core/src/main/java/com/plotsquared/core/command/Like.java

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

Core/src/main/java/com/plotsquared/core/command/ListCmd.java

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

Core/src/main/java/com/plotsquared/core/command/Load.java

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

Core/src/main/java/com/plotsquared/core/command/MainCommand.java

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

Core/src/main/java/com/plotsquared/core/command/Merge.java

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

Core/src/main/java/com/plotsquared/core/command/Move.java

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

Core/src/main/java/com/plotsquared/core/command/Music.java

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

Core/src/main/java/com/plotsquared/core/command/Near.java

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

Core/src/main/java/com/plotsquared/core/command/Owner.java

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

Core/src/main/java/com/plotsquared/core/command/PluginCmd.java

@@ -46,7 +46,7 @@ public class PluginCmd extends SubCommand {
                     StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared
                             .platform()
                             .pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"),
-                    Template.template("version", String.valueOf(PlotSquared.get().getVersion()))
+                    Template.of("version", String.valueOf(PlotSquared.get().getVersion()))
             );
             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>"));
@@ -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>"));
             player.sendMessage(
                     StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"),
-                    Template.template("value", String.valueOf(PremiumVerification.isPremium()))
+                    Template.of("value", String.valueOf(PremiumVerification.isPremium()))
             );
         });
         return true;

Core/src/main/java/com/plotsquared/core/command/Purge.java

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

Core/src/main/java/com/plotsquared/core/command/Rate.java

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

Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java

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

Core/src/main/java/com/plotsquared/core/command/Remove.java

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

Core/src/main/java/com/plotsquared/core/command/Save.java

@@ -48,7 +48,7 @@ import java.util.UUID;
 
 /**
  * @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)
 @CommandDeclaration(command = "save",
@@ -123,7 +123,7 @@ public class Save extends SubCommand {
                                 player.sendMessage(TranslatableCaption.of("web.save_success"));
                                 player.sendMessage(
                                         TranslatableCaption.of("errors.deprecated_commands"),
-                                        Template.template("replacement", "/plot download")
+                                        Template.of("replacement", "/plot download")
                                 );
                                 try (final MetaDataAccess<List<String>> schematicAccess =
                                              player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {

Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java

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

Core/src/main/java/com/plotsquared/core/command/Set.java

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

Core/src/main/java/com/plotsquared/core/command/SetCommand.java

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

Core/src/main/java/com/plotsquared/core/command/SetHome.java

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

Core/src/main/java/com/plotsquared/core/command/Setup.java

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

Core/src/main/java/com/plotsquared/core/command/Swap.java

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

Core/src/main/java/com/plotsquared/core/command/Target.java

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

Core/src/main/java/com/plotsquared/core/command/Template.java

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

Core/src/main/java/com/plotsquared/core/command/Toggle.java

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

Core/src/main/java/com/plotsquared/core/command/Trust.java

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

Core/src/main/java/com/plotsquared/core/command/Unlink.java

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

Core/src/main/java/com/plotsquared/core/command/Visit.java

@@ -107,8 +107,8 @@ public class Visit extends Command {
         } else if (plots.size() < page || page < 1) {
             player.sendMessage(
                     TranslatableCaption.of("invalid.number_not_in_range"),
-                    Template.template("min", "1"),
-                    Template.template("max", String.valueOf(plots.size()))
+                    Template.of("min", "1"),
+                    Template.of("max", String.valueOf(plots.size()))
             );
             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
             // plot.admin.visit.untrusted permission
             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(
                         TranslatableCaption.of("permission.no_permission"),
                         Templates.of("node", "plots.visit.other")
@@ -154,7 +154,7 @@ public class Visit extends Command {
                 if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
-                            Template.template("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED))
+                            Template.of("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED))
                     );
                     return;
                 }
@@ -257,7 +257,7 @@ public class Visit extends Command {
                 } catch (NumberFormatException ignored) {
                     player.sendMessage(
                             TranslatableCaption.of("invalid.not_a_number"),
-                            Template.template("value", args[1])
+                            Template.of("value", args[1])
                     );
                     return CompletableFuture.completedFuture(false);
                 }
@@ -290,7 +290,7 @@ public class Visit extends Command {
                             } else {
                                 player.sendMessage(
                                         TranslatableCaption.of("errors.invalid_player"),
-                                        Template.template("value", finalArgs[0])
+                                        Template.of("value", finalArgs[0])
                                 );
                             }
                         } else {

Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java

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

Core/src/main/java/com/plotsquared/core/configuration/ConfigurationSection.java

@@ -74,7 +74,7 @@ public interface ConfigurationSection {
      *
      * @param path Path to check for existence.
      * @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}.
      */
     boolean contains(String path);
@@ -88,7 +88,7 @@ public interface ConfigurationSection {
      *
      * @param path Path to check for existence.
      * @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}.
      */
     boolean isSet(String path);

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

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

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

@@ -29,7 +29,6 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.util.PlayerManager;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
@@ -54,35 +53,13 @@ public final class Templates {
      * @param caption      Caption object
      * @param replacements Replacements
      * @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(
             final @NonNull LocaleHolder localeHolder,
             final @NonNull String key, final @NonNull Caption caption,
             final @NonNull Template... 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)));
+        return Template.of(key, MINI_MESSAGE.parse(caption.getComponent(localeHolder), replacements));
     }
 
     /**
@@ -94,7 +71,7 @@ public final class Templates {
      */
     public static @NonNull Template of(final @NonNull String key, final @NonNull UUID uuid) {
         final String username = PlayerManager.getName(uuid);
-        return Template.template(key, username);
+        return Template.of(key, username);
     }
 
     /**
@@ -105,7 +82,7 @@ public final class Templates {
      * @return Generated template
      */
     public static @NonNull Template of(final @NonNull String key, final @NonNull String value) {
-        return Template.template(key, value);
+        return Template.of(key, value);
     }
 
     /**
@@ -116,7 +93,7 @@ public final class Templates {
      * @return Generated template
      */
     public static @NonNull Template of(final @NonNull String key, final @NonNull PlotArea area) {
-        return Template.template(key, area.toString());
+        return Template.of(key, area.toString());
     }
 
     /**
@@ -127,7 +104,7 @@ public final class Templates {
      * @return Generated template
      */
     public static @NonNull Template of(final @NonNull String key, final @NonNull Number number) {
-        return Template.template(key, number.toString());
+        return Template.of(key, number.toString());
     }
 
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/package-info.java

@@ -1,62 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            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;

Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java

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

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -334,7 +334,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 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) {
                 LOGGER.info("- schematic: false");
             }

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

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

Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java

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

Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java

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

Core/src/main/java/com/plotsquared/core/player/MetaDataAccess.java

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

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

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

Core/src/main/java/com/plotsquared/core/plot/Plot.java

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

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

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

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

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

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

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

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

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

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

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

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

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

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

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

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

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

Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java

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

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

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

Core/src/main/java/com/plotsquared/core/setup/CommonSetupSteps.java

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

Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java

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

Core/src/main/java/com/plotsquared/core/synchronization/LockRepository.java

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

Core/src/main/java/com/plotsquared/core/util/BlockUtil.java

@@ -84,7 +84,7 @@ public final class BlockUtil {
      *
      * @param id String or integer ID
      * @return Parsed block state, or {@code null} if none
-     * could be parsed
+     *         could be parsed
      */
     public static @Nullable BlockState get(final @NonNull String id) {
         if (id.length() == 1 && id.charAt(0) == '*') {
@@ -136,7 +136,7 @@ public final class BlockUtil {
      *
      * @param map Serialized block state
      * @return Deserialized block state, or {@code null} if the map is
-     * not a properly serialized block state
+     *         not a properly serialized block state
      */
     public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
         if (map.containsKey("material")) {

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -380,7 +380,7 @@ public class EventDispatcher {
                 if (notifyPerms) {
                     player.sendMessage(
                             TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
-                            Template.template("flag", PlaceFlag.getFlagName(UseFlag.class))
+                            Template.of("flag", PlaceFlag.getFlagName(UseFlag.class))
                     );
                 }
                 return false;
@@ -447,7 +447,7 @@ public class EventDispatcher {
                 if (notifyPerms) {
                     player.sendMessage(
                             TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
-                            Template.template("flag", PlotFlag.getFlagName(MobPlaceFlag.class)
+                            Template.of("flag", PlotFlag.getFlagName(MobPlaceFlag.class)
                                     + '/' + PlotFlag.getFlagName(PlaceFlag.class))
                     );
                 }
@@ -483,7 +483,7 @@ public class EventDispatcher {
                 if (notifyPerms) {
                     player.sendMessage(
                             TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
-                            Template.template("flag", PlotFlag.getFlagName(MiscPlaceFlag.class)
+                            Template.of("flag", PlotFlag.getFlagName(MiscPlaceFlag.class)
                                     + '/' + PlotFlag.getFlagName(PlaceFlag.class))
                     );
                 }

Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java

@@ -119,8 +119,8 @@ public final class LegacyConverter {
         this.setString(section, key, bucket);
         ConsolePlayer.getConsole().sendMessage(
                 TranslatableCaption.of("legacyconfig.legacy_config_replaced"),
-                Template.template("value1", block),
-                Template.template("value2", bucket.toString())
+                Template.of("value1", block),
+                Template.of("value2", bucket.toString())
         );
     }
 
@@ -135,8 +135,8 @@ public final class LegacyConverter {
         ConsolePlayer.getConsole()
                 .sendMessage(
                         TranslatableCaption.of("legacyconfig.legacy_config_replaced"),
-                        Template.template("value1", plotBlockArrayString(blocks)),
-                        Template.template("value2", bucket.toString())
+                        Template.of("value1", plotBlockArrayString(blocks)),
+                        Template.of("value2", bucket.toString())
                 );
     }
 

Core/src/main/java/com/plotsquared/core/util/PatternUtil.java

@@ -91,7 +91,7 @@ public class PatternUtil {
         } catch (InputParseException e) {
             throw new Command.CommandException(
                     TranslatableCaption.of("invalid.not_valid_block"),
-                    Template.template("value", e.getMessage())
+                    Template.of("value", e.getMessage())
             );
         }
     }

Core/src/main/java/com/plotsquared/core/util/Permissions.java

@@ -95,7 +95,7 @@ public class Permissions {
             if (notify) {
                 player.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        Template.template("node", permission)
+                        Template.of("node", permission)
                 );
             }
             return false;

Core/src/main/java/com/plotsquared/core/util/PlayerManager.java

@@ -38,7 +38,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 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.Nullable;
 
@@ -150,11 +149,9 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
         TextComponent.Builder list = Component.text();
         for (int x = 0; x < users.size(); x++) {
             if (x + 1 == uuids.size()) {
-                list.append(MINI_MESSAGE.deserialize(c,
-                        TemplateResolver.templates(Template.template("user", users.get(x)))));
+                list.append(MINI_MESSAGE.parse(c, Template.of("user", users.get(x))));
             } else {
-                list.append(MINI_MESSAGE.deserialize(c + ", ",
-                        TemplateResolver.templates(Template.template("user", users.get(x)))));
+                list.append(MINI_MESSAGE.parse(c + ", ", Template.of("user", users.get(x))));
             }
         }
         return list.asComponent();

Core/src/main/java/com/plotsquared/core/util/TabCompletions.java

@@ -38,6 +38,7 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.uuid.UUIDMapping;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -115,6 +116,7 @@ public final class TabCompletions {
      * @param input    Command input
      * @param existing Players that should not be included in completions
      * @return List of completions
+     *
      * @deprecated In favor {@link #completeAddedPlayers(PlotPlayer, Plot, String, List)}
      */
     @Deprecated(forRemoval = true)

Core/src/main/java/com/plotsquared/core/util/WorldUtil.java

@@ -91,7 +91,7 @@ public abstract class WorldUtil {
      *
      * @param worldName World name
      * @return {@code true} if there exists a world with the given world name,
-     * {@code false} if not
+     *         {@code false} if not
      */
     public abstract boolean isWorld(@NonNull String worldName);
 

Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java

@@ -33,7 +33,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.util.StringMan;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
 
 public class HelpObject {
 
@@ -42,15 +41,13 @@ public class HelpObject {
     private final String rendered;
 
     public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) {
-        rendered = MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
+        rendered = MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
                 TranslatableCaption.of("help.help_item").getComponent(audience),
-                TemplateResolver.templates(
-                        Template.template("usage", command.getUsage().replace("{label}", label)),
-                        Template.template("alias", command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")),
-                        Templates.template(audience, "desc", command.getDescription()),
-                        Template.template("arguments", buildArgumentList(command.getRequiredArguments())),
-                        Template.template("label", label)
-                )
+                Template.of("usage", command.getUsage().replace("{label}", label)),
+                Template.of("alias", command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")),
+                Templates.of(audience, "desc", command.getDescription()),
+                Template.of("arguments", buildArgumentList(command.getRequiredArguments())),
+                Template.of("label", label)
         ));
     }