From 86d3e74d47252bbb3b181c707a521e11309da09d Mon Sep 17 00:00:00 2001 From: coding Date: Mon, 23 Oct 2017 07:18:59 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=99=8D=E4=BD=8E=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=20=E4=BC=98=E5=8C=96=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/pw/yumc/MiaoScript/Base.java | 6 +++--- .../java/pw/yumc/MiaoScript/MiaoScript.java | 1 + src/main/resources/core/reflect.js | 6 +++--- src/main/resources/core/require.js | 6 +++--- src/main/resources/modules/event.js | 18 +++++++++--------- src/main/resources/modules/plugin.js | 4 ++-- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 7a1ee58..0e17dea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pw.yumc MiaoScript - 1.1 + 1.1.1 502647092 diff --git a/src/main/java/pw/yumc/MiaoScript/Base.java b/src/main/java/pw/yumc/MiaoScript/Base.java index 01414eb..faeb5a4 100644 --- a/src/main/java/pw/yumc/MiaoScript/Base.java +++ b/src/main/java/pw/yumc/MiaoScript/Base.java @@ -36,12 +36,12 @@ public class Base { } public String read(String path) throws IOException { - Log.d("读取文件 %s ...", path); + Log.fd("读取文件 %s ...", path); return new String(Files.readAllBytes(new File(path).toPath()), "UTF-8"); } public void save(String path, String content) throws IOException { - Log.d("保存文件 %s ...", path); + Log.fd("保存文件 %s ...", path); File file = new File(path); file.getParentFile().mkdirs(); Files.write(file.toPath(), content.getBytes("UTF-8")); @@ -54,7 +54,7 @@ public class Base { public void delete(Path path) throws IOException { val file = path.toFile(); if (!file.exists()) { return; } - Log.d("删除文件 %s ...", path); + Log.fd("删除文件 %s ...", path); if (file.isDirectory()) { for (Path f : Files.list(file.toPath()).collect(Collectors.toList())) { delete(f); diff --git a/src/main/java/pw/yumc/MiaoScript/MiaoScript.java b/src/main/java/pw/yumc/MiaoScript/MiaoScript.java index bc134ab..fe0dc75 100644 --- a/src/main/java/pw/yumc/MiaoScript/MiaoScript.java +++ b/src/main/java/pw/yumc/MiaoScript/MiaoScript.java @@ -79,6 +79,7 @@ public class MiaoScript extends JavaPlugin implements Executor { private void saveScript() { P.saveFile(true, "core", "modules"); + P.saveFile('plugins'); } private void enableEngine() { diff --git a/src/main/resources/core/reflect.js b/src/main/resources/core/reflect.js index c0aa992..0fb7d12 100644 --- a/src/main/resources/core/reflect.js +++ b/src/main/resources/core/reflect.js @@ -42,7 +42,7 @@ function Reflect(obj) { }; this.cacheMethod = function (name, clazzs) { - var mkey = this.class.name + '.' + name; + var mkey = this.class.name + '.' + name + ':' + clazzs.join(':'); if (!methodCache[mkey]) { methodCache[mkey] = this.method(name, clazzs); } @@ -53,7 +53,7 @@ function Reflect(obj) { var name = arguments[0]; var params = Array.prototype.slice.call(arguments, 1); var method = this.cacheMethod(name, types(params)); - return exports.on(method.invoke(this.get(), params)); + return on(method.invoke(this.get(), params)); }; this.get = function () { @@ -84,7 +84,7 @@ function types(values, def) { } var result = []; values.forEach(function (t) { - result.push((t === null || def) ? Object.class : t instanceof Class ? t : t.class) + result.push((t || def) ? Object.class : t instanceof Class ? t : t.class) }); return result; } diff --git a/src/main/resources/core/require.js b/src/main/resources/core/require.js index a41bca6..e9495cf 100644 --- a/src/main/resources/core/require.js +++ b/src/main/resources/core/require.js @@ -103,7 +103,7 @@ * @returns {Object} */ function compileModule(id, name, file, optional) { - log.d('加载模块 %s 位于 %s Optional %s', name, id, optional.toJson()); + log.fd('加载模块 %s 位于 %s Optional %s', name, id, optional.toJson()); // noinspection JSUnresolvedVariable var module = { id: id, @@ -116,7 +116,7 @@ compiledWrapper.apply(module.exports, [ module, module.exports, module.require, file.parentFile, file ]); - log.d('模块 %s 编译成功!', name); + log.fd('模块 %s 编译成功!', name); module.loaded = true; } catch (ex) { log.console("§4警告! §b模块 §a%s §4编译失败! ERR: %s", name, ex); @@ -150,7 +150,7 @@ function _require(name, path, optional) { var file = resolve(name, path); if (file === undefined) { - log.w("模块 %s 加载失败! 未找到该模块!", name); + log.console("§c模块 §a%s §c加载失败! §4未找到该模块!", name); return {exports:{}}; } if (!optional) optional = { cache: true } diff --git a/src/main/resources/modules/event.js b/src/main/resources/modules/event.js index b45d567..f0dd404 100644 --- a/src/main/resources/modules/event.js +++ b/src/main/resources/modules/event.js @@ -25,7 +25,7 @@ var listenerMap = []; */ function mapEventName() { var eventPackageDir = "org/bukkit/event"; - + var count = 0; var dirs = Thread.currentThread().getContextClassLoader().getResources(eventPackageDir); while (dirs.hasMoreElements()) { var url = dirs.nextElement(); @@ -48,6 +48,7 @@ function mapEventName() { var simpleName = clz.simpleName.toLowerCase(); log.fd("Mapping Event [%s] => %s", clz.name, simpleName); mapEvent[simpleName] = clz; + count++; } } catch (ex) { //ignore already loaded class @@ -56,6 +57,7 @@ function mapEventName() { } } } + return count; } /** @@ -83,7 +85,7 @@ function isVaildEvent(clz) { function listen(jsp, event, exec, priority, ignoreCancel) { var name = jsp.description.name; if (ext.isNull(name)) throw new TypeError('插件名称为空 请检查传入参数!'); - var eventCls = mapEvent[event]; + var eventCls = mapEvent[event] || mapEvent[event.toLowerCase()] || mapEvent[event +'Event'] || mapEvent[event.toLowerCase() + 'event']; if (!eventCls) { try { eventCls = base.getClass(eventCls); @@ -92,12 +94,11 @@ function listen(jsp, event, exec, priority, ignoreCancel) { return; } } - if (priority === undefined) { - priority = 'NORMAL' - } - if (ignoreCancel === undefined) { - ignoreCancel = false; + if (typeof priority === 'boolean') { + ignoreCancel = priority } + priority = priority || 'NORMAL'; + ignoreCancel = ignoreCancel || false; var listener = new Listener({}); // noinspection JSUnusedGlobalSymbols /** @@ -143,8 +144,7 @@ function listen(jsp, event, exec, priority, ignoreCancel) { var mapEvent = []; // 映射事件名称 -mapEventName(); -// log.i('Bukkit 事件映射完毕 共计 %s 个事件!', mapEvent.length); +log.i('Bukkit 事件映射完毕 共计 %s 个事件!', mapEventName().toFixed(0)); module.exports = { on: listen, diff --git a/src/main/resources/modules/plugin.js b/src/main/resources/modules/plugin.js index 2e2b414..3c43c18 100644 --- a/src/main/resources/modules/plugin.js +++ b/src/main/resources/modules/plugin.js @@ -197,7 +197,7 @@ function runAndCatch(jsp, exec, ext) { exec.bind(jsp)(); if (ext) { ext(); } } catch (ex) { - log.w('§6插件 §b%s §6执行 §d%s §6方法时发生错误 §4%s', jsp.description.name, exec.name, ex.message); + log.console('§6插件 §b%s §6执行 §d%s §6方法时发生错误 §4%s', jsp.description.name, exec.name, ex.message); console.ex(ex); } } @@ -208,7 +208,7 @@ function checkAndGet(args) { var name = args[0]; // 如果是插件 则直接返回 if (name.description) { return [name]; } - if (!exports.plugins[name]) { throw new Error("插件 " + name + "不存在!"); } + if (!exports.plugins[name]) { throw new Error("插件 " + name + " 不存在!"); } return [exports.plugins[name]]; }