Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add /brush none and unbind aliases

Browse Source
This commit is contained in:
Kenzie Togami 2019-09-09 18:13:57 -07:00
parent 0e9fee3b60
commit ba26d788af
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -82,6 +82,15 @@ public class BrushCommands {
this.worldEdit = worldEdit; this.worldEdit = worldEdit;
} }
@Command(
name = "none",
aliases = "unbind",
desc = "Unbind a bound brush from your current item"
)
void none(Player player, LocalSession session) throws WorldEditException {
ToolCommands.setToolNone(player, session, "Brush");
}
@Command( @Command(
name = "sphere", name = "sphere",
aliases = { "s" }, aliases = { "s" },

18
worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java
View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.command.tool.BlockReplacer;
import com.sk89q.worldedit.command.tool.DistanceWand; import com.sk89q.worldedit.command.tool.DistanceWand;
import com.sk89q.worldedit.command.tool.FloatingTreeRemover; import com.sk89q.worldedit.command.tool.FloatingTreeRemover;
import com.sk89q.worldedit.command.tool.FloodFillTool; import com.sk89q.worldedit.command.tool.FloodFillTool;
import com.sk89q.worldedit.command.tool.InvalidToolBindException;
import com.sk89q.worldedit.command.tool.LongRangeBuildTool; import com.sk89q.worldedit.command.tool.LongRangeBuildTool;
import com.sk89q.worldedit.command.tool.NavigationWand; import com.sk89q.worldedit.command.tool.NavigationWand;
import com.sk89q.worldedit.command.tool.QueryTool; import com.sk89q.worldedit.command.tool.QueryTool;
@ -80,6 +81,12 @@ public class ToolCommands {
Set<org.enginehub.piston.Command> commands = collect.getAllCommands() Set<org.enginehub.piston.Command> commands = collect.getAllCommands()
.collect(Collectors.toSet()); .collect(Collectors.toSet());
for (org.enginehub.piston.Command command : commands) { for (org.enginehub.piston.Command command : commands) {
if (command.getAliases().contains("unbind")) {
// Don't register new /tool unbind alias
command = command.toBuilder().aliases(
Collections2.filter(command.getAliases(), alias -> !"unbind".equals(alias))
).build();
}
commandManager.register(CommandUtil.deprecate( commandManager.register(CommandUtil.deprecate(
command, "Using global tool names is deprecated " + command, "Using global tool names is deprecated " +
"and will be removed in WorldEdit 8", ToolCommands::asNonGlobal "and will be removed in WorldEdit 8", ToolCommands::asNonGlobal
@ -115,6 +122,12 @@ public class ToolCommands {
return "/tool " + name; return "/tool " + name;
} }
static void setToolNone(Player player, LocalSession session, String type)
throws InvalidToolBindException {
session.setTool(player.getItemInHand(HandSide.MAIN_HAND).getType(), null);
player.print(type + " unbound from your current item.");
}
private final WorldEdit we; private final WorldEdit we;
public ToolCommands(WorldEdit we) { public ToolCommands(WorldEdit we) {
@ -123,12 +136,11 @@ public class ToolCommands {
@Command( @Command(
name = "none", name = "none",
aliases = "unbind",
desc = "Unbind a bound tool from your current item" desc = "Unbind a bound tool from your current item"
) )
public void none(Player player, LocalSession session) throws WorldEditException { public void none(Player player, LocalSession session) throws WorldEditException {
setToolNone(player, session, "Tool");
session.setTool(player.getItemInHand(HandSide.MAIN_HAND).getType(), null);
player.print("Tool unbound from your current item.");
} }
@Command( @Command(