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

Replace some common messages

This commit is contained in:
Hannes Greule 2020-07-18 15:06:51 +02:00
parent 4d24112ec7
commit 7e0cdb12d7
46 changed files with 255 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,9 @@ public class Auto extends SubCommand {
PlayerAutoPlotEvent event = this.eventDispatcher
.callAuto(player, plotarea, schematic, size_x, size_z);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Auto claim");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto claim"));
return true;
}
boolean force = event.getEventResult() == Result.FORCE;
@ -320,7 +322,9 @@ public class Auto extends SubCommand {
final PlotAutoMergeEvent mergeEvent = this.eventDispatcher
.callAutoMerge(plotarea.getPlotAbs(pos1), plotIds);
if (!force && mergeEvent.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Auto merge");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge"));
return false;
}
if (!plotarea.mergePlots(mergeEvent.getPlots(), true)) {

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

@ -31,6 +31,7 @@ import com.plotsquared.core.backup.BackupProfile;
import com.plotsquared.core.backup.NullBackupProfile;
import com.plotsquared.core.backup.PlayerBackupProfile;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.Permissions;
@ -128,7 +129,7 @@ public final class Backup extends Command {
final RunnableVal2<Command, CommandResult> whenDone) {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
} else if (!plot.hasOwner()) {
sendMessage(player, Captions.BACKUP_IMPOSSIBLE,
Captions.GENERIC_UNOWNED.getTranslated());
@ -167,7 +168,7 @@ public final class Backup extends Command {
final RunnableVal2<Command, CommandResult> whenDone) {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
} else if (!plot.hasOwner()) {
sendMessage(player, Captions.BACKUP_IMPOSSIBLE,
Captions.GENERIC_UNOWNED.getTranslated());
@ -218,7 +219,7 @@ public final class Backup extends Command {
final RunnableVal2<Command, CommandResult> whenDone) {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
} else if (!plot.hasOwner()) {
sendMessage(player, Captions.BACKUP_IMPOSSIBLE,
Captions.GENERIC_UNOWNED.getTranslated());

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

@ -26,13 +26,14 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.StringMan;
import com.sk89q.worldedit.command.util.SuggestionHelper;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import net.kyori.adventure.text.minimessage.Template;
import java.util.Collection;
import java.util.Locale;
@ -56,20 +57,22 @@ public class Biome extends SetCommand {
if (biome == null) {
String biomes = StringMan
.join(BiomeType.REGISTRY.values(), Captions.BLOCK_LIST_SEPARATOR.getTranslated());
Captions.NEED_BIOME.send(player);
MainUtil.sendMessage(player,
Captions.SUBCOMMAND_SET_OPTIONS_HEADER.getTranslated() + biomes);
player.sendMessage(TranslatableCaption.of("biome.need_biome"));
player.sendMessage(
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
Template.of("values", biomes));
return false;
}
if (plot.getRunning() > 0) {
MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
return false;
}
plot.addRunning();
plot.setBiome(biome, () -> {
plot.removeRunning();
MainUtil
.sendMessage(player, Captions.BIOME_SET_TO.getTranslated() + value.toLowerCase());
player.sendMessage(
TranslatableCaption.of("biome.biome_set_to"),
Template.of("value", value.toLowerCase()));
});
return true;
}

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.player.PlotPlayer;
@ -39,6 +40,7 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -71,7 +73,10 @@ public class Buy extends Command {
check(this.econHandler, Captions.ECON_DISABLED);
final Plot plot;
if (args.length != 0) {
checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
if (args.length != 1) {
sendUsage(player);
return CompletableFuture.completedFuture(false);
}
plot = check(MainUtil.getPlotFromString(player, args[0], true), null);
} else {
plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
@ -90,13 +95,20 @@ public class Buy extends Command {
// Failure
// Success
confirm.run(this, () -> {
Captions.REMOVED_BALANCE.send(player, price);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
Template.of("money", String.valueOf(price)));
this.econHandler.depositMoney(PlotSquared.platform().getPlayerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
PlotPlayer owner = PlotSquared.platform().getPlayerManager().getPlayerIfExists(plot.getOwnerAbs());
if (owner != null) {
Captions.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
owner.sendMessage(
TranslatableCaption.of("economy.plot_sold"),
Template.of("plot", plot.getId().toString()),
Template.of("player", player.getName()),
Template.of("price", String.valueOf(price))
);
}
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
PlotFlagRemoveEvent event = this.eventDispatcher.callFlagRemove(plotFlag, plot);
@ -104,7 +116,7 @@ public class Buy extends Command {
plot.removeFlag(event.getFlag());
}
plot.setOwner(player.getUUID());
Captions.CLAIMED.send(player);
player.sendMessage(TranslatableCaption.of("working.claimed"));
whenDone.run(Buy.this, CommandResult.SUCCESS);
}, () -> {
player.deposit(price);

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

@ -26,6 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.PlotFlag;
@ -36,6 +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.minimessage.Template;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
@ -53,13 +55,17 @@ public class Caps extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return Captions.NOT_IN_PLOT.send(player);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.isAdded(player.getUUID()) && !Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN_CAPS_OTHER)) {
return Captions.NO_PERMISSION.send(player, Captions.PERMISSION_ADMIN_CAPS_OTHER);
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", Captions.PERMISSION_ADMIN_CAPS_OTHER.getTranslated()));
return false;
}
Captions.PLOT_CAPS_HEADER.send(player);
player.sendMessage(TranslatableCaption.of("info.plot_caps_header"));
final int[] countedEntities = plot.countEntities();
sendFormatted(plot, player, MobCapFlag.class, countedEntities, "mobs", CAP_MOB);
sendFormatted(plot, player, HostileCapFlag.class, countedEntities, "hostile", CAP_MONSTER);
@ -76,8 +82,10 @@ 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));
player.sendMessage(Captions.PLOT_CAPS_FORMAT.getTranslated().replace("%cap%", name)
.replace("%current%", Integer.toString(current))
.replace("%limit%", Integer.toString(max)).replace("%percentage%", percentage));
player.sendMessage(TranslatableCaption.of("info.plot_caps_format"),
Template.of("cap", name),
Template.of("current", String.valueOf(current)),
Template.of("limit", String.valueOf(max)),
Template.of("percentage", percentage));
}
}

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

@ -30,6 +30,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlayerClaimPlotEvent;
import com.plotsquared.core.events.PlotMergeEvent;
@ -44,8 +45,7 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.Expression;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.TaskManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.kyori.adventure.text.minimessage.Template;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -75,12 +75,15 @@ public class Claim extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
final PlayerClaimPlotEvent event = this.eventDispatcher.callClaim(player, plot, schematic);
schematic = event.getSchematic();
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Claim");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Claim"));
return true;
}
boolean force = event.getEventResult() == Result.FORCE;
@ -154,7 +157,9 @@ public class Claim extends SubCommand {
PlotMergeEvent mergeEvent = Claim.this.eventDispatcher
.callMerge(plot, Direction.ALL, Integer.MAX_VALUE, player);
if (mergeEvent.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Auto merge on claim");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge on claim"));
} else {
plot.autoMerge(mergeEvent.getDir(), mergeEvent.getMax(), player.getUUID(), true);
}

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

