Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More json stuff, fixes and enhancements

This commit is contained in:
N0tMyFaultOG 2020-08-17 22:26:01 +02:00
parent 05a15ac689
commit d6a80c7ea5
12 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ public class Cluster extends SubCommand {
} else {
cluster = area.getCluster(player.getLocation());
if (cluster == null) {
player.sendMessage(TranslatableCaption.of("cluster.not_in_cluster"));
player.sendMessage(TranslatableCaption.of("errors.not_in_cluster"));
return false;
}
}
@ -298,7 +298,7 @@ public class Cluster extends SubCommand {
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster delete [name]")
Template.of("value", "/plot cluster resize [name]")
);
return false;
}
@ -623,7 +623,7 @@ public class Cluster extends SubCommand {
if (args.length != 3) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot cluster helpers <add | remove> <player>")
Template.of("value", "/plot cluster <members | admin | helper> <add | remove> <player>")
);
return false;
}
@ -690,7 +690,7 @@ public class Cluster extends SubCommand {
PlotCluster cluster = area.getCluster(args[1]);
if (cluster == null) {
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster"),
TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1])
);
return false;
@ -733,7 +733,7 @@ public class Cluster extends SubCommand {
if (args.length == 2) {
cluster = area.getCluster(args[1]);
player.sendMessage(
TranslatableCaption.of("cluster.invalid_cluster"),
TranslatableCaption.of("cluster.invalid_cluster_name"),
Template.of("cluster", args[1])
);
} else {

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

@ -338,7 +338,7 @@ public class DebugExec extends SubCommand {
case "he":
case "?":
case "help":
player.sendMessage(StaticCaption.of("Possible sub commands: /plot debugexec <" + StringMan.join(allowed_params, " | ") + ">"));
player.sendMessage(StaticCaption.of("<core.prefix><gold>Possible sub commands: </gray>/plot debugexec <" + StringMan.join(allowed_params, " | ") + "></gray>"));
return false;
case "addcmd":
try {

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

@ -140,7 +140,7 @@ public class DebugRoadRegen extends SubCommand {
Plot plot = player.getCurrentPlot();
PlotManager manager = area.getPlotManager();
if (!(manager instanceof HybridPlotManager)) {
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
return true;
}
player.sendMessage(TranslatableCaption.of("debugroadregen.schematic"),

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

@ -93,7 +93,7 @@ public class Done extends SubCommand {
return false;
}
plot.addRunning();
player.sendMessage(TranslatableCaption.of("web.generating_lin"));
player.sendMessage(TranslatableCaption.of("web.generating_link"));
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
if (ExpireManager.IMP == null || doneRequirements == null) {
finish(plot, player, true);

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

@ -234,7 +234,7 @@ public class Merge extends SubCommand {
Template.of("money", String.valueOf(price))
);
}
player.sendMessage(TranslatableCaption.of("success_merge"));
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
return true;
}
Plot adjacent = plot.getRelative(direction);

1
Core/src/main/java/com/plotsquared/core/command/Middle.java
View File

@ -50,6 +50,7 @@ public class Middle extends SubCommand {
return false;
}
plot.getCenter(center -> player.teleport(center, TeleportCause.COMMAND));
player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot"));
return true;
}
}

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

@ -51,7 +51,7 @@ import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
@CommandDeclaration(usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false] clear:[true|false]",
@CommandDeclaration(usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true | false] clear:[true | false]",
command = "purge",
permission = "plots.admin",
description = "Purge all plots for a world",

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

@ -89,7 +89,7 @@ public class RegenAllRoads extends SubCommand {
String name = args[0];
PlotManager manager = area.getPlotManager();
if (!(manager instanceof HybridPlotManager)) {
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
return false;
}
//Set<BlockVector2> chunks = ChunkManager.manager.getChunkChunks(name);

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

@ -34,7 +34,7 @@ import com.plotsquared.core.util.query.PlotQuery;
import net.kyori.adventure.text.minimessage.Template;
@CommandDeclaration(command = "target",
usage = "/plot target <<plot> | nearest>",
usage = "/plot target <<X;Z> | nearest>",
description = "Target a plot with your compass",
permission = "plots.target",
requiredType = RequiredType.PLAYER,
@ -54,7 +54,7 @@ public class Target extends SubCommand {
if (args.length == 0) {
player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"),
Template.of("value", "/plot target <<plot> | nearest>")
Template.of("value", "/plot target <<X;Z> | nearest>")
);
return false;
}

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

@ -239,7 +239,8 @@ public class Template extends SubCommand {
}
final PlotArea area = this.plotAreaManager.getPlotAreaByString(world);
if (area == null) {
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"),
net.kyori.adventure.text.minimessage.Template.of("value", args[1]));
return false;
}
final PlotManager manager = area.getPlotManager();

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

@ -372,7 +372,7 @@ public class Plot {
}
if (area == null) {
if (message) {
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"));
player.sendMessage(TranslatableCaption.of("errors.invalid_plot_world"));
}
return null;
}

9
Core/src/main/resources/lang/messages_en.json
View File

@ -1,7 +1,7 @@
{
"confirm.expired_confirm": "<prefix><red>Confirmation has expired, please run the command again!</red>",
"confirm.failed_confirm": "<prefix><red>You have no pending actions to confirm!</red>",
"confirm.requires_confirm": "<prefix><gray>Are you sure you wish to execute: </gray><gold><command></orange><gray>?</gray>\n<red>This cannot be undone! If you are sure: </red><gray><value></gray>",
"confirm.requires_confirm": "<prefix><gray>Are you sure you wish to execute: </gray><gold><command></gold><gray>?</gray>\n<red>This cannot be undone! If you are sure: </red><gray><value></gray>",
"move.move_success": "<prefix><dark_aqua>Successfully moved plot.</dark_aqua>",
"move.move_merged": "<prefix><red>Merged plots may not be moved. Please unmerge the plot before performing the move.</red>",
@ -9,7 +9,7 @@
"move.requires_unowned": "<prefix><red>The location specified is already occupied.</red>",
"debug.requires_unmerged": "<prefix><red>The plot cannot be merged.</red>",
"debug.debug_header": "<prefix> <gold>Debug Information</orange>\n",
"debug.debug_header": "<prefix> <gold>Debug Information</gold>\n",
"debug.debug_section": "<gray>>></gray> <gold><bold>&l<val></bold></gold>",
"debug.debug_line": "<gray>>></gray> <gold><var></gold><gray>:</gray><gold> <val></gold>\n",
"debug.plot_debug": "<gray>[<gold>Plot </gold><gray>Debug] (</gray><gold><plot></gold><gray>): <message></gray>",
@ -58,7 +58,7 @@
"cluster.cluster_regenerated": "<prefix><dark_aqua>Successfully started cluster regeneration.</dark_aqua>",
"cluster.cluster_teleporting": "<prefix><dark_aqua>Teleporting...</dark_aqua>",
"cluster.cluster_info": "<prefix><gold>Current cluster: </gold><gray><id></gray>\n<gold>Name: </gold><gray><name></gray>\n<gold>Owner: </gold><gray><owner></gray>\n<gold>Size: </gold><gray><size></gray>\n<gold>Rights: </gold><gray><rights></gray>",
"border.border": "<prefix><gray>You are outside the current map border.</gray>",
"worldedit.worldedit_bypass": "<prefix><gray><italic>To bypass your restrictions use </gray><dark_aqua><command></dark_aqua></italic>",
@ -311,7 +311,8 @@
"errors.not_in_plot_world": "<prefix><red>You're not in a plot area.</red>",
"errors.plotworld_incompatible": "<prefix><red>The two worlds must be compatible.</red>",
"errors.not_valid_world": "<prefix><red>That is not a valid world (case sensitive).</red>",
"errors.not_valid_plot_world": "<prefix><red><value> is not a valid plot area (case sensitive).</red>",
"errors.not_valid_plot_world": "<prefix><gray><value></gray><red> is not a valid plot area (case sensitive).</red>",
"errors.invalid_plot_world": "<prefix><redThat is not a valid plot area (case sensitive).</red>",
"errors.no_plots": "<prefix><gray>You don't have any plots.</gray>",
"errors.player_no_plots": "<prefix><gray>That player does not own any plots.</gray>",
"errors.wait_for_timer": "<prefix><gray>A set block timer is bound to either the current plot or you. Please wait for it to finish.</gray>",