feat: 兼容Sponge部分功能

src/main/resources/modules/bukkit/command.js

@@ -59,13 +59,13 @@ function register(jsp, cmd) {
 
 function on(jsp, name, exec) {
     var c = get(name) || create(jsp, name);
-    console.debug('插件 %s 设置命令 %s(%s) 执行器 ...'.fotmat(jsp.description.name, name, c));
+    console.debug('插件 %s 设置命令 %s(%s) 执行器 ...'.format(jsp.description.name, name, c));
     if (exec.cmd) {
         c.setExecutor(function (sender, cmd, command, args) {
             try {
                 return exec.cmd(sender, command, args);
             } catch (ex) {
-                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'.fotmat(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
+                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
                 console.ex(ex);
             }
         });
@@ -78,7 +78,7 @@ function on(jsp, name, exec) {
                 StringUtil.copyPartialMatches(token, Arrays.asList(exec.tab(sender, command, args)), completions);
                 return completions;
             } catch (ex) {
-                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'.fotmat(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
+                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
                 console.ex(ex);
             }
         });

src/main/resources/modules/bukkit/console.js

@@ -0,0 +1,19 @@
+var BukkitConsole = {
+    createNew: function () {
+        var console = Console.createNew();
+        console.sender = function () {
+            var sender = arguments[0];
+            if (!(sender instanceof org.bukkit.command.CommandSender)) {
+                this.error("第一个参数未实现 org.bukkit.command.CommandSender 无法发送消息!")
+            }
+            var args = Array.prototype.slice.call(arguments, 1);
+            sender.sendMessage(console.prefix + args.join(' '));
+        };
+        console.console = function () {
+            this.sender(MServer.consoleSender, Array.prototype.join.call(arguments, ' '));
+        };
+        return console;
+    }
+}
+global.Console = BukkitConsole;
+exports = global.Console;

src/main/resources/modules/bukkit/event.js

@@ -138,7 +138,7 @@ function listen(jsp, event, exec, priority, ignoreCancel) {
     }
     listeners.push(off);
     // noinspection JSUnresolvedVariable
-    console.debug('插件 %s 注册事件 %s 方法 %s'.format(name, eventCls.simpleName, exec.name === '' ? '匿名方法' : exec.name));
+    console.debug('插件 %s 注册事件 %s => %s'.format(name, eventCls.simpleName, exec.name === '' ? '匿名方法' : exec.name));
     return off;
 }
 

src/main/resources/modules/bukkit/plugin.js

@@ -6,7 +6,7 @@
 // var zip = require("core/zip");
 var fs = require('core/fs');
 var yaml = require('modules/yaml');
-var event = require('modules/event');
+var event = require('./event');
 var bukkit = require('./server');
 var command = require('./command');
 var permission = require('./permission');