@ -29,6 +29,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.backup.BackupManager;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.player.PlotPlayer;
@ -38,16 +39,14 @@ import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.queue.GlobalBlockQueue;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal2;
import com.plotsquared.core.util.task.RunnableVal3;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import static com.plotsquared.core.command.SubCommand.sendMessage;
@CommandDeclaration(command = "clear",
description = "Clear the plot you stand on",
requiredType = RequiredType.NONE,
@ -72,11 +71,16 @@ public class Clear extends Command {
public CompletableFuture<Boolean> execute(final PlotPlayer<?> player, String[] args,
RunnableVal3<Command, Runnable, Runnable> confirm,
RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
checkTrue(args.length == 0, Captions.COMMAND_SYNTAX, getUsage());
if (args.length != 0) {
sendUsage(player);
return CompletableFuture.completedFuture(false);
}
final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
Result eventResult = this.eventDispatcher.callClear(plot).getEventResult();
if (eventResult == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Clear");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Clear"));
return CompletableFuture.completedFuture(true);
}
boolean force = eventResult == Result.FORCE;
@ -112,12 +116,14 @@ public class Clear extends Command {
plot.removeFlag(event.getFlag());
}
}
MainUtil.sendMessage(player, Captions.CLEARING_DONE,
"" + (System.currentTimeMillis() - start));
player.sendMessage(
TranslatableCaption.of("working.clearing_done"),
Template.of("amount", String.valueOf(System.currentTimeMillis() - start))
);
});
});
if (!result) {
MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
} else {
plot.addRunning();
}

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

