mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-10-31 01:23:44 +01:00
Compare commits
4 Commits
fix/v7/min
...
fix/v6/plo
| Author | SHA1 | Date | |
|---|---|---|---|
|
61ec076522 | ||
|
|
0a41e87dc8 | ||
|
|
170b8eab65 | ||
|
|
ad4366f31b |
@@ -513,10 +513,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
||||
this.backgroundPipeline.registerService(essentialsUUIDService);
|
||||
}
|
||||
|
||||
if (Settings.UUID.IMPROMPTU_SERVICE_MOJANG_API) {
|
||||
final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT);
|
||||
this.impromptuPipeline.registerService(impromptuMojangService);
|
||||
}
|
||||
final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT);
|
||||
this.backgroundPipeline.registerService(backgroundMojangService);
|
||||
} else {
|
||||
|
||||
@@ -68,9 +68,7 @@ import com.plotsquared.core.util.task.TaskTime;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
@@ -287,20 +285,15 @@ public class BlockEventListener implements Listener {
|
||||
event.setCancelled(true);
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("height.height_limit"),
|
||||
TagResolver.builder()
|
||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
||||
.build()
|
||||
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
|
||||
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
|
||||
);
|
||||
}
|
||||
if (!plot.hasOwner()) {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
@@ -317,10 +310,7 @@ public class BlockEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
plot.debug(player.getName() + " could not place " + event.getBlock().getType()
|
||||
@@ -347,10 +337,7 @@ public class BlockEventListener implements Listener {
|
||||
} else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -373,10 +360,7 @@ public class BlockEventListener implements Listener {
|
||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
@@ -387,10 +371,8 @@ public class BlockEventListener implements Listener {
|
||||
event.setCancelled(true);
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("height.height_limit"),
|
||||
TagResolver.builder()
|
||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
||||
.build()
|
||||
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
|
||||
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
|
||||
);
|
||||
}
|
||||
if (!plot.hasOwner()) {
|
||||
@@ -415,10 +397,7 @@ public class BlockEventListener implements Listener {
|
||||
}
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||
@@ -444,10 +423,7 @@ public class BlockEventListener implements Listener {
|
||||
}
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1123,10 +1099,7 @@ public class BlockEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1134,10 +1107,7 @@ public class BlockEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1145,10 +1115,7 @@ public class BlockEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1272,7 +1239,7 @@ public class BlockEventListener implements Listener {
|
||||
) && !(Objects.equals(currentLocation.getPlot(), plot))) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
break;
|
||||
@@ -1283,10 +1250,8 @@ public class BlockEventListener implements Listener {
|
||||
if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("height.height_limit"),
|
||||
TagResolver.builder()
|
||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
||||
.build()
|
||||
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
|
||||
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
break;
|
||||
|
||||
@@ -47,9 +47,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.TileState;
|
||||
@@ -306,7 +304,7 @@ public class PaperListener implements Listener {
|
||||
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
|
||||
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
event.setBuild(false);
|
||||
@@ -340,10 +338,7 @@ public class PaperListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
@@ -352,10 +347,7 @@ public class PaperListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
@@ -365,10 +357,7 @@ public class PaperListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
|
||||
@@ -33,9 +33,7 @@ import com.plotsquared.core.location.Location;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.block.Banner;
|
||||
import org.bukkit.block.Beacon;
|
||||
import org.bukkit.block.BlockState;
|
||||
@@ -86,7 +84,7 @@ public class PaperListener113 extends PaperListener {
|
||||
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
|
||||
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
event.setBuild(false);
|
||||
|
||||
@@ -84,10 +84,7 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import io.papermc.lib.PaperLib;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.FluidCollisionMode;
|
||||
@@ -155,11 +152,13 @@ import org.bukkit.util.Vector;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* Player Events involving plots.
|
||||
@@ -364,15 +363,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
&& PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
|
||||
Caption boundary = TranslatableCaption.of("update.update_boundary");
|
||||
Caption updateNotification = TranslatableCaption.of("update.update_notification");
|
||||
Template internalVersion = Template.of("p2version", UpdateUtility.internalVersion.versionString());
|
||||
Template spigotVersion = Template.of("spigotversion", UpdateUtility.spigotVersion);
|
||||
Template downloadUrl = Template.of("downloadurl", "https://www.spigotmc.org/resources/77506/updates");
|
||||
pp.sendMessage(boundary);
|
||||
pp.sendMessage(
|
||||
updateNotification,
|
||||
TagResolver.builder()
|
||||
.tag("p2version", Tag.inserting(Component.text(UpdateUtility.internalVersion.versionString())))
|
||||
.tag("spigotversion", Tag.inserting(Component.text(UpdateUtility.spigotVersion)))
|
||||
.tag("downloadurl", Tag.preProcessParsed("https://www.spigotmc.org/resources/77506/updates"))
|
||||
.build()
|
||||
);
|
||||
pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl);
|
||||
pp.sendMessage(boundary);
|
||||
}
|
||||
}
|
||||
@@ -424,7 +419,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
.equals(BukkitUtil.adaptComplete(to)))) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("deny.no_enter"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
Template.of("plot", plot.toString())
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -540,10 +535,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
|
||||
);
|
||||
this.tmpTeleport = false;
|
||||
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
||||
@@ -561,7 +553,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
} else if (!plotEntry(pp, now) && this.tmpTeleport) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("deny.no_enter"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(now.toString())))
|
||||
Template.of("plot", now.toString())
|
||||
);
|
||||
this.tmpTeleport = false;
|
||||
to.setX(from.getBlockX());
|
||||
@@ -633,10 +625,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
|
||||
);
|
||||
this.tmpTeleport = false;
|
||||
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
||||
@@ -654,7 +643,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
} else if (!plotEntry(pp, plot) && this.tmpTeleport) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("deny.no_enter"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
Template.of("plot", plot.toString())
|
||||
);
|
||||
this.tmpTeleport = false;
|
||||
player.teleport(from);
|
||||
@@ -739,34 +728,46 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
PlotId id = plot.getId();
|
||||
String worldName = plot.getWorldName();
|
||||
Caption msg = TranslatableCaption.of("chat.plot_chat_format");
|
||||
TagResolver.Builder builder = TagResolver.builder();
|
||||
builder.tag("world", Tag.inserting(Component.text(worldName)));
|
||||
builder.tag("plot_id", Tag.inserting(Component.text(id.toString())));
|
||||
builder.tag("sender", Tag.inserting(Component.text(sender)));
|
||||
Template msgTemplate;
|
||||
Template worldNameTemplate = Template.of("world", worldName);
|
||||
Template plotTemplate = Template.of("plot_id", id.toString());
|
||||
Template senderTemplate = Template.of("sender", sender);
|
||||
// If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc.
|
||||
// In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose
|
||||
// or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if
|
||||
// allowing colour.
|
||||
if (plotPlayer.hasPermission("plots.chat.color")) {
|
||||
builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
|
||||
message,
|
||||
TagResolver.resolver(StandardTags.color(), StandardTags.gradient(),
|
||||
StandardTags.rainbow(), StandardTags.decorations()
|
||||
)
|
||||
)));
|
||||
msgTemplate = Template
|
||||
.of(
|
||||
"msg",
|
||||
BukkitUtil.LEGACY_COMPONENT_SERIALIZER.deserialize(ChatColor.translateAlternateColorCodes(
|
||||
'&',
|
||||
message
|
||||
))
|
||||
);
|
||||
} else {
|
||||
builder.tag("msg", Tag.inserting(Component.text(message)));
|
||||
msgTemplate = Template.of("msg", BukkitUtil.MINI_MESSAGE.deserialize(
|
||||
ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message)))));
|
||||
}
|
||||
for (PlotPlayer<?> receiver : plotRecipients) {
|
||||
receiver.sendMessage(msg, builder.build());
|
||||
receiver.sendMessage(msg, worldNameTemplate, msgTemplate, plotTemplate, senderTemplate);
|
||||
}
|
||||
if (!spies.isEmpty()) {
|
||||
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
||||
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
|
||||
Template spysenderTemplate = Template.of("sender", sender);
|
||||
Template spymessageTemplate = Template.of("msg", Component.text(message));
|
||||
for (PlotPlayer<?> player : spies) {
|
||||
player.sendMessage(spymsg, builder.tag("message", Tag.inserting(Component.text(message))).build());
|
||||
player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate);
|
||||
}
|
||||
}
|
||||
if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
|
||||
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
spymsg,
|
||||
builder.tag("message", Tag.inserting(Component.text(message))).build()
|
||||
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
|
||||
Template spysenderTemplate = Template.of("sender", sender);
|
||||
Template spymessageTemplate = Template.of("msg", Component.text(message));
|
||||
ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate,
|
||||
spymessageTemplate
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -920,10 +921,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||
);
|
||||
cancelled = true;
|
||||
}
|
||||
@@ -931,10 +929,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||
);
|
||||
cancelled = true;
|
||||
}
|
||||
@@ -944,10 +939,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||
);
|
||||
cancelled = true;
|
||||
}
|
||||
@@ -985,10 +977,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||
);
|
||||
e.setCancelled(true);
|
||||
}
|
||||
@@ -1006,10 +995,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||
);
|
||||
e.setCancelled(true);
|
||||
}
|
||||
@@ -1024,10 +1010,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||
);
|
||||
e.setCancelled(true);
|
||||
plot.debug(pp.getName() + " could not interact with " + entity.getType()
|
||||
@@ -1151,8 +1134,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
return;
|
||||
}
|
||||
switch (type) {
|
||||
case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART ->
|
||||
eventType = PlayerBlockEventType.PLACE_VEHICLE;
|
||||
case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART -> eventType = PlayerBlockEventType.PLACE_VEHICLE;
|
||||
case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB;
|
||||
case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ;
|
||||
case ARMOR_STAND -> {
|
||||
@@ -1248,7 +1230,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (!plot.hasOwner()) {
|
||||
@@ -1257,10 +1239,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (!plot.isAdded(pp.getUUID())) {
|
||||
@@ -1269,10 +1248,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||
@@ -1319,7 +1295,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (!plot.hasOwner()) {
|
||||
@@ -1328,10 +1304,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (!plot.isAdded(plotPlayer.getUUID())) {
|
||||
@@ -1340,10 +1313,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
}
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||
@@ -1375,10 +1345,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1387,10 +1354,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1401,10 +1365,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1433,10 +1394,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1444,10 +1402,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1458,10 +1413,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
plot.debug(p.getName()
|
||||
@@ -1483,10 +1435,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1496,10 +1445,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
plot.debug(player.getName()
|
||||
@@ -1531,10 +1477,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1542,10 +1485,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1603,10 +1543,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1628,10 +1565,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
@@ -1640,10 +1574,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
@@ -1657,10 +1588,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER))
|
||||
);
|
||||
event.setCancelled(true);
|
||||
plot.debug(pp.getName()
|
||||
|
||||
@@ -38,9 +38,7 @@ import com.plotsquared.core.plot.PlotHandler;
|
||||
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
@@ -116,10 +114,7 @@ public class ProjectileEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
@@ -128,10 +123,7 @@ public class ProjectileEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
@@ -141,10 +133,7 @@ public class ProjectileEventListener implements Listener {
|
||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||
);
|
||||
entity.remove();
|
||||
event.setCancelled(true);
|
||||
|
||||
@@ -51,7 +51,6 @@ import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.Container;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -267,13 +266,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
||||
} catch (WorldEditException ignored) {
|
||||
// Fallback to not so nice method
|
||||
BlockData blockData = BukkitAdapter.adapt(block);
|
||||
Block existing;
|
||||
// Assume a chunk object has been given only when it should have been.
|
||||
if (getChunkObject() instanceof Chunk chunkObject) {
|
||||
existing = chunkObject.getBlock(x & 15, y, z & 15);
|
||||
} else {
|
||||
existing = getBukkitWorld().getBlockAt(x, y, z);
|
||||
}
|
||||
Block existing = getBukkitWorld().getBlockAt(x, y, z);
|
||||
final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
|
||||
if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
|
||||
return;
|
||||
@@ -289,7 +282,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
||||
CompoundTag tag = block.getNbtData();
|
||||
StateWrapper sw = new StateWrapper(tag);
|
||||
|
||||
sw.restoreTag(existing);
|
||||
sw.restoreTag(getWorld().getName(), existing.getX(), existing.getY(), existing.getZ());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,6 @@ import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.InventoryHolder;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
@@ -167,32 +166,14 @@ public class StateWrapper {
|
||||
return str;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the TileEntity data to the given world at the given coordinates.
|
||||
*
|
||||
* @param worldName World name
|
||||
* @param x x position
|
||||
* @param y y position
|
||||
* @param z z position
|
||||
* @return true if successful
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
|
||||
public boolean restoreTag(String worldName, int x, int y, int z) {
|
||||
World world = BukkitUtil.getWorld(worldName);
|
||||
if (world == null) {
|
||||
if (this.tag == null) {
|
||||
return false;
|
||||
}
|
||||
return restoreTag(world.getBlockAt(x, y, z));
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the TileEntity data to the given block
|
||||
*
|
||||
* @param block Block to restore to
|
||||
* @return true if successful
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
|
||||
public boolean restoreTag(@NonNull Block block) {
|
||||
if (this.tag == null) {
|
||||
World world = BukkitUtil.getWorld(worldName);
|
||||
Block block = world.getBlockAt(x, y, z);
|
||||
if (block == null) {
|
||||
return false;
|
||||
}
|
||||
org.bukkit.block.BlockState state = block.getState();
|
||||
|
||||
@@ -50,9 +50,7 @@ import com.plotsquared.core.util.EntityUtil;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.entity.EntityCategories;
|
||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Creature;
|
||||
import org.bukkit.entity.Entity;
|
||||
@@ -190,10 +188,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -205,10 +200,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
|
||||
);
|
||||
if (plot != null) {
|
||||
plot.debug(player.getName()
|
||||
@@ -229,10 +221,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||
);
|
||||
if (plot != null) {
|
||||
plot.debug(player.getName() + " could not attack " + entityType
|
||||
@@ -253,10 +242,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||
);
|
||||
if (plot != null) {
|
||||
plot.debug(player.getName() + " could not attack " + entityType
|
||||
@@ -270,10 +256,7 @@ public class BukkitEntityUtil {
|
||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
|
||||
);
|
||||
plot.debug(player.getName() + " could not attack " + entityType
|
||||
+ " because pve = false");
|
||||
@@ -287,10 +270,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -307,10 +287,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||
);
|
||||
if (plot != null) {
|
||||
plot.debug(player.getName() + " could not attack " + entityType
|
||||
@@ -332,10 +309,7 @@ public class BukkitEntityUtil {
|
||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||
);
|
||||
if (plot != null) {
|
||||
plot.debug(player.getName() + " could not attack " + entityType
|
||||
|
||||
@@ -63,7 +63,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
|
||||
ItemMeta meta = null;
|
||||
if (item.getName() != null) {
|
||||
meta = stack.getItemMeta();
|
||||
Component nameComponent = BukkitUtil.MINI_MESSAGE.deserialize(item.getName());
|
||||
Component nameComponent = BukkitUtil.MINI_MESSAGE.parse(item.getName());
|
||||
meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
|
||||
}
|
||||
if (item.getLore() != null) {
|
||||
|
||||
@@ -52,7 +52,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import io.papermc.lib.PaperLib;
|
||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -339,7 +339,7 @@ public class BukkitUtil extends WorldUtil {
|
||||
@SuppressWarnings("deprecation")
|
||||
public void setSign(
|
||||
final @NonNull Location location, final @NonNull Caption[] lines,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
|
||||
PlotArea area = location.getPlotArea();
|
||||
@@ -372,9 +372,8 @@ public class BukkitUtil extends WorldUtil {
|
||||
final org.bukkit.block.BlockState blockstate = block.getState();
|
||||
if (blockstate instanceof final Sign sign) {
|
||||
for (int i = 0; i < lines.length; i++) {
|
||||
sign.setLine(i, LEGACY_COMPONENT_SERIALIZER.serialize(
|
||||
MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()), replacements)
|
||||
));
|
||||
sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
|
||||
.serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
|
||||
}
|
||||
sign.update(true, false);
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ import com.plotsquared.core.util.ChunkManager;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.SchematicHandler;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
@@ -152,7 +152,7 @@ public class PlotAPI {
|
||||
*/
|
||||
public void sendConsoleMessage(
|
||||
final @NonNull String message,
|
||||
final @NonNull TagResolver @NonNull ... replacements
|
||||
final @NonNull Template @NonNull ... replacements
|
||||
) {
|
||||
ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
|
||||
}
|
||||
@@ -165,7 +165,7 @@ public class PlotAPI {
|
||||
*/
|
||||
public void sendConsoleMessage(
|
||||
final @NonNull Caption caption,
|
||||
final @NonNull TagResolver @NonNull ... replacements
|
||||
final @NonNull Template @NonNull ... replacements
|
||||
) {
|
||||
ConsolePlayer.getConsole().sendMessage(caption, replacements);
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ public class PlayerBackupProfile implements BackupProfile {
|
||||
if (value) {
|
||||
future.complete(null);
|
||||
} else {
|
||||
future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
|
||||
future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
|
||||
TranslatableCaption
|
||||
.of("schematics.schematic_paste_failed")
|
||||
.getComponent(ConsolePlayer.getConsole()))));
|
||||
|
||||
@@ -31,14 +31,13 @@ import com.google.inject.Inject;
|
||||
import com.google.inject.Singleton;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
@@ -108,7 +107,7 @@ public class SimpleBackupManager implements BackupManager {
|
||||
if (player != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_automatic_started"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
profile.createBackup().whenComplete((backup, throwable) -> {
|
||||
@@ -116,7 +115,7 @@ public class SimpleBackupManager implements BackupManager {
|
||||
if (player != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_automatic_failure"),
|
||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
||||
Templates.of("reason", throwable.getMessage())
|
||||
);
|
||||
}
|
||||
throwable.printStackTrace();
|
||||
|
||||
@@ -38,9 +38,7 @@ import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -79,7 +77,7 @@ public class Add extends Command {
|
||||
TranslatableCaption.of("permission.no_plot_perms")
|
||||
);
|
||||
checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot add <player | *>")))
|
||||
Template.of("value", "/plot add <player | *>")
|
||||
);
|
||||
final CompletableFuture<Boolean> future = new CompletableFuture<>();
|
||||
PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
|
||||
@@ -89,7 +87,7 @@ public class Add extends Command {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
}
|
||||
future.completeExceptionally(throwable);
|
||||
@@ -97,7 +95,7 @@ public class Add extends Command {
|
||||
} else {
|
||||
try {
|
||||
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
Iterator<UUID> iterator = uuids.iterator();
|
||||
int size = plot.getTrusted().size() + plot.getMembers().size();
|
||||
@@ -108,9 +106,7 @@ public class Add extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -118,9 +114,7 @@ public class Add extends Command {
|
||||
if (plot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
TagResolver.resolver("player", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -128,9 +122,7 @@ public class Add extends Command {
|
||||
if (plot.getMembers().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
TagResolver.resolver("player", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -143,7 +135,7 @@ public class Add extends Command {
|
||||
if (localAddSize >= maxAddSize) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("members.plot_max_members_added"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(localAddSize)))
|
||||
Template.of("amount", String.valueOf(localAddSize))
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -35,9 +35,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.MathMan;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -101,10 +99,7 @@ public class Alias extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ALIAS_SET)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_SET))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -120,10 +115,7 @@ public class Alias extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -164,16 +156,13 @@ public class Alias extends SubCommand {
|
||||
.anyMatch()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_is_taken"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
||||
Template.of("alias", alias)
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (Settings.UUID.OFFLINE) {
|
||||
plot.setAlias(alias);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_set_to"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.of("alias", alias));
|
||||
return;
|
||||
}
|
||||
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
|
||||
@@ -182,13 +171,13 @@ public class Alias extends SubCommand {
|
||||
} else if (uuid != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_is_taken"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
||||
Template.of("alias", alias)
|
||||
);
|
||||
} else {
|
||||
plot.setAlias(alias);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_set_to"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
||||
Template.of("alias", alias)
|
||||
);
|
||||
}
|
||||
}));
|
||||
@@ -200,7 +189,7 @@ public class Alias extends SubCommand {
|
||||
if (!plot.getAlias().isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_removed"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
||||
Template.of("alias", alias)
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
|
||||
@@ -31,6 +31,7 @@ import com.plotsquared.core.configuration.ConfigurationSection;
|
||||
import com.plotsquared.core.configuration.ConfigurationUtil;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.configuration.file.YamlConfiguration;
|
||||
import com.plotsquared.core.events.TeleportCause;
|
||||
@@ -75,9 +76,7 @@ import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.io.File;
|
||||
@@ -149,17 +148,14 @@ public class Area extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot area single <name>")))
|
||||
Template.of("command", "/plot area single <name>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -291,7 +287,7 @@ public class Area extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error_create"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(hybridPlotWorld.getWorldName())))
|
||||
Template.of("world", hybridPlotWorld.getWorldName())
|
||||
);
|
||||
}
|
||||
};
|
||||
@@ -302,10 +298,7 @@ public class Area extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_AREA_CREATE)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -313,10 +306,7 @@ public class Area extends SubCommand {
|
||||
case 1:
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot area create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
case 2:
|
||||
@@ -330,11 +320,7 @@ public class Area extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text(
|
||||
"/plot area create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -345,18 +331,12 @@ public class Area extends SubCommand {
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("set.set_attribute"),
|
||||
TagResolver.builder()
|
||||
.tag("attribute", Tag.inserting(Component.text("area_pos1")))
|
||||
.tag("value", Tag.inserting(
|
||||
Component.text(location.getX())
|
||||
.append(Component.text(","))
|
||||
.append(Component.text(location.getZ()))
|
||||
))
|
||||
.build()
|
||||
Template.of("attribute", "area_pos1"),
|
||||
Template.of("value", location.getX() + "," + location.getZ())
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("area.set_pos2"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot area create pos2")))
|
||||
Template.of("command", "/plot area create pos2")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -370,11 +350,7 @@ public class Area extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text(
|
||||
"/plot area create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -401,10 +377,7 @@ public class Area extends SubCommand {
|
||||
if (!areas.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||
TagResolver.resolver(
|
||||
"cluster",
|
||||
Tag.inserting(areas.iterator().next())
|
||||
)
|
||||
Template.of("cluster", areas.iterator().next().toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -443,7 +416,7 @@ public class Area extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error_create"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
|
||||
Template.of("world", area.getWorldName())
|
||||
);
|
||||
}
|
||||
};
|
||||
@@ -477,7 +450,7 @@ public class Area extends SubCommand {
|
||||
if (other != null && Objects.equals(pa.getId(), other.getId())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("setup.setup_world_taken"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(pa.getId())))
|
||||
Template.of("value", pa.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -492,13 +465,8 @@ public class Area extends SubCommand {
|
||||
if (pair.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||
TagResolver.builder()
|
||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
||||
.tag(
|
||||
"value2",
|
||||
Tag.inserting(Component.text("create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
.build()
|
||||
Template.of("value1,", getCommandString()),
|
||||
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -534,14 +502,8 @@ public class Area extends SubCommand {
|
||||
default -> {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||
TagResolver.builder()
|
||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
||||
.tag(
|
||||
"value2",
|
||||
Tag.inserting(Component.text(
|
||||
" create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
.build()
|
||||
Template.of("value1", getCommandString()),
|
||||
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -551,7 +513,7 @@ public class Area extends SubCommand {
|
||||
if (this.worldUtil.isWorld(pa.getWorldName())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("setup.setup_world_taken"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(pa.getWorldName())))
|
||||
Template.of("value", pa.getWorldName())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -572,7 +534,7 @@ public class Area extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error_create"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(pa.getWorldName())))
|
||||
Template.of("world", pa.getWorldName())
|
||||
);
|
||||
}
|
||||
try {
|
||||
@@ -591,18 +553,12 @@ public class Area extends SubCommand {
|
||||
if (pa.getId() == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Template.of("value", getUsage())
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||
TagResolver.builder()
|
||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
||||
.tag(
|
||||
"value2",
|
||||
Tag.inserting(Component.text(
|
||||
" create [world[:id]] [<modifier>=<value>]..."))
|
||||
)
|
||||
.build()
|
||||
Template.of("value1", getCommandString()),
|
||||
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -619,7 +575,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"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text(getCommandString())))
|
||||
Template.of("command", getCommandString())
|
||||
);
|
||||
break;
|
||||
}
|
||||
@@ -629,10 +585,7 @@ public class Area extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_AREA_INFO)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -643,20 +596,15 @@ public class Area extends SubCommand {
|
||||
default -> {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||
TagResolver.builder()
|
||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
||||
.tag("value2", Tag.inserting(Component.text(" info [area]")))
|
||||
.build()
|
||||
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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(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"));
|
||||
}
|
||||
@@ -680,35 +628,42 @@ public class Area extends SubCommand {
|
||||
percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
|
||||
region = "N/A";
|
||||
}
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag(
|
||||
Template headerTemplate = Template.of(
|
||||
"header",
|
||||
Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player))
|
||||
)
|
||||
.tag("name", Tag.inserting(Component.text(name)))
|
||||
.tag("type", Tag.inserting(Component.text(area.getType().name())))
|
||||
.tag("terrain", Tag.inserting(Component.text(area.getTerrain().name())))
|
||||
.tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent))))
|
||||
.tag("claimed", Tag.inserting(Component.text(claimed)))
|
||||
.tag("clusters", Tag.inserting(Component.text(clusters)))
|
||||
.tag("region", Tag.inserting(Component.text(region)))
|
||||
.tag("generator", Tag.inserting(Component.text(generator)))
|
||||
.tag(
|
||||
TranslatableCaption.of("info.plot_info_header").getComponent(player)
|
||||
);
|
||||
Template nameTemplate = Template.of("name", name);
|
||||
Template typeTemplate = Template.of("type", area.getType().name());
|
||||
Template terrainTemplate = Template.of("terrain", area.getTerrain().name());
|
||||
Template usageTemplate = Template.of("usage", String.format("%.2f", percent));
|
||||
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
|
||||
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
|
||||
Template regionTemplate = Template.of("region", region);
|
||||
Template generatorTemplate = Template.of("generator", generator);
|
||||
Template footerTemplate = Template.of(
|
||||
"footer",
|
||||
Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player))
|
||||
)
|
||||
.build();
|
||||
player.sendMessage(TranslatableCaption.of("info.area_info_format"), resolver);
|
||||
TranslatableCaption.of("info.plot_info_footer").getComponent(player)
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("info.area_info_format"),
|
||||
headerTemplate,
|
||||
nameTemplate,
|
||||
typeTemplate,
|
||||
terrainTemplate,
|
||||
usageTemplate,
|
||||
claimedTemplate,
|
||||
clustersTemplate,
|
||||
regionTemplate,
|
||||
generatorTemplate,
|
||||
footerTemplate
|
||||
);
|
||||
return true;
|
||||
}
|
||||
case "l", "list" -> {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_AREA_LIST)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -725,10 +680,8 @@ public class Area extends SubCommand {
|
||||
default:
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||
TagResolver.builder()
|
||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
||||
.tag("value2", Tag.inserting(Component.text(" list [#]")))
|
||||
.build()
|
||||
Template.of("value1", getCommandString()),
|
||||
Template.of("value2", " list [#]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -754,27 +707,37 @@ public class Area extends SubCommand {
|
||||
percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
|
||||
region = "N/A";
|
||||
}
|
||||
Component tooltip = MINI_MESSAGE.deserialize(
|
||||
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
|
||||
Template usageTemplate = Template.of("usage", String.format("%.2f", percent) + "%");
|
||||
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
|
||||
Template regionTemplate = Template.of("region", region);
|
||||
Template generatorTemplate = Template.of("generator", generator);
|
||||
String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE
|
||||
.parse(
|
||||
TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
|
||||
TagResolver.builder()
|
||||
.tag("claimed", Tag.inserting(Component.text(claimed)))
|
||||
.tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent) + "%")))
|
||||
.tag("clusters", Tag.inserting(Component.text(clusters)))
|
||||
.tag("region", Tag.inserting(Component.text(region)))
|
||||
.tag("generator", Tag.inserting(Component.text(generator)))
|
||||
.build()
|
||||
);
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("hover_info", Tag.inserting(tooltip))
|
||||
.tag("command_tp", Tag.preProcessParsed("/plot area tp " + name))
|
||||
.tag("command_info", Tag.preProcessParsed("/plot area info " + name))
|
||||
.tag("number", Tag.inserting(Component.text(i)))
|
||||
.tag("area_name", Tag.inserting(Component.text(name)))
|
||||
.tag("area_type", Tag.inserting(Component.text(area.getType().name())))
|
||||
.tag("area_terrain", Tag.inserting(Component.text(area.getTerrain().name())))
|
||||
.build();
|
||||
claimedTemplate,
|
||||
usageTemplate,
|
||||
clustersTemplate,
|
||||
regionTemplate,
|
||||
generatorTemplate
|
||||
));
|
||||
Template tooltipTemplate = Template.of("hover_info", tooltip);
|
||||
Template visitcmdTemplate = Template.of("command_tp", "/plot area tp " + area);
|
||||
Template infocmdTemplate = Template.of("command_info", "/plot area info " + area);
|
||||
Template numberTemplate = Template.of("number", String.valueOf(i));
|
||||
Template nameTemplate = Template.of("area_name", name);
|
||||
Template typeTemplate = Template.of("area_type", area.getType().name());
|
||||
Template terrainTemplate = Template.of("area_terrain", area.getTerrain().name());
|
||||
caption.set(TranslatableCaption.of("info.area_list_item"));
|
||||
caption.setTagResolvers(resolver);
|
||||
caption.setTemplates(
|
||||
tooltipTemplate,
|
||||
visitcmdTemplate,
|
||||
numberTemplate,
|
||||
nameTemplate,
|
||||
typeTemplate,
|
||||
terrainTemplate,
|
||||
infocmdTemplate
|
||||
);
|
||||
}
|
||||
}, "/plot area list", TranslatableCaption.of("list.area_list_header_paged"));
|
||||
return true;
|
||||
@@ -783,10 +746,7 @@ public class Area extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_AREA_REGEN)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -798,7 +758,7 @@ public class Area extends SubCommand {
|
||||
if (area.getType() != PlotAreaType.PARTIAL) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("single.delete_world_region"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
|
||||
Template.of("world", area.getWorldName())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -819,23 +779,20 @@ public class Area extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
|
||||
return false;
|
||||
}
|
||||
Location center;
|
||||
|
||||
@@ -51,9 +51,7 @@ import com.plotsquared.core.util.task.AutoClaimFinishTask;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import io.leangen.geantyref.TypeToken;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
@@ -119,13 +117,13 @@ public class Auto extends SubCommand {
|
||||
if (diff < 0 && grantedPlots < sizeX * sizeZ) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(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"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
|
||||
Template.of("amount", String.valueOf(diff + grantedPlots))
|
||||
);
|
||||
return false;
|
||||
} else {
|
||||
@@ -137,16 +135,15 @@ public class Auto extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_granted_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
|
||||
.tag("remainingGrants", Tag.inserting(Component.text(left)))
|
||||
.build()
|
||||
Template.of("usedGrants", String.valueOf(grantedPlots - left)),
|
||||
Template.of("remainingGrants", String.valueOf(left))
|
||||
);
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
||||
Template.of("amount", String.valueOf(player.getAllowedPlots())
|
||||
)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -225,7 +222,7 @@ public class Auto extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Template.of("value", getUsage())
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -248,7 +245,7 @@ public class Auto extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto claim")))
|
||||
Template.of("value", "Auto claim")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -259,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"),
|
||||
TagResolver.resolver("node", Tag.inserting(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"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Claim.MAX_AUTO_AREA)))
|
||||
Template.of("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -283,10 +280,8 @@ public class Auto extends SubCommand {
|
||||
if (!plotarea.hasSchematic(schematic)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
||||
TagResolver.builder()
|
||||
.tag("schemname", Tag.inserting(Component.text(schematic)))
|
||||
.tag("reason", Tag.inserting(Component.text("non-existent")))
|
||||
.build()
|
||||
Template.of("schemname", schematic),
|
||||
Template.of("reason", "non-existent")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -297,7 +292,7 @@ public class Auto extends SubCommand {
|
||||
.hasPermission(player, "plots.admin.command.schematic")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.claim.%s0")))
|
||||
Template.of("node", "plots.claim.%s0")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -316,20 +311,15 @@ public class Auto extends SubCommand {
|
||||
if (!force && this.econHandler.getMoney(player) < cost) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
||||
.tag(
|
||||
"balance",
|
||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
|
||||
)
|
||||
.build()
|
||||
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"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
||||
Template.of("money", this.econHandler.format(cost))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -363,7 +353,7 @@ public class Auto extends SubCommand {
|
||||
if (!force && mergeEvent.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge")))
|
||||
Template.of("value", "Auto merge")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -37,9 +37,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.nio.file.Files;
|
||||
@@ -76,7 +74,7 @@ public final class Backup extends Command {
|
||||
private static boolean sendMessage(PlotPlayer<?> player) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot backup <save | list | load>")))
|
||||
Template.of("value", "/plot backup <save | list | load>")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -144,45 +142,34 @@ public final class Backup extends Command {
|
||||
} else if (!plot.hasOwner()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_unowned").toComponent(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"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_merged").toComponent(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"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver(
|
||||
"plot", Tag.inserting(TranslatableCaption
|
||||
.of("generic.generic_other")
|
||||
.toComponent(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"),
|
||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
||||
Template.of("reason", throwable.getMessage())
|
||||
);
|
||||
throwable.printStackTrace();
|
||||
} else {
|
||||
@@ -209,16 +196,12 @@ public final class Backup extends Command {
|
||||
} else if (!plot.hasOwner()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_unowned").toComponent(player)
|
||||
))
|
||||
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
|
||||
);
|
||||
} else if (plot.isMerged()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_merged").toComponent(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"));
|
||||
@@ -226,48 +209,37 @@ public final class Backup extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_other").toComponent(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"),
|
||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
||||
Template.of("reason", throwable.getMessage())
|
||||
);
|
||||
throwable.printStackTrace();
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_list_header"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(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"),
|
||||
TagResolver.builder()
|
||||
.tag("number", Tag.inserting(Component.text(i + 1)))
|
||||
.tag(
|
||||
"value",
|
||||
Tag.inserting(Component.text(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()
|
||||
))))
|
||||
)
|
||||
.build()
|
||||
)))
|
||||
);
|
||||
}
|
||||
} catch (final Exception e) {
|
||||
@@ -295,16 +267,12 @@ public final class Backup extends Command {
|
||||
} else if (!plot.hasOwner()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_unowned").toComponent(player)
|
||||
))
|
||||
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
|
||||
);
|
||||
} else if (plot.isMerged()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_merged").toComponent(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"));
|
||||
@@ -312,15 +280,12 @@ public final class Backup extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Usage: /plot backup save/list/load")))
|
||||
Template.of("value", "Usage: /plot backup save/list/load")
|
||||
);
|
||||
} else {
|
||||
final int number;
|
||||
@@ -329,7 +294,7 @@ public final class Backup extends Command {
|
||||
} catch (final Exception e) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_a_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -337,27 +302,23 @@ public final class Backup extends Command {
|
||||
if (backupProfile instanceof NullBackupProfile) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver("plot", Tag.inserting(
|
||||
TranslatableCaption.of("generic.generic_other").toComponent(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"),
|
||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
||||
Template.of("reason", throwable.getMessage())
|
||||
);
|
||||
throwable.printStackTrace();
|
||||
} else {
|
||||
if (number < 1 || number > backups.size()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver(
|
||||
Template.of(
|
||||
"plot",
|
||||
Tag.inserting(TranslatableCaption
|
||||
.of("generic.generic_invalid_choice")
|
||||
.toComponent(player))
|
||||
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
@@ -367,11 +328,9 @@ public final class Backup extends Command {
|
||||
.exists(backup.getFile())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_impossible"),
|
||||
TagResolver.resolver(
|
||||
Template.of(
|
||||
"plot",
|
||||
Tag.inserting(TranslatableCaption
|
||||
.of("generic.generic_invalid_choice")
|
||||
.toComponent(player))
|
||||
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
|
||||
)
|
||||
);
|
||||
} else {
|
||||
@@ -381,10 +340,7 @@ public final class Backup extends Command {
|
||||
if (error != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("backups.backup_load_failure"),
|
||||
TagResolver.resolver(
|
||||
"reason",
|
||||
Tag.inserting(Component.text(error.getMessage()))
|
||||
)
|
||||
Template.of("reason", error.getMessage())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
*/
|
||||
package com.plotsquared.core.command;
|
||||
|
||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
@@ -33,10 +32,7 @@ import com.plotsquared.core.util.StringMan;
|
||||
import com.sk89q.worldedit.command.util.SuggestionHelper;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Locale;
|
||||
@@ -58,13 +54,16 @@ public class Biome extends SetCommand {
|
||||
} catch (final Exception ignore) {
|
||||
}
|
||||
if (biome == null) {
|
||||
String separator = TranslatableCaption.of("blocklist.block_list_separator").getComponent(player);
|
||||
String biomes = StringMan.join(
|
||||
BiomeType.REGISTRY.values(),
|
||||
MINI_MESSAGE.serialize(MINI_MESSAGE.parse(TranslatableCaption
|
||||
.of("blocklist.block_list_separator")
|
||||
.getComponent(player)))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("biome.need_biome"));
|
||||
player.sendMessage(
|
||||
StaticCaption.of(
|
||||
TranslatableCaption.of("commandconfig.subcommand_set_options_header_only").getComponent(player)
|
||||
+ StringMan.join(BiomeType.REGISTRY.values(), separator)
|
||||
)
|
||||
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
|
||||
Template.of("values", biomes)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -81,7 +80,7 @@ public class Biome extends SetCommand {
|
||||
plot.removeRunning();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("biome.biome_set_to"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(value.toLowerCase())))
|
||||
Template.of("value", value.toLowerCase())
|
||||
);
|
||||
});
|
||||
return true;
|
||||
|
||||
@@ -39,9 +39,7 @@ import com.plotsquared.core.util.EconHandler;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Set;
|
||||
@@ -93,7 +91,7 @@ public class Buy extends Command {
|
||||
checkTrue(
|
||||
player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
||||
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||
);
|
||||
double price = plot.getFlag(PriceFlag.class);
|
||||
if (price <= 0) {
|
||||
@@ -106,10 +104,8 @@ public class Buy extends Command {
|
||||
checkTrue(
|
||||
this.econHandler.getMoney(player) >= price,
|
||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
.tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
|
||||
.build()
|
||||
Template.of("money", this.econHandler.format(price)),
|
||||
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||
);
|
||||
this.econHandler.withdrawMoney(player, price);
|
||||
// Failure
|
||||
@@ -117,7 +113,7 @@ public class Buy extends Command {
|
||||
confirm.run(this, () -> {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_balance"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
Template.of("money", this.econHandler.format(price))
|
||||
);
|
||||
|
||||
this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
|
||||
@@ -126,11 +122,9 @@ public class Buy extends Command {
|
||||
if (owner != null) {
|
||||
owner.sendMessage(
|
||||
TranslatableCaption.of("economy.plot_sold"),
|
||||
TagResolver.builder()
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.tag("player", Tag.inserting(Component.text(player.getName())))
|
||||
.tag("price", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
.build()
|
||||
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);
|
||||
@@ -141,7 +135,7 @@ public class Buy extends Command {
|
||||
plot.setOwner(player.getUUID());
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
whenDone.run(Buy.this, CommandResult.SUCCESS);
|
||||
}, () -> {
|
||||
|
||||
@@ -37,10 +37,7 @@ import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
|
||||
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
|
||||
@@ -65,7 +62,7 @@ public class Caps extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_CAPS_OTHER))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -92,17 +89,15 @@ public class Caps extends SubCommand {
|
||||
final int current = countedEntities[type];
|
||||
final int max = plot.getFlag(capFlag);
|
||||
final String percentage = String.format("%.1f", 100 * ((float) current / max));
|
||||
ComponentLike maxBeautified = max >= Integer.MAX_VALUE
|
||||
? TranslatableCaption.of("info.infinite").toComponent(player)
|
||||
: Component.text(max);
|
||||
String maxBeautified = max >= Integer.MAX_VALUE
|
||||
? TranslatableCaption.of("info.infinite").getComponent(player)
|
||||
: String.valueOf(max);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("info.plot_caps_format"),
|
||||
TagResolver.builder()
|
||||
.tag("cap", Tag.inserting(Component.text(name)))
|
||||
.tag("current", Tag.inserting(Component.text(current)))
|
||||
.tag("limit", Tag.inserting(maxBeautified))
|
||||
.tag("percentage", Tag.inserting(Component.text(percentage)))
|
||||
.build()
|
||||
Template.of("cap", name),
|
||||
Template.of("current", String.valueOf(current)),
|
||||
Template.of("limit", maxBeautified),
|
||||
Template.of("percentage", percentage)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,9 +28,7 @@ package com.plotsquared.core.command;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.PlotArea;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
/**
|
||||
* @deprecated In favor of "/plot toggle chat" and
|
||||
@@ -50,7 +48,7 @@ public class Chat extends SubCommand {
|
||||
check(area, TranslatableCaption.of("errors.not_in_plot_world"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.deprecated_commands"),
|
||||
TagResolver.resolver("replacement", Tag.inserting(Component.text("/plot toggle chat")))
|
||||
Template.of("replacement", "/plot toggle chat")
|
||||
);
|
||||
if (player.getPlotAreaAbs().isForcingPlotChat()) {
|
||||
player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));
|
||||
|
||||
@@ -45,9 +45,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlotExpression;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@@ -91,7 +89,7 @@ public class Claim extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Claim")))
|
||||
Template.of("value", "Claim")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -110,14 +108,14 @@ public class Claim extends SubCommand {
|
||||
if (grants <= 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(grants)))
|
||||
Template.of("amount", String.valueOf(grants))
|
||||
);
|
||||
metaDataAccess.remove();
|
||||
}
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
||||
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -132,10 +130,8 @@ public class Claim extends SubCommand {
|
||||
if (!area.hasSchematic(schematic)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
||||
TagResolver.builder()
|
||||
.tag("schemname", Tag.inserting(Component.text(schematic)))
|
||||
.tag("reason", Tag.inserting(Component.text("non-existent")))
|
||||
.build()
|
||||
Template.of("schemname", schematic),
|
||||
Template.of("reason", "non-existent")
|
||||
);
|
||||
}
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC
|
||||
@@ -145,7 +141,7 @@ public class Claim extends SubCommand {
|
||||
) && !force) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_schematic_permission"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(schematic)))
|
||||
Template.of("value", schematic)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -161,28 +157,16 @@ public class Claim extends SubCommand {
|
||||
if (this.econHandler.getMoney(player) < cost) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
||||
.tag(
|
||||
"balance",
|
||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
|
||||
player))))
|
||||
)
|
||||
.build()
|
||||
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"),
|
||||
TagResolver.builder()
|
||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
||||
.tag(
|
||||
"balance",
|
||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
|
||||
player))))
|
||||
)
|
||||
.build()
|
||||
Template.of("money", this.econHandler.format(cost)),
|
||||
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -194,10 +178,8 @@ public class Claim extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_granted_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
|
||||
.tag("remainingGrants", Tag.inserting(Component.text(grants)))
|
||||
.build()
|
||||
Template.of("usedGrants", String.valueOf((grants - 1))),
|
||||
Template.of("remainingGrants", String.valueOf(grants))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -223,7 +205,7 @@ public class Claim extends SubCommand {
|
||||
if (mergeEvent.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
|
||||
Template.of("value", "Auto merge on claim")
|
||||
);
|
||||
} else {
|
||||
if (plot.getPlotModificationManager().autoMerge(
|
||||
|
||||
@@ -43,9 +43,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@@ -88,7 +86,7 @@ public class Clear extends Command {
|
||||
if (eventResult == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Clear")))
|
||||
Template.of("value", "Clear")
|
||||
);
|
||||
return CompletableFuture.completedFuture(true);
|
||||
}
|
||||
@@ -139,10 +137,8 @@ public class Clear extends Command {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.clearing_done"),
|
||||
TagResolver.builder()
|
||||
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.build()
|
||||
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -39,15 +39,10 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.PlotCluster;
|
||||
import com.plotsquared.core.plot.PlotId;
|
||||
import com.plotsquared.core.util.ComponentHelper;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.kyori.adventure.text.format.Style;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -58,7 +53,6 @@ import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@CommandDeclaration(command = "cluster",
|
||||
aliases = "clusters",
|
||||
@@ -67,19 +61,18 @@ import java.util.stream.Stream;
|
||||
permission = "plots.cluster")
|
||||
public class Cluster extends SubCommand {
|
||||
|
||||
private static final Component[] AVAILABLE_ARGS = Stream.of(
|
||||
"list", "create", "delete", "resize", "invite", "kick", "leave", "helpers", "tp", "sethome"
|
||||
).map(s -> Component.text(s).style(Style.style(NamedTextColor.DARK_AQUA))).toArray(Component[]::new);
|
||||
private static final Component SEPARATOR = Component.text(", ").style(Style.style(NamedTextColor.GRAY));
|
||||
|
||||
// list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
|
||||
@Override
|
||||
public boolean onCommand(PlotPlayer<?> player, String[] args) {
|
||||
|
||||
// list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
|
||||
if (args.length == 0) {
|
||||
// return arguments
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_available_args"),
|
||||
TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
|
||||
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>"
|
||||
)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -90,17 +83,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster list")))
|
||||
Template.of("value", "/plot cluster list")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -112,7 +102,7 @@ public class Cluster extends SubCommand {
|
||||
Set<PlotCluster> clusters = area.getClusters();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_list_heading"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(clusters.size())))
|
||||
Template.of("amount", clusters.size() + "")
|
||||
);
|
||||
for (PlotCluster cluster : clusters) {
|
||||
// Ignore unmanaged clusters
|
||||
@@ -120,22 +110,22 @@ public class Cluster extends SubCommand {
|
||||
if (player.getUUID().equals(cluster.owner)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_list_element_owner"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
||||
Template.of("cluster", name)
|
||||
);
|
||||
} else if (cluster.helpers.contains(player.getUUID())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_list_element_helpers"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
||||
Template.of("cluster", name)
|
||||
);
|
||||
} else if (cluster.invited.contains(player.getUUID())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_list_element_invited"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
||||
Template.of("cluster", name)
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_list_element"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.toString())))
|
||||
Template.of("cluster", cluster.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -146,10 +136,7 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -161,10 +148,7 @@ public class Cluster extends SubCommand {
|
||||
if (args.length != 4) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot cluster create <name> <id-bot> <id-top>"))
|
||||
)
|
||||
Template.of("value", "/plot cluster create <name> <id-bot> <id-top>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -174,7 +158,7 @@ public class Cluster extends SubCommand {
|
||||
if (currentClusters >= player.getAllowedPlots()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_clusters"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
||||
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||
);
|
||||
}
|
||||
PlotId pos1;
|
||||
@@ -192,7 +176,7 @@ public class Cluster extends SubCommand {
|
||||
if (area.getCluster(name) != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("alias.alias_is_taken"),
|
||||
TagResolver.resolver("alias", Tag.inserting(Component.text(name)))
|
||||
Template.of("alias", name)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -206,7 +190,7 @@ public class Cluster extends SubCommand {
|
||||
if (cluster != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
||||
Template.of("cluster", cluster.getName())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -214,7 +198,7 @@ public class Cluster extends SubCommand {
|
||||
if (!area.contains(pos1) || !area.contains(pos2)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_outside"),
|
||||
TagResolver.resolver("area", Tag.inserting(Component.text(area.toString())))
|
||||
Template.of("area", String.valueOf(area))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -227,10 +211,7 @@ public class Cluster extends SubCommand {
|
||||
if (!plot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -252,10 +233,7 @@ public class Cluster extends SubCommand {
|
||||
if (current + cluster.getArea() > allowed) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea())))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -274,7 +252,7 @@ public class Cluster extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_created"),
|
||||
TagResolver.resolver("name", Tag.inserting(Component.text(name)))
|
||||
Template.of("name", name)
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -284,17 +262,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster delete [name]")))
|
||||
Template.of("value", "/plot cluster delete [name]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -309,7 +284,7 @@ public class Cluster extends SubCommand {
|
||||
if (cluster == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("cluster", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -325,18 +300,15 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"), TagResolver.resolver(
|
||||
player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.of(
|
||||
"cluster",
|
||||
Tag.inserting(Component.text(cluster.toString()))
|
||||
String.valueOf(cluster)
|
||||
));
|
||||
return true;
|
||||
}
|
||||
@@ -345,17 +317,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster resize [name]")))
|
||||
Template.of("value", "/plot cluster resize [name]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -389,10 +358,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -402,12 +368,13 @@ public class Cluster extends SubCommand {
|
||||
if (intersect != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(intersect.getName())))
|
||||
Template.of("cluster", intersect.getName())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
|
||||
Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
|
||||
// Set<Plot> removed = (HashSet<Plot>) existing.clone();
|
||||
Set<Plot> removed = new HashSet<>(existing);
|
||||
|
||||
removed.removeAll(newPlots);
|
||||
@@ -417,10 +384,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -431,10 +395,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -453,9 +414,7 @@ public class Cluster extends SubCommand {
|
||||
if (current + cluster.getArea() > allowed) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(
|
||||
Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea())
|
||||
)))
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea()))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -470,17 +429,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster invite <player>")))
|
||||
Template.of("value", "/plot cluster invite <player>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -499,10 +455,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE_OTHER)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -515,7 +468,7 @@ public class Cluster extends SubCommand {
|
||||
} else if (throwable != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
} else {
|
||||
if (!cluster.isAdded(uuid)) {
|
||||
@@ -527,7 +480,7 @@ public class Cluster extends SubCommand {
|
||||
if (otherPlayer != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_invited"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
||||
Template.of("cluster", cluster.getName())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -542,17 +495,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_KICK)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster kick <player>")))
|
||||
Template.of("value", "/plot cluster kick <player>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -570,10 +520,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_KICK_OTHER)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -586,7 +533,7 @@ public class Cluster extends SubCommand {
|
||||
} else if (throwable != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
} else {
|
||||
// Can't kick if the player is yourself, the owner, or not added to the cluster
|
||||
@@ -594,7 +541,7 @@ public class Cluster extends SubCommand {
|
||||
|| !cluster.isAdded(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cannot_kick_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(cluster.getName())))
|
||||
Template.of("value", cluster.getName())
|
||||
);
|
||||
} else {
|
||||
if (cluster.helpers.contains(uuid)) {
|
||||
@@ -609,7 +556,7 @@ public class Cluster extends SubCommand {
|
||||
if (player2 != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_removed"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
||||
Template.of("cluster", cluster.getName())
|
||||
);
|
||||
}
|
||||
removePlayerPlots(cluster, uuid, player2.getLocation().getWorldName());
|
||||
@@ -624,17 +571,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_LEAVE)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length != 1 && args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster leave [name]")))
|
||||
Template.of("value", "/plot cluster leave [name]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -648,7 +592,7 @@ public class Cluster extends SubCommand {
|
||||
if (cluster == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("cluster", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -676,7 +620,7 @@ public class Cluster extends SubCommand {
|
||||
DBFunc.removeInvited(cluster, uuid);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_removed"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
||||
Template.of("cluster", cluster.getName())
|
||||
);
|
||||
removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
|
||||
return true;
|
||||
@@ -685,20 +629,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(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"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot cluster members <add | remove> <player>"))
|
||||
)
|
||||
Template.of("value", "/plot cluster members <add | remove> <player>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -719,7 +657,7 @@ public class Cluster extends SubCommand {
|
||||
} else if (throwable != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
|
||||
Template.of("value", args[2])
|
||||
);
|
||||
} else {
|
||||
if (args[1].equalsIgnoreCase("add")) {
|
||||
@@ -733,9 +671,7 @@ public class Cluster extends SubCommand {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
||||
"/plot cluster members <add | remove> <player>"
|
||||
)))
|
||||
Template.of("value", "/plot cluster members <add | remove> <player>")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -748,17 +684,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster tp <name>")))
|
||||
Template.of("value", "/plot cluster tp <name>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -771,7 +704,7 @@ public class Cluster extends SubCommand {
|
||||
if (cluster == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("cluster", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -780,10 +713,7 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP_OTHER)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -799,17 +729,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length != 1 && args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster info [name]")))
|
||||
Template.of("value", "/plot cluster info [name]")
|
||||
);
|
||||
}
|
||||
PlotArea area = player.getApplicablePlotArea();
|
||||
@@ -823,7 +750,7 @@ public class Cluster extends SubCommand {
|
||||
if (cluster == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("cluster", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -852,14 +779,19 @@ 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");
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("id", Tag.inserting(Component.text(id)))
|
||||
.tag("owner", Tag.inserting(Component.text(owner)))
|
||||
.tag("name", Tag.inserting(Component.text(name)))
|
||||
.tag("size", Tag.inserting(Component.text(size)))
|
||||
.tag("rights", Tag.inserting(Component.text(rights)))
|
||||
.build();
|
||||
player.sendMessage(message, resolver);
|
||||
Template idTemplate = Template.of("id", id);
|
||||
Template ownerTemplate = Template.of("owner", owner);
|
||||
Template nameTemplate = Template.of("name", name);
|
||||
Template sizeTemplate = Template.of("size", size);
|
||||
Template rightsTemplate = Template.of("rights", rights);
|
||||
player.sendMessage(
|
||||
message,
|
||||
idTemplate,
|
||||
ownerTemplate,
|
||||
nameTemplate,
|
||||
sizeTemplate,
|
||||
rightsTemplate
|
||||
);
|
||||
}
|
||||
});
|
||||
return true;
|
||||
@@ -870,14 +802,14 @@ public class Cluster extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME))
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length != 1 && args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster sethome")))
|
||||
Template.of("value", "/plot cluster sethome")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -895,10 +827,7 @@ public class Cluster extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -917,7 +846,10 @@ public class Cluster extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("cluster.cluster_available_args"),
|
||||
TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
|
||||
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>"
|
||||
)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -32,9 +32,7 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
public class CmdConfirm {
|
||||
@@ -61,11 +59,9 @@ public class CmdConfirm {
|
||||
if (commandStr != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("confirm.requires_confirm"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text(commandStr)))
|
||||
.tag("timeout", Tag.inserting(Component.text(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)))
|
||||
.tag("value", Tag.inserting(Component.text("/plot confirm")))
|
||||
.build()
|
||||
Template.of("command", commandStr),
|
||||
Template.of("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)),
|
||||
Template.of("value", "/plot confirm")
|
||||
);
|
||||
}
|
||||
TaskManager.runTaskLater(() -> {
|
||||
|
||||
@@ -37,10 +37,8 @@ import com.plotsquared.core.util.StringComparison;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
@@ -265,14 +263,10 @@ public abstract class Command {
|
||||
max = c.size();
|
||||
}
|
||||
// Send the header
|
||||
player.sendMessage(
|
||||
header,
|
||||
TagResolver.builder()
|
||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
||||
.tag("max", Tag.inserting(Component.text(totalPages + 1)))
|
||||
.tag("amount", Tag.inserting(Component.text(c.size())))
|
||||
.build()
|
||||
);
|
||||
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);
|
||||
int i = page * size;
|
||||
@@ -280,24 +274,13 @@ public abstract class Command {
|
||||
i++;
|
||||
final CaptionHolder msg = new CaptionHolder();
|
||||
add.run(i, obj, msg);
|
||||
player.sendMessage(msg.get(), msg.getTagResolvers());
|
||||
player.sendMessage(msg.get(), msg.getTemplates());
|
||||
}
|
||||
// Send the footer
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("list.page_turn"),
|
||||
TagResolver.builder()
|
||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
||||
.tag(
|
||||
"command1",
|
||||
Tag.preProcessParsed(baseCommand + " " + page)
|
||||
)
|
||||
.tag("command2", Tag.preProcessParsed(baseCommand + " " + (page + 2)))
|
||||
.tag(
|
||||
"clickable",
|
||||
Tag.inserting(TranslatableCaption.of("list.clickable").toComponent(player))
|
||||
)
|
||||
.build()
|
||||
);
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -349,7 +332,7 @@ public abstract class Command {
|
||||
if (commands.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(MainCommand.getInstance().help.getUsage())))
|
||||
Template.of("value", MainCommand.getInstance().help.getUsage())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -370,7 +353,7 @@ public abstract class Command {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(cmd.getUsage())))
|
||||
Template.of("value", cmd.getUsage())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -405,7 +388,7 @@ public abstract class Command {
|
||||
// TODO improve or remove the Argument system
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(StringMan.join(fullSplit, " "))))
|
||||
Template.of("value", StringMan.join(fullSplit, " "))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -494,7 +477,7 @@ public abstract class Command {
|
||||
if (message) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(getPermission())))
|
||||
Template.of("node", getPermission())
|
||||
);
|
||||
}
|
||||
} else {
|
||||
@@ -519,7 +502,7 @@ public abstract class Command {
|
||||
public void sendUsage(PlotPlayer<?> player) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Template.of("value", getUsage())
|
||||
);
|
||||
}
|
||||
|
||||
@@ -623,13 +606,13 @@ public abstract class Command {
|
||||
return this.getFullId().hashCode();
|
||||
}
|
||||
|
||||
public void checkTrue(boolean mustBeTrue, Caption message, TagResolver... args) {
|
||||
public void checkTrue(boolean mustBeTrue, Caption message, Template... args) {
|
||||
if (!mustBeTrue) {
|
||||
throw new CommandException(message, args);
|
||||
}
|
||||
}
|
||||
|
||||
public <T> T check(T object, Caption message, TagResolver... args) {
|
||||
public <T> T check(T object, Caption message, Template... args) {
|
||||
if (object == null) {
|
||||
throw new CommandException(message, args);
|
||||
}
|
||||
@@ -645,10 +628,10 @@ public abstract class Command {
|
||||
|
||||
public static class CommandException extends RuntimeException {
|
||||
|
||||
private final Template[] args;
|
||||
private final Caption message;
|
||||
private final TagResolver[] args;
|
||||
|
||||
public CommandException(final @Nullable Caption message, final TagResolver... args) {
|
||||
public CommandException(final @Nullable Caption message, final Template... args) {
|
||||
this.message = message;
|
||||
this.args = args;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
package com.plotsquared.core.command;
|
||||
|
||||
import com.plotsquared.core.configuration.caption.Caption;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
@@ -41,7 +41,7 @@ public interface CommandCaller {
|
||||
* @param caption Caption to send
|
||||
* @param replacements Variable replacements
|
||||
*/
|
||||
void sendMessage(@NonNull Caption caption, @NonNull TagResolver... replacements);
|
||||
void sendMessage(@NonNull Caption caption, @NonNull Template... replacements);
|
||||
|
||||
/**
|
||||
* Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
|
||||
|
||||
@@ -29,9 +29,6 @@ import com.plotsquared.core.configuration.caption.Caption;
|
||||
import com.plotsquared.core.configuration.caption.LocaleHolder;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
@@ -100,11 +97,6 @@ public enum CommandCategory implements Caption {
|
||||
return this.caption.getComponent(localeHolder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
|
||||
return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a player has access to this command category
|
||||
*
|
||||
|
||||
@@ -34,9 +34,7 @@ import com.plotsquared.core.plot.comment.CommentInbox;
|
||||
import com.plotsquared.core.plot.comment.CommentManager;
|
||||
import com.plotsquared.core.plot.comment.PlotComment;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
@@ -53,10 +51,8 @@ public class Comment extends SubCommand {
|
||||
if (args.length < 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_syntax"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
||||
.build()
|
||||
Template.of("command", "/plot comment [X;Z]"),
|
||||
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -75,10 +71,8 @@ public class Comment extends SubCommand {
|
||||
if (args.length < 3) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_syntax"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
||||
.build()
|
||||
Template.of("command", "/plot comment [X;Z]"),
|
||||
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -89,10 +83,8 @@ public class Comment extends SubCommand {
|
||||
if (inbox == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_syntax"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
||||
.build()
|
||||
Template.of("command", "/plot comment [X;Z]"),
|
||||
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -112,10 +104,8 @@ public class Comment extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_syntax"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
||||
.build()
|
||||
Template.of("command", "/plot comment [X;Z]"),
|
||||
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.util.MathMan;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -77,9 +75,7 @@ public class Condense extends SubCommand {
|
||||
if (args.length != 2 && args.length != 3) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
||||
"/plot condense <area> <start | stop | info> [radius]"
|
||||
)))
|
||||
Template.of("value", "/plot condense <area> <start | stop | info> [radius]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -93,10 +89,7 @@ public class Condense extends SubCommand {
|
||||
if (args.length == 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot condense" + area + " start " + "<radius>"))
|
||||
)
|
||||
Template.of("value", "/plot condense" + area + " start <radius>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -195,10 +188,8 @@ public class Condense extends SubCommand {
|
||||
if (result.get()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.moving"),
|
||||
TagResolver.builder()
|
||||
.tag("origin", Tag.inserting(Component.text(origin.toString())))
|
||||
.tag("possible", Tag.inserting(Component.text(possible.toString())))
|
||||
.build()
|
||||
Template.of("origin", String.valueOf(origin)),
|
||||
Template.of("possible", String.valueOf(possible))
|
||||
);
|
||||
TaskManager.runTaskLater(task, TaskTime.ticks(1L));
|
||||
}
|
||||
@@ -218,7 +209,7 @@ public class Condense extends SubCommand {
|
||||
if (i >= free.size()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.skipping"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(origin.toString())))
|
||||
Template.of("plot", String.valueOf(origin))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -239,10 +230,7 @@ public class Condense extends SubCommand {
|
||||
if (args.length == 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot condense " + area + " info <radius>"))
|
||||
)
|
||||
Template.of("value", "/plot condense " + area + " info <radius>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -263,20 +251,20 @@ public class Condense extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("condense.default_eval"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.minimum_radius"),
|
||||
TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
|
||||
Template.of("minimumRadius", String.valueOf(minimumRadius))
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.maximum_moved"),
|
||||
TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
|
||||
TranslatableCaption.of("condense.minimum_radius"),
|
||||
Template.of("maxMove", String.valueOf(maxMove))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("condense.input_eval"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.input_radius"),
|
||||
TagResolver.resolver("radius", Tag.inserting(Component.text(radius)))
|
||||
Template.of("radius", String.valueOf(radius))
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("condense.estimated_moves"),
|
||||
TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
|
||||
Template.of("userMove", String.valueOf(userMove))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("condense.eta"));
|
||||
player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
|
||||
@@ -285,10 +273,7 @@ public class Condense extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot condense " + area.getWorldName() + " <start | stop | info> [radius]"))
|
||||
)
|
||||
Template.of("value", "/plot condense " + area.getWorldName() + " <start | stop | info> [radius]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -37,9 +37,7 @@ import com.plotsquared.core.plot.flag.PlotFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "continue",
|
||||
@@ -66,9 +64,7 @@ public class Continue extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(
|
||||
TranslatableCaption.of("permission.no_plot_perms").toComponent(player)
|
||||
))
|
||||
Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -81,7 +77,7 @@ public class Continue extends SubCommand {
|
||||
< player.getPlotCount() + size)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
||||
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -95,7 +91,7 @@ public class Continue extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Done flag removal")))
|
||||
Template.of("value", "Done flag removal")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -31,9 +31,7 @@ import com.plotsquared.core.permissions.Permission;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
@CommandDeclaration(command = "copy",
|
||||
permission = "plots.copy",
|
||||
@@ -59,7 +57,7 @@ public class Copy extends SubCommand {
|
||||
if (args.length != 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot copy <X;Z>")))
|
||||
Template.of("value", "/plot copy <X;Z>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -78,11 +76,8 @@ public class Copy extends SubCommand {
|
||||
|
||||
plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
|
||||
if (result) {
|
||||
player.sendMessage(TranslatableCaption.of("move.copy_success"),
|
||||
TagResolver.builder()
|
||||
.tag("origin", Tag.inserting(Component.text(plot1.toString())))
|
||||
.tag("target", Tag.inserting(Component.text(plot2.toString())))
|
||||
.build()
|
||||
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"));
|
||||
|
||||
@@ -32,9 +32,7 @@ import com.plotsquared.core.generator.HybridUtils;
|
||||
import com.plotsquared.core.location.Location;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "createroadschematic",
|
||||
@@ -70,7 +68,7 @@ public class CreateRoadSchematic extends SubCommand {
|
||||
this.hybridUtils.setupRoadSchematic(plot);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_road_created"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugroadregen")))
|
||||
Template.of("command", "/plot debugroadregen")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -47,9 +47,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.FileUtils;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.io.File;
|
||||
@@ -110,10 +108,7 @@ public class DatabaseCommand extends SubCommand {
|
||||
if (args.length < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot database [area] <sqlite | mysql | import>"))
|
||||
)
|
||||
Template.of("value", "/plot database [area] <sqlite | mysql | import>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -128,7 +123,7 @@ public class DatabaseCommand extends SubCommand {
|
||||
if (args.length < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot database [area] <sqlite|mysql|import>")))
|
||||
Template.of("value", "/plot database [area] <sqlite|mysql|import>")
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("database.arg"));
|
||||
return false;
|
||||
@@ -141,10 +136,7 @@ public class DatabaseCommand extends SubCommand {
|
||||
if (args.length < 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot database import <sqlite file> [prefix]"))
|
||||
)
|
||||
Template.of("value", "/plot database import <sqlite file> [prefix]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -155,7 +147,7 @@ public class DatabaseCommand extends SubCommand {
|
||||
if (!file.exists()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("database.does_not_exist"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(file.toString())))
|
||||
Template.of("value", String.valueOf(file))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -199,10 +191,8 @@ public class DatabaseCommand extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("database.skipping_duplicated_plot"),
|
||||
TagResolver.builder()
|
||||
.tag("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
.tag("id", Tag.inserting(Component.text(plot.temp)))
|
||||
.build()
|
||||
Template.of("plot", String.valueOf(plot)),
|
||||
Template.of("id", String.valueOf(plot.temp))
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -41,10 +41,7 @@ import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import com.sk89q.worldedit.world.entity.EntityType;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
import net.kyori.adventure.text.format.TextColor;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -78,10 +75,7 @@ public class Debug extends SubCommand {
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
|
||||
)
|
||||
Template.of("value", "/plot debug <loadedchunks | player | debug-players | entitytypes | msg>")
|
||||
);
|
||||
}
|
||||
if (args.length > 0) {
|
||||
@@ -108,7 +102,7 @@ public class Debug extends SubCommand {
|
||||
final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debug.cached_uuids"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(mappings.size())))
|
||||
Template.of("value", String.valueOf(mappings.size()))
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -117,7 +111,7 @@ public class Debug extends SubCommand {
|
||||
for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debug.player_in_debugmode_list"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(pp.getName())))
|
||||
Template.of("value", pp.getName())
|
||||
);
|
||||
}
|
||||
return true;
|
||||
@@ -127,11 +121,10 @@ public class Debug extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("debug.entity_categories"));
|
||||
EntityCategory.REGISTRY.forEach(category -> {
|
||||
final StringBuilder builder =
|
||||
new StringBuilder("<gray>-</gray> <gold>").append(category.getId()).append("</gold><gray>: <gold>");
|
||||
new StringBuilder("§7- §6").append(category.getId()).append("§7: §6");
|
||||
for (final EntityType entityType : category.getAll()) {
|
||||
builder.append(entityType.getId()).append(" ");
|
||||
}
|
||||
builder.append("</gold>");
|
||||
player.sendMessage(StaticCaption.of("<prefix>" + builder));
|
||||
});
|
||||
EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
|
||||
@@ -151,53 +144,28 @@ public class Debug extends SubCommand {
|
||||
.getCaptionMap(TranslatableCaption.DEFAULT_NAMESPACE)
|
||||
.getCaptions();
|
||||
TextComponent.Builder information = Component.text();
|
||||
Component header = TranslatableCaption.of("debug.debug_header").toComponent(player)
|
||||
.append(Component.newline());
|
||||
Component header = MINI_MESSAGE.parse(TranslatableCaption.of("debug.debug_header").getComponent(player) + "\n");
|
||||
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,
|
||||
TagResolver.resolver("val", Tag.inserting(Component.text("PlotArea")))
|
||||
));
|
||||
information.append(MINI_MESSAGE.parse(section, Template.of("val", "PlotArea")));
|
||||
information.append(MINI_MESSAGE
|
||||
.deserialize(
|
||||
.parse(
|
||||
line,
|
||||
TagResolver.builder()
|
||||
.tag("var", Tag.inserting(Component.text("Plot Worlds")))
|
||||
.tag(
|
||||
"val",
|
||||
Tag.inserting(Component.text(StringMan.join(
|
||||
this.plotAreaManager.getAllPlotAreas(),
|
||||
", "
|
||||
)))
|
||||
)
|
||||
.build()
|
||||
Template.of("var", "Plot Worlds"),
|
||||
Template.of("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", "))
|
||||
));
|
||||
information.append(
|
||||
MINI_MESSAGE.deserialize(
|
||||
MINI_MESSAGE.parse(
|
||||
line,
|
||||
TagResolver.builder()
|
||||
.tag("var", Tag.inserting(Component.text("Owned Plots")))
|
||||
.tag(
|
||||
"val",
|
||||
Tag.inserting(Component.text(PlotQuery.newQuery().allPlots().count()))
|
||||
)
|
||||
.build()
|
||||
Template.of("var", "Owned Plots"),
|
||||
Template.of("val", String.valueOf(PlotQuery.newQuery().allPlots().count()))
|
||||
));
|
||||
information.append(MINI_MESSAGE.deserialize(
|
||||
section,
|
||||
TagResolver.resolver("val", Tag.inserting(Component.text("Messages")))
|
||||
));
|
||||
information.append(MINI_MESSAGE.deserialize(
|
||||
information.append(MINI_MESSAGE.parse(section, Template.of("val", "Messages")));
|
||||
information.append(MINI_MESSAGE.parse(
|
||||
line,
|
||||
TagResolver.builder()
|
||||
.tag("var", Tag.inserting(Component.text("Total Messages")))
|
||||
.tag(
|
||||
"val",
|
||||
Tag.inserting(Component.text(captions.size()))
|
||||
)
|
||||
.build()
|
||||
Template.of("var", "Total Messages"),
|
||||
Template.of("val", String.valueOf(captions.size()))
|
||||
));
|
||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
|
||||
return true;
|
||||
|
||||
@@ -43,13 +43,12 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
@@ -104,7 +103,7 @@ public class DebugExec extends SubCommand {
|
||||
if (analysis != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugexec.changes_column"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(analysis.changes)))
|
||||
Template.of("value", String.valueOf(analysis.changes))
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -114,7 +113,7 @@ public class DebugExec extends SubCommand {
|
||||
public void run(PlotAnalysis value) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugexec.analyze_done"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugexec analyze")))
|
||||
Template.of("command", "/plot debugexec analyze")
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -124,10 +123,7 @@ public class DebugExec extends SubCommand {
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot debugexec analyze <threshold>"))
|
||||
)
|
||||
Template.of("value", "/plot debugexec analyze <threshold>")
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
|
||||
return false;
|
||||
@@ -138,7 +134,7 @@ public class DebugExec extends SubCommand {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugexec.invalid_threshold"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
|
||||
return false;
|
||||
@@ -172,7 +168,7 @@ public class DebugExec extends SubCommand {
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot debugexec remove-flag <flag>")))
|
||||
Template.of("value", "/plot debugexec remove-flag <flag>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -190,7 +186,7 @@ public class DebugExec extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugexec.cleared_flag"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(flag)))
|
||||
Template.of("value", flag)
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -198,10 +194,7 @@ public class DebugExec extends SubCommand {
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("Invalid syntax: /plot debugexec start-rgar <world>"))
|
||||
)
|
||||
Template.of("value", "Invalid syntax: /plot debugexec start-rgar <world>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -209,7 +202,7 @@ public class DebugExec extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -38,9 +38,7 @@ import com.plotsquared.core.inject.annotations.WorldFile;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.util.PremiumVerification;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.io.File;
|
||||
@@ -140,10 +138,8 @@ public class DebugPaste extends SubCommand {
|
||||
} catch (IOException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.latest_log"),
|
||||
TagResolver.builder()
|
||||
.tag("file", Tag.inserting(Component.text("latest.log")))
|
||||
.tag("size", Tag.inserting(Component.text("14MB")))
|
||||
.build()
|
||||
Template.of("file", "latest.log"),
|
||||
Template.of("size", "14MB")
|
||||
);
|
||||
}
|
||||
|
||||
@@ -152,7 +148,7 @@ public class DebugPaste extends SubCommand {
|
||||
} catch (final IllegalArgumentException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.empty_file"),
|
||||
TagResolver.resolver("file", Tag.inserting(Component.text("settings.yml")))
|
||||
Template.of("file", "settings.yml")
|
||||
);
|
||||
}
|
||||
try {
|
||||
@@ -160,7 +156,7 @@ public class DebugPaste extends SubCommand {
|
||||
} catch (final IllegalArgumentException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.empty_file"),
|
||||
TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
|
||||
Template.of("file", "worlds.yml")
|
||||
);
|
||||
}
|
||||
|
||||
@@ -173,7 +169,7 @@ public class DebugPaste extends SubCommand {
|
||||
} catch (final IOException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.skip_multiverse"),
|
||||
TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
|
||||
Template.of("file", "worlds.yml")
|
||||
);
|
||||
}
|
||||
|
||||
@@ -188,20 +184,20 @@ public class DebugPaste extends SubCommand {
|
||||
String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.debug_report_created"),
|
||||
TagResolver.resolver("url", Tag.preProcessParsed(link))
|
||||
Template.of("url", link)
|
||||
);
|
||||
} else {
|
||||
final String responseMessage = jsonObject.get("response").getAsString();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.creation_failed"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(responseMessage)))
|
||||
Template.of("value", responseMessage)
|
||||
);
|
||||
}
|
||||
} catch (final Throwable throwable) {
|
||||
throwable.printStackTrace();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugpaste.creation_failed"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(throwable.getMessage())))
|
||||
Template.of("value", throwable.getMessage())
|
||||
);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
|
||||
@@ -35,9 +35,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.PlotManager;
|
||||
import com.plotsquared.core.queue.QueueCoordinator;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -69,7 +67,7 @@ public class DebugRoadRegen extends SubCommand {
|
||||
if (args.length < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
||||
Template.of("value", DebugRoadRegen.USAGE)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -89,7 +87,7 @@ public class DebugRoadRegen extends SubCommand {
|
||||
default:
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
||||
Template.of("value", DebugRoadRegen.USAGE)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -112,11 +110,11 @@ public class DebugRoadRegen extends SubCommand {
|
||||
queue.setCompleteTask(() -> {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugroadregen.regen_done"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("value", plot.getId().toString())
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugroadregen.regen_all"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads")))
|
||||
Template.of("value", "/plot regenallroads")
|
||||
);
|
||||
});
|
||||
manager.createRoadEast(plot, queue);
|
||||
@@ -135,18 +133,18 @@ public class DebugRoadRegen extends SubCommand {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("0, 256")))
|
||||
Template.of("value", "0, 256")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
||||
Template.of("value", DebugRoadRegen.USAGE)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
} else if (args.length != 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
||||
Template.of("value", DebugRoadRegen.USAGE)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -164,11 +162,11 @@ public class DebugRoadRegen extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugroadregen.schematic"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
|
||||
Template.of("command", "/plot createroadschematic")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugroadregen.regenallroads"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot regenallroads")))
|
||||
Template.of("command", "/plot regenallroads")
|
||||
);
|
||||
boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
|
||||
if (!result) {
|
||||
|
||||
@@ -40,9 +40,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlotExpression;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
|
||||
@@ -87,7 +85,7 @@ public class Delete extends SubCommand {
|
||||
if (eventResult == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Delete")))
|
||||
Template.of("value", "Delete")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -123,17 +121,14 @@ public class Delete extends SubCommand {
|
||||
this.econHandler.depositMoney(player, value);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.added_balance"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(value))))
|
||||
Template.of("money", this.econHandler.format(value))
|
||||
);
|
||||
}
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.deleting_done"),
|
||||
TagResolver.resolver(
|
||||
"amount",
|
||||
Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
|
||||
),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
eventDispatcher.callPostDelete(plot);
|
||||
});
|
||||
|
||||
@@ -42,9 +42,7 @@ import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -99,7 +97,7 @@ public class Deny extends SubCommand {
|
||||
if (size >= maxDenySize) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("members.plot_max_members_denied"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(size)))
|
||||
Template.of("amount", String.valueOf(size))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -110,7 +108,7 @@ public class Deny extends SubCommand {
|
||||
} else if (throwable != null || uuids.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
} else {
|
||||
for (UUID uuid : uuids) {
|
||||
@@ -119,7 +117,7 @@ public class Deny extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
} else if (plot.isOwner(uuid)) {
|
||||
player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
|
||||
@@ -127,10 +125,7 @@ public class Deny extends SubCommand {
|
||||
} else if (plot.getDenied().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
|
||||
@@ -34,9 +34,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "setdescription",
|
||||
@@ -63,7 +61,7 @@ public class Desc extends SetCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Description removal")))
|
||||
Template.of("value", "Description removal")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -78,7 +76,7 @@ public class Desc extends SetCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Description set")))
|
||||
Template.of("value", "Description set")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -43,9 +43,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "done",
|
||||
@@ -79,7 +77,7 @@ public class Done extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Done")))
|
||||
Template.of("value", "Done")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -100,7 +98,7 @@ public class Done extends SubCommand {
|
||||
plot.addRunning();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generating_link"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(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) {
|
||||
|
||||
@@ -41,9 +41,7 @@ import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.net.URL;
|
||||
@@ -123,10 +121,7 @@ public class Download extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_DOWNLOAD_WORLD)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -140,24 +135,18 @@ public class Download extends SubCommand {
|
||||
if (url == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generating_link_failed"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
return;
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generation_link_success_legacy_world"),
|
||||
TagResolver.resolver("url", Tag.inserting(Component.text(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"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.of("plot", plot.getId().toString()));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -201,10 +190,8 @@ public class Download extends SubCommand {
|
||||
public void run(URL value) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generation_link_success"),
|
||||
TagResolver.builder()
|
||||
.tag("download", Tag.preProcessParsed(value.toString()))
|
||||
.tag("delete", Tag.preProcessParsed("Not available"))
|
||||
.build()
|
||||
Template.of("download", value.toString()),
|
||||
Template.of("delete", "Not available")
|
||||
);
|
||||
player.sendMessage(StaticCaption.of(value.toString()));
|
||||
}
|
||||
@@ -218,15 +205,13 @@ public class Download extends SubCommand {
|
||||
if (throwable != null || !result.isSuccess()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generating_link_failed"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.generation_link_success"),
|
||||
TagResolver.builder()
|
||||
.tag("download", Tag.preProcessParsed(result.getDownloadUrl()))
|
||||
.tag("delete", Tag.preProcessParsed(result.getDeletionUrl()))
|
||||
.build()
|
||||
Template.of("download", result.getDownloadUrl()),
|
||||
Template.of("delete", result.getDeletionUrl())
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -30,6 +30,7 @@ import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.events.PlotFlagAddEvent;
|
||||
import com.plotsquared.core.events.PlotFlagRemoveEvent;
|
||||
@@ -54,9 +55,7 @@ import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.format.Style;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
@@ -93,10 +92,7 @@ public final class FlagCommand extends Command {
|
||||
private static boolean sendMessage(PlotPlayer<?> player) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot flag <set | remove | add | list | info> <flag> <value>"))
|
||||
)
|
||||
Template.of("value", "/plot flag <set | remove | add | list | info> <flag> <value>")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -122,9 +118,9 @@ public final class FlagCommand extends Command {
|
||||
if (!result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
Template.of(
|
||||
"node",
|
||||
Tag.inserting(Component.text(perm + "." + numeric))
|
||||
perm + "." + numeric
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -141,21 +137,16 @@ public final class FlagCommand extends Command {
|
||||
);
|
||||
final boolean result = Permissions.hasPermission(player, permission);
|
||||
if (!result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(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"),
|
||||
TagResolver.builder()
|
||||
.tag("flag_name", Tag.inserting(Component.text(flag.getName())))
|
||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
||||
.build()
|
||||
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) {
|
||||
@@ -172,10 +163,7 @@ public final class FlagCommand extends Command {
|
||||
perm = basePerm;
|
||||
}
|
||||
if (!result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(perm)))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", perm));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -200,7 +188,7 @@ public final class FlagCommand extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_SET_FLAG_OTHER))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -235,7 +223,7 @@ public final class FlagCommand extends Command {
|
||||
if (best != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.not_valid_flag_suggested"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(best)))
|
||||
Template.of("value", best)
|
||||
);
|
||||
suggested = true;
|
||||
}
|
||||
@@ -344,7 +332,7 @@ public final class FlagCommand extends Command {
|
||||
if (args.length < 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag set <flag> <value>")))
|
||||
Template.of("value", "/plot flag set <flag> <value>")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -357,7 +345,7 @@ public final class FlagCommand extends Command {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag set")))
|
||||
Template.of("value", "Flag set")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -373,21 +361,15 @@ public final class FlagCommand extends Command {
|
||||
} catch (final FlagParseException e) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_parse_error"),
|
||||
TagResolver.builder()
|
||||
.tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
|
||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
||||
.build()
|
||||
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"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
||||
.tag("value", Tag.inserting(Component.text(parsed.toString())))
|
||||
.build()
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
|
||||
Template.of("value", String.valueOf(parsed))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -409,7 +391,7 @@ public final class FlagCommand extends Command {
|
||||
if (args.length < 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag add <flag> <values>")))
|
||||
Template.of("value", "/plot flag add <flag> <values>")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -422,7 +404,7 @@ public final class FlagCommand extends Command {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag add")))
|
||||
Template.of("value", "Flag add")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -443,11 +425,9 @@ public final class FlagCommand extends Command {
|
||||
} catch (FlagParseException e) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_parse_error"),
|
||||
TagResolver.builder()
|
||||
.tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
|
||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
||||
.build()
|
||||
Template.of("flag_name", plotFlag.getName()),
|
||||
Template.of("flag_value", e.getValue()),
|
||||
Template.of("error", e.getErrorMessage().getComponent(player))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -457,12 +437,8 @@ public final class FlagCommand extends Command {
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
|
||||
return;
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_added"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
||||
.tag("value", Tag.inserting(Component.text(parsed.toString())))
|
||||
.build()
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
|
||||
Template.of("value", String.valueOf(parsed))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -484,7 +460,7 @@ public final class FlagCommand extends Command {
|
||||
if (args.length != 1 && args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag remove <flag> [values]")))
|
||||
Template.of("value", "/plot flag remove <flag> [values]")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -497,7 +473,7 @@ public final class FlagCommand extends Command {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag remove")))
|
||||
Template.of("value", "Flag remove")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -507,10 +483,7 @@ public final class FlagCommand extends Command {
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase())))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -525,11 +498,9 @@ public final class FlagCommand extends Command {
|
||||
} catch (final FlagParseException e) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_parse_error"),
|
||||
TagResolver.builder()
|
||||
.tag("flag_name", Tag.inserting(Component.text(flag.getName())))
|
||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
||||
.build()
|
||||
Template.of("flag_name", flag.getName()),
|
||||
Template.of("flag_value", e.getValue()),
|
||||
Template.of("error", String.valueOf(e.getErrorMessage()))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -540,13 +511,10 @@ 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"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
||||
.tag("value", Tag.inserting(Component.text(flag.toString())))
|
||||
.build()
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||
"value",
|
||||
String.valueOf(flag)
|
||||
));
|
||||
return;
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_not_removed"));
|
||||
@@ -558,10 +526,7 @@ public final class FlagCommand extends Command {
|
||||
if (addEvent.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("Re-addition of " + plotFlag.getName()))
|
||||
)
|
||||
Template.of("value", "Re-addition of " + plotFlag.getName())
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -584,13 +549,10 @@ public final class FlagCommand extends Command {
|
||||
return;
|
||||
}
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_removed"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
||||
.tag("value", Tag.inserting(Component.text(flag.toString())))
|
||||
.build()
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||
"value",
|
||||
String.valueOf(flag)
|
||||
));
|
||||
}
|
||||
|
||||
@CommandDeclaration(command = "list",
|
||||
@@ -608,35 +570,34 @@ public final class FlagCommand extends Command {
|
||||
return;
|
||||
}
|
||||
|
||||
final Map<Component, ArrayList<String>> flags = new HashMap<>();
|
||||
final Map<String, ArrayList<String>> flags = new HashMap<>();
|
||||
for (PlotFlag<?, ?> plotFlag : GlobalFlagContainer.getInstance().getRecognizedPlotFlags()) {
|
||||
if (plotFlag instanceof InternalFlag) {
|
||||
continue;
|
||||
}
|
||||
final Component category = plotFlag.getFlagCategory().toComponent(player);
|
||||
final Collection<String> flagList = flags.computeIfAbsent(category, k -> new ArrayList<>());
|
||||
final String category = MINI_MESSAGE.stripTokens(plotFlag.getFlagCategory().getComponent(player));
|
||||
final Collection<String> flagList =
|
||||
flags.computeIfAbsent(category, k -> new ArrayList<>());
|
||||
flagList.add(plotFlag.getName());
|
||||
}
|
||||
|
||||
for (final Map.Entry<Component, ArrayList<String>> entry : flags.entrySet()) {
|
||||
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),
|
||||
TagResolver.resolver("category", Tag.inserting(entry.getKey().style(Style.empty())))
|
||||
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),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.preProcessParsed("/plot flag info " + flag))
|
||||
.tag("flag", Tag.inserting(Component.text(flag)))
|
||||
.tag("suffix", Tag.inserting(Component.text(flagIterator.hasNext() ? ", " : "")))
|
||||
.build()
|
||||
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())));
|
||||
@@ -660,7 +621,7 @@ public final class FlagCommand extends Command {
|
||||
if (args.length < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag info <flag>")))
|
||||
Template.of("value", "/plot flag info <flag>")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -668,17 +629,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"),
|
||||
TagResolver.resolver("flag", Tag.inserting(Component.text(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"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(plotFlag.getFlagCategory().toComponent(player))
|
||||
)
|
||||
Templates.of(player, "value", plotFlag.getFlagCategory())
|
||||
);
|
||||
// Flag description
|
||||
// TODO maybe merge and \n instead?
|
||||
@@ -687,18 +642,16 @@ public final class FlagCommand extends Command {
|
||||
// Flag example
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("flag.flag_info_example"),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.preProcessParsed("/plot flag set"))
|
||||
.tag("flag", Tag.preProcessParsed(plotFlag.getName()))
|
||||
.tag("value", Tag.preProcessParsed(plotFlag.getExample()))
|
||||
.build()
|
||||
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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(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"));
|
||||
|
||||
@@ -40,9 +40,7 @@ import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -73,7 +71,7 @@ public class Grant extends Command {
|
||||
checkTrue(
|
||||
args.length >= 1 && args.length <= 2,
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot grant <check | add> [player]")))
|
||||
Template.of("value", "/plot grant <check | add> [player]")
|
||||
);
|
||||
final String arg0 = args[0].toLowerCase();
|
||||
switch (arg0) {
|
||||
@@ -81,7 +79,7 @@ public class Grant extends Command {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_GRANT.format(arg0))))
|
||||
Template.of("node", Permission.PERMISSION_GRANT.format(arg0))
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -94,7 +92,7 @@ public class Grant extends Command {
|
||||
} else if (throwable != null || uuids.size() != 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(String.valueOf(uuids))))
|
||||
Template.of("value", String.valueOf(uuids))
|
||||
);
|
||||
} else {
|
||||
final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
|
||||
@@ -105,7 +103,7 @@ public class Grant extends Command {
|
||||
if (args[0].equalsIgnoreCase("check")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("grants.granted_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(access.get().orElse(0))))
|
||||
Template.of("amount", String.valueOf(access.get().orElse(0)))
|
||||
);
|
||||
} else {
|
||||
access.set(access.get().orElse(0) + 1);
|
||||
@@ -125,7 +123,7 @@ public class Grant extends Command {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("grants.granted_plots"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(granted)))
|
||||
Template.of("amount", String.valueOf(granted))
|
||||
);
|
||||
} else { // add
|
||||
int amount;
|
||||
@@ -140,7 +138,7 @@ public class Grant extends Command {
|
||||
DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("grants.added"),
|
||||
TagResolver.resolver("grants", Tag.inserting(Component.text(amount)))
|
||||
Template.of("grants", String.valueOf(amount))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,7 @@ import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -118,31 +117,27 @@ public class Help extends Command {
|
||||
}
|
||||
if (cat == null && page == 0) {
|
||||
TextComponent.Builder builder = Component.text();
|
||||
builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
|
||||
builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
|
||||
for (CommandCategory c : CommandCategory.values()) {
|
||||
if (!c.canAccess(player)) {
|
||||
continue;
|
||||
}
|
||||
builder.append(Component.newline()).append(MINI_MESSAGE
|
||||
.deserialize(
|
||||
.parse(
|
||||
TranslatableCaption.of("help.help_info_item").getComponent(player),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot help")))
|
||||
.tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
|
||||
.tag("category_desc", Tag.inserting(c.toComponent(player)))
|
||||
.build()
|
||||
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),
|
||||
TagResolver.builder()
|
||||
.tag("command", Tag.inserting(Component.text("/plot help")))
|
||||
.tag("category", Tag.inserting(Component.text("all")))
|
||||
.tag("category_desc", Tag.inserting(Component.text("Display all commands")))
|
||||
.build()
|
||||
Template.of("command", "/plot help"),
|
||||
Template.of("category", "all"),
|
||||
Template.of("category_desc", "Display all commands")
|
||||
));
|
||||
builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
|
||||
builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption
|
||||
.of("help.help_footer")
|
||||
.getComponent(player)));
|
||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
|
||||
|
||||
@@ -42,9 +42,7 @@ import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.query.SortingStrategy;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -81,10 +79,8 @@ public class HomeCommand extends Command {
|
||||
} else if (plots.size() < page || page < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.number_not_in_range"),
|
||||
TagResolver.builder()
|
||||
.tag("min", Tag.inserting(Component.text(1)))
|
||||
.tag("max", Tag.inserting(Component.text(plots.size())))
|
||||
.build()
|
||||
Template.of("min", "1"),
|
||||
Template.of("max", String.valueOf(plots.size()))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -119,7 +115,7 @@ public class HomeCommand extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_HOME)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_VISIT_OWNED.toString())))
|
||||
Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -141,7 +137,7 @@ public class HomeCommand extends Command {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_a_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
|
||||
Template.of("value", identifier)
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -182,7 +178,7 @@ public class HomeCommand extends Command {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_a_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
|
||||
Template.of("value", identifier)
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ package com.plotsquared.core.command;
|
||||
|
||||
import com.google.inject.TypeLiteral;
|
||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.permissions.Permission;
|
||||
import com.plotsquared.core.player.MetaDataAccess;
|
||||
@@ -42,8 +43,7 @@ import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -79,14 +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',
|
||||
TagResolver.builder()
|
||||
.tag("amount", Tag.inserting(Component.text(comments.length)))
|
||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
||||
.tag("max", Tag.inserting(Component.text(totalPages + 1)))
|
||||
.tag("word", Tag.inserting(Component.text("all")))
|
||||
.build()
|
||||
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
|
||||
@@ -95,28 +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),
|
||||
TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
|
||||
Template.of("comment", comment.comment)
|
||||
);
|
||||
} else {
|
||||
commentColored = MINI_MESSAGE
|
||||
.deserialize(
|
||||
.parse(
|
||||
TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
|
||||
TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
|
||||
Template.of("comment", comment.comment)
|
||||
);
|
||||
}
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("number", Tag.inserting(Component.text(x)))
|
||||
.tag("world", Tag.inserting(Component.text(comment.world)))
|
||||
.tag("plot_id", Tag.inserting(Component.text(comment.id.getX() + ";" + comment.id.getY())))
|
||||
.tag("commenter", Tag.inserting(Component.text(comment.senderName)))
|
||||
.tag("comment", Tag.inserting(commentColored))
|
||||
.build();
|
||||
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),
|
||||
resolver
|
||||
number,
|
||||
world,
|
||||
plot_id,
|
||||
commenter,
|
||||
commentTemplate
|
||||
));
|
||||
}
|
||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
|
||||
@@ -153,23 +150,20 @@ public class Inbox extends SubCommand {
|
||||
if (total != 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.inbox_item"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text(inbox + " (" + total + '/' + unread + ')'))
|
||||
)
|
||||
Template.of("value", inbox + " (" + total + '/' + unread + ')')
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.inbox_item"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
|
||||
Template.of("value", inbox.toString())
|
||||
);
|
||||
}
|
||||
})) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.inbox_item"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
|
||||
Template.of("value", inbox.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -180,10 +174,7 @@ public class Inbox extends SubCommand {
|
||||
if (inbox == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.invalid_inbox"),
|
||||
TagResolver.resolver(
|
||||
"list",
|
||||
Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), ", ")))
|
||||
)
|
||||
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), ", "))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -206,10 +197,7 @@ public class Inbox extends SubCommand {
|
||||
if (args.length != 3) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
|
||||
)
|
||||
Template.of("value", "/plot inbox " + inbox + " delete <index>")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -219,17 +207,14 @@ public class Inbox extends SubCommand {
|
||||
if (index < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
||||
TagResolver.resolver("number", Tag.inserting(Component.text(index)))
|
||||
Templates.of("number", index)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
|
||||
)
|
||||
Template.of("value", "/plot inbox " + inbox + " delete <index>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -240,7 +225,7 @@ public class Inbox extends SubCommand {
|
||||
if (index > value.size()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
||||
TagResolver.resolver("number", Tag.inserting(Component.text(index)))
|
||||
Templates.of("number", index)
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -250,7 +235,7 @@ public class Inbox extends SubCommand {
|
||||
if (success) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_removed_success"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment)))
|
||||
Template.of("value", comment.comment)
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
@@ -271,7 +256,7 @@ public class Inbox extends SubCommand {
|
||||
if (!comments.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("comment.comment_removed_success"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("*")))
|
||||
Template.of("value", String.valueOf(comments))
|
||||
);
|
||||
plot.getPlotCommentContainer().removeComments(comments);
|
||||
}
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -100,10 +98,7 @@ public class Info extends SubCommand {
|
||||
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_AREA_INFO_FORCE)
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -125,10 +120,7 @@ public class Info extends SubCommand {
|
||||
if (!hasOwner && !containsEveryone && !trustedEveryone) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("info.plot_info_unclaimed"),
|
||||
TagResolver.resolver(
|
||||
"plot",
|
||||
Tag.inserting(Component.text(plot.getId().getX() + ";" + plot.getId().getY()))
|
||||
)
|
||||
Template.of("plot", plot.getId().getX() + ";" + plot.getId().getY())
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -38,9 +38,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -91,7 +89,7 @@ public class Kick extends SubCommand {
|
||||
} else if (throwable != null || uuids.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
} else {
|
||||
Set<PlotPlayer<?>> players = new HashSet<>();
|
||||
@@ -115,7 +113,7 @@ public class Kick extends SubCommand {
|
||||
if (players.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -123,14 +121,14 @@ public class Kick extends SubCommand {
|
||||
if (!plot.equals(player2.getCurrentPlot())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(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"),
|
||||
TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
|
||||
Template.of("name", player2.getName())
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -32,9 +32,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.UUID;
|
||||
@@ -76,7 +74,7 @@ public class Leave extends Command {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.plot_left"),
|
||||
TagResolver.resolver("player", Tag.inserting(Component.text(player.getName())))
|
||||
Template.of("player", player.getName())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
|
||||
@@ -41,9 +41,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -162,7 +160,7 @@ public class Like extends SubCommand {
|
||||
if (oldRating != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -180,12 +178,12 @@ public class Like extends SubCommand {
|
||||
if (like) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_liked"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_disliked"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.Caption;
|
||||
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
import com.plotsquared.core.permissions.Permission;
|
||||
@@ -54,8 +55,7 @@ import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -132,7 +132,7 @@ public class ListCmd extends SubCommand {
|
||||
public void noArgs(PlotPlayer<?> player) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
|
||||
TagResolver.resolver("values", Tag.inserting(Component.text(Arrays.toString(getArgumentList(player)))))
|
||||
Templates.of("values", Arrays.toString(getArgumentList(player)))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -168,14 +168,9 @@ public class ListCmd extends SubCommand {
|
||||
if (query == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||
TagResolver.resolver(
|
||||
Template.of(
|
||||
"value",
|
||||
Tag.inserting(Component.text(
|
||||
new StringComparison<>(
|
||||
args[0],
|
||||
new String[]{"mine", "shared", "world", "all"}
|
||||
).getBestMatch()
|
||||
))
|
||||
new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch()
|
||||
)
|
||||
);
|
||||
return;
|
||||
@@ -203,7 +198,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.mine")))
|
||||
Templates.of("node", "plots.list.mine")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -218,7 +213,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.shared")))
|
||||
Templates.of("node", "plots.list.shared")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -231,14 +226,14 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
|
||||
Templates.of("node", "plots.list.world")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
||||
Templates.of("node", "plots.list.world." + world)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -248,7 +243,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.expired")))
|
||||
Templates.of("node", "plots.list.expired")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -262,14 +257,14 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_AREA)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.area")))
|
||||
Templates.of("node", "plots.list.area")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
||||
Templates.of("node", "plots.list.world." + world)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -283,7 +278,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.all")))
|
||||
Templates.of("node", "plots.list.all")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -293,7 +288,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.done")))
|
||||
Templates.of("node", "plots.list.done")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -308,7 +303,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.top")))
|
||||
Templates.of("node", "plots.list.top")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -319,7 +314,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.forsale")))
|
||||
Templates.of("node", "plots.list.forsale")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -332,7 +327,7 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.unowned")))
|
||||
Templates.of("node", "plots.list.unowned")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -342,14 +337,14 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.fuzzy")))
|
||||
Templates.of("node", "plots.list.fuzzy")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (args.length < (page == -1 ? 2 : 3)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot list fuzzy <search...> [#]")))
|
||||
Templates.of("value", "/plot list fuzzy <search...> [#]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -367,14 +362,14 @@ public class ListCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
|
||||
Templates.of("node", "plots.list.world")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!Permissions.hasPermission(player, "plots.list.world." + args[0])) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + args[0])))
|
||||
Templates.of("node", "plots.list.world." + args[0])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -393,15 +388,12 @@ public class ListCmd extends SubCommand {
|
||||
}
|
||||
}
|
||||
if (uuid == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("errors.invalid_player"), Templates.of("value", args[0]));
|
||||
} else {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.player")))
|
||||
Templates.of("node", "plots.list.player")
|
||||
);
|
||||
} else {
|
||||
sort[0] = false;
|
||||
@@ -437,34 +429,32 @@ 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),
|
||||
TagResolver.resolver("trusted", Tag.inserting(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),
|
||||
TagResolver.resolver("members", Tag.inserting(PlayerManager.getPlayerList(plot.getMembers(), player)))
|
||||
Template.of("members", PlayerManager.getPlayerList(plot.getMembers(), player))
|
||||
);
|
||||
TagResolver.Builder finalResolver = TagResolver.builder();
|
||||
finalResolver.tag(
|
||||
"command_tp",
|
||||
Tag.preProcessParsed("/plot visit " + plot.getArea() + ";" + plot.getId())
|
||||
);
|
||||
finalResolver.tag(
|
||||
"command_info",
|
||||
Tag.preProcessParsed("/plot info " + plot.getArea() + ";" + plot.getId())
|
||||
);
|
||||
finalResolver.tag("hover_info", Tag.inserting(
|
||||
Component.text()
|
||||
Template command_tp = Template.of("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId());
|
||||
Template command_info = Template.of("command_info", "/plot info " + plot.getArea() + ";" + plot.getId());
|
||||
Template hover_info =
|
||||
Template.of(
|
||||
"hover_info",
|
||||
MINI_MESSAGE.serialize(Component
|
||||
.text()
|
||||
.append(trusted)
|
||||
.append(Component.newline())
|
||||
.append(members)
|
||||
.asComponent()
|
||||
));
|
||||
finalResolver.tag("number", Tag.inserting(Component.text(i)));
|
||||
finalResolver.tag("plot", Tag.inserting(MINI_MESSAGE.deserialize(
|
||||
color.getComponent(player), TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
)));
|
||||
.asComponent())
|
||||
);
|
||||
Template numberTemplate = Template.of("number", String.valueOf(i));
|
||||
Template plotTemplate = Template.of(
|
||||
"plot",
|
||||
MINI_MESSAGE.parse(color.getComponent(player), Template.of("plot", plot.toString()))
|
||||
);
|
||||
|
||||
String prefix = "";
|
||||
String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
|
||||
String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
|
||||
@@ -473,37 +463,35 @@ public class ListCmd extends SubCommand {
|
||||
String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
|
||||
TextComponent.Builder builder = Component.text();
|
||||
if (plot.getFlag(ServerPlotFlag.class)) {
|
||||
TagResolver serverResolver = TagResolver.resolver(
|
||||
Template serverTemplate = Template.of(
|
||||
"info.server",
|
||||
Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
|
||||
TranslatableCaption.of("info.server").getComponent(player)
|
||||
);
|
||||
builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
|
||||
builder.append(MINI_MESSAGE.parse(server, serverTemplate));
|
||||
} else {
|
||||
try {
|
||||
final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
|
||||
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
|
||||
for (final UUIDMapping uuidMapping : names) {
|
||||
PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("prefix", Tag.inserting(Component.text(prefix)))
|
||||
.tag("player", Tag.inserting(Component.text(uuidMapping.getUsername())))
|
||||
.build();
|
||||
Template prefixTemplate = Template.of("prefix", prefix);
|
||||
Template playerTemplate = Template.of("player", uuidMapping.getUsername());
|
||||
if (pp != null) {
|
||||
builder.append(MINI_MESSAGE.deserialize(online, resolver));
|
||||
builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
|
||||
} else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
|
||||
TagResolver unknownResolver = TagResolver.resolver(
|
||||
Template unknownTemplate = Template.of(
|
||||
"info.unknown",
|
||||
Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
|
||||
TranslatableCaption.of("info.unknown").getComponent(player)
|
||||
);
|
||||
builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
|
||||
builder.append(MINI_MESSAGE.parse(unknown, unknownTemplate));
|
||||
} else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
|
||||
TagResolver everyoneResolver = TagResolver.resolver(
|
||||
Template everyoneTemplate = Template.of(
|
||||
"info.everyone",
|
||||
Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
|
||||
TranslatableCaption.of("info.everyone").getComponent(player)
|
||||
);
|
||||
builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
|
||||
builder.append(MINI_MESSAGE.parse(everyone, everyoneTemplate));
|
||||
} else {
|
||||
builder.append(MINI_MESSAGE.deserialize(offline, resolver));
|
||||
builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
|
||||
}
|
||||
prefix = ", ";
|
||||
}
|
||||
@@ -519,15 +507,15 @@ public class ListCmd extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(playerBuilder.toString())))
|
||||
Templates.of("value", playerBuilder.toString())
|
||||
);
|
||||
} catch (TimeoutException e) {
|
||||
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
|
||||
}
|
||||
}
|
||||
finalResolver.tag("players", Tag.inserting(builder.asComponent()));
|
||||
Template players = Template.of("players", builder.asComponent());
|
||||
caption.set(TranslatableCaption.of("info.plot_list_item"));
|
||||
caption.setTagResolvers(finalResolver.build());
|
||||
caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);
|
||||
}
|
||||
}, "/plot list " + args[0], TranslatableCaption.of("list.plot_list_header_paged"));
|
||||
}
|
||||
|
||||
@@ -43,9 +43,7 @@ import com.plotsquared.core.util.SchematicHandler;
|
||||
import com.plotsquared.core.util.TimeUtil;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.net.MalformedURLException;
|
||||
@@ -108,7 +106,7 @@ public class Load extends SubCommand {
|
||||
// No schematics found:
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.load_null"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot load")))
|
||||
Template.of("command", "/plot load")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -119,7 +117,7 @@ public class Load extends SubCommand {
|
||||
// use /plot load <index>
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("(1, " + schematics.size() + ')')))
|
||||
Template.of("value", "(1, " + schematics.size() + ')')
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -139,10 +137,7 @@ public class Load extends SubCommand {
|
||||
plot.removeRunning();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||
TagResolver.resolver(
|
||||
"reason",
|
||||
Tag.inserting(Component.text("non-existent or not in gzip format"))
|
||||
)
|
||||
Template.of("reason", "non-existent or not in gzip format")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -173,7 +168,7 @@ public class Load extends SubCommand {
|
||||
plot.removeRunning();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot load <index>")))
|
||||
Template.of("value", "/plot load <index>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -224,7 +219,7 @@ public class Load extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("web.load_list"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot load #")))
|
||||
Template.of("command", "/plot load #")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,9 +43,6 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlotExpression;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -321,7 +318,7 @@ public class MainCommand extends Command {
|
||||
if (message != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(message)))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", message)
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
|
||||
@@ -42,9 +42,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlotExpression;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.UUID;
|
||||
@@ -124,13 +122,11 @@ public class Merge extends SubCommand {
|
||||
if (direction == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
||||
"/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
|
||||
)))
|
||||
Template.of("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("help.direction"),
|
||||
TagResolver.resolver("dir", Tag.inserting(Component.text(direction(location.getYaw()))))
|
||||
Template.of("dir", direction(location.getYaw()))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -141,7 +137,7 @@ public class Merge extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Merge")))
|
||||
Template.of("value", "Merge")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -152,7 +148,7 @@ public class Merge extends SubCommand {
|
||||
if (!force && size - 1 > maxSize) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_MERGE + "." + (size + 1))))
|
||||
Template.of("node", Permission.PERMISSION_MERGE + "." + (size + 1))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -179,10 +175,7 @@ public class Merge extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -191,11 +184,8 @@ public class Merge extends SubCommand {
|
||||
this.econHandler.withdrawMoney(player, price);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_balance"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))),
|
||||
TagResolver.resolver(
|
||||
"balance",
|
||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
|
||||
)
|
||||
Template.of("money", this.econHandler.format(price)),
|
||||
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||
);
|
||||
}
|
||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||
@@ -209,7 +199,7 @@ public class Merge extends SubCommand {
|
||||
&& this.econHandler.getMoney(player) < price) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.cannot_afford_merge"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
Template.of("money", this.econHandler.format(price))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -223,7 +213,7 @@ public class Merge extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -232,7 +222,7 @@ public class Merge extends SubCommand {
|
||||
this.econHandler.withdrawMoney(player, price);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_balance"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
Template.of("money", this.econHandler.format(price))
|
||||
);
|
||||
}
|
||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||
@@ -248,7 +238,7 @@ public class Merge extends SubCommand {
|
||||
if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_OTHER))
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -273,14 +263,14 @@ public class Merge extends SubCommand {
|
||||
if (!force && this.econHandler.getMoney(player) < price) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.cannot_afford_merge"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
Template.of("money", this.econHandler.format(price))
|
||||
);
|
||||
return;
|
||||
}
|
||||
this.econHandler.withdrawMoney(player, price);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("economy.removed_balance"),
|
||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
||||
Template.of("money", this.econHandler.format(price))
|
||||
);
|
||||
}
|
||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||
@@ -288,15 +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),
|
||||
TagResolver.builder()
|
||||
.tag("player", Tag.inserting(Component.text(player.getName())))
|
||||
.tag(
|
||||
"location",
|
||||
Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
|
||||
)
|
||||
.build()
|
||||
Template.of("player", player.getName()),
|
||||
Template.of("location", plot.getWorldName() + ";" + plot.getId())
|
||||
)),
|
||||
run
|
||||
);
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@@ -116,10 +114,8 @@ public class Move extends SubCommand {
|
||||
if (result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("move.move_success"),
|
||||
TagResolver.builder()
|
||||
.tag("origin", Tag.inserting(Component.text(p1)))
|
||||
.tag("target", Tag.inserting(Component.text(p2)))
|
||||
.build()
|
||||
Template.of("origin", p1),
|
||||
Template.of("target", p2)
|
||||
);
|
||||
return true;
|
||||
} else {
|
||||
|
||||
@@ -43,9 +43,7 @@ import com.plotsquared.core.util.InventoryUtil;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.sk89q.worldedit.world.item.ItemType;
|
||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -92,10 +90,7 @@ public class Music extends SubCommand {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_ADMIN_MUSIC_OTHER)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER))
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -118,17 +113,15 @@ public class Music extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Music removal")))
|
||||
Template.of("value", "Music removal")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
plot.removeFlag(event.getFlag());
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("flag.flag_removed"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text("music")))
|
||||
.tag("value", Tag.inserting(Component.text("music_disc")))
|
||||
.build()
|
||||
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)
|
||||
@@ -137,17 +130,13 @@ public class Music extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Music addition")))
|
||||
Template.of("value", "Music addition")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
plot.setFlag(event.getFlag());
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("flag.flag_added"),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text("music")))
|
||||
.tag("value", Tag.inserting(Component.text(event.getFlag().getValue().toString())))
|
||||
.build()
|
||||
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"));
|
||||
|
||||
@@ -31,9 +31,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@@ -57,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"),
|
||||
TagResolver.resolver("list", Tag.inserting(Component.text(StringMan.join(plot.getPlayersInPlot(), ", "))))
|
||||
Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", "))
|
||||
);
|
||||
return CompletableFuture.completedFuture(true);
|
||||
}
|
||||
|
||||
@@ -42,9 +42,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
@@ -75,7 +73,7 @@ public class Owner extends SetCommand {
|
||||
if (value == null || value.isEmpty()) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot setowner <owner>")))
|
||||
Template.of("value", "/plot setowner <owner>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -87,7 +85,7 @@ public class Owner extends SetCommand {
|
||||
&& !value.equalsIgnoreCase("-")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(value)))
|
||||
Template.of("value", value)
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -101,7 +99,7 @@ public class Owner extends SetCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Owner change")))
|
||||
Template.of("value", "Owner change")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -124,7 +122,7 @@ public class Owner extends SetCommand {
|
||||
if (unlinkEvent.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Unlink on owner change")))
|
||||
Template.of("value", "Unlink on owner change")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -144,10 +142,7 @@ public class Owner extends SetCommand {
|
||||
if (plot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_owner"),
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
|
||||
)
|
||||
Template.of("player", PlayerManager.resolveName(uuid, false).getComponent(player))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -156,10 +151,7 @@ public class Owner extends SetCommand {
|
||||
if (other == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player_offline"),
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -195,10 +187,7 @@ public class Owner extends SetCommand {
|
||||
if (other != null) {
|
||||
other.sendMessage(
|
||||
TranslatableCaption.of("owner.now_owner"),
|
||||
TagResolver.resolver(
|
||||
"plot",
|
||||
Tag.inserting(Component.text(plot.getArea() + ";" + plot.getId()))
|
||||
)
|
||||
Template.of("plot", plot.getArea() + ";" + plot.getId())
|
||||
);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -30,9 +30,7 @@ import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.util.PremiumVerification;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
@CommandDeclaration(command = "plugin",
|
||||
permission = "plots.use",
|
||||
@@ -48,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>"),
|
||||
TagResolver.resolver("version", Tag.inserting(Component.text(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>"));
|
||||
@@ -58,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>"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(PremiumVerification.isPremium())))
|
||||
Template.of("value", String.valueOf(PremiumVerification.isPremium()))
|
||||
);
|
||||
});
|
||||
return true;
|
||||
|
||||
@@ -40,9 +40,7 @@ import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@@ -107,7 +105,7 @@ public class Purge extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
||||
Template.of("value", split[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -119,7 +117,7 @@ public class Purge extends SubCommand {
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_plot_id"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
||||
Template.of("value", split[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -130,7 +128,7 @@ public class Purge extends SubCommand {
|
||||
if (ownerMapping == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
||||
Template.of("value", split[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -142,7 +140,7 @@ public class Purge extends SubCommand {
|
||||
if (addedMapping == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
||||
Template.of("value", split[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -267,10 +265,7 @@ public class Purge extends SubCommand {
|
||||
DBFunc.purgeIds(ids);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("purge.purge_success"),
|
||||
TagResolver.resolver(
|
||||
"amount",
|
||||
Tag.inserting(Component.text(ids.size() + "/" + toDelete.size()))
|
||||
)
|
||||
Template.of("amount", ids.size() + "/" + toDelete.size())
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -45,9 +45,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -157,7 +155,7 @@ public class Rate extends SubCommand {
|
||||
if (plot.getRatings().containsKey(player.getUUID())) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -177,7 +175,7 @@ public class Rate extends SubCommand {
|
||||
plot.addRating(this.getPlayer().getUUID(), event.getRating());
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_applied"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
return false;
|
||||
@@ -250,7 +248,7 @@ public class Rate extends SubCommand {
|
||||
if (plot.getRatings().containsKey(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -260,7 +258,7 @@ public class Rate extends SubCommand {
|
||||
plot.addRating(uuid, event.getRating());
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("ratings.rating_applied"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -33,9 +33,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.PlotManager;
|
||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "regenallroads",
|
||||
@@ -67,18 +65,18 @@ public class RegenAllRoads extends SubCommand {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("(0, 256)")))
|
||||
Template.of("value", "(0, 256)")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads <world> [height]")))
|
||||
Template.of("value", "/plot regenallroads <world> [height]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -86,7 +84,7 @@ public class RegenAllRoads extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -97,7 +95,7 @@ public class RegenAllRoads extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("debugroadregen.schematic"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
|
||||
Template.of("command", "/plot createroadschematic")
|
||||
);
|
||||
player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started"));
|
||||
boolean result = this.hybridUtils.scheduleRoadUpdate(area, height);
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -88,7 +86,7 @@ public class Remove extends SubCommand {
|
||||
} else if (throwable != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
return;
|
||||
} else if (!uuids.isEmpty()) {
|
||||
@@ -125,12 +123,12 @@ public class Remove extends SubCommand {
|
||||
if (count == 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.removed_players"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(count)))
|
||||
Template.of("amount", count + "")
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -39,9 +39,7 @@ import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.SchematicHandler;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.net.URL;
|
||||
@@ -125,7 +123,7 @@ public class Save extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("web.save_success"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.deprecated_commands"),
|
||||
TagResolver.resolver("replacement", Tag.inserting(Component.text("/plot download")))
|
||||
Template.of("replacement", "/plot download")
|
||||
);
|
||||
try (final MetaDataAccess<List<String>> schematicAccess =
|
||||
player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {
|
||||
|
||||
@@ -43,9 +43,7 @@ import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.net.URL;
|
||||
@@ -82,7 +80,7 @@ public class SchematicCmd extends SubCommand {
|
||||
if (args.length < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
|
||||
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -92,20 +90,14 @@ public class SchematicCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("Possible values: save, paste, exportall, list"))
|
||||
)
|
||||
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||
);
|
||||
break;
|
||||
}
|
||||
@@ -146,10 +138,7 @@ public class SchematicCmd extends SubCommand {
|
||||
e.printStackTrace();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||
TagResolver.resolver(
|
||||
"reason",
|
||||
Tag.inserting(Component.text("non-existent url: " + location))
|
||||
)
|
||||
Template.of("reason", "non-existent url: " + location)
|
||||
);
|
||||
SchematicCmd.this.running = false;
|
||||
return;
|
||||
@@ -165,10 +154,7 @@ public class SchematicCmd extends SubCommand {
|
||||
SchematicCmd.this.running = false;
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||
TagResolver.resolver(
|
||||
"reason",
|
||||
Tag.inserting(Component.text("non-existent or not in gzip format"))
|
||||
)
|
||||
Template.of("reason", "non-existent or not in gzip format")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -203,10 +189,7 @@ public class SchematicCmd extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("Use /plot schematic exportall <area>"))
|
||||
)
|
||||
Template.of("value", "Use /plot schematic exportall <area>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -214,7 +197,7 @@ public class SchematicCmd extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -223,7 +206,7 @@ public class SchematicCmd extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Use /plot sch exportall <area>")))
|
||||
Template.of("value", "Use /plot sch exportall <area>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -237,7 +220,7 @@ public class SchematicCmd extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("schematics.plot_to_schem"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(plots.size())))
|
||||
Template.of("amount", String.valueOf(plots.size()))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -245,10 +228,7 @@ public class SchematicCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_SCHEMATIC_SAVE)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -291,22 +271,19 @@ public class SchematicCmd extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(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"),
|
||||
TagResolver.resolver("list", Tag.inserting(Component.text(string)))
|
||||
Template.of("list", string)
|
||||
);
|
||||
}
|
||||
default -> player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
|
||||
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||
);
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -47,9 +47,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
|
||||
import com.sk89q.worldedit.world.block.BlockCategory;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -132,7 +130,7 @@ public class Set extends SubCommand {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.component_illegal_block"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(forbiddenType)))
|
||||
Template.of("value", forbiddenType)
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -144,10 +142,7 @@ public class Set extends SubCommand {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(Permission.PERMISSION_SET_COMPONENT.format(component)))
|
||||
)
|
||||
Template.of("node", Permission.PERMISSION_SET_COMPONENT.format(component))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -170,7 +165,7 @@ public class Set extends SubCommand {
|
||||
plot.removeRunning();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.component_complete"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
});
|
||||
if (Settings.QUEUE.NOTIFY_PROGRESS) {
|
||||
|
||||
@@ -32,9 +32,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
public abstract class SetCommand extends SubCommand {
|
||||
|
||||
@@ -50,10 +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"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(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;
|
||||
@@ -63,10 +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"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Component.text(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;
|
||||
|
||||
@@ -30,9 +30,7 @@ import com.plotsquared.core.location.BlockLoc;
|
||||
import com.plotsquared.core.location.Location;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
@CommandDeclaration(command = "sethome",
|
||||
permission = "plots.set.home",
|
||||
@@ -73,7 +71,7 @@ public class SetHome extends SetCommand {
|
||||
default -> {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Use /plot set home [none]")))
|
||||
Template.of("value", "Use /plot set home [none]")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.setup.SetupProcess;
|
||||
import com.plotsquared.core.setup.SetupStep;
|
||||
import com.plotsquared.core.util.SetupUtils;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -87,10 +85,7 @@ public class Setup extends SubCommand {
|
||||
player.sendMessage(TranslatableCaption.of("setup.setup_not_started"));
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("Use /plot setup to start a setup process."))
|
||||
)
|
||||
Template.of("value", "Use /plot setup to start a setup process.")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -33,9 +33,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
@@ -93,10 +91,8 @@ public class Swap extends SubCommand {
|
||||
if (result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("swap.swap_success"),
|
||||
TagResolver.builder()
|
||||
.tag("origin", Tag.inserting(Component.text(p1)))
|
||||
.tag("target", Tag.inserting(Component.text(p2)))
|
||||
.build()
|
||||
Template.of("origin", p1),
|
||||
Template.of("target", p2)
|
||||
);
|
||||
return true;
|
||||
} else {
|
||||
|
||||
@@ -31,9 +31,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Locale;
|
||||
@@ -61,7 +59,7 @@ public class Target extends SubCommand {
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot target <<X;Z> | nearest>")))
|
||||
Template.of("value", "/plot target <<X;Z> | nearest>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -85,7 +83,7 @@ public class Target extends SubCommand {
|
||||
target.getCenter(player::setCompassTarget);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("compass.compass_target"),
|
||||
TagResolver.resolver("target", Tag.inserting(Component.text(target.toString())))
|
||||
Template.of("target", target.toString())
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -51,9 +51,6 @@ import com.plotsquared.core.util.SetupUtils;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.WorldUtil;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.io.File;
|
||||
@@ -179,16 +176,13 @@ public class Template extends SubCommand {
|
||||
if (args[0].equalsIgnoreCase("export")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/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"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot template import <world> <template>"))
|
||||
)
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template import <world> <template>")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
@@ -202,17 +196,14 @@ public class Template extends SubCommand {
|
||||
if (args.length != 3) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/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"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(world)))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", world)
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -220,7 +211,7 @@ public class Template extends SubCommand {
|
||||
if (!result) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("template.invalid_template"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", args[2])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -258,7 +249,7 @@ public class Template extends SubCommand {
|
||||
if (args.length != 2) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot template export <world>")))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", "/plot template export <world>")
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -266,7 +257,7 @@ public class Template extends SubCommand {
|
||||
if (area == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", args[1])
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -278,7 +269,7 @@ public class Template extends SubCommand {
|
||||
e.printStackTrace();
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("template.template_failed"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(e.getMessage())))
|
||||
net.kyori.adventure.text.minimessage.Template.of("value", e.getMessage())
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -29,9 +29,7 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
@CommandDeclaration(command = "toggle",
|
||||
aliases = {"attribute"},
|
||||
@@ -56,12 +54,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "chatspy")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -77,12 +75,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "worldedit")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -97,12 +95,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "chat")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -117,12 +115,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "ignoreExpireTask")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -137,12 +135,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "disabletitles")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -157,12 +155,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "disabletime")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -177,12 +175,12 @@ public class Toggle extends Command {
|
||||
if (toggle(player, "debug")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_disabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("toggle.toggle_enabled"),
|
||||
TagResolver.resolver("setting", Tag.inserting(Component.text(command.toString())))
|
||||
Template.of("setting", command.toString())
|
||||
);
|
||||
}
|
||||
player.refreshDebug();
|
||||
|
||||
@@ -27,6 +27,7 @@ package com.plotsquared.core.command;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
import com.plotsquared.core.permissions.Permission;
|
||||
@@ -38,9 +39,7 @@ import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Collection;
|
||||
@@ -83,7 +82,7 @@ public class Trust extends Command {
|
||||
);
|
||||
|
||||
checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Templates.of("value", getUsage())
|
||||
);
|
||||
|
||||
final CompletableFuture<Boolean> future = new CompletableFuture<>();
|
||||
@@ -94,14 +93,14 @@ public class Trust extends Command {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Template.of("value", args[0])
|
||||
);
|
||||
}
|
||||
future.completeExceptionally(throwable);
|
||||
return;
|
||||
} else {
|
||||
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
||||
Templates.of("value", args[0])
|
||||
);
|
||||
|
||||
Iterator<UUID> iterator = uuids.iterator();
|
||||
@@ -113,10 +112,7 @@ public class Trust extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -124,10 +120,7 @@ public class Trust extends Command {
|
||||
if (currentPlot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -135,10 +128,7 @@ public class Trust extends Command {
|
||||
if (currentPlot.getTrusted().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@@ -151,7 +141,7 @@ public class Trust extends Command {
|
||||
if (localTrustSize >= maxTrustSize) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("members.plot_max_members_trusted"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(localTrustSize)))
|
||||
Template.of("amount", String.valueOf(localTrustSize))
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -37,9 +37,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
@CommandDeclaration(command = "unlink",
|
||||
@@ -95,7 +93,7 @@ public class Unlink extends SubCommand {
|
||||
if (event.getEventResult() == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Unlink")))
|
||||
Template.of("value", "Unlink")
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ package com.plotsquared.core.command;
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.events.TeleportCause;
|
||||
import com.plotsquared.core.permissions.Permission;
|
||||
@@ -44,9 +45,7 @@ import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.query.SortingStrategy;
|
||||
import com.plotsquared.core.util.task.RunnableVal2;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -108,10 +107,8 @@ public class Visit extends Command {
|
||||
} else if (plots.size() < page || page < 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.number_not_in_range"),
|
||||
TagResolver.builder()
|
||||
.tag("min", Tag.inserting(Component.text(1)))
|
||||
.tag("max", Tag.inserting(Component.text(plots.size())))
|
||||
.build()
|
||||
Template.of("min", "1"),
|
||||
Template.of("max", String.valueOf(plots.size()))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -121,7 +118,7 @@ public class Visit extends Command {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_UNOWNED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.unowned")))
|
||||
Templates.of("node", "plots.visit.unowned")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -130,7 +127,7 @@ public class Visit extends Command {
|
||||
.hasPermission(player, Permission.PERMISSION_HOME)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.owned")))
|
||||
Templates.of("node", "plots.visit.owned")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -138,7 +135,7 @@ public class Visit extends Command {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SHARED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.shared")))
|
||||
Templates.of("node", "plots.visit.shared")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -149,7 +146,7 @@ public class Visit extends Command {
|
||||
&& !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.visit.other")))
|
||||
Templates.of("node", "plots.visit.other")
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -157,10 +154,7 @@ public class Visit extends Command {
|
||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver(
|
||||
"node",
|
||||
Tag.inserting(Permission.PERMISSION_VISIT_DENIED)
|
||||
)
|
||||
Template.of("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED))
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -202,11 +196,11 @@ public class Visit extends Command {
|
||||
if (!MathMan.isInteger(args[2])) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)")))
|
||||
Templates.of("value", "(1, ∞)")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Templates.of("value", getUsage())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -219,11 +213,11 @@ public class Visit extends Command {
|
||||
if (sortByArea == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_valid_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)")))
|
||||
Templates.of("value", "(1, ∞)")
|
||||
);
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Templates.of("value", getUsage())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -236,7 +230,7 @@ public class Visit extends Command {
|
||||
} else if (throwable != null || uuids.size() != 1) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Templates.of("value", getUsage())
|
||||
);
|
||||
} else {
|
||||
final UUID uuid = uuids.toArray(new UUID[0])[0];
|
||||
@@ -263,7 +257,7 @@ public class Visit extends Command {
|
||||
} catch (NumberFormatException ignored) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("invalid.not_a_number"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
||||
Template.of("value", args[1])
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
@@ -298,7 +292,7 @@ public class Visit extends Command {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(finalArgs[0])))
|
||||
Template.of("value", finalArgs[0])
|
||||
);
|
||||
}
|
||||
} else {
|
||||
@@ -326,7 +320,7 @@ public class Visit extends Command {
|
||||
// /p v is invalid
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
||||
Templates.of("value", getUsage())
|
||||
);
|
||||
return CompletableFuture.completedFuture(false);
|
||||
default:
|
||||
|
||||
@@ -45,10 +45,8 @@ import com.plotsquared.core.util.PatternUtil;
|
||||
import com.plotsquared.core.util.Permissions;
|
||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@@ -189,8 +187,7 @@ public class ComponentPresetManager {
|
||||
}
|
||||
final int size = (int) Math.ceil((double) allowedPresets.size() / 9.0D);
|
||||
final PlotInventory plotInventory = new PlotInventory(this.inventoryUtil, player, size,
|
||||
TranslatableCaption.of("preset.title").getComponent(player)
|
||||
) {
|
||||
TranslatableCaption.of("preset.title").getComponent(player)) {
|
||||
@Override
|
||||
public boolean onClick(final int index) {
|
||||
if (!getPlayer().getCurrentPlot().equals(plot)) {
|
||||
@@ -221,8 +218,7 @@ public class ComponentPresetManager {
|
||||
if (!econHandler.isEnabled(plot.getArea())) {
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("preset.economy_disabled"),
|
||||
TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.getDisplayName())))
|
||||
);
|
||||
Template.of("preset", componentPreset.getDisplayName()));
|
||||
return false;
|
||||
}
|
||||
if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
|
||||
@@ -232,10 +228,7 @@ public class ComponentPresetManager {
|
||||
econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
|
||||
getPlayer().sendMessage(
|
||||
TranslatableCaption.of("economy.removed_balance"),
|
||||
TagResolver.resolver(
|
||||
"money",
|
||||
Tag.inserting(Component.text(econHandler.format(componentPreset.getCost())))
|
||||
)
|
||||
Template.of("money", econHandler.format(componentPreset.getCost()))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -265,21 +258,19 @@ public class ComponentPresetManager {
|
||||
final List<String> lore = new ArrayList<>();
|
||||
if (preset.getCost() > 0) {
|
||||
if (!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_economy_disabled").getComponent(player))));
|
||||
} else {
|
||||
lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
|
||||
lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
|
||||
TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
|
||||
TagResolver.resolver("cost", Tag.inserting(Component.text(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),
|
||||
TagResolver.builder()
|
||||
.tag("component", Tag.inserting(Component.text(preset.getComponent().name().toLowerCase())))
|
||||
.tag("prefix", Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(player)))
|
||||
.build()
|
||||
Template.of("component", preset.getComponent().name().toLowerCase()),
|
||||
Template.of("prefix", TranslatableCaption.of("core.prefix").getComponent(player))
|
||||
)));
|
||||
lore.removeIf(String::isEmpty);
|
||||
lore.addAll(preset.getDescription());
|
||||
|
||||
@@ -249,9 +249,6 @@ public class Settings extends Config {
|
||||
public static int UUID_CACHE_SIZE = 100000;
|
||||
@Comment("Rate limit (per 10 minutes) for background UUID fetching from the Mojang API")
|
||||
public static int BACKGROUND_LIMIT = 200;
|
||||
@Comment("Whether the Mojang API service is enabled for impromptu api calls. If false only the Background task will use" +
|
||||
" http requests to fill the UUID cache (requires restart)")
|
||||
public static boolean IMPROMPTU_SERVICE_MOJANG_API = true;
|
||||
@Comment("Rate limit (per 10 minutes) for random UUID fetching from the Mojang API")
|
||||
public static int IMPROMPTU_LIMIT = 300;
|
||||
@Comment("Timeout (in milliseconds) for non-blocking UUID requests (mostly commands)")
|
||||
@@ -694,7 +691,6 @@ public class Settings extends Config {
|
||||
@Comment({"If blocks at the edges of queued operations should be set causing updates",
|
||||
" - Slightly slower, but prevents issues such as fences left connected to nothing"})
|
||||
public static boolean UPDATE_EDGES = true;
|
||||
|
||||
}
|
||||
|
||||
@Comment("Settings related to tab completion")
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
*/
|
||||
package com.plotsquared.core.configuration.caption;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
/**
|
||||
@@ -42,13 +40,4 @@ public interface Caption {
|
||||
*/
|
||||
@NonNull String getComponent(@NonNull LocaleHolder localeHolder);
|
||||
|
||||
/**
|
||||
* Get the Adventure {@link ComponentLike} for this caption
|
||||
*
|
||||
* @param localeHolder Locale holder
|
||||
* @return ComponentLike
|
||||
* @since TODO
|
||||
*/
|
||||
@NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
|
||||
|
||||
}
|
||||
|
||||
@@ -25,53 +25,27 @@
|
||||
*/
|
||||
package com.plotsquared.core.configuration.caption;
|
||||
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
/**
|
||||
* A holder for a caption.
|
||||
* Useful when constructing messages in multiple steps with {@link TagResolver}s.
|
||||
*/
|
||||
public class CaptionHolder {
|
||||
|
||||
private Caption caption = StaticCaption.of("");
|
||||
private TagResolver[] tagResolvers = new TagResolver[0];
|
||||
private Template[] templates = new Template[0];
|
||||
|
||||
/**
|
||||
* Set the {@link Caption} to send.
|
||||
*
|
||||
* @param caption The new caption.
|
||||
*/
|
||||
public void set(Caption caption) {
|
||||
this.caption = caption;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the {@link Caption} to send.
|
||||
*
|
||||
* @return The caption to send.
|
||||
*/
|
||||
public Caption get() {
|
||||
return this.caption;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
|
||||
*
|
||||
* @return The tag resolvers to use.
|
||||
* @since TODO
|
||||
*/
|
||||
public TagResolver[] getTagResolvers() {
|
||||
return this.tagResolvers;
|
||||
public Template[] getTemplates() {
|
||||
return this.templates;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
|
||||
*
|
||||
* @param tagResolvers The tag resolvers to use.
|
||||
* @since TODO
|
||||
*/
|
||||
public void setTagResolvers(TagResolver... tagResolvers) {
|
||||
this.tagResolvers = tagResolvers;
|
||||
public void setTemplates(Template... templates) {
|
||||
this.templates = templates;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -107,9 +107,9 @@ public class CaptionUtility {
|
||||
*/
|
||||
public static String stripClickEvents(final @NonNull String miniMessageString) {
|
||||
// parse, transform and serialize again
|
||||
Component component = MiniMessage.miniMessage().deserialize(miniMessageString);
|
||||
Component component = MiniMessage.get().parse(miniMessageString);
|
||||
component = CLICK_STRIP_TRANSFORM.transform(component);
|
||||
return MiniMessage.miniMessage().serialize(component);
|
||||
return MiniMessage.get().serialize(component);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,9 +26,6 @@
|
||||
package com.plotsquared.core.configuration.caption;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public final class StaticCaption implements Caption {
|
||||
@@ -54,9 +51,4 @@ public final class StaticCaption implements Caption {
|
||||
return this.value; // can't be translated
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
|
||||
return MiniMessage.miniMessage().deserialize(this.value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
/*
|
||||
* _____ _ _ _____ _
|
||||
* | __ \| | | | / ____| | |
|
||||
* | |__) | | ___ | |_| (___ __ _ _ _ __ _ _ __ ___ __| |
|
||||
* | ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
|
||||
* | | | | (_) | |_ ____) | (_| | |_| | (_| | | | __/ (_| |
|
||||
* |_| |_|\___/ \__|_____/ \__, |\__,_|\__,_|_| \___|\__,_|
|
||||
* | |
|
||||
* |_|
|
||||
* PlotSquared plot management system for Minecraft
|
||||
* Copyright (C) 2014 - 2022 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/>.
|
||||
*/
|
||||
package com.plotsquared.core.configuration.caption;
|
||||
|
||||
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 org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Utility class that generates {@link net.kyori.adventure.text.minimessage.Template templates}
|
||||
*/
|
||||
public final class Templates {
|
||||
|
||||
private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
|
||||
|
||||
private Templates() {
|
||||
throw new UnsupportedOperationException(
|
||||
"This is a utility class and cannot be instantiated");
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
public static @NonNull Template of(
|
||||
final @NonNull LocaleHolder localeHolder,
|
||||
final @NonNull String key, final @NonNull Caption caption,
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
return Template.of(key, MINI_MESSAGE.parse(caption.getComponent(localeHolder), replacements));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a {@link Template} from a username (using UUID mappings)
|
||||
*
|
||||
* @param key Template key
|
||||
* @param uuid Player UUID
|
||||
* @return Generated template
|
||||
*/
|
||||
public static @NonNull Template of(final @NonNull String key, final @NonNull UUID uuid) {
|
||||
final String username = PlayerManager.resolveName(uuid).getComponent(LocaleHolder.console());
|
||||
return Template.of(key, username);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a {@link Template} from a string
|
||||
*
|
||||
* @param key Template key
|
||||
* @param value Template value
|
||||
* @return Generated template
|
||||
*/
|
||||
public static @NonNull Template of(final @NonNull String key, final @NonNull String value) {
|
||||
return Template.of(key, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a {@link Template} from a plot area
|
||||
*
|
||||
* @param key Template Key
|
||||
* @param area Plot area
|
||||
* @return Generated template
|
||||
*/
|
||||
public static @NonNull Template of(final @NonNull String key, final @NonNull PlotArea area) {
|
||||
return Template.of(key, area.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a {@link Template} from a number
|
||||
*
|
||||
* @param key Template key
|
||||
* @param number Number
|
||||
* @return Generated template
|
||||
*/
|
||||
public static @NonNull Template of(final @NonNull String key, final @NonNull Number number) {
|
||||
return Template.of(key, number.toString());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -27,11 +27,6 @@ package com.plotsquared.core.configuration.caption;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Locale;
|
||||
@@ -101,17 +96,6 @@ public final class TranslatableCaption implements NamespacedCaption {
|
||||
return PlotSquared.get().getCaptionMap(this.namespace).getMessage(this, localeHolder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
|
||||
if (getKey().equals("core.prefix")) {
|
||||
return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
|
||||
}
|
||||
return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver(
|
||||
"prefix",
|
||||
Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder))
|
||||
));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull String getKey() {
|
||||
return this.key;
|
||||
|
||||
@@ -41,7 +41,7 @@ import com.plotsquared.core.plot.flag.GlobalFlagContainer;
|
||||
import com.plotsquared.core.plot.flag.PlotFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
|
||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||
import com.plotsquared.core.queue.ChunkQueueCoordinator;
|
||||
import com.plotsquared.core.queue.BlockArrayCacheScopedQueueCoordinator;
|
||||
import com.plotsquared.core.queue.GlobalBlockQueue;
|
||||
import com.plotsquared.core.queue.QueueCoordinator;
|
||||
import com.plotsquared.core.util.ChunkManager;
|
||||
@@ -83,6 +83,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
public class HybridUtils {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
|
||||
private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
|
||||
|
||||
public static HybridUtils manager;
|
||||
public static Set<BlockVector2> regions;
|
||||
@@ -136,6 +137,11 @@ public class HybridUtils {
|
||||
*
|
||||
*/
|
||||
TaskManager.runTaskAsync(() -> {
|
||||
final PlotArea area = this.plotAreaManager.getPlotArea(world, null);
|
||||
if (!(area instanceof HybridPlotWorld hpw)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final BlockVector3 bot = region.getMinimumPoint();
|
||||
final BlockVector3 top = region.getMaximumPoint();
|
||||
|
||||
@@ -152,37 +158,28 @@ public class HybridUtils {
|
||||
final int height = area.getMaxGenHeight() - area.getMinGenHeight() + 1;
|
||||
final int minHeight = area.getMinGenHeight();
|
||||
|
||||
final PlotArea area = this.plotAreaManager.getPlotArea(world, null);
|
||||
|
||||
if (!(area instanceof HybridPlotWorld hpw)) {
|
||||
return;
|
||||
}
|
||||
|
||||
ChunkQueueCoordinator chunk = new ChunkQueueCoordinator(worldUtil.getWeWorld(world), bot, top, false);
|
||||
hpw.getGenerator().generateChunk(chunk, hpw);
|
||||
|
||||
final BlockState airBlock = BlockTypes.AIR.getDefaultState();
|
||||
final BlockState[][][] oldBlocks = chunk.getBlocks();
|
||||
final BlockState[][][] newBlocks = new BlockState[height][width][length];
|
||||
for (final BlockState[][] newBlock : newBlocks) {
|
||||
for (final BlockState[] blockStates : newBlock) {
|
||||
Arrays.fill(blockStates, airBlock);
|
||||
}
|
||||
}
|
||||
for (final BlockState[][] oldBlock : oldBlocks) {
|
||||
for (final BlockState[] blockStates : oldBlock) {
|
||||
Arrays.fill(blockStates, airBlock);
|
||||
}
|
||||
}
|
||||
|
||||
System.gc();
|
||||
System.gc();
|
||||
BlockArrayCacheScopedQueueCoordinator oldBlockQueue = new BlockArrayCacheScopedQueueCoordinator(
|
||||
Location.at("", region.getMinimumPoint().withY(hpw.getMinGenHeight())),
|
||||
Location.at("", region.getMaximumPoint().withY(hpw.getMaxGenHeight()))
|
||||
);
|
||||
|
||||
region.getChunks().forEach(chunkPos -> {
|
||||
int relChunkX = chunkPos.getX() - cbx;
|
||||
int relChunkZ = chunkPos.getZ() - cbz;
|
||||
oldBlockQueue.setOffsetX(relChunkX << 4);
|
||||
oldBlockQueue.setOffsetZ(relChunkZ << 4);
|
||||
hpw.getGenerator().generateChunk(oldBlockQueue, hpw);
|
||||
});
|
||||
|
||||
final BlockState[][][] oldBlocks = oldBlockQueue.getBlockStates();
|
||||
|
||||
QueueCoordinator queue = area.getQueue();
|
||||
queue.addReadChunks(region.getChunks());
|
||||
queue.setChunkConsumer(blockVector2 -> {
|
||||
int X = blockVector2.getX();
|
||||
int Z = blockVector2.getZ();
|
||||
queue.setChunkConsumer(chunkPos -> {
|
||||
int X = chunkPos.getX();
|
||||
int Z = chunkPos.getZ();
|
||||
int minX;
|
||||
if (X == cbx) {
|
||||
minX = bx & 15;
|
||||
@@ -220,6 +217,9 @@ public class HybridUtils {
|
||||
for (int yIndex = 0; yIndex < height; yIndex++) {
|
||||
int y = yIndex + minHeight;
|
||||
BlockState block = queue.getBlock(xx, y, zz);
|
||||
if (block == null) {
|
||||
block = AIR;
|
||||
}
|
||||
int xr = xb + x;
|
||||
int zr = zb + z;
|
||||
newBlocks[yIndex][xr][zr] = block;
|
||||
@@ -240,10 +240,10 @@ public class HybridUtils {
|
||||
for (int z = 0; z < length; z++) {
|
||||
Set<BlockType> types = new HashSet<>();
|
||||
for (int yIndex = 0; yIndex < height; yIndex++) {
|
||||
BlockState old = oldBlocks[yIndex][x][z];
|
||||
BlockState old = oldBlocks[yIndex][x][z]; // Nullable
|
||||
try {
|
||||
BlockState now = newBlocks[yIndex][x][z];
|
||||
if (!old.equals(now)) {
|
||||
BlockState now = newBlocks[yIndex][x][z]; // Not null
|
||||
if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
|
||||
changes[i]++;
|
||||
}
|
||||
if (now.getBlockType().getMaterial().isAir()) {
|
||||
@@ -301,8 +301,6 @@ public class HybridUtils {
|
||||
analysis.data_sd = (int) (MathMan.getSD(data, analysis.data) * 100);
|
||||
analysis.air_sd = (int) (MathMan.getSD(air, analysis.air) * 100);
|
||||
analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100);
|
||||
System.gc();
|
||||
System.gc();
|
||||
whenDone.value = analysis;
|
||||
whenDone.run();
|
||||
});
|
||||
|
||||
@@ -72,11 +72,8 @@ import com.sk89q.worldedit.world.gamemode.GameMode;
|
||||
import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||
import com.sk89q.worldedit.world.item.ItemType;
|
||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -88,7 +85,7 @@ import java.util.function.Consumer;
|
||||
|
||||
public class PlotListener {
|
||||
|
||||
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
|
||||
private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
|
||||
|
||||
private final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
|
||||
private final HashMap<UUID, Interval> healRunnable = new HashMap<>();
|
||||
@@ -149,7 +146,7 @@ public class PlotListener {
|
||||
.hasPermission(player, "plots.admin.entry.denied")) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("deny.no_enter"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
Template.of("plot", plot.toString())
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -217,10 +214,8 @@ public class PlotListener {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
|
||||
TagResolver.builder()
|
||||
.tag("gamemode", Tag.inserting(Component.text(gameMode.toString())))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.build()
|
||||
Template.of("gamemode", String.valueOf(gameMode)),
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -234,10 +229,8 @@ public class PlotListener {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
|
||||
TagResolver.builder()
|
||||
.tag("gamemode", Tag.inserting(Component.text(guestGameMode.toString())))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.build()
|
||||
Template.of("gamemode", String.valueOf(guestGameMode)),
|
||||
Template.of("plot", plot.getId().toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -316,21 +309,39 @@ public class PlotListener {
|
||||
}
|
||||
if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
|
||||
final UUID plotOwner = plot.getOwnerAbs();
|
||||
ComponentLike owner = PlayerManager.resolveName(plotOwner, true).toComponent(player);
|
||||
String owner = PlayerManager.resolveName(plotOwner, true).getComponent(player);
|
||||
Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
|
||||
".title_entered_plot");
|
||||
Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
|
||||
".title_entered_plot_sub");
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
|
||||
.tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
|
||||
.tag("owner", Tag.inserting(owner))
|
||||
.tag("alias", Tag.inserting(Component.text(plot.getAlias())))
|
||||
.build();
|
||||
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) {
|
||||
player.sendActionBar(header, resolver);
|
||||
player.sendActionBar(header, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
|
||||
} else {
|
||||
player.sendTitle(header, subHeader, resolver);
|
||||
player.sendTitle(header, subHeader, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
|
||||
}
|
||||
};
|
||||
|
||||
UUID uuid = plot.getOwner();
|
||||
if (uuid == null) {
|
||||
userConsumer.accept("Unknown");
|
||||
} else if (uuid.equals(DBFunc.SERVER)) {
|
||||
userConsumer.accept(MINI_MESSAGE.stripTokens(TranslatableCaption
|
||||
.of("info.server")
|
||||
.getComponent(player)));
|
||||
} else {
|
||||
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(plot.getOwner(), (user, throwable) -> {
|
||||
if (throwable != null) {
|
||||
userConsumer.accept("Unknown");
|
||||
} else {
|
||||
userConsumer.accept(user);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}, TaskTime.seconds(1L));
|
||||
@@ -380,10 +391,8 @@ public class PlotListener {
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("gamemode.gamemode_was_bypassed"),
|
||||
TagResolver.builder()
|
||||
.tag("gamemode", Tag.inserting(Component.text(pw.getGameMode().toString())))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
.build()
|
||||
Template.of("gamemode", pw.getGameMode().getName().toLowerCase()),
|
||||
Template.of("plot", plot.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -453,15 +462,13 @@ public class PlotListener {
|
||||
}
|
||||
|
||||
private void notifyPlotOwner(final PlotPlayer<?> player, final Plot plot, final PlotPlayer<?> owner, final Caption caption) {
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("player", Tag.inserting(Component.text(player.getName())))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.tag("area", Tag.inserting(Component.text(String.valueOf(plot.getArea()))))
|
||||
.build();
|
||||
Template playerTemplate = Template.of("player", player.getName());
|
||||
Template plotTemplate = Template.of("plot", plot.getId().toString());
|
||||
Template areaTemplate = Template.of("area", plot.getArea().toString());
|
||||
if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
|
||||
owner.sendMessage(caption, resolver);
|
||||
owner.sendMessage(caption, playerTemplate, plotTemplate, areaTemplate);
|
||||
} else {
|
||||
owner.sendActionBar(caption, resolver);
|
||||
owner.sendActionBar(caption, playerTemplate, plotTemplate, areaTemplate);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -46,9 +46,7 @@ import com.sk89q.worldedit.util.Location;
|
||||
import com.sk89q.worldedit.util.eventbus.EventHandler.Priority;
|
||||
import com.sk89q.worldedit.util.eventbus.Subscribe;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.Set;
|
||||
@@ -104,7 +102,7 @@ public class WESubscriber {
|
||||
if (Permissions.hasPermission(plotPlayer, "plots.worldedit.bypass")) {
|
||||
plotPlayer.sendMessage(
|
||||
TranslatableCaption.of("worldedit.worldedit_bypass"),
|
||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot toggle worldedit")))
|
||||
Template.of("command", "/plot toggle worldedit")
|
||||
);
|
||||
}
|
||||
if (this.plotAreaManager.hasPlotArea(world)) {
|
||||
|
||||
@@ -25,15 +25,12 @@
|
||||
*/
|
||||
package com.plotsquared.core.permissions;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* Permission class.
|
||||
*/
|
||||
public enum Permission implements ComponentLike {
|
||||
public enum Permission {
|
||||
|
||||
//@formatter:off
|
||||
//<editor-fold desc="Static Permission">
|
||||
@@ -228,9 +225,4 @@ public enum Permission implements ComponentLike {
|
||||
return String.format(this.toString(), replacements);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull Component asComponent() {
|
||||
return Component.text(text);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||
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.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.UUID;
|
||||
@@ -117,7 +117,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
|
||||
@Override
|
||||
public void sendTitle(
|
||||
final @NonNull Caption title, final @NonNull Caption subtitle,
|
||||
final int fadeIn, final int stay, final int fadeOut, final @NonNull TagResolver... resolvers
|
||||
final int fadeIn, final int stay, final int fadeOut, final @NonNull Template... replacements
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
|
||||
@Override
|
||||
public void sendMessage(
|
||||
final @NonNull Caption caption,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
String message = caption.getComponent(this);
|
||||
if (message.isEmpty()) {
|
||||
@@ -161,7 +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, replacements));
|
||||
PlotSquared.platform().consoleAudience().sendMessage(MINI_MESSAGE.parse(message, replacements));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -65,9 +65,8 @@ import com.sk89q.worldedit.world.gamemode.GameMode;
|
||||
import com.sk89q.worldedit.world.item.ItemType;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import net.kyori.adventure.title.Title;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -845,7 +844,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
*/
|
||||
public void sendTitle(
|
||||
final @NonNull Caption title, final @NonNull Caption subtitle,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
sendTitle(
|
||||
title,
|
||||
@@ -870,11 +869,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
public void sendTitle(
|
||||
final @NonNull Caption title, final @NonNull Caption subtitle,
|
||||
final int fadeIn, final int stay, final int fadeOut,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
final Component titleComponent = MiniMessage.miniMessage().deserialize(title.getComponent(this), replacements);
|
||||
final Component titleComponent = MiniMessage.get().parse(title.getComponent(this), replacements);
|
||||
final Component subtitleComponent =
|
||||
MiniMessage.miniMessage().deserialize(subtitle.getComponent(this), 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),
|
||||
@@ -892,7 +891,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
*/
|
||||
public void sendActionBar(
|
||||
final @NonNull Caption caption,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
String message;
|
||||
try {
|
||||
@@ -912,14 +911,14 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
.replace("<prefix>", TranslatableCaption.of("core.prefix").getComponent(this));
|
||||
|
||||
|
||||
final Component component = MiniMessage.miniMessage().deserialize(message, replacements);
|
||||
final Component component = MiniMessage.get().parse(message, replacements);
|
||||
getAudience().sendActionBar(component);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(
|
||||
final @NonNull Caption caption,
|
||||
final @NonNull TagResolver... replacements
|
||||
final @NonNull Template... replacements
|
||||
) {
|
||||
String message;
|
||||
try {
|
||||
@@ -938,7 +937,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 = MiniMessage.miniMessage().deserialize(message, 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);
|
||||
|
||||
@@ -77,11 +77,9 @@ import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@@ -1422,7 +1420,15 @@ public class Plot {
|
||||
0
|
||||
);
|
||||
}
|
||||
Location location = toHomeLocation(bottom, home);
|
||||
Location location = Location
|
||||
.at(
|
||||
bottom.getWorldName(),
|
||||
bottom.getX() + home.getX(),
|
||||
bottom.getY() + home.getY(),
|
||||
bottom.getZ() + home.getZ(),
|
||||
home.getYaw(),
|
||||
home.getPitch()
|
||||
);
|
||||
if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) {
|
||||
location = location.withY(
|
||||
Math.max(1 + this.worldUtil.getHighestBlockSynchronous(
|
||||
@@ -1455,7 +1461,15 @@ public class Plot {
|
||||
return;
|
||||
}
|
||||
Location bottom = this.getBottomAbs();
|
||||
Location location = toHomeLocation(bottom, home);
|
||||
Location location = Location
|
||||
.at(
|
||||
bottom.getWorldName(),
|
||||
bottom.getX() + home.getX(),
|
||||
home.getY(), // y is absolute
|
||||
bottom.getZ() + home.getZ(),
|
||||
home.getYaw(),
|
||||
home.getPitch()
|
||||
);
|
||||
this.worldUtil.getBlock(location, block -> {
|
||||
if (!block.getBlockType().getMaterial().isAir()) {
|
||||
this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
|
||||
@@ -1468,17 +1482,6 @@ public class Plot {
|
||||
}
|
||||
}
|
||||
|
||||
private Location toHomeLocation(Location bottom, BlockLoc relativeHome) {
|
||||
return Location.at(
|
||||
bottom.getWorldName(),
|
||||
bottom.getX() + relativeHome.getX(),
|
||||
relativeHome.getY(), // y is absolute
|
||||
bottom.getZ() + relativeHome.getZ(),
|
||||
relativeHome.getYaw(),
|
||||
relativeHome.getPitch()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the home location
|
||||
*
|
||||
@@ -1735,10 +1738,7 @@ public class Plot {
|
||||
area.addPlot(this);
|
||||
updateWorldBorder();
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(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 -> {
|
||||
@@ -2607,13 +2607,11 @@ public class Plot {
|
||||
return;
|
||||
}
|
||||
Caption caption = TranslatableCaption.of("debug.plot_debug");
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("plot", Tag.inserting(Component.text(toString())))
|
||||
.tag("message", Tag.inserting(Component.text(message)))
|
||||
.build();
|
||||
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, resolver);
|
||||
player.sendMessage(caption, plotTemplate, messageTemplate);
|
||||
}
|
||||
}
|
||||
} catch (final Exception ignored) {
|
||||
@@ -2643,7 +2641,7 @@ public class Plot {
|
||||
if (result == Result.DENY) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
|
||||
Template.of("value", "Teleport")
|
||||
);
|
||||
resultConsumer.accept(false);
|
||||
return;
|
||||
@@ -2658,7 +2656,7 @@ public class Plot {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("teleport.teleport_in_seconds"),
|
||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Teleport.DELAY)))
|
||||
Template.of("amount", String.valueOf(Settings.Teleport.DELAY))
|
||||
);
|
||||
final String name = player.getName();
|
||||
TaskManager.addToTeleportQueue(name);
|
||||
@@ -2834,44 +2832,41 @@ public class Plot {
|
||||
public CompletableFuture<Caption> format(final Caption iInfo, PlotPlayer<?> player, final boolean full) {
|
||||
final CompletableFuture<Caption> future = new CompletableFuture<>();
|
||||
int num = this.getConnectedPlots().size();
|
||||
ComponentLike alias = !this.getAlias().isEmpty() ?
|
||||
Component.text(this.getAlias()) :
|
||||
TranslatableCaption.of("info.none").toComponent(player);
|
||||
String alias = !this.getAlias().isEmpty() ? this.getAlias() : TranslatableCaption.of("info.none").getComponent(player);
|
||||
Location bot = this.getCorners()[0];
|
||||
PlotSquared.platform().worldUtil().getBiome(
|
||||
Objects.requireNonNull(this.getWorldName()),
|
||||
bot.getX(),
|
||||
bot.getZ(),
|
||||
biome -> {
|
||||
ComponentLike trusted = PlayerManager.getPlayerList(this.getTrusted(), player);
|
||||
ComponentLike members = PlayerManager.getPlayerList(this.getMembers(), player);
|
||||
ComponentLike denied = PlayerManager.getPlayerList(this.getDenied(), player);
|
||||
ComponentLike seen;
|
||||
Component trusted = PlayerManager.getPlayerList(this.getTrusted(), player);
|
||||
Component members = PlayerManager.getPlayerList(this.getMembers(), player);
|
||||
Component denied = PlayerManager.getPlayerList(this.getDenied(), player);
|
||||
String seen;
|
||||
if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
|
||||
if (this.isOnline()) {
|
||||
seen = TranslatableCaption.of("info.now").toComponent(player);
|
||||
seen = TranslatableCaption.of("info.now").getComponent(player);
|
||||
} else {
|
||||
int time = (int) (ExpireManager.IMP.getAge(this, false) / 1000);
|
||||
if (time != 0) {
|
||||
seen = Component.text(TimeUtil.secToTime(time));
|
||||
seen = TimeUtil.secToTime(time);
|
||||
} else {
|
||||
seen = TranslatableCaption.of("info.unknown").toComponent(player);
|
||||
seen = TranslatableCaption.of("info.unknown").getComponent(player);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
seen = TranslatableCaption.of("info.never").toComponent(player);
|
||||
seen = TranslatableCaption.of("info.never").getComponent(player);
|
||||
}
|
||||
|
||||
ComponentLike description = TranslatableCaption.of("info.plot_no_description").toComponent(player);
|
||||
String descriptionValue = this.getFlag(DescriptionFlag.class);
|
||||
if (!descriptionValue.isEmpty()) {
|
||||
description = Component.text(descriptionValue);
|
||||
String description = this.getFlag(DescriptionFlag.class);
|
||||
if (description.isEmpty()) {
|
||||
description = TranslatableCaption.of("info.plot_no_description").getComponent(player);
|
||||
}
|
||||
|
||||
ComponentLike flags;
|
||||
Component flags;
|
||||
Collection<PlotFlag<?, ?>> flagCollection = this.getApplicableFlags(true);
|
||||
if (flagCollection.isEmpty()) {
|
||||
flags = TranslatableCaption.of("info.none").toComponent(player);
|
||||
flags = MINI_MESSAGE.parse(TranslatableCaption.of("info.none").getComponent(player));
|
||||
} else {
|
||||
TextComponent.Builder flagBuilder = Component.text();
|
||||
String prefix = "";
|
||||
@@ -2882,18 +2877,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)
|
||||
),
|
||||
TagResolver.builder()
|
||||
.tag("flag", Tag.inserting(Component.text(flag.getName())))
|
||||
.tag("value", Tag.inserting(Component.text(CaptionUtility.formatRaw(
|
||||
player,
|
||||
value.toString()
|
||||
))))
|
||||
.build()
|
||||
Template.of("flag", flag.getName()),
|
||||
Template.of("value", CaptionUtility.formatRaw(player, value.toString()))
|
||||
);
|
||||
flagBuilder.append(snip);
|
||||
prefix = ", ";
|
||||
@@ -2905,57 +2895,67 @@ public class Plot {
|
||||
if (this.getOwner() == null) {
|
||||
owner = Component.text("unowned");
|
||||
} else if (this.getOwner().equals(DBFunc.SERVER)) {
|
||||
owner = Component.text(MINI_MESSAGE.stripTags(TranslatableCaption
|
||||
owner = Component.text(MINI_MESSAGE.stripTokens(TranslatableCaption
|
||||
.of("info.server")
|
||||
.getComponent(player)));
|
||||
} else {
|
||||
owner = PlayerManager.getPlayerList(this.getOwners(), player);
|
||||
}
|
||||
TagResolver.Builder tagBuilder = TagResolver.builder();
|
||||
tagBuilder.tag("header", Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player)));
|
||||
tagBuilder.tag("footer", Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player)));
|
||||
TextComponent.Builder areaComponent = Component.text();
|
||||
Template headerTemplate = Template.of(
|
||||
"header",
|
||||
TranslatableCaption.of("info.plot_info_header").getComponent(player)
|
||||
);
|
||||
Template footerTemplate = Template.of(
|
||||
"footer",
|
||||
TranslatableCaption.of("info.plot_info_footer").getComponent(player)
|
||||
);
|
||||
Template areaTemplate;
|
||||
if (this.getArea() != null) {
|
||||
areaComponent.append(Component.text(getArea().getWorldName()));
|
||||
if (getArea().getId() != null) {
|
||||
areaComponent.append(Component.text("("))
|
||||
.append(Component.text(getArea().getId()))
|
||||
.append(Component.text(")"));
|
||||
}
|
||||
areaTemplate =
|
||||
Template.of(
|
||||
"area",
|
||||
this.getArea().getWorldName() + (this.getArea().getId() == null
|
||||
? ""
|
||||
: "(" + this.getArea().getId() + ")")
|
||||
);
|
||||
} else {
|
||||
areaComponent.append(TranslatableCaption.of("info.none").toComponent(player));
|
||||
areaTemplate = Template.of("area", TranslatableCaption.of("info.none").getComponent(player));
|
||||
}
|
||||
tagBuilder.tag("area", Tag.inserting(areaComponent));
|
||||
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);
|
||||
|
||||
tagBuilder.tag("id", Tag.inserting(Component.text(getId().toString())));
|
||||
tagBuilder.tag("alias", Tag.inserting(alias));
|
||||
tagBuilder.tag("num", Tag.inserting(Component.text(num)));
|
||||
tagBuilder.tag("desc", Tag.inserting(description));
|
||||
tagBuilder.tag("biome", Tag.inserting(Component.text(biome.toString().toLowerCase())));
|
||||
tagBuilder.tag("owner", Tag.inserting(owner));
|
||||
tagBuilder.tag("members", Tag.inserting(members));
|
||||
tagBuilder.tag("player", Tag.inserting(Component.text(player.getName())));
|
||||
tagBuilder.tag("trusted", Tag.inserting(trusted));
|
||||
tagBuilder.tag("denied", Tag.inserting(denied));
|
||||
tagBuilder.tag("seen", Tag.inserting(seen));
|
||||
tagBuilder.tag("flags", Tag.inserting(flags));
|
||||
tagBuilder.tag("creationdate", Tag.inserting(Component.text(newDate)));
|
||||
tagBuilder.tag("build", Tag.inserting(Component.text(build)));
|
||||
tagBuilder.tag("size", Tag.inserting(Component.text(getConnectedPlots().size())));
|
||||
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));
|
||||
Template sizeTemplate = Template.of("size", String.valueOf(getConnectedPlots().size()));
|
||||
String component = iInfo.getComponent(player);
|
||||
if (component.contains("<rating>") || component.contains("<likes>")) {
|
||||
TaskManager.runTaskAsync(() -> {
|
||||
Template ratingTemplate;
|
||||
Template likesTemplate;
|
||||
if (Settings.Ratings.USE_LIKES) {
|
||||
tagBuilder.tag("rating", Tag.inserting(Component.text(
|
||||
ratingTemplate = Template.of(
|
||||
"rating",
|
||||
String.format("%.0f%%", Like.getLikesPercentage(this) * 100D)
|
||||
)));
|
||||
tagBuilder.tag("likes", Tag.inserting(Component.text(
|
||||
);
|
||||
likesTemplate = Template.of(
|
||||
"likes",
|
||||
String.format("%.0f%%", Like.getLikesPercentage(this) * 100D)
|
||||
)));
|
||||
);
|
||||
} else {
|
||||
int max = 10;
|
||||
if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
|
||||
@@ -2970,34 +2970,70 @@ public class Plot {
|
||||
.append(String.format("%.1f", ratings[i]));
|
||||
prefix = ",";
|
||||
}
|
||||
tagBuilder.tag("rating", Tag.inserting(Component.text(rating.toString())));
|
||||
ratingTemplate = Template.of("rating", rating.toString());
|
||||
} else {
|
||||
double rating = this.getAverageRating();
|
||||
if (Double.isFinite(rating)) {
|
||||
tagBuilder.tag(
|
||||
"rating",
|
||||
Tag.inserting(Component.text(String.format("%.1f", rating) + '/' + max))
|
||||
);
|
||||
ratingTemplate = Template.of("rating", String.format("%.1f", rating) + '/' + max);
|
||||
} else {
|
||||
tagBuilder.tag(
|
||||
"rating", Tag.inserting(TranslatableCaption.of("info.none").toComponent(player))
|
||||
ratingTemplate = Template.of(
|
||||
"rating",
|
||||
TranslatableCaption.of("info.none").getComponent(player)
|
||||
);
|
||||
}
|
||||
}
|
||||
tagBuilder.tag("likes", Tag.inserting(Component.text("N/A")));
|
||||
likesTemplate = Template.of("likes", "N/A");
|
||||
}
|
||||
future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
|
||||
.deserialize(
|
||||
.parse(
|
||||
iInfo.getComponent(player),
|
||||
tagBuilder.build()
|
||||
headerTemplate,
|
||||
areaTemplate,
|
||||
idTemplate,
|
||||
aliasTemplate,
|
||||
numTemplate,
|
||||
descTemplate,
|
||||
biomeTemplate,
|
||||
ownerTemplate,
|
||||
membersTemplate,
|
||||
playerTemplate,
|
||||
trustedTemplate,
|
||||
helpersTemplate,
|
||||
deniedTemplate,
|
||||
seenTemplate,
|
||||
flagsTemplate,
|
||||
buildTemplate,
|
||||
ratingTemplate,
|
||||
creationTemplate,
|
||||
sizeTemplate,
|
||||
likesTemplate,
|
||||
footerTemplate
|
||||
))));
|
||||
});
|
||||
return;
|
||||
}
|
||||
future.complete(StaticCaption.of(MINI_MESSAGE.serialize(MINI_MESSAGE
|
||||
.deserialize(
|
||||
.parse(
|
||||
iInfo.getComponent(player),
|
||||
tagBuilder.build()
|
||||
headerTemplate,
|
||||
areaTemplate,
|
||||
idTemplate,
|
||||
aliasTemplate,
|
||||
numTemplate,
|
||||
descTemplate,
|
||||
biomeTemplate,
|
||||
ownerTemplate,
|
||||
membersTemplate,
|
||||
playerTemplate,
|
||||
trustedTemplate,
|
||||
helpersTemplate,
|
||||
deniedTemplate,
|
||||
seenTemplate,
|
||||
flagsTemplate,
|
||||
buildTemplate,
|
||||
creationTemplate,
|
||||
sizeTemplate,
|
||||
footerTemplate
|
||||
))));
|
||||
}
|
||||
);
|
||||
|
||||
@@ -66,15 +66,12 @@ import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||
import com.sk89q.worldedit.world.gamemode.GameMode;
|
||||
import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
@@ -94,7 +91,7 @@ import java.util.function.Consumer;
|
||||
/**
|
||||
* @author Jesse Boyd, Alexander Söderberg
|
||||
*/
|
||||
public abstract class PlotArea implements ComponentLike {
|
||||
public abstract class PlotArea {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotArea.class.getSimpleName());
|
||||
private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
|
||||
@@ -415,7 +412,7 @@ public abstract class PlotArea implements ComponentLike {
|
||||
this.getFlagContainer().addAll(parseFlags(flags));
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
TranslatableCaption.of("flags.area_flags"),
|
||||
TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
|
||||
Template.of("flags", flags.toString())
|
||||
);
|
||||
|
||||
this.spawnEggs = config.getBoolean("event.spawn.egg");
|
||||
@@ -437,7 +434,7 @@ public abstract class PlotArea implements ComponentLike {
|
||||
this.getRoadFlagContainer().addAll(parseFlags(roadflags));
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
TranslatableCaption.of("flags.road_flags"),
|
||||
TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
|
||||
Template.of("flags", roadflags.toString())
|
||||
);
|
||||
|
||||
loadConfiguration(config);
|
||||
@@ -530,11 +527,6 @@ public abstract class PlotArea implements ComponentLike {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull Component asComponent() {
|
||||
return Component.text(toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
if (this.hash != 0) {
|
||||
|
||||
@@ -52,9 +52,7 @@ import com.sk89q.worldedit.math.BlockVector2;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
@@ -396,10 +394,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, TagResolver.builder()
|
||||
.tag("id", Tag.inserting(Component.text(id)))
|
||||
.tag("owner", Tag.inserting(Component.text(name)))
|
||||
.build());
|
||||
PlotSquared.platform().worldUtil().setSign(location, lines, Template.of("id", id), Template.of("owner", name));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -509,7 +504,7 @@ public final class PlotModificationManager {
|
||||
if (player != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("events.event_denied"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
|
||||
Template.of("value", "Auto merge on claim")
|
||||
);
|
||||
}
|
||||
return;
|
||||
|
||||
@@ -36,9 +36,7 @@ import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
@@ -77,10 +75,8 @@ public class CommentManager {
|
||||
player.sendTitle(
|
||||
StaticCaption.of(""),
|
||||
TranslatableCaption.of("comment.inbox_notification"),
|
||||
TagResolver.builder()
|
||||
.tag("amount", Tag.inserting(Component.text(total)))
|
||||
.tag("command", Tag.inserting(Component.text("/plot inbox")))
|
||||
.build()
|
||||
Template.of("amount", Integer.toString(total)),
|
||||
Template.of("command", "/plot inbox")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ package com.plotsquared.core.plot.expiration;
|
||||
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.caption.Caption;
|
||||
import com.plotsquared.core.configuration.caption.Templates;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
import com.plotsquared.core.events.PlotFlagAddEvent;
|
||||
@@ -50,9 +51,7 @@ import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.RunnableVal3;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import net.kyori.adventure.text.minimessage.Template;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
@@ -153,17 +152,25 @@ public class ExpireManager {
|
||||
current.getCenter(pp::teleport);
|
||||
metaDataAccess.remove();
|
||||
Caption msg = TranslatableCaption.of("expiry.expired_options_clicky");
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("num", Tag.inserting(Component.text(num)))
|
||||
.tag("are_or_is", Tag.inserting(Component.text(num > 1 ? "plots are" : "plot is")))
|
||||
.tag("list_cmd", Tag.preProcessParsed("/plot list expired"))
|
||||
.tag("plot", Tag.inserting(Component.text(current.toString())))
|
||||
.tag("cmd_del", Tag.preProcessParsed("/plot delete"))
|
||||
.tag("cmd_keep_1d", Tag.preProcessParsed("/plot flag set keep 1d"))
|
||||
.tag("cmd_keep", Tag.preProcessParsed("/plot flag set keep true"))
|
||||
.tag("cmd_no_show_expir", Tag.preProcessParsed("/plot toggle clear-confirmation"))
|
||||
.build();
|
||||
pp.sendMessage(msg, resolver);
|
||||
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,
|
||||
areIsTemplate,
|
||||
list_cmd,
|
||||
plot,
|
||||
cmd_del,
|
||||
cmd_keep_1d,
|
||||
cmd_keep,
|
||||
cmd_no_show_expir
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
iter.remove();
|
||||
@@ -429,7 +436,7 @@ public class ExpireManager {
|
||||
if (player != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("trusted.plot_removed_user"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
Templates.of("plot", plot.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -438,7 +445,7 @@ public class ExpireManager {
|
||||
if (player != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("trusted.plot_removed_user"),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
||||
Templates.of("plot", plot.toString())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,9 +75,9 @@ public class ExpiryTask {
|
||||
plots = plots != null ? plots : getPlotsToCheck();
|
||||
int diff = settings.REQUIRED_PLOTS;
|
||||
boolean min = true;
|
||||
if (settings.REQUIRED_PLOTS - plots.size() < settings.REQUIRED_PLOTS) {
|
||||
if (plots.size() > settings.REQUIRED_PLOTS) {
|
||||
min = false;
|
||||
diff = settings.REQUIRED_PLOTS - plots.size();
|
||||
diff = plots.size() - settings.REQUIRED_PLOTS;
|
||||
}
|
||||
List<Long> entireList =
|
||||
plots.stream().map(plot -> ExpireManager.IMP.getAge(plot, settings.DELETE_IF_OWNER_IS_UNKNOWN))
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user