Patch new cmds system into old system

worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

@@ -21,13 +21,11 @@ package com.sk89q.worldedit.command;
 
 import com.google.common.collect.Multimap;
 import com.google.common.io.Files;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.command.util.CommandPermissions;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
@@ -49,6 +47,7 @@ import org.enginehub.piston.annotation.param.ArgFlag;
 import org.enginehub.piston.annotation.param.Switch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.enginehub.piston.exception.StopExecutionException;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -138,7 +137,7 @@ public class SchematicCommands {
                      @Arg(desc = "File name.") String filename,
                      @Arg(desc = "Format name.", def = "sponge") String formatName,
                      @Switch(name = 'f', desc = "Overwrite an existing file.") boolean allowOverwrite
-        ) throws CommandException, WorldEditException {
+        ) throws WorldEditException {
         LocalConfiguration config = worldEdit.getConfiguration();
 
         File dir = worldEdit.getWorkingDirectoryFile(config.saveDir);
@@ -154,7 +153,7 @@ public class SchematicCommands {
         boolean overwrite = f.exists();
         if (overwrite) {
             if (!player.hasPermission("worldedit.schematic.delete")) {
-                throw new CommandException("That schematic already exists!");
+                throw new StopExecutionException("That schematic already exists!");
             }
             if (!allowOverwrite) {
                 player.printError("That schematic already exists. Use the -f flag to overwrite it.");
@@ -181,7 +180,7 @@ public class SchematicCommands {
         File parent = f.getParentFile();
         if (parent != null && !parent.exists()) {
             if (!parent.mkdirs()) {
-                throw new CommandException("Could not create folder for schematics!");
+                throw new StopExecutionException("Could not create folder for schematics!");
             }
         }
 
@@ -263,8 +262,13 @@ public class SchematicCommands {
         descFooter = "Note: Format is not fully verified until loading."
     )
     @CommandPermissions("worldedit.schematic.list")
-    public void list(Actor actor, CommandContext args,
-                     @ArgFlag(name = 'p', desc = "Page to view.", def = "1") int page) {
+    public void list(Actor actor,
+                     @ArgFlag(name = 'p', desc = "Page to view.", def = "1") int page,
+                     @Switch(name = 'd', desc = "Sort by date, oldest first") boolean oldFirst,
+                     @Switch(name = 'n', desc = "Sort by date, newest first") boolean newFirst) {
+        if (oldFirst && newFirst) {
+            throw new StopExecutionException("Cannot sort by oldest and newest.");
+        }
         File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().saveDir);
         List<File> fileList = allFiles(dir);
 
@@ -286,7 +290,7 @@ public class SchematicCommands {
             return;
         }
 
-        final int sortType = args.hasFlag('d') ? -1 : args.hasFlag('n') ? 1 : 0;
+        final int sortType = oldFirst ? -1 : newFirst ? 1 : 0;
         // cleanup file list
         Arrays.sort(files, (f1, f2) -> {
             // http://stackoverflow.com/questions/203030/best-way-to-list-files-in-java-sorted-by-date-modified

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/CommandPermissions.java

@@ -0,0 +1,39 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.util;
+
+import org.enginehub.piston.annotation.CommandCondition;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@CommandCondition(CommandPermissionsConditionGenerator.class)
+public @interface CommandPermissions {
+
+    /**
+     * A list of permissions. Only one permission has to be met
+     * for the command to be permitted.
+     *
+     * @return a list of permissions strings
+     */
+    String[] value();
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/CommandPermissionsConditionGenerator.java

@@ -0,0 +1,49 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.util;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Key;
+import com.sk89q.worldedit.extension.platform.Actor;
+import org.enginehub.piston.Command;
+import org.enginehub.piston.gen.CommandConditionGenerator;
+import org.enginehub.piston.util.NonnullByDefault;
+
+import java.lang.reflect.Method;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+@NonnullByDefault
+public class CommandPermissionsConditionGenerator implements CommandConditionGenerator {
+
+    private static final Key<Actor> ACTOR_KEY = Key.get(Actor.class);
+
+    @Override
+    public Command.Condition generateCondition(Method commandMethod) {
+        CommandPermissions annotation = commandMethod.getAnnotation(CommandPermissions.class);
+        checkNotNull(annotation, "Annotation is missing from commandMethod");
+        Set<String> permissions = ImmutableSet.copyOf(annotation.value());
+        return p -> {
+            Actor actor = p.injectedValue(ACTOR_KEY);
+            return permissions.stream().anyMatch(actor::hasPermission);
+        };
+    }
+}