@ -25,11 +25,11 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.task.TaskManager;
import com.plotsquared.core.util.task.TaskTime;
import net.kyori.adventure.text.minimessage.Template;
public class CmdConfirm {
@ -45,7 +45,10 @@ public class CmdConfirm {
final Runnable runnable) {
removePending(player);
if (commandStr != null) {
MainUtil.sendMessage(player, Captions.REQUIRES_CONFIRM, commandStr);
player.sendMessage(
TranslatableCaption.of("confirm.requires_confirm"),
Template.of("command", commandStr)
);
}
TaskManager.runTaskLater(() -> {
CmdInstance cmd = new CmdInstance(runnable);

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

@ -25,12 +25,16 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Caption;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.LocaleHolder;
import javax.annotation.Nonnull;
/**
* CommandCategory.
*/
public enum CommandCategory {
public enum CommandCategory implements Caption {
/**
* Claiming CommandConfig.
* Such as: /plot claim
@ -74,13 +78,20 @@ public enum CommandCategory {
/**
* The category name (Readable).
*/
private final Captions caption;
private final Caption caption;
CommandCategory(final Captions caption) {
CommandCategory(final Caption caption) {
this.caption = caption;
}
@Override public String toString() {
return this.caption.getTranslated();
// TODO this method shouldn't be invoked
@Deprecated @Override public String toString() {
return this.caption.getComponent(LocaleHolder.console());
}
@Nonnull
@Override
public String getComponent(@Nonnull LocaleHolder localeHolder) {
return this.caption.getComponent(localeHolder);
}
}

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

@ -68,7 +68,7 @@ public class Condense extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, String[] args) {
if (args.length != 2 && args.length != 3) {
MainUtil.sendMessage(player, getUsage());
sendUsage(player);
return false;
}
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[0]);

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.player.PlotPlayer;
@ -37,6 +38,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@ -56,7 +58,8 @@ public class Continue extends SubCommand {
@Override public boolean onCommand(PlotPlayer<?> player, String[] args) {
Plot plot = player.getCurrentPlot();
if ((plot == null) || !plot.hasOwner()) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
@ -82,7 +85,9 @@ public class Continue extends SubCommand {
PlotFlagRemoveEvent event =
this.eventDispatcher.callFlagRemove(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Done flag removal");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Done flag removal"));
return true;
}
plot.removeFlag(event.getFlag());

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

@ -26,6 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
@ -45,7 +46,8 @@ public class Copy extends SubCommand {
Location location = player.getLocation();
Plot plot1 = location.getPlotAbs();
if (plot1 == null) {
return !MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot1.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN.getTranslated())) {
@ -53,7 +55,7 @@ public class Copy extends SubCommand {
return false;
}
if (args.length != 1) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
@ -62,7 +64,7 @@ public class Copy extends SubCommand {
}
if (plot1.equals(plot2)) {
MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
if (!plot1.getArea().isCompatible(plot2.getArea())) {

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.generator.HybridPlotWorld;
import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.location.Location;
@ -55,7 +56,8 @@ public class CreateRoadSchematic extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!(location.getPlotArea() instanceof HybridPlotWorld)) {
return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);

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

@ -99,7 +99,7 @@ public class DatabaseCommand extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, String[] args) {
if (args.length < 1) {
MainUtil.sendMessage(player, getUsage());
sendUsage(player);
return false;
}
List<Plot> plots;
@ -111,7 +111,7 @@ public class DatabaseCommand extends SubCommand {
plots = PlotSquared.get().sortPlotsByTemp(PlotQuery.newQuery().allPlots().asList());
}
if (args.length < 1) {
MainUtil.sendMessage(player, getUsage());
sendUsage(player);
MainUtil.sendMessage(player, "[arg] indicates an optional argument");
return false;
}

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

@ -30,6 +30,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
@ -213,7 +214,7 @@ public class DebugExec extends SubCommand {
case "analyze": {
Plot plot = player.getCurrentPlot();
if (plot == null) {
MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
PlotAnalysis analysis = plot.getComplexity(null);

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -39,6 +40,7 @@ import com.plotsquared.core.util.Expression;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.TaskManager;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -67,14 +69,18 @@ public class Delete extends SubCommand {
Location location = player.getLocation();
final Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
return !sendMessage(player, Captions.PLOT_UNOWNED);
player.sendMessage(TranslatableCaption.of("info.plot_unowned"));
return false;
}
Result eventResult = this.eventDispatcher.callDelete(plot).getEventResult();
if (eventResult == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Delete");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Delete"));
return true;
}
boolean force = eventResult == Result.FORCE;

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -72,7 +73,8 @@ public class Deny extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
@ -35,6 +36,7 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@ -57,7 +59,9 @@ public class Desc extends SetCommand {
if (desc.isEmpty()) {
PlotFlagRemoveEvent event = this.eventDispatcher.callFlagRemove(plot.getFlagContainer().getFlag(DescriptionFlag.class), plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Description removal");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Description removal"));
return false;
}
plot.removeFlag(event.getFlag());
@ -66,7 +70,9 @@ public class Desc extends SetCommand {
}
PlotFlagAddEvent event = this.eventDispatcher.callFlagAdd(plot.getFlagContainer().getFlag(DescriptionFlag.class).createFlagInstance(desc), plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Description set");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Description set"));
return false;
}
boolean result = plot.setFlag(event.getFlag());

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotDoneEvent;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.Result;
@ -43,6 +44,7 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.RunnableVal;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@ -67,11 +69,14 @@ public class Done extends SubCommand {
Location location = player.getLocation();
final Plot plot = location.getPlotAbs();
if ((plot == null) || !plot.hasOwner()) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
PlotDoneEvent event = this.eventDispatcher.callDone(plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Done");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Done"));
return true;
}
boolean force = event.getEventResult() == Result.FORCE;

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
@ -71,7 +72,8 @@ public class Download extends SubCommand {
}
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
@ -132,7 +134,7 @@ public class Download extends SubCommand {
}
});
} else {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
MainUtil.sendMessage(player, Captions.GENERATING_LINK);

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

@ -29,6 +29,7 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
@ -154,7 +155,7 @@ public final class FlagCommand extends Command {
final Location location = player.getLocation();
final Plot plot = location.getPlotAbs();
if (plot == null) {
MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
@ -299,7 +300,9 @@ public final class FlagCommand extends Command {
Plot plot = player.getLocation().getPlotAbs();
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Flag set");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag set"));
return;
}
boolean force = event.getEventResult() == Result.FORCE;
@ -344,7 +347,9 @@ public final class FlagCommand extends Command {
Plot plot = player.getLocation().getPlotAbs();
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Flag add");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag add"));
return;
}
boolean force = event.getEventResult() == Result.FORCE;
@ -401,7 +406,9 @@ public final class FlagCommand extends Command {
final Plot plot = player.getLocation().getPlotAbs();
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(flag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Flag remove");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Flag remove"));
return;
}
boolean force = event.getEventResult() == Result.FORCE;

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

@ -112,7 +112,7 @@ public class Grant extends Command {
});
return CompletableFuture.completedFuture(true);
}
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return CompletableFuture.completedFuture(true);
}
}

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

