Patch new cmds system into old system

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java

@@ -19,10 +19,8 @@
 
 package com.sk89q.worldedit.extension.platform;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.util.command.composition.LegacyCommandAdapter.adapt;
-
 import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
@@ -41,6 +39,7 @@ import com.sk89q.worldedit.command.HistoryCommands;
 import com.sk89q.worldedit.command.NavigationCommands;
 import com.sk89q.worldedit.command.RegionCommands;
 import com.sk89q.worldedit.command.SchematicCommands;
+import com.sk89q.worldedit.command.SchematicCommandsRegistration;
 import com.sk89q.worldedit.command.ScriptingCommands;
 import com.sk89q.worldedit.command.SelectionCommands;
 import com.sk89q.worldedit.command.SnapshotCommands;
@@ -57,6 +56,7 @@ import com.sk89q.worldedit.command.composition.DeformCommand;
 import com.sk89q.worldedit.command.composition.PaintCommand;
 import com.sk89q.worldedit.command.composition.SelectionCommand;
 import com.sk89q.worldedit.command.composition.ShapedBrushCommand;
+import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
@@ -69,8 +69,10 @@ import com.sk89q.worldedit.internal.command.UserCommandCompleter;
 import com.sk89q.worldedit.internal.command.WorldEditBinding;
 import com.sk89q.worldedit.internal.command.WorldEditExceptionConverter;
 import com.sk89q.worldedit.session.request.Request;
+import com.sk89q.worldedit.util.command.CommandCallable;
 import com.sk89q.worldedit.util.command.Dispatcher;
 import com.sk89q.worldedit.util.command.InvalidUsageException;
+import com.sk89q.worldedit.util.command.SimpleDescription;
 import com.sk89q.worldedit.util.command.composition.ProvidedValue;
 import com.sk89q.worldedit.util.command.fluent.CommandGraph;
 import com.sk89q.worldedit.util.command.parametric.ExceptionConverter;
@@ -82,6 +84,7 @@ import com.sk89q.worldedit.util.formatting.component.CommandUsageBox;
 import com.sk89q.worldedit.util.logging.DynamicStreamHandler;
 import com.sk89q.worldedit.util.logging.LogFormat;
 import com.sk89q.worldedit.world.World;
+import org.enginehub.piston.DefaultCommandManagerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,6 +94,9 @@ import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.command.composition.LegacyCommandAdapter.adapt;
+
 /**
  * Handles the registration and invocation of commands.
  *
@@ -158,10 +164,7 @@ public final class CommandManager {
                             .describeAs("WorldEdit commands")
                             .registerMethods(new WorldEditCommands(worldEdit))
                             .parent()
-                        .group("schematic", "schem", "/schematic", "/schem")
-                            .describeAs("Schematic commands for saving/loading areas")
-                            .registerMethods(new SchematicCommands(worldEdit))
-                            .parent()
+                        .register(schematicCommands(),"schematic", "schem", "/schematic", "/schem")
                         .group("snapshot", "snap")
                             .describeAs("Schematic commands for saving/loading areas")
                             .registerMethods(new SnapshotCommands(worldEdit))
@@ -189,6 +192,21 @@ public final class CommandManager {
                 .getDispatcher();
     }
 
+    private CommandCallable schematicCommands() {
+        SimpleDescription desc = new SimpleDescription();
+        desc.setDescription("Schematic commands for saving/loading areas");
+        desc.setPermissions(ImmutableList.of());
+        org.enginehub.piston.CommandManager manager = DefaultCommandManagerService.getInstance()
+            .newCommandManager();
+        new SchematicCommandsRegistration(
+            manager,
+            new SchematicCommands(worldEdit),
+            new CommandPermissionsConditionGenerator()
+        );
+
+        return new CommandManagerCallable(worldEdit, manager, desc);
+    }
+
     public ExceptionConverter getExceptionConverter() {
         return exceptionConverter;
     }

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManagerCallable.java

@@ -0,0 +1,90 @@
+/*
+ * 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.extension.platform;
+
+import com.google.common.base.Splitter;
+import com.google.inject.Key;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.util.command.CommandCallable;
+import com.sk89q.worldedit.util.command.Description;
+import org.enginehub.piston.CommandManager;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Hack to get {@link CommandManager} working under {@link CommandCallable}.
+ */
+public class CommandManagerCallable implements CommandCallable {
+
+    private final WorldEdit worldEdit;
+    private final CommandManager manager;
+    private final Description description;
+
+    public CommandManagerCallable(WorldEdit worldEdit, CommandManager manager, Description description) {
+        this.worldEdit = worldEdit;
+        this.manager = manager;
+        this.description = description;
+    }
+
+    @Override
+    public Object call(String arguments, CommandLocals locals, String[] parentCommands) throws CommandException {
+        manager.injectValue(Key.get(Actor.class), () -> locals.get(Actor.class));
+        manager.injectValue(Key.get(Player.class), () -> getPlayer(locals));
+        manager.injectValue(Key.get(LocalSession.class), () -> {
+            Player sender = getPlayer(locals);
+            return worldEdit.getSessionManager().get(sender);
+        });
+        manager.injectValue(Key.get(EditSession.class), () -> {
+            Player sender = getPlayer(locals);
+            LocalSession session = worldEdit.getSessionManager().get(sender);
+            EditSession editSession = session.createEditSession(sender);
+            editSession.enableStandardMode();
+            session.tellVersion(sender);
+            return editSession;
+        });
+        return manager.execute(Splitter.on(' ').splitToList(arguments));
+    }
+
+    private Player getPlayer(CommandLocals locals) {
+        Actor actor = locals.get(Actor.class);
+        return actor instanceof Player ? (Player) actor : null;
+    }
+
+    @Override
+    public Description getDescription() {
+        return description;
+    }
+
+    @Override
+    public boolean testPermission(CommandLocals locals) {
+        return true;
+    }
+
+    @Override
+    public List<String> getSuggestions(String arguments, CommandLocals locals) throws CommandException {
+        return Collections.emptyList();
+    }
+}