@@ -99,7 +99,7 @@ function beforeLoadHook(origin) {
     // 处理 event 为了不影响 正常逻辑 event 还是手动require吧
     // result = result + 'var event = {}; module.exports.event = event;';
     // 注入 console 对象         // 给插件注入单独的 console
-    result = result + 'var console = new Console(); module.exports.console = console;';
+    result = result + 'var console = Console.createNew(); module.exports.console = console;';
     // 插件注入 self 对象
     result = result + 'var self = {}; module.exports.self = self;';
     return result;
@@ -226,7 +226,6 @@ function checkAndGet(args) {
 
 var plugins = [];
 
-exports.$ = undefined;
 exports.plugins = plugins;
 exports.init = function (path) {
     var plugin = bukkit.plugin.self;

src/main/resources/modules/bukkit/server.js

@@ -5,10 +5,10 @@
  */
 
 /*global Java, base, module, exports, require, __FILE__*/
-var Bukkit = Java.type("org.bukkit.Bukkit");
+var Bukkit = MServer;
 // noinspection JSUnresolvedVariable
 var Server = Bukkit.server;
-var PluginManager = Bukkit.pluginManager;
+var PluginManager = Server.pluginManager;
 exports.$ = Bukkit;
 /**
  * 获取NMS版本

src/main/resources/modules/command.js

@@ -1 +1 @@
-module.exports = require('./bukkit/command');
+module.exports = require('./mserver').command;

src/main/resources/modules/event.js

@@ -1 +1 @@
-module.exports = require('./bukkit/event');
+module.exports = require('./mserver').event;

src/main/resources/modules/mserver.js

@@ -0,0 +1,8 @@
+module.exports = {
+    command: require('./' + DetectServerType + '/command'),
+    event: require('./' + DetectServerType + '/event'),
+    permission: require('./' + DetectServerType + '/permission'),
+    plugin: require('./' + DetectServerType + '/plugin'),
+    server: require('./' + DetectServerType + '/server'),
+    task: require('./' + DetectServerType + '/task')
+}

src/main/resources/modules/permission.js

@@ -1 +1 @@
-module.exports = require('./bukkit/permission');
+module.exports = require('./mserver').permission;

src/main/resources/modules/plugin.js

@@ -1 +1 @@
-module.exports = require('./bukkit/plugin');
+module.exports = require('./mserver').plugin;

src/main/resources/modules/server.js

@@ -1 +1 @@
-module.exports = require('./bukkit/server');
+module.exports = require('./mserver').server;

src/main/resources/modules/sponge/command.js

@@ -0,0 +1,93 @@
+'use strict';
+/**
+ * Sponge 命令相关类
+ */
+
+/*global Java, base, module, exports, require, __FILE__*/
+var server = require('./server');
+var plugin = server.plugin.self;
+
+var CommandManager = server.CommandManager;
+
+var CommandSpec = Java.type('org.spongepowered.api.command.spec.CommandSpec');
+var Text = Java.type('org.spongepowered.api.text.Text');
+
+var ArrayList = Java.type('java.util.ArrayList');
+var Arrays = Java.type('java.util.Arrays');
+
+function enable(jsp) {
+    var commands = jsp.description.commands;
+    if (commands) {
+        var pluginCmds = [];
+        for (var name in commands) {
+            var command = commands[name];
+            if (typeof command !== 'object') continue;
+            var newCmd = create(jsp, name);
+            if (command.description) newCmd.setDescription(command.description);
+            if (command.usage) newCmd.setUsage(command.usage);
+            if (command.aliases) newCmd.setAliases(Arrays.asList(command.aliases));
+            if (command.permission) newCmd.setPermission(command.permission);
+            if (command['permission-message']) newCmd.setPermissionMessage(command['permission-message']);
+            pluginCmds.push(newCmd);
+            console.debug('插件 %s 注册命令 %s ...'.format(jsp.description.name, name));
+        }
+        commandMap.registerAll(jsp.description.name, Arrays.asList(pluginCmds));
+    }
+}
+
+function get(name) {
+    return commandMap.getCommand(name);
+}
+
+function create(jsp, name) {
+    return register(jsp, ref.on(PluginCommand).create(name, plugin).get());
+}
+
+function register(jsp, cmd) {
+    commandMap.register(jsp.description.name, cmd);
+    return cmd;
+}
+
+// var exec = {
+//     cmd: function (sender, command, args) {
+//
+//     },
+//     tab: function (sender, command, args) {
+//
+//     }
+// };
+
+function on(jsp, name, exec) {
+    var c = get(name) || create(jsp, name);
+    console.debug('插件 %s 设置命令 %s(%s) 执行器 ...'.format(jsp.description.name, name, c));
+    if (exec.cmd) {
+        c.setExecutor(function (sender, cmd, command, args) {
+            try {
+                return exec.cmd(sender, command, args);
+            } catch (ex) {
+                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
+                console.ex(ex);
+            }
+        });
+    }
+    if (exec.tab) {
+        c.setTabCompleter(function (sender, cmd, command, args) {
+            try {
+                var completions = new ArrayList();
+                var token = args[args.length - 1];
+                StringUtil.copyPartialMatches(token, Arrays.asList(exec.tab(sender, command, args)), completions);
+                return completions;
+            } catch (ex) {
+                console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
+                console.ex(ex);
+            }
+        });
+    }
+}
+
+exports.enable = enable;
+
+exports.on = on;
+exports.off = function () {
+
+};

src/main/resources/modules/sponge/console.js

@@ -0,0 +1,23 @@
+var SpongeConsole = {
+    createNew: function () {
+        var console = Console.createNew();
+        console.sender = function () {
+            var Text = Java.type("org.spongepowered.api.text.Text");
+            var sender = arguments[0];
+            if (!(sender instanceof org.spongepowered.api.command.CommandSource)) {
+                this.error("第一个参数未实现 org.spongepowered.api.command.CommandSource 无法发送消息!")
+            }
+            var args = Array.prototype.slice.call(arguments, 1);
+            sender.sendMessage(Text.of(console.prefix + args.join(' ')));
+        };
+        console.console = function () {
+            this.sender(MServer.server.console, Array.prototype.join.call(arguments, ' '));
+        };
+        console.warn = function () {
+            log.warn(this.name + Array.prototype.join.call(arguments, ' '));
+        };
+        return console;
+    }
+}
+global.Console = SpongeConsole;
+exports = global.Console;

src/main/resources/modules/sponge/server.js

@@ -0,0 +1,43 @@
+'use strict';
+/**
+ * Sponge基础操作
+ * Created by 蒋天蓓 on 2017/10/27 0009.
+ */
+
+/*global Java, base, module, exports, require, __FILE__*/
+var Sponge = MServer;
+// noinspection JSUnresolvedVariable
+var Server = Sponge.server;
+var PluginManager = Sponge.pluginManager;
+exports.$ = Sponge;
+/**
+ * 插件管理
+ * @type {{manager: *, get: exports.plugin.get, load: exports.plugin.load}}
+ */
+exports.plugin = {
+    /**
+     * 插件管理工具
+     */
+    manager: PluginManager,
+    /**
+     * 获得插件实例
+     * @param name 插件名称
+     * @returns {*}
+     */
+    get: function (name) {
+        return PluginManager.getPlugin(name);
+    },
+    /**
+     * 载入插件 并且返回结果
+     * @param name 插件名称
+     * @returns {*}
+     */
+    load: function (name) {
+        var plugin = this.get(name);
+        if (ext.notNull(plugin) && !plugin.isEnabled()) {
+            PluginManager.enablePlugin(plugin);
+        }
+        return PluginManager.isPluginEnabled(name);
+    },
+    self: PluginManager.getPlugin('miaoscript').get()
+};

src/main/resources/modules/sponge/task.js

@@ -0,0 +1,72 @@
+'use strict';
+/*global Java, base, module, exports, require, __FILE__*/
+/**
+ * 任务计划
+ * Created by 蒋天蓓 on 2017/2/9 0009.
+ */
+var plugin = require('./server').plugin.self;
+var Comsumer = Java.type('java.util.function.Consumer');
+var Task = Java.type("org.spongepowered.api.scheduler.Task");
+/**
+ * 创建任务对象
+ * @param func 任务
+ */
+exports.create = function (func) {
+    return Task.builder().execute(new Comsumer(func));
+};
+/**
+ * 运行任务
+ * @param func 任务
+ */
+exports.run = function (func) {
+    return exports.create(func).submit(plugin);
+};
+/**
+ * 延时运行任务
+ * @param func 任务
+ * @param time 延时时间
+ */
+exports.later = function (func, time) {
+    return exports.create(func).delayTicks(time).submit(plugin);
+};
+/**
+ * 运行循环任务
+ * @constructor (任务,执行间隔).
+ * @constructor (任务,首次延时,执行间隔)
+ */
+exports.timer = function () {
+    switch (arguments.length) {
+        case 2:
+            return exports.create(arguments[0]).intervalTicks(arguments[1]).submit(plugin);
+        case 3:
+            return exports.create(arguments[0]).delayTicks(arguments[1]).intervalTicks(arguments[2]).submit(plugin);
+    }
+};
+/**
+ * 运行异步任务
+ * @param  func function 任务
+ */
+exports.async = function (func) {
+    return exports.create(func).async().submit(plugin);
+};
+/**
+ * 延时运行异步任务
+ * @param func 任务
+ * @param time 延时时间
+ */
+exports.laterAsync = function (func, time) {
+    return exports.create(func).async().delayTicks(time).submit(plugin);
+};
+/**
+ * 运行异步循环任务
+ * @constructor (任务,执行间隔).
+ * @constructor (任务,首次延时,执行间隔)
+ */
+exports.timerAsync = function () {
+    switch (arguments.length) {
+        case 2:
+            return exports.create(arguments[0]).async().intervalTicks(arguments[1]).submit(plugin);
+        case 3:
+            return exports.create(arguments[0]).async().delayTicks(arguments[1]).intervalTicks(arguments[2]).submit(plugin);
+    }
+};

src/main/resources/modules/task.js

@@ -1 +1 @@
-module.exports = require('./bukkit/task');
+module.exports = require('./mserver').task;