@ -78,7 +78,7 @@ public class Help extends Command {
}
return CompletableFuture.completedFuture(false);
default:
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
}
return CompletableFuture.completedFuture(true);
}

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

@ -106,7 +106,7 @@ public class HomeCommand extends Command {
return CompletableFuture.completedFuture(false);
}
if (args.length > 2) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return CompletableFuture.completedFuture(false);
}
PlotQuery query = query(player);

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

@ -26,6 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.comment.CommentInbox;
@ -89,7 +90,7 @@ public class Inbox extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, String[] args) {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
@ -97,7 +98,7 @@ public class Inbox extends SubCommand {
return false;
}
if (args.length == 0) {
sendMessage(player, Captions.COMMAND_SYNTAX, getUsage());
sendUsage(player);
for (final CommentInbox inbox : CommentManager.inboxes.values()) {
if (inbox.canRead(plot, player)) {
if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
@ -185,7 +186,7 @@ public class Inbox extends SubCommand {
}
}
})) {
sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
return true;
@ -204,7 +205,7 @@ public class Inbox extends SubCommand {
try {
page = Integer.parseInt(args[1]);
} catch (NumberFormatException ignored) {
sendMessage(player, Captions.COMMAND_SYNTAX, getUsage());
sendUsage(player);
return false;
}
}

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -69,7 +70,8 @@ public class Kick extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_KICK)) {

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

@ -29,6 +29,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotRateEvent;
import com.plotsquared.core.events.TeleportCause;
@ -92,7 +93,8 @@ public class Like extends SubCommand {
case "purge": {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_RATE, true)) {
@ -106,7 +108,8 @@ public class Like extends SubCommand {
}
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
sendMessage(player, Captions.RATING_NOT_OWNED);

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

@ -28,6 +28,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
@ -70,7 +71,8 @@ public class Load extends SubCommand {
}
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);

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

@ -29,6 +29,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Direction;
@ -42,6 +43,7 @@ import com.plotsquared.core.util.Expression;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringMan;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@ -95,7 +97,8 @@ public class Merge extends SubCommand {
Location location = player.getLocationFull();
final Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
@ -141,7 +144,9 @@ public class Merge extends SubCommand {
PlotMergeEvent event =
this.eventDispatcher.callMerge(plot, direction, max, player);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Merge");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Merge"));
return false;
}
boolean force = event.getEventResult() == Result.FORCE;

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

