Various command (use es6 if java9 + nashorn)

worldedit-core/src/main/java/com/sk89q/worldedit/scripting/CommandScriptLoader.java

@@ -0,0 +1,106 @@
+package com.sk89q.worldedit.scripting;
+
+import com.boydti.fawe.Fawe;
+import com.boydti.fawe.FaweAPI;
+import com.boydti.fawe.command.FaweParser;
+import com.boydti.fawe.config.Settings;
+import com.boydti.fawe.object.RunnableVal2;
+import com.boydti.fawe.util.MainUtil;
+import com.google.common.base.Charsets;
+import com.google.common.base.Function;
+import com.google.common.io.CharStreams;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.command.BrushProcessor;
+import com.sk89q.worldedit.extension.factory.DefaultMaskParser;
+import com.sk89q.worldedit.extension.factory.HashTagPatternParser;
+import com.sk89q.worldedit.extension.platform.CommandManager;
+import com.sk89q.worldedit.util.command.CallableProcessor;
+import com.sk89q.worldedit.util.command.ProcessedCallable;
+import com.sk89q.worldedit.util.command.parametric.FunctionParametricCallable;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+public class CommandScriptLoader {
+    private final NashornCraftScriptEngine engine;
+    private final String loader;
+
+    public CommandScriptLoader() throws IOException {
+        this.engine = new NashornCraftScriptEngine();
+
+        try (InputStream inputStream = WorldEdit.class.getResourceAsStream("/cs_adv.js")) {
+            this.loader = CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8));
+        }
+    }
+
+    /**
+     * Load all file commands
+     * @throws Throwable
+     */
+    public void load() throws Throwable {
+        File commands = MainUtil.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.COMMANDS);
+        if (commands.exists()) {
+            for (File file : commands.listFiles()) add(new String[0], file);
+        }
+    }
+
+    private void add(String[] aliases, File file) throws Throwable {
+        if (file.isDirectory()) {
+            if (aliases.length == 0) {
+                String[] newAliases = new String[] {file.getName()};
+                for (File newFile : file.listFiles()) {
+                    add(newAliases, newFile);
+                }
+            } else {
+                Fawe.debug("Ignoring nested directory: " + file);
+            }
+        } else {
+            String name = file.getName();
+            if (name.endsWith(".js")) {
+                Fawe.debug("Loading script: " + name);
+                List<FunctionParametricCallable> cmds = getCommands(file, Collections.emptyMap());
+                FaweParser parser = null;
+                if (aliases.length == 1) {
+                    switch (aliases[0]) {
+                        case "brush":
+                            if (!cmds.isEmpty()) {
+                                BrushProcessor processor = new BrushProcessor(WorldEdit.getInstance());
+                                for (FunctionParametricCallable cmd : cmds) {
+                                    ProcessedCallable processed = new ProcessedCallable(cmd, processor);
+                                    CommandManager.getInstance().registerCommand(aliases, cmd.getCommand(), processed);
+                                }
+                            }
+                            return;
+                        case "patterns":
+                            parser = FaweAPI.getParser(HashTagPatternParser.class);
+                            break;
+                        case "masks":
+                            parser = FaweAPI.getParser(DefaultMaskParser.class);
+                            break;
+                    }
+                    if (parser != null) {
+                        for (FunctionParametricCallable cmd : cmds) {
+                            parser.getDispatcher().registerCommand(cmd, cmd.getCommand().aliases());
+                        }
+                        return;
+                    }
+                }
+                for (FunctionParametricCallable cmd : cmds) {
+                    CommandManager.getInstance().registerCommand(aliases, cmd.getCommand(), cmd);
+                }
+            }
+        }
+    }
+
+    private List<FunctionParametricCallable> getCommands(File file, Map<String, Object> vars) throws Throwable {
+        String script = new String(Files.readAllBytes(file.toPath())) + loader;
+        return (List) engine.evaluate(script, file.getPath(), vars);
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/scripting/NashornCraftScriptEngine.java

@@ -0,0 +1,79 @@
+/*
+ * 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.scripting;
+
+import com.boydti.fawe.Fawe;
+import com.sk89q.worldedit.WorldEditException;
+import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+import java.util.Map;
+
+public class NashornCraftScriptEngine implements CraftScriptEngine {
+    private static NashornScriptEngineFactory FACTORY;
+    private int timeLimit;
+
+    @Override
+    public void setTimeLimit(int milliseconds) {
+        timeLimit = milliseconds;
+    }
+
+    @Override
+    public int getTimeLimit() {
+        return timeLimit;
+    }
+
+    @Override
+    public Object evaluate(String script, String filename, Map<String, Object> args) throws Throwable {
+        ClassLoader cl = Fawe.get().getClass().getClassLoader();
+        Thread.currentThread().setContextClassLoader(cl);
+        synchronized (NashornCraftScriptEngine.class) {
+            if (FACTORY == null) FACTORY = new NashornScriptEngineFactory();
+        }
+        ;
+        ScriptEngine engine = FACTORY.getScriptEngine("--language=es6");
+        SimpleBindings bindings = new SimpleBindings();
+
+        for (Map.Entry<String, Object> entry : args.entrySet()) {
+            bindings.put(entry.getKey(), entry.getValue());
+        }
+
+       try {
+           Object result = engine.eval(script, bindings);
+           return result;
+        } catch (Error e) {
+            e.printStackTrace();
+            throw new ScriptException(e.getMessage());
+        } catch (Throwable e) {
+            e.printStackTrace();
+            while (e.getCause() != null) {
+                e = e.getCause();
+            }
+            if (e instanceof WorldEditException) {
+                throw e;
+            }
+            throw e;
+        } finally {
+        }
+    }
+
+}