From 302051a6ca09db5574bd3064669fe588ffbe243f Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sat, 20 Oct 2018 14:03:21 +0200 Subject: [PATCH] Minor cleanup --- .../intellectualcrafters/plot/commands/Add.java | 2 +- .../plot/commands/Clear.java | 2 +- .../plot/commands/Delete.java | 7 +++++-- .../plot/commands/Kick.java | 2 +- .../plot/commands/Load.java | 2 +- .../plot/commands/Music.java | 2 +- .../plot/commands/PluginCmd.java | 1 + .../plot/commands/Relight.java | 5 ++++- .../plot/commands/Reload.java | 3 ++- .../plot/commands/SchematicCmd.java | 2 +- .../plot/commands/SetHome.java | 3 ++- .../plot/commands/Trust.java | 2 +- .../plot/flag/GameModeFlag.java | 2 +- .../plot/flag/IntegerListFlag.java | 2 +- .../plot/flag/PlotWeatherFlag.java | 2 +- README.md | 17 ++++++++++------- 16 files changed, 34 insertions(+), 22 deletions(-) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java index 956bd0f01..4f0aabf80 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Add.java @@ -18,7 +18,7 @@ import java.util.UUID; @CommandDeclaration( command = "add", - description = "Allow a user to build while you are online", + description = "Allow a user to build in a plot while you are online", usage = "/plot add ", category = CommandCategory.SETTINGS, permission = "plots.add", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java index 375d408c6..d3d2e8385 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java @@ -15,7 +15,7 @@ import com.plotsquared.general.commands.Command; import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration(command = "clear", - description = "Clear a plot", + description = "Clear the plot you stand on", permission = "plots.clear", category = CommandCategory.APPEARANCE, usage = "/plot clear", diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java index 9ebc7a058..b84b50a1d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Delete.java @@ -17,14 +17,17 @@ import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration( command = "delete", permission = "plots.delete", - description = "Delete a plot", + description = "Delete the plot you stand on", usage = "/plot delete", - aliases = {"dispose", "del", "reset"}, + aliases = {"dispose", "del"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, confirmation = true) public class Delete extends SubCommand { + // Note: To delete a specific plot use /plot delete + // The syntax also works with any command: /plot + @Override public boolean onCommand(final PlotPlayer player, String[] args) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java index 18a7af200..f637c83b7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java @@ -21,7 +21,7 @@ import java.util.UUID; aliases = {"k"}, description = "Kick a player from your plot", permission = "plots.kick", - usage = "", + usage = "/plot kick ", category = CommandCategory.TELEPORT, requiredType = RequiredType.NONE) public class Kick extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java index c5309ba80..238c3631f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java @@ -25,7 +25,7 @@ import java.util.List; requiredType = RequiredType.NONE, description = "Load your plot", permission = "plots.load", - usage = "/plot restore") + usage = "/plot load") public class Load extends SubCommand { @Override diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java index 5f3a12dc9..47f47fb48 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Music.java @@ -14,7 +14,7 @@ import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration( command = "music", permission = "plots.music", - description = "Player music in a plot", + description = "Play music in your plot", usage = "/plot music", category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java index 0938c42f1..ca79585f1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java @@ -11,6 +11,7 @@ import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration(command = "plugin", permission = "plots.use", description = "Show plugin information", + usage = "/plot plugin", aliases = "version", category = CommandCategory.INFO) public class PluginCmd extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java index 4b20ca2c6..5226dd15e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java @@ -13,7 +13,10 @@ import com.plotsquared.general.commands.Command; import com.plotsquared.general.commands.CommandDeclaration; import java.util.HashSet; -@CommandDeclaration(command = "relight", description = "Relight your plot", category = CommandCategory.DEBUG) +@CommandDeclaration(command = "relight", + description = "Relight your plot", + usage = "/plot relight", + category = CommandCategory.DEBUG) public class Relight extends Command { public Relight() { super(MainCommand.getInstance(), true); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java index 37092ac9c..58d447337 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Reload.java @@ -14,8 +14,9 @@ import java.io.IOException; import java.util.Objects; @CommandDeclaration(command = "reload", + aliases = "rl", permission = "plots.admin.command.reload", - description = "Reload configurations", + description = "Reload translations and world settings", usage = "/plot reload", category = CommandCategory.ADMINISTRATION) public class Reload extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java index 644a040ae..b190de880 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java @@ -25,7 +25,7 @@ import java.util.UUID; command = "schematic", permission = "plots.schematic", description = "Schematic command", - aliases = {"sch"}, + aliases = {"sch", "schem"}, category = CommandCategory.SCHEMATIC, usage = "/plot schematic ") public class SchematicCmd extends SubCommand { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java index 5ae2647c3..de5a11f97 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java @@ -11,7 +11,7 @@ import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration( command = "sethome", permission = "plots.set.home", - description = "Set the plot home", + description = "Set the plot home to your current position", usage = "/plot sethome [none]", aliases = {"sh", "seth"}, category = CommandCategory.SETTINGS, @@ -22,6 +22,7 @@ public class SetHome extends SetCommand { public boolean set(PlotPlayer player, Plot plot, String value) { switch (value.toLowerCase()) { case "unset": + case "reset": case "remove": case "none": { Plot base = plot.getBasePlot(false); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java index 768b2b09a..194bc27a1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Trust.java @@ -21,7 +21,7 @@ import java.util.UUID; aliases = {"t"}, requiredType = RequiredType.NONE, usage = "/plot trust ", - description = "Allow a player to build in a plot", + description = "Allow a user to build in a plot while you are offline", category = CommandCategory.SETTINGS) public class Trust extends Command { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java index d7c0ccec0..983149342 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/GameModeFlag.java @@ -38,6 +38,6 @@ public class GameModeFlag extends Flag { @Override public String getValueDescription() { - return "Flag value must be a gamemode: 'creative' , 'survival', 'adventure' or 'spectator'"; + return "Flag value must be a gamemode: 'survival', 'creative', 'adventure' or 'spectator'"; } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java index 9667269c1..aa4bb3fb1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/IntegerListFlag.java @@ -26,6 +26,6 @@ public class IntegerListFlag extends ListFlag> { } @Override public String getValueDescription() { - return "Flag value must be a integer list"; + return "Flag value must be an integer list"; } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java index b3ff8f7ce..63b849b5b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/PlotWeatherFlag.java @@ -31,6 +31,6 @@ public class PlotWeatherFlag extends Flag { } @Override public String getValueDescription() { - return ""; + return "Flag must be a weather: 'rain' or 'sun'"; } } diff --git a/README.md b/README.md index 84e60b9ae..ca61ee768 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ -# PlotSquared [![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://forthebadge.com) +

+ +

+ +--- -[![Join the chat at https://gitter.im/PlotSquared/Lobby](https://badges.gitter.im/PlotSquared/Lobby.svg)](https://gitter.im/PlotSquared/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) For the end user, PlotSquared is packed with a tonne of cool features. It allows you to merge plots, and build together with your friends. You can also change a lot of plot specific settings in the form of @@ -11,15 +14,15 @@ is to provide a lag-free and smooth experience. ## Links -### Server Owner +* [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev) +* [Jenkins](https://ci.athion.net/job/PlotSquared/) * [Spigot Page](https://www.spigotmc.org/resources/plotsquared.1177/) * [WebChat/IRC]: #IntellectualCrafters on irc.esper.net +* [Discord](https://discord.gg/ngZCzbU) * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki) -* [Website](http://plotsquared.com) ### Developer Resources -* [JavaDocs] Link Temporarily Unavailable -* [Build Server] [![Build Status](http://ci.plotsquared.com/buildStatus/icon?job=PlotSquared)](http://ci.athion.net/job/PlotSquared/) +* [JavaDocs] Link Temporarily Unavailable * [Maven Repo] Link Temporarily Unavailable # Building @@ -43,4 +46,4 @@ Suggestions are welcome! We have a separate issue tracker for suggestions, that * [BasicPlots](https://www.spigotmc.org/resources/basicplots.6901/) * [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/) -[WebChat/IRC]: http://webchat.esper.net/?nick=&channels=IntellectualCrafters&fg_color=000&fg_sec_color=000&bg_color=FFF +[WebChat/IRC]: https://webchat.esper.net/?nick=&channels=IntellectualCrafters \ No newline at end of file