@ -25,7 +25,7 @@
*/
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.TeleportCause;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -46,7 +46,8 @@ public class Middle extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlot();
if (plot == null) {
return sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
plot.getCenter(center -> player.teleport(center, TeleportCause.COMMAND));
return true;

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
@ -61,8 +62,8 @@ public class Move extends SubCommand {
Location location = player.getLocation();
Plot plot1 = location.getPlotAbs();
if (plot1 == null) {
return CompletableFuture
.completedFuture(!MainUtil.sendMessage(player, Captions.NOT_IN_PLOT));
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return CompletableFuture.completedFuture(false);
}
if (!plot1.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN.getTranslated())) {
@ -75,7 +76,7 @@ public class Move extends SubCommand {
override = true;
}
if (args.length != 1) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return CompletableFuture.completedFuture(false);
}
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[0]);

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
@ -39,6 +40,7 @@ import com.plotsquared.core.plot.flag.PlotFlag;
import com.plotsquared.core.plot.flag.implementations.MusicFlag;
import com.plotsquared.core.util.InventoryUtil;
import com.sk89q.worldedit.world.item.ItemTypes;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nullable;
import java.util.Arrays;
@ -68,7 +70,8 @@ public class Music extends SubCommand {
Location location = player.getLocation();
final Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.isAdded(player.getUUID())) {
sendMessage(player, Captions.NO_PLOT_PERMS);
@ -85,7 +88,9 @@ public class Music extends SubCommand {
.createFlagInstance(item.getType());
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Music removal");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music removal"));
return true;
}
plot.removeFlag(event.getFlag());
@ -95,7 +100,9 @@ public class Music extends SubCommand {
.createFlagInstance(item.getType());
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Music addition");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Music addition"));
return true;
}
plot.setFlag(event.getFlag());

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

@ -29,6 +29,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotChangeOwnerEvent;
import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;
@ -38,6 +39,7 @@ import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.task.TaskManager;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
import java.util.Set;
@ -77,7 +79,9 @@ public class Owner extends SetCommand {
PlotChangeOwnerEvent event = this.eventDispatcher.callOwnerChange(player, plot, plot.hasOwner() ? plot.getOwnerAbs() : null, uuid,
plot.hasOwner());
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Owner change");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Owner change"));
return;
}
uuid = event.getNewOwner();
@ -90,7 +94,9 @@ public class Owner extends SetCommand {
}
PlotUnlinkEvent unlinkEvent = this.eventDispatcher.callUnlink(plot.getArea(), plot, false, false, PlotUnlinkEvent.REASON.NEW_OWNER);
if (unlinkEvent.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Unlink on owner change");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Unlink on owner change"));
return;
}
plot.unlinkPlot(unlinkEvent.isCreateRoad(), unlinkEvent.isCreateRoad());

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

@ -71,7 +71,7 @@ public class Purge extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, String[] args) {
if (args.length == 0) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
@ -84,7 +84,7 @@ public class Purge extends SubCommand {
for (String arg : args) {
String[] split = arg.split(":");
if (split.length != 2) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
switch (split[0].toLowerCase()) {
@ -133,7 +133,7 @@ public class Purge extends SubCommand {
clear = Boolean.parseBoolean(split[1]);
break;
default:
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
}

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

@ -29,6 +29,7 @@ import com.google.inject.Inject;
import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotRateEvent;
import com.plotsquared.core.events.TeleportCause;
@ -109,7 +110,8 @@ public class Rate extends SubCommand {
case "purge": {
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!Permissions
.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_RATE, true)) {
@ -123,7 +125,8 @@ public class Rate extends SubCommand {
}
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
sendMessage(player, Captions.RATING_NOT_OWNED);

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
@ -62,7 +63,8 @@ public class Remove extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
@ -67,7 +68,8 @@ public class Save extends SubCommand {
}
final Plot plot = player.getCurrentPlot();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);

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

@ -29,6 +29,7 @@ import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.player.PlotPlayer;
@ -87,7 +88,8 @@ public class SchematicCmd extends SubCommand {
Location loc = player.getLocation();
final Plot plot = loc.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
@ -195,7 +197,8 @@ public class SchematicCmd extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);

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

@ -30,6 +30,7 @@ import com.plotsquared.core.backup.BackupManager;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
@ -204,7 +205,7 @@ public class Set extends SubCommand {
// Additional checks
Plot plot = player.getCurrentPlot();
if (plot == null) {
MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
// components

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.plotsquared.core.configuration.CaptionUtility;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
@ -40,7 +41,8 @@ public abstract class SetCommand extends SubCommand {
Location location = player.getLocation();
Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
if (!Permissions.hasPermission(player, CaptionUtility

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

@ -60,7 +60,7 @@ public class Swap extends SubCommand {
return CompletableFuture.completedFuture(false);
}
if (args.length != 1) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return CompletableFuture.completedFuture(false);
}
Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);

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

@ -173,7 +173,7 @@ public class Template extends SubCommand {
return true;
}
}
MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, getUsage());
sendUsage(player);
return true;
}
final String world = args[1];
@ -246,7 +246,7 @@ public class Template extends SubCommand {
});
return true;
default:
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
}
return false;
}

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

@ -127,7 +127,7 @@ public class Trim extends SubCommand {
@Override public boolean onCommand(final PlotPlayer<?> player, String[] args) {
if (args.length == 0) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
final String world = args[0];

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

@ -27,6 +27,7 @@ package com.plotsquared.core.command;
import com.google.inject.Inject;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Location;
@ -37,6 +38,7 @@ import com.plotsquared.core.util.MainUtil;
import com.plotsquared.core.util.Permissions;
import com.plotsquared.core.util.StringMan;
import com.plotsquared.core.util.task.TaskManager;
import net.kyori.adventure.text.minimessage.Template;
import javax.annotation.Nonnull;
@ -59,7 +61,8 @@ public class Unlink extends SubCommand {
Location location = player.getLocation();
final Plot plot = location.getPlotAbs();
if (plot == null) {
return !sendMessage(player, Captions.NOT_IN_PLOT);
player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
return false;
}
if (!plot.hasOwner()) {
return !sendMessage(player, Captions.PLOT_UNOWNED);
@ -70,7 +73,7 @@ public class Unlink extends SubCommand {
final boolean createRoad;
if (args.length != 0) {
if (args.length != 1 || !StringMan.isEqualIgnoreCaseToAny(args[0], "true", "false")) {
Captions.COMMAND_SYNTAX.send(player, getUsage());
sendUsage(player);
return false;
}
createRoad = Boolean.parseBoolean(args[0]);
@ -82,7 +85,9 @@ public class Unlink extends SubCommand {
.callUnlink(plot.getArea(), plot, createRoad, createRoad,
PlotUnlinkEvent.REASON.PLAYER_COMMAND);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Unlink");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Unlink"));
return true;
}
boolean force = event.getEventResult() == Result.FORCE;

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

@ -32,6 +32,7 @@ import com.plotsquared.core.PlotSquared;
import com.plotsquared.core.configuration.Captions;
import com.plotsquared.core.configuration.ConfigurationUtil;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.database.DBFunc;
import com.plotsquared.core.events.PlotComponentSetEvent;
import com.plotsquared.core.events.PlotMergeEvent;
@ -75,6 +76,7 @@ import com.sk89q.worldedit.math.BlockVector3;
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.minimessage.Template;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -1828,7 +1830,9 @@ public class Plot {
PlotMergeEvent event = this.eventDispatcher
.callMerge(this, Direction.ALL, Integer.MAX_VALUE, player);
if (event.getEventResult() == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Auto merge on claim");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Auto merge on claim"));
return;
}
Plot.this.autoMerge(event.getDir(), event.getMax(), uuid, true);
@ -2978,7 +2982,9 @@ public class Plot {
this.eventDispatcher.callTeleport(player, player.getLocation(), plot)
.getEventResult();
if (result == Result.DENY) {
sendMessage(player, Captions.EVENT_DENIED, "Teleport");
player.sendMessage(
TranslatableCaption.of("events.event_denied"),
Template.of("value", "Teleport"));
resultConsumer.accept(false);
return;
}

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

@ -256,7 +256,7 @@
"blocklist.block_list_separator": "<gold>,</gold><gray> ",
"biome.need_biome": "<prefix><red>You need to specify a valid biome.</red>",
"biome.biome_set_to": "<prefix><gold>Plot biome set to </gold><gray>",
"biome.biome_set_to": "<prefix><gold>Plot biome set to <gray><value></gray></gold>",
"teleport.teleported_to_plot": "<prefix><gold>You have been teleported.</gold>",
"teleport.teleported_to_road": "<prefix><gold>You got teleported to the road.</gold>",
@ -300,8 +300,7 @@
"info.plot_no_description": "<prefix><gray>No description set.</gray>",
"info.info_syntax_console": "<prefix><gray>/plot info X;Z</gray>",
"info.plot_caps_header": "<dark_gray><strikethrough>---------<reset> <gold>CAPS </gold><dark_gray><strikethrough>---------<reset>",
"infoplot_caps_format": "<prefix><gray>- Cap Type: </gray><gold><cap> </gold><gray>| Status: </gray><gold><current></gold><gray>/</gray><gold><limit> </gold><gray>(</gray><gold><percentage>%</gold><gray>)</gray>",
"info.plot_caps_format": "<prefix><gray>- Cap Type: </gray><gold><cap> </gold><gray>| Status: </gray><gold><current></gold><gray>/</gray><gold><limit> </gold><gray>(</gray><gold><percentage>%</gold><gray>)</gray>",
"working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
"working.clearing_done": "<prefix><dark_aqua>Clear completed! Took <amount>ms.</dark_aqua>",