v0.3.0

Signed-off-by: MiaoWoo <admin@yumc.pw>

.gitignore

@@ -1,3 +1,5 @@
+.vscode
+.theia
 node_modules
 dist
 package-lock.json

doc/MCBBS.MD

@@ -13,8 +13,8 @@
 ## 插件简介
 
 - 此插件可以实现跨端使用 `TypeScript` 开发 脚本插件
-- 目前已经兼容 `Spigot` `Sponge`
-- 后续计划兼容 `BungeeCord` `Nukkit`
+- 目前已经兼容 `Spigot` `Sponge` `Paper` `CatServer` `BungeeCord` `Nukkit`
+- 后续计划兼容 暂无
 
 ## 起源 (可以略过)
 
@@ -103,17 +103,20 @@
     ├─type        Java的类型定义
     |   ├─bungee  BungeeCord类型定义
     |   ├─bukkit  Bukkit类型定义
-    |   └─sponge  Sponge类型定义
+    |   ├─sponge  Sponge类型定义
+    |   └─nukkit  Nukkit类型定义
     ├─websocket   Netty的WebSocket注入
     └─plugins     这里当然是插件啦
         ├─bungee  只兼容BungeeCord的插件
         ├─bukkit  只兼容Bukkit的插件
-        └─sponge  只兼容Sponge的插件
+        ├─sponge  只兼容Sponge的插件
+        └─nukkit  只兼容Nukkit的插件
 ```
 
 详细的内容就不逼逼了 自己看代码吧
 
 Github: https://github.com/circlecloud/ms
+YUMC: https://git.yumc.pw/circlecloud/ms
 
 ## 插件开发基础
 
@@ -146,6 +149,7 @@ Github: https://github.com/circlecloud/ms
 /// <reference types="@ms/types/dist/typings/bukkit" />
 /// <reference types="@ms/types/dist/typings/sponge" />
 /// <reference types="@ms/types/dist/typings/bungee" />
+/// <reference types="@ms/types/dist/typings/nukkit" />
 
 import { server } from '@ms/api';
 import { inject } from '@ms/container';
@@ -196,6 +200,16 @@ export class HelloWorld extends interfaces.Plugin {
         this.logger.log('Disable When ServerType is BungeeCord!')
     }
 
+    nukkitload() {
+        this.logger.log('Load When ServerType is Nukkit!')
+    }
+    nukkitenable() {
+        this.logger.log('Enable When ServerType is Nukkit!')
+    }
+    nukkitdisable() {
+        this.logger.log('Disable When ServerType is Nukkit!')
+    }
+
     @cmd()
     hello(sender: any, command: string, args: string[]) {
         this.logger.log(sender, command, args);
@@ -207,7 +221,8 @@ export class HelloWorld extends interfaces.Plugin {
         return ['world']
     }
 
-    @listener({ servers: ['bukkit'] })
+    // bukkit nukkit 大部分API神似 可以直接用
+    @listener({ servers: ['bukkit', 'nukkit'] })
     PlayerJoin(event: org.bukkit.event.player.PlayerJoinEvent) {
         let plyaer = event.getPlayer();
         this.logger.console(`§cBukkit §aPlayerJoinEvent: §b${plyaer.getName()}`)
@@ -236,10 +251,11 @@ export class HelloWorld extends interfaces.Plugin {
 
 - 进入 `ms`目录
 - 执行编译 `yarn build:plugins`
-- 从 `packages/plugins/dist` 中复制 `HelloWorld.js` 文件 到对应的插件目录
+- 从 `packages/plugins/dist` 中复制 `HelloWorld.js` 和 `HelloWorld.js.map`(可选 用于显示插件原有行数) 文件 到对应的插件目录
   - Bungee: plugins/MiaoScript/plugins/
   - Bukkit: plugins/MiaoScript/plugins/
   - Sponge: config/miaoscript/plugins/
+  - Nukkit: plugins/MiaoScript/plugins/
 - 重载 `MiaoScript`
 - 打开客户端进入游戏 预览一下效果
 - 从 Spigot 服务端进入
@@ -358,7 +374,8 @@ tabhello(_sender: any, _command: string, _args: string[]) {
 - 事件监听方法的第一个参数就是本次事件的具体内容 (这里就需要自己去查询对应的JavaDoc了)
 
 ```ts
-@listener({ servers: ['bukkit'] })
+// bukkit nukkit 大部分API神似 可以直接用
+@listener({ servers: ['bukkit', 'nukkit'] })
 PlayerJoin(event: org.bukkit.event.player.PlayerJoinEvent) {
     let plyaer = event.getPlayer();
     this.logger.console(`§cBukkit §aPlayerJoinEvent: §b${plyaer.getName()}`)

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.2.1",
+    "version": "0.3.0",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/api",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,8 +22,8 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/container": "^0.2.1",
-        "@ms/ployfill": "^0.2.1",
+        "@ms/container": "^0.3.0",
+        "@ms/ployfill": "^0.3.0",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {

packages/api/src/channel.ts

@@ -0,0 +1,58 @@
+import { injectable } from "@ms/container";
+
+export namespace channel {
+    /**
+    * handle plugin message
+    * @param data byte[]
+    */
+    export type ChannelListener = (data: any) => void
+
+    @injectable()
+    export abstract class Channel {
+        private listenerMap = [];
+
+        listen(plugin: any, channel: string, exec: ChannelListener) {
+            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError('Plugin can\'t be undefiend!');
+            let name = plugin.description.name;
+            let listener = this.register(channel, exec)
+            if (!this.listenerMap[name]) this.listenerMap[name] = [];
+            let offExec = () => {
+                this.unregister(channel, listener);
+                console.debug(`[${name}] unregister channel ${channel}`);
+            };
+            var off = {
+                channel,
+                listener,
+                off: offExec
+            };
+            this.listenerMap[name].push(off);
+            console.debug(`[${name}] register channel ${channel} => ${exec.name || '[anonymous]'}`);
+            return off;
+        }
+        disable(plugin: any) {
+            var channelCache = this.listenerMap[plugin.description.name];
+            if (channelCache) {
+                channelCache.forEach(t => t.off());
+                delete this.listenerMap[plugin.description.name];
+            }
+        }
+
+        /**
+         * Send Channel Message
+         * @param player recover target
+         * @param channel ChannelName
+         * @param data byte[]
+         */
+        abstract send(player: any, channel: string, data: any)
+        /**
+         * register channel
+         * @param channel ChannelName
+         */
+        abstract register(channel: string, listener: ChannelListener): any
+        /**
+         * unregister channel
+         * @param channel ChannelName
+         */
+        abstract unregister(channel: string, listener?: any): void
+    }
+}

packages/api/src/command.ts

@@ -1,3 +1,4 @@
+import i18n from '@ms/i18n'
 import { injectable } from "@ms/container";
 
 export namespace command {
@@ -5,18 +6,18 @@ export namespace command {
     export abstract class Command {
         on(plugin: any, name: string, exec: { cmd: Function, tab?: Function }) {
             var cmd = this.create(plugin, name);
-            console.debug(`[${plugin.description.name}] register command ${name}(${cmd})...`)
+            console.debug(i18n.translate("ms.api.command.register", { plugin: plugin.description.name, name, cmd }))
             if (exec.cmd && typeof exec.cmd === "function") {
                 this.onCommand(plugin, cmd, exec.cmd);
             } else {
-                throw Error("CommandExec Must be a function... Input: " + exec.cmd)
+                throw Error(i18n.translate("ms.api.command.register.input.error", { exec: exec.cmd }))
             }
             if (exec.tab && typeof exec.tab === "function") {
                 this.onTabComplete(plugin, cmd, exec.tab);
             }
         }
         off(plugin: any, name: string) {
-            console.debug(`[${plugin.description.name}] unregister command ${name}...`)
+            console.debug(i18n.translate("ms.api.command.unregister", { plugin: plugin.description.name, name }))
             this.remove(plugin, name);
         }
         /**

packages/api/src/console.ts

@@ -1,3 +1,4 @@
+import i18m from '@ms/i18n'
 import { SourceMapBuilder } from 'source-map-builder'
 
 const Arrays = Java.type('java.util.Arrays');
@@ -78,6 +79,9 @@ export class MiaoScriptConsole implements Console {
     console(...args) {
         this.info(args)
     }
+    i18n(name: string, param?: { [key: string]: any }) {
+        this.console(i18m.translate(name, param))
+    }
     object(obj) {
         for (var i in obj) {
             this.info(i, '=>', obj[i])
@@ -90,20 +94,24 @@ export class MiaoScriptConsole implements Console {
         try {
             if (fileName.endsWith('js')) {
                 var file = Paths.get(fileName + '.map');
-                if (!this.sourceMaps[fileName]) {
+                if (this.sourceMaps[fileName] === undefined) {
                     if (file.toFile().exists()) {
                         var sourceMapObj = JSON.parse(new JavaString(Files.readAllBytes(file), "UTF-8"))
                         this.sourceMaps[fileName] = new SourceMapBuilder(sourceMapObj)
+                    } else {
+                        this.sourceMaps[fileName] = null;
                     }
                 }
                 if (this.sourceMaps[fileName]) {
                     var sourceMapping = this.sourceMaps[fileName].getSource(lineNumber, lineNumber);
                     if (sourceMapping) {
+                        if (lineNumber != sourceMapping.mapping.sourceLine) {
                             fileName = fileName.replace(".js", ".ts");
                             lineNumber = sourceMapping.mapping.sourceLine;
                         }
                     }
                 }
+            }
         } catch (error) {
             console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
         }

packages/api/src/event.ts

@@ -1,10 +1,10 @@
-'use strict';
+/// <reference types='@ms/nashorn' />
+
 /**
  * MiaoScript Event处理类
  */
-import '@ms/core'
-import '@ms/nashorn'
-import { injectable } from '@ms/container'
+import i18n from '@ms/i18n'
+import { injectable, unmanaged } from '@ms/container'
 
 const Thread = Java.type('java.lang.Thread');
 
@@ -25,7 +25,7 @@ export namespace event {
 
         protected baseEventDir = '';
 
-        constructor(baseEventDir: string) {
+        constructor(@unmanaged() baseEventDir: string) {
             this.baseEventDir = baseEventDir;
         }
 
@@ -35,9 +35,7 @@ export namespace event {
          *     org.spongepowered.api.event.game.GameRegistryEvent.Register => gameregistryevent$register
          */
         mapEventName() {
-            if (this.baseEventDir === "") {
-                throw new Error("base event dir is empty, can't map event name !");
-            }
+            if (this.baseEventDir === "") { throw new Error(i18n.translate('ms.api.event.empty.event.dir')); }
             let count = 0;
             let jar = this.getJarFile(this.baseEventDir);
             let entries = jar.entries();
@@ -51,7 +49,7 @@ export namespace event {
                         let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6));
                         if (this.isValidEvent(clazz)) {
                             let simpleName = this.class2Name(clazz).toLowerCase();
-                            console.trace(`Mapping Event [${clazz.canonicalName}] => ${simpleName}`);
+                            console.trace(i18n.translate("ms.api.event.mapping", { canonicalName: clazz.canonicalName, simpleName }));
                             this.mapEvent[simpleName] = clazz;
                             count++;
                         }
@@ -69,7 +67,7 @@ export namespace event {
                 let url = dirs.nextElement();
                 if (url.protocol === "jar") { return url.openConnection().jarFile; }
             }
-            throw new Error(`Can't Mapping Event Because not found Resources ${resource}!`)
+            throw new Error(i18n.translate("ms.api.event.resource.not.found", { resource }))
         }
 
         class2Name(clazz: any) {
@@ -77,14 +75,13 @@ export namespace event {
         }
 
         name2Class(name: any, event: string) {
-            var eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event'];
+            let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event'];
             if (!eventCls) {
                 try {
                     eventCls = base.getClass(eventCls);
                     this.mapEvent[event] = eventCls;
                 } catch (ex) {
-                    console.console(`§6插件 §b${name} §6注册事件 §c${event} §6失败 §4事件未找到!`);
-                    console.ex(new Error(`Plugin ${name} register event error ${event} not found!`));
+                    console.i18n("ms.api.event.not.found", { name, event })
                     return;
                 }
             }
@@ -94,14 +91,17 @@ export namespace event {
         execute(name, exec, eventCls) {
             return (...args: any[]) => {
                 try {
-                    var time = new Date().getTime()
-                    exec(args[args.length - 1]);
-                    var cost = new Date().getTime() - time;
+                    let event = args[args.length - 1];
+                    if (eventCls.isAssignableFrom(event.getClass())) {
+                        let time = Date.now()
+                        exec(event);
+                        let cost = Date.now() - time;
                         if (cost > 20) {
-                        console.console(`§c注意! §6插件 §b${name} §6处理 §d${this.class2Name(eventCls)} §6事件 §c耗时 §4${cost}ms !`)
+                            console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
+                        }
                     }
                 } catch (ex) {
-                    console.console(`§6插件 §b${name} §6处理 §d${this.class2Name(eventCls)} §6事件时发生异常 §4${ex}`);
+                    console.i18n("ms.api.event.execute.error", { name, event: this.class2Name(eventCls), ex })
                     console.ex(ex);
                 }
             }
@@ -115,8 +115,8 @@ export namespace event {
         * @param priority {string} [LOWEST,LOW,NORMAL,HIGH,HIGHEST,MONITOR]
         * @param ignoreCancel
         */
-        listen(plugin: any, event: string, exec: () => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) {
-            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError('插件名称为空 请检查传入参数!');
+        listen(plugin: any, event: string, exec: (event: any) => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) {
+            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"));
             var name = plugin.description.name;
             var eventCls = this.name2Class(name, event);
             if (!eventCls) { return; }
@@ -133,7 +133,7 @@ export namespace event {
             if (!listenerMap[name]) listenerMap[name] = [];
             var offExec = () => {
                 this.unregister(eventCls, listener);
-                console.debug(`[${name}] unregister event ${this.class2Name(eventCls)}`);
+                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls) }));
             };
             var off = {
                 event: eventCls,
@@ -142,7 +142,7 @@ export namespace event {
             };
             listenerMap[name].push(off);
             // noinspection JSUnresolvedVariable
-            console.debug(`[${name}] register event ${this.class2Name(eventCls)} => ${exec.name || '[anonymous]'}`);
+            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls) }));
             return off;
         }
 

packages/api/src/index.ts

@@ -1,6 +1,7 @@
-/// <reference types='@ms/ployfill' />
+import "@ms/ployfill"
 export * from './task'
 export * from './event'
 export * from './console'
+export * from './channel'
 export * from './command'
 export * from './interfaces'

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/bukkit",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -27,9 +27,9 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
-        "@ms/types": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/types": "^0.3.0"
     }
 }

packages/bukkit/src/channel.ts

@@ -0,0 +1,28 @@
+import { channel, plugin } from '@ms/api'
+import { inject, provideSingleton } from '@ms/container'
+
+const Bukkit = org.bukkit.Bukkit
+const PluginMessageListener = Java.type("org.bukkit.plugin.messaging.PluginMessageListener")
+const Messenger = Bukkit.getMessenger()
+
+@provideSingleton(channel.Channel)
+export class BukkitChannel extends channel.Channel {
+    @inject(plugin.PluginInstance)
+    private pluginInstance: any;
+
+    send(player: any, channel: string, data: any) {
+        player.sendPluginMessage(this.pluginInstance, channel, data);
+    }
+    register(channel: string, listener: channel.ChannelListener) {
+        Messenger.registerIncomingPluginChannel(this.pluginInstance, channel, new PluginMessageListener({
+            onPluginMessageReceived: (/**String */ var1, /**Player */ var2, /**byte[] */var3) => {
+                listener(var3)
+            }
+        }));
+        Messenger.registerOutgoingPluginChannel(this.pluginInstance, channel);
+    }
+    unregister(channel: string, listener: any) {
+        Messenger.unregisterIncomingPluginChannel(this.pluginInstance, channel)
+        Messenger.unregisterOutgoingPluginChannel(this.pluginInstance, channel)
+    }
+}

packages/bukkit/src/command.ts

@@ -2,14 +2,14 @@ import '@ms/nashorn'
 
 import { command, plugin } from '@ms/api'
 import * as reflect from '@ms/common/dist/reflect'
-import { injectable, postConstruct, inject } from '@ms/container'
+import { provideSingleton, postConstruct, inject } from '@ms/container'
 
 let Bukkit = org.bukkit.Bukkit;
 let TabCompleter = Java.type('org.bukkit.command.TabCompleter');
 let PluginCommand = Java.type('org.bukkit.command.PluginCommand');
 let CommandExecutor = Java.type('org.bukkit.command.CommandExecutor');
 
-@injectable()
+@provideSingleton(command.Command)
 export class BukkitCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any

packages/bukkit/src/event.ts

@@ -1,5 +1,5 @@
-import { event, server, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { event, plugin } from '@ms/api'
+import { inject, provideSingleton } from '@ms/container';
 import * as reflect from '@ms/common/dist/reflect'
 
 const Bukkit = Java.type("org.bukkit.Bukkit");
@@ -9,7 +9,7 @@ const Listener = Java.type("org.bukkit.event.Listener");
 const EventPriority = Java.type("org.bukkit.event.EventPriority");
 const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor");
 
-@injectable()
+@provideSingleton(event.Event)
 export class BukkitEvent extends event.Event {
     @inject(plugin.PluginInstance)
     private pluginInstance: any

packages/bukkit/src/index.ts

@@ -1,18 +1,15 @@
 /// <reference types="@ms/types/dist/typings/bukkit" />
 
-import { server, command, event, task } from '@ms/api'
+import { server } from '@ms/api'
 import { Container } from '@ms/container'
 
 import { BukkitConsole } from './console';
-import { BukkitEvent } from './event';
-import { BukkitServer } from './server';
-import { BukkitCommand } from './command';
-import { BukkitTaskManager } from './task';
+import './event';
+import './server';
+import './command';
+import './channel';
+import './task';
 
 export default function BukkitImpl(container: Container) {
     container.bind(server.Console).toConstantValue(BukkitConsole);
-    container.bind(event.Event).to(BukkitEvent).inSingletonScope();
-    container.bind(server.Server).to(BukkitServer).inSingletonScope();
-    container.bind(command.Command).to(BukkitCommand).inSingletonScope();
-    container.bind(task.TaskManager).to(BukkitTaskManager).inSingletonScope();
 }

packages/bukkit/src/server.ts

@@ -1,11 +1,11 @@
 import { server } from '@ms/api'
-import { injectable } from '@ms/container';
+import { provideSingleton } from '@ms/container';
 
 import chat from './enhance/chat'
 
 let Bukkit = org.bukkit.Bukkit;
 
-@injectable()
+@provideSingleton(server.Server)
 export class BukkitServer implements server.Server {
     getPlayer(name: string) {
         return Bukkit.getPlayer(name)

packages/bukkit/src/task.ts

@@ -1,11 +1,11 @@
 import { task, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { inject, provideSingleton } from '@ms/container';
 
 const Bukkit = Java.type('org.bukkit.Bukkit');
 const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable');
 const Callable = Java.type('java.util.concurrent.Callable')
 
-@injectable()
+@provideSingleton(task.TaskManager)
 export class BukkitTaskManager implements task.TaskManager {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/bungee",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -27,9 +27,9 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
-        "@ms/types": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/types": "^0.3.0"
     }
 }

packages/bungee/src/channel.ts

@@ -0,0 +1,18 @@
+import { channel } from '@ms/api'
+import { provideSingleton } from '@ms/container'
+
+const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
+
+@provideSingleton(channel.Channel)
+export class BungeeChannel extends channel.Channel {
+    send(player: any, channel: string, data: any) {
+        throw new Error("Method not implemented.");
+    }
+    register(channel: string, listener: channel.ChannelListener) {
+        Bungee.registerChannel(channel);
+        console.console('§6[§eWARN§6] §eBungeeCord Channel only registerChannel you need self hanler PluginMessageEvent!')
+    }
+    unregister(channel: string, listener: any) {
+        Bungee.unregisterChannel(channel);
+    }
+}

packages/bungee/src/command.ts

@@ -1,6 +1,5 @@
 import { command, plugin } from "@ms/api";
-import { inject, injectable } from "@ms/container";
-import * as ref from '@ms/common/dist/reflect'
+import { inject, provideSingleton } from "@ms/container";
 
 const Arrays = Java.type('java.util.Arrays')
 const Command = Java.extend(Java.type('net.md_5.bungee.api.plugin.Command'), Java.type('net.md_5.bungee.api.plugin.TabExecutor'));
@@ -13,26 +12,7 @@ const createCommand = eval(`
             }
         `)
 
-class SimpleCommand {
-    public callable: any;
-    private name: string;
-    private executor: Function;
-    private tabComplete: Function = () => [];
-
-    constructor(command: string) {
-        this.name = command;
-        this.callable = createCommand(Command, command,
-            (sender, args) => this.executor(sender, '', command, args),
-            (sender, args) => Arrays.asList(this.tabComplete(sender, '', command, args))
-        );
-    }
-
-    setExecutor = (executor: Function) => this.executor = executor;
-    setTabComplete = (tabComplete: Function) => this.tabComplete = tabComplete;
-    toString = () => `Bungee SimpleCommand(${this.name})`
-}
-
-@injectable()
+@provideSingleton(command.Command)
 export class BungeeCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;
@@ -64,3 +44,22 @@ export class BungeeCommand extends command.Command {
         return plugin.description.name.toLowerCase() + ":" + command;
     }
 }
+
+class SimpleCommand {
+    public callable: any;
+    private name: string;
+    private executor: Function;
+    private tabComplete: Function = () => [];
+
+    constructor(command: string) {
+        this.name = command;
+        this.callable = createCommand(Command, command,
+            (sender, args) => this.executor(sender, '', command, args),
+            (sender, args) => Arrays.asList(this.tabComplete(sender, '', command, args))
+        );
+    }
+
+    setExecutor = (executor: Function) => this.executor = executor;
+    setTabComplete = (tabComplete: Function) => this.tabComplete = tabComplete;
+    toString = () => `Bungee SimpleCommand(${this.name})`
+}

packages/bungee/src/event.ts

@@ -1,5 +1,5 @@
-import { event, plugin } from '@ms/api'
-import { injectable, inject, postConstruct } from '@ms/container'
+import { event } from '@ms/api'
+import { provideSingleton, postConstruct } from '@ms/container'
 import * as reflect from '@ms/common/dist/reflect'
 
 const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
@@ -21,10 +21,8 @@ EventPriority[event.EventPriority.HIGHEST] = Byte.valueOf(64);
 /**
  * Bungee Event Impl
  */
-@injectable()
+@provideSingleton(event.Event)
 export class BungeeEvent extends event.Event {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any;
     private pluginManager = Bungee.getPluginManager()
 
     // EventBus

packages/bungee/src/index.ts

@@ -1,18 +1,15 @@
 /// <reference types="@ms/types/dist/typings/bungee" />
 
-import { server, command, event, task } from '@ms/api'
+import { server } from '@ms/api'
 import { Container } from '@ms/container'
 
 import { BungeeConsole } from './console';
-import { BungeeEvent } from './event';
-import { BungeeServer } from './server';
-import { BungeeCommand } from './command';
-import { BungeeTaskManager } from './task';
+import './event';
+import './server';
+import './command';
+import './channel';
+import './task';
 
 export default function BungeeImpl(container: Container) {
     container.bind(server.Console).toConstantValue(BungeeConsole);
-    container.bind(event.Event).to(BungeeEvent).inSingletonScope();
-    container.bind(server.Server).to(BungeeServer).inSingletonScope();
-    container.bind(command.Command).to(BungeeCommand).inSingletonScope();
-    container.bind(task.TaskManager).to(BungeeTaskManager).inSingletonScope();
 }

packages/bungee/src/server.ts

@@ -1,9 +1,9 @@
 import { server } from '@ms/api'
-import { injectable } from '@ms/container';
+import { provideSingleton } from '@ms/container';
 
 let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
 
-@injectable()
+@provideSingleton(server.Server)
 export class BungeeServer implements server.Server {
     getPlayer(name: string) {
         return Bungee.getPlayer(name);

packages/bungee/src/task.ts

@@ -1,10 +1,10 @@
 import { task, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { inject, provideSingleton } from '@ms/container';
 
 var Runnable = Java.type('java.lang.Runnable')
 let TimeUnit = Java.type('java.util.concurrent.TimeUnit')
 
-@injectable()
+@provideSingleton(task.TaskManager)
 export class BungeeTaskManager implements task.TaskManager {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/client",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/common",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,8 +27,8 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.2.1",
-        "@ms/ployfill": "^0.2.1"
+        "@ms/nashorn": "^0.3.0",
+        "@ms/ployfill": "^0.3.0"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/compile",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/container",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/core",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,12 +27,12 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/bukkit": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
-        "@ms/plugin": "^0.2.1",
-        "@ms/sponge": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/bukkit": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/plugin": "^0.3.0",
+        "@ms/sponge": "^0.3.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -1,12 +1,13 @@
-import '@ms/ployfill'
-let containerStartTime = new Date().getTime()
-console.log(`Initialization MiaoScript IOC Container @ms/container. Please wait...`)
-import { plugin, server, task } from '@ms/api'
-import { PluginManagerImpl } from '@ms/plugin'
-import { DefaultContainer as container, injectable, inject, ContainerInstance } from '@ms/container'
-console.log('MiaoScript IOC Container @ms/container loading completed(' + (new Date().getTime() - containerStartTime) / 1000 + 's)!');
+/// <reference types="@ms/nashorn" />
+import '@ms/i18n'
 
-@injectable()
+let containerStartTime = Date.now();
+console.i18n("ms.core.ioc.initialize");
+import { plugin, server, task } from '@ms/api'
+import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ms/container'
+console.i18n("ms.core.ioc.completed", { time: (Date.now() - containerStartTime) / 1000 })
+
+@provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {
     @inject(server.Console)
     private Console: Console;
@@ -39,15 +40,16 @@ class MiaoScriptCore {
 
     loadPlugins() {
         let loadPluginStartTime = new Date().getTime()
-        console.log(`Initialization MiaoScript Plugin System. Please wait...`)
+        console.i18n("ms.core.plugin.initialize")
         this.pluginManager.scan(this.pluginFolder);
         this.pluginManager.build();
         this.pluginManager.load();
         this.pluginManager.enable();
-        console.log('MiaoScript Plugin System loading completed(' + (new Date().getTime() - loadPluginStartTime) / 1000 + 's)!');
+        console.i18n("ms.core.plugin.completed", { time: (new Date().getTime() - loadPluginStartTime) / 1000 })
     }
 
     disable() {
+        console.i18n("ms.core.engine.disable")
         this.pluginManager.disable();
     }
 }
@@ -82,15 +84,15 @@ function initialize() {
     container.bind(plugin.PluginInstance).toConstantValue(base.getInstance());
     container.bind(plugin.PluginFolder).toConstantValue('plugins');
     let type = detectServer();
-    console.info(`Detect Compatible Server set ServerType to ${type} ...`)
+    console.i18n("ms.core.initialize.detect", { type });
     container.bind(server.ServerType).toConstantValue(type);
-    console.log(`Initialization MiaoScript Package @ms/core @ms/${type}. Please wait...`)
+    console.i18n("ms.core.package.initialize", { type });
     require(`@ms/${type}`).default(container);
-    container.bind(plugin.PluginManager).to(PluginManagerImpl).inSingletonScope();
-    container.bind(MiaoScriptCore).to(MiaoScriptCore).inSingletonScope();
-    console.log(`MiaoScript Package @ms/core @ms/${type} loading completed(` + (new Date().getTime() - corePackageStartTime) / 1000 + 's)!');
+    require('@ms/plugin')
+    container.load(buildProviderModule());
+    console.i18n("ms.core.package.completed", { type, time: (Date.now() - corePackageStartTime) / 1000 });
     let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-    console.log('MiaoScript ScriptEngine loading completed... Done (' + (new Date().getTime() - global.NashornEngineStartTime) / 1000 + 's)!');
+    console.i18n("ms.core.engine.completed", { time: (Date.now() - global.NashornEngineStartTime) / 1000 });
     return disable;
 }
 

packages/i18n/languages/en.yml

@@ -0,0 +1,38 @@
+ms.ployfill.initialize: "Initialization Java Nashorn ployfill. Please wait..."
+ms.ployfill.completed: "Java Nashorn ployfill loading completed... Cost ({time}s)!"
+
+ms.core.ioc.initialize: "Initialization MiaoScript IOC Container @ms/container. Please wait..."
+ms.core.ioc.completed: "MiaoScript IOC Container @ms/container loading completed({time}s)!"
+ms.core.initialize.detect: "Detect Compatible Server set ServerType to {type} ..."
+ms.core.package.initialize: "Initialization MiaoScript Package @ms/core @ms/{type} @ms/plugin. Please wait..."
+ms.core.package.completed: "MiaoScript Package @ms/core @ms/{type} @ms/plugin loading completed({time}s)!"
+ms.core.plugin.initialize: "Initialization MiaoScript Plugin System. Please wait..."
+ms.core.plugin.completed: "MiaoScript Plugin System loading completed({time}s)!"
+ms.core.engine.completed: "MiaoScript ScriptEngine loading completed... Done({time}s)!"
+ms.core.engine.disable: "Disable MiaoScript Engine..."
+
+ms.api.event.resource.not.found: "Can't Mapping Event Because not found Resources {resource}!"
+ms.api.event.empty.event.dir: "base event dir is empty, can't map event name !"
+ms.api.event.mapping: "Mapping Event [{canonicalName}] => {simpleName}"
+ms.api.event.not.found: "§6Plugin §b{name} §6register {event} error. event not found!"
+ms.api.event.execute.slow: "§cWARN! §6Plugin §b{name} §6execute §d{event} §6evnet §ccost §4{cost}ms !"
+ms.api.event.execute.error: "§6Plugin §b{name} §6execute §d{event} §6event error §4{ex}"
+ms.api.event.listen.plugin.name.empty: "Plugin name can't be empty!"
+ms.api.event.register: "[{name}] register event {event}"
+ms.api.event.unregister: "[{name}] unregister event {event}"
+ms.api.command.register.input.error: "CommandExec Must be a function... Input: {exec}"
+ms.api.command.register: "[{plugin}] register command {name}({cmd})..."
+ms.api.command.unregister: "[{plugin}] unregister command {name}..."
+
+ms.plugin.initialize: "Initialization MiaoScript Plugin System: {plugin} ..."
+ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."
+ms.plugin.manager.scan: "Scanning Plugins in {folder} ..."
+ms.plugin.manager.initialize.error: "§6Plugin §b{name} §6initialize error §4{ex}"
+ms.plugin.manager.stage: "{stage} {plugin} version {version} by {author}"
+ms.plugin.manager.stage.load: "Loading"
+ms.plugin.manager.stage.enable: "Enabling"
+ms.plugin.manager.stage.disable: "Disabling"
+ms.plugin.manager.build.update: "Auto Update Plugin {name} ..."
+ms.plugin.manager.build.not.extends: "§4Found error plugin §b{source} §4it's not extends interfaces.Plugin, the plugin will be ignore!"
+ms.plugin.manager.build.exists: "§4Found duplicate plugin §b{exists} §4and §b{source}§4. the first plugin will be ignore!"
+ms.plugin.manager.config.save.default: "[{plugin}] config {name}.{format} not exists. auto create from default variable..."

packages/i18n/languages/zh_cn.yml

@@ -0,0 +1,38 @@
+ms.ployfill.initialize: "初始化 Java Nashorn 补丁. 请稍候..."
+ms.ployfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
+
+ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 @ms/container. 请稍候..."
+ms.core.ioc.completed: "MiaoScript IOC 容器 @ms/container 加载完成 耗时({time}s)"
+ms.core.initialize.detect: "检测到兼容的服务器类型. 设置 ServerType 值 {type} ..."
+ms.core.package.initialize: "初始化 MiaoScript 扩展 @ms/core @ms/{type} @ms/plugin. 请稍候..."
+ms.core.package.completed: "MiaoScript 扩展 @ms/core @ms/{type} @ms/plugin 加载完成 耗时({time}s)"
+ms.core.plugin.initialize: "MiaoScript 开始引导插件系统. 请稍候..."
+ms.core.plugin.completed: "MiaoScript 插件加载完毕 耗时({time}s)!"
+ms.core.engine.completed: "MiaoScript 脚本引擎 加载完毕... 耗时({time}s)!"
+ms.core.engine.disable: "关闭 MiaoScript 引擎..."
+
+ms.api.event.resource.not.found: "无法映射事件 未找到资源文件 {resource}!"
+ms.api.event.empty.event.dir: "事件基础目录为空, 无法映射事件!"
+ms.api.event.mapping: "映射事件 [{canonicalName}] => {simpleName}"
+ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失败. §4事件未找到!"
+ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
+ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
+ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
+ms.api.event.register: "[{name}] 注册事件 {event}"
+ms.api.event.unregister: "[{name}] 注销事件 {event}"
+ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
+ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
+ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."
+
+ms.plugin.initialize: "初始化 MiaoScript 插件系统: {plugin} ..."
+ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
+ms.plugin.manager.scan: "在 {folder} 文件夹中扫描插件..."
+ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"
+ms.plugin.manager.stage: "{stage} {plugin} 版本 {version} 作者 {author}"
+ms.plugin.manager.stage.load: "加载"
+ms.plugin.manager.stage.enable: "启用"
+ms.plugin.manager.stage.disable: "关闭"
+ms.plugin.manager.build.update: "自动更新插件 {name} ..."
+ms.plugin.manager.build.not.extends: "§4发现错误的插件 §b{source} §4未继承接口 interfaces.Plugin, 将不会被载入到服务器!"
+ms.plugin.manager.build.duplicate: "§4发现已存在插件 §b{exists} §4和 §b{source}§4 存在冲突. 已存在插件将会被替换!"
+ms.plugin.manager.config.save.default: "[{plugin}] 配置 {name}.{format} 不存在. 从默认值自动创建保存..."

packages/i18n/package.json

@@ -0,0 +1,37 @@
+{
+    "name": "@ms/i18n",
+    "version": "0.3.0",
+    "description": "MiaoScript i18n package",
+    "keywords": [
+        "miaoscript",
+        "minecraft",
+        "bukkit",
+        "sponge"
+    ],
+    "author": "MiaoWoo <admin@yumc.pw>",
+    "homepage": "https://github.com/circlecloud/ms.git",
+    "license": "ISC",
+    "main": "dist/index.js",
+    "publishConfig": {
+        "registry": "https://repo.yumc.pw/repository/npm-hosted/"
+    },
+    "scripts": {
+        "clean": "rimraf dist",
+        "watch": "tsc --watch",
+        "build": "yarn clean && tsc",
+        "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "devDependencies": {
+        "@types/js-yaml": "^3.12.2",
+        "reflect-metadata": "^0.1.13",
+        "rimraf": "^3.0.2",
+        "typescript": "^3.8.2"
+    },
+    "dependencies": {
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/ployfill": "^0.3.0",
+        "js-yaml": "^3.13.1"
+    },
+    "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
+}

packages/i18n/src/index.ts

@@ -0,0 +1,42 @@
+import '@ms/ployfill'
+import * as yaml from 'js-yaml'
+
+import * as fs from '@ms/common/dist/fs'
+
+let langMap = {};
+let fallbackMap = {};
+
+type TranslateParam = { [key: string]: any }
+
+function translate(name: string, param?: TranslateParam) {
+    let langText: string = langMap[name] || fallbackMap[name];
+    if (!langText) { return '[WARN] @ms/i18n miss lang translate: ' + name }
+    for (const key in param) {
+        langText = langText.replace("{" + key + "}", param[key])
+    }
+    return langText;
+}
+
+function initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
+    langMap = readYamlFile(root, lang) || readYamlFile(fs.concat(__dirname, '..'), lang)
+    fallbackMap = readYamlFile(root, fallback) || readYamlFile(fs.concat(__dirname, '..'), fallback)
+    console.i18n = function i18n(name: string, param?: TranslateParam) {
+        console.log(translate(name, param))
+    }
+}
+
+function readYamlFile(dir: string, name: string) {
+    let langFile = fs.concat(dir, 'languages', name + '.yml');
+    return fs.exists(langFile) && yaml.safeLoad(base.read(langFile))
+}
+
+declare global {
+    interface Console {
+        i18n(name: string, param?: TranslateParam);
+    }
+}
+
+export default {
+    initialize,
+    translate
+};

packages/i18n/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "baseUrl": "src",
+        "outDir": "dist"
+    }
+}

packages/manager/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/manager",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript manager package",
     "keywords": [
         "miaoscript",

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/nashorn",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/nukkit",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -27,9 +27,9 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
-        "@ms/types": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/types": "^0.3.0"
     }
 }

packages/nukkit/src/command.ts

@@ -1,12 +1,12 @@
 import '@ms/nashorn'
 
 import { command, plugin } from '@ms/api'
-import { injectable, postConstruct, inject } from '@ms/container'
+import { inject, provideSingleton, postConstruct } from '@ms/container'
 
 let PluginCommand = Java.type('cn.nukkit.command.PluginCommand');
 let CommandExecutor = Java.type('cn.nukkit.command.CommandExecutor');
 
-@injectable()
+@provideSingleton(command.Command)
 export class NukkitCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
@@ -30,7 +30,6 @@ export class NukkitCommand extends command.Command {
         }
     }
     onCommand(plugin: any, command: any, executor: Function) {
-        // 必须指定需要实现的接口类型 否则MOD服会报错
         command.setExecutor(new CommandExecutor({
             onCommand: super.setExecutor(plugin, command, executor)
         }));

packages/nukkit/src/event.ts

@@ -1,5 +1,5 @@
-import { event, server, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container'
+import { event, plugin } from '@ms/api'
+import { inject, provideSingleton } from '@ms/container'
 
 const Nukkit: cn.nukkit.Server = base.getInstance().getServer();
 const Event = Java.type("cn.nukkit.event.Event");
@@ -8,7 +8,7 @@ const Listener = Java.type("cn.nukkit.event.Listener");
 const EventPriority = Java.type("cn.nukkit.event.EventPriority");
 const EventExecutor = Java.type("cn.nukkit.plugin.EventExecutor");
 
-@injectable()
+@provideSingleton(event.Event)
 export class NukkitEvent extends event.Event {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
@@ -42,6 +42,6 @@ export class NukkitEvent extends event.Event {
         return listener;
     }
     unregister(event: any, listener: any): void {
-        event.getHandlers().unregister(listener);
+        event.getMethod('getHandlers').invoke(null).unregister(listener);
     }
 }

packages/nukkit/src/index.ts

@@ -1,18 +1,14 @@
 /// <reference types="@ms/types/dist/typings/nukkit" />
 
-import { server, command, event, task } from '@ms/api'
+import { server } from '@ms/api'
 import { Container } from '@ms/container'
 
 import { NukkitConsole } from './console';
-import { NukkitEvent } from './event';
-import { NukkitServer } from './server';
-import { NukkitCommand } from './command';
-import { NukkitTaskManager } from './task';
+import './event';
+import './server';
+import './command';
+import './task';
 
 export default function NukkitImpl(container: Container) {
     container.bind(server.Console).toConstantValue(NukkitConsole);
-    container.bind(event.Event).to(NukkitEvent).inSingletonScope();
-    container.bind(server.Server).to(NukkitServer).inSingletonScope();
-    container.bind(command.Command).to(NukkitCommand).inSingletonScope();
-    container.bind(task.TaskManager).to(NukkitTaskManager).inSingletonScope();
 }

packages/nukkit/src/server.ts

@@ -1,9 +1,9 @@
 import { server } from '@ms/api'
-import { injectable } from '@ms/container';
+import { provideSingleton } from '@ms/container';
 
 let Nukkit: cn.nukkit.Server = base.getInstance().getServer();
 
-@injectable()
+@provideSingleton(server.Server)
 export class NukkitServer implements server.Server {
     getPlayer(name: string) {
         return Nukkit.getPlayer(name)

packages/nukkit/src/task.ts

@@ -1,11 +1,9 @@
 import { task, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { inject, provideSingleton } from '@ms/container';
 
-const Nukkit: cn.nukkit.Server = base.getInstance().getServer();
 const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable');
-const Callable = Java.type('java.util.concurrent.Callable')
 
-@injectable()
+@provideSingleton(task.TaskManager)
 export class NukkitTaskManager implements task.TaskManager {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;

packages/ployfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/ployfill",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript ployfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "homepage": "https://github.com/circlecloud/ms.git",
@@ -17,7 +17,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ms/nashorn": "^0.2.1",
+        "@ms/nashorn": "^0.3.0",
         "core-js": "^3.6.4"
     },
     "devDependencies": {

packages/ployfill/src/global.ts

@@ -27,6 +27,7 @@ declare global {
         stack(err: Error): string[];
         sender(...args: any): void;
         console(...args: any): void;
+        i18n(name: string, ...params: any[]);
     }
 }
 export { }

packages/ployfill/src/index.ts

@@ -1,10 +1,12 @@
 /// <reference path="./global.ts" />
 /// <reference types='@ms/nashorn' />
+import i18n from '@ms/i18n'
 let ployfillStartTime = new Date().getTime();
-console.info('Initialization Java Nashorn ployfill. Please wait...');
+i18n.initialize();
+console.i18n("ms.ployfill.initialize");
 require('./es5-ext');
 require('core-js');
 global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 global.setGlobal('Blob', require('blob-polyfill').Blob)
-console.info('Java Nashorn ployfill loading completed... Cost (' + (new Date().getTime() - ployfillStartTime) / 1000 + 's)!');
+console.i18n("ms.ployfill.completed", { time: (new Date().getTime() - ployfillStartTime) / 1000 });

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/plugin",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -28,9 +28,10 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/i18n": "^0.3.0",
         "js-yaml": "^3.13.1"
     }
 }

packages/plugin/src/interfaces.ts

@@ -20,7 +20,13 @@ export namespace interfaces {
         public disable() { }
     }
     interface BaseMetadata {
+        /**
+         * 名称 为空则为对象名称
+         */
         name?: string;
+        /**
+         * 支持的服务器列表 为空则代表所有
+         */
         servers?: string[];
     }
     export interface PluginMetadata extends BaseMetadata {
@@ -50,19 +56,37 @@ export namespace interfaces {
         target?: any;
     }
     interface ExecMetadata extends BaseMetadata {
+        /**
+         * 执行器
+         */
         executor?: string;
     }
     export interface CommandMetadata extends ExecMetadata {
+        /**
+         * 参数列表
+         */
         paramtypes?: string[];
     }
     export interface TabCompleterMetadata extends ExecMetadata {
+        /**
+         * 参数列表
+         */
         paramtypes?: string[];
     }
     export interface ListenerMetadata extends ExecMetadata {
     }
     export interface ConfigMetadata extends BaseMetadata {
+        /**
+         * 配置文件版本号
+         */
         version?: number;
+        /**
+         * 实体变量名称
+         */
         variable?: string;
+        /**
+         * 配置文件格式 默认 yml
+         */
         format?: string;
     }
     export type PluginLike = Plugin | string;

packages/plugin/src/manager.ts

@@ -1,12 +1,13 @@
+import i18n from '@ms/i18n'
 import { plugin, server, command, event } from '@ms/api'
-import { injectable, inject, postConstruct, Container, ContainerInstance } from '@ms/container'
+import { inject, provideSingleton, postConstruct, Container, ContainerInstance } from '@ms/container'
 import * as fs from '@ms/common/dist/fs'
 
 import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPlugin, getPluginTabCompleterMetadata, getPluginConfigMetadata } from './utils'
 import { interfaces } from './interfaces'
 import { getConfigLoader } from './config'
 
-@injectable()
+@provideSingleton(plugin.PluginManager)
 export class PluginManagerImpl implements plugin.PluginManager {
     @inject(ContainerInstance)
     private container: Container
@@ -27,9 +28,9 @@ export class PluginManagerImpl implements plugin.PluginManager {
     initialize() {
         if (this.pluginInstance !== null) {
             // 如果plugin不等于null 则代表是正式环境
-            console.info(`Initialization MiaoScript Plugin System: ${this.pluginInstance} ...`)
+            console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance })
             this.pluginMap = new Map()
-            console.info(`${this.EventManager.mapEventName().toFixed(0)} ${this.serverType} Event Mapping Complate...`)
+            console.i18n('ms.plugin.event.map', { count: this.EventManager.mapEventName().toFixed(0), type: this.serverType });
         }
     }
 
@@ -37,9 +38,9 @@ export class PluginManagerImpl implements plugin.PluginManager {
         var plugin = fs.file(root, folder)
         var files = []
             // load common plugin
-            .concat(this.scanFloder(plugin))
+            .concat(this.scanFolder(plugin))
             // load space plugin
-            .concat(this.scanFloder(fs.file(plugin, this.serverType)))
+            .concat(this.scanFolder(fs.file(plugin, this.serverType)))
         this.loadPlugins(files)
     }
 
@@ -48,12 +49,12 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
 
     private logStage(plugin: interfaces.Plugin, stage: string) {
-        console.log(`[${plugin.description.name}] ${stage} ${plugin.description.name} version ${plugin.description.version} by ${plugin.description.author || 'Unknow'}`)
+        console.i18n("ms.plugin.manager.stage", { stage, plugin: plugin.description.name, version: plugin.description.version, author: plugin.description.author })
     }
 
     load(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, "Loading")
+            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.load"))
             this.loadConfig(plugin)
             this.runCatch(plugin, 'load')
             this.runCatch(plugin, `${this.serverType}load`)
@@ -62,7 +63,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
 
     enable(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, "Enabling")
+            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.enable"))
             this.runCatch(plugin, 'enable')
             this.runCatch(plugin, `${this.serverType}enable`)
             this.registryCommand(plugin)
@@ -72,7 +73,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
 
     disable(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
-            this.logStage(plugin, "Disabling")
+            this.logStage(plugin, i18n.translate("ms.plugin.manager.stage.disable"))
             this.runCatch(plugin, 'disable')
             this.runCatch(plugin, `${this.serverType}disable`)
             this.unregistryCommand(plugin)
@@ -98,7 +99,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         try {
             if (pl[func]) pl[func].call(pl)
         } catch (ex) {
-            console.console(`§6插件 §b${pl.description.name} §6执行 §d${func} §6方法时发生错误 §4${ex}`)
+            console.console(`§6Plugin §b${pl.description.name} §6exec §d${func} §6function error §4${ex}`)
             console.ex(ex)
         }
     }
@@ -110,12 +111,12 @@ export class PluginManagerImpl implements plugin.PluginManager {
         throw new Error(`Plugin ${JSON.stringify(name)} not exist!`)
     }
 
-    private scanFloder(plugin: any): string[] {
+    private scanFolder(folder: any): string[] {
         var files = []
-        console.info(`Scanning Plugins in ${plugin} ...`)
-        this.checkUpdateFolder(plugin)
+        console.i18n('ms.plugin.manager.scan', { folder })
+        this.checkUpdateFolder(folder)
         // must check file is exist maybe is a illegal symbolic link file
-        fs.list(plugin).forEach((file: any) => file.toFile().exists() ? files.push(file.toFile()) : void 0)
+        fs.list(folder).forEach((file: any) => file.toFile().exists() ? files.push(file.toFile()) : void 0)
         return files
     }
 
@@ -146,7 +147,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
             this.updatePlugin(file)
             this.createPlugin(file)
         } catch (ex) {
-            console.console(`§6插件 §b${file.name} §6初始化时发生错误 §4${ex.message}`)
+            console.i18n("ms.plugin.manager.initialize.error", { name: file.name, ex })
             console.ex(ex)
         }
     }
@@ -154,14 +155,15 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private updatePlugin(file: any) {
         var update = fs.file(fs.file(file.parentFile, 'update'), file.name)
         if (update.exists()) {
-            console.info(`Auto Update Plugin ${file.name} ...`)
+            console.i18n("ms.plugin.manager.build.update", { name: file.name })
             fs.move(update, file, true)
         }
     }
 
     private checkServers(servers: string[]) {
         if (!servers) { return true }
-        return servers?.indexOf(this.serverType) != -1 && servers?.indexOf(`!${this.serverType}`) == -1
+        if (servers.indexOf(`!${this.serverType}`) != -1) { return false }
+        return servers?.indexOf(this.serverType) != -1
     }
 
     private createPlugin(file: string) {
@@ -181,7 +183,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         this.bindPlugin(metadata)
         let pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
         if (!(pluginInstance instanceof interfaces.Plugin)) {
-            console.console(`§4found error plugin §b${metadata.source} §4it's not extends interfaces.Plugin, the plugin will be ignore!`)
+            console.i18n('ms.plugin.manager.build.not.extends', { source: metadata.source })
             return
         }
         this.pluginMap.set(metadata.name, pluginInstance)
@@ -192,7 +194,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         try {
             let pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
             if (pluginInstance.description.source + '' !== metadata.source + '') {
-                console.console(`§4found duplicate plugin §b${pluginInstance.description.source} §4and §b${metadata.source}§4. the first plugin will be ignore!`)
+                console.i18n('ms.plugin.manager.build.duplicate', { exists: pluginInstance.description.source, source: metadata.source })
             }
             this.container.rebind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
         } catch{
@@ -204,11 +206,10 @@ export class PluginManagerImpl implements plugin.PluginManager {
         let configs = getPluginConfigMetadata(plugin);
         for (let [_, config] of configs) {
             let configFile = fs.concat(root, this.pluginFolder, plugin.description.name, config.name + '.' + config.format)
-            console.log(configFile)
             let configFactory = getConfigLoader(config.format);
             if (!fs.exists(configFile)) {
                 base.save(configFile, configFactory.dump(plugin[config.variable]))
-                console.log(`[${plugin.description.name}] config ${config.name}.${config.format} don't exists auto create from default variable...`)
+                console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: config.name, format: config.format })
             } else {
                 plugin[config.variable] = configFactory.load(base.read(configFile));
             }

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/plugins",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -28,7 +28,7 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/plugin": "^0.2.1",
+        "@ms/plugin": "^0.3.0",
         "axios": "^0.19.2",
         "es6-map": "^0.1.5",
         "inversify": "^5.0.1"

packages/plugins/src/MiaoChat.ts

@@ -2,7 +2,7 @@
 /// <reference types="@ms/types/dist/typings/sponge" />
 /// <reference types="@ms/types/dist/typings/bungee" />
 
-import { server, plugin as pluginApi } from '@ms/api'
+import { server, plugin as pluginApi, channel } from '@ms/api'
 import { inject } from '@ms/container';
 import { plugin, interfaces, cmd, listener, tab, config } from '@ms/plugin'
 import Tellraw from '@ms/common/dist/tellraw'
@@ -20,8 +20,6 @@ const BiConsumer = Java.type('java.util.function.BiConsumer')
 class MiaoMessage {
     // public static final String CHANNEL = "MiaoChat:Default".toLowerCase();
     public static CHANNEL: string = "MiaoChat:Default".toLowerCase()
-    // public static final String NORMAL_CHANNEL = "MiaoChat:Normal".toLowerCase();
-    public static NORMAL_CHANNEL: string = "MiaoChat:Normal".toLowerCase()
     // private static final int MAX_MESSAGE_LENGTH = 32000;
     private static MAX_MESSAGE_LENGTH = 32000;
 
@@ -60,9 +58,8 @@ export class MiaoChat extends interfaces.Plugin {
     private Server: server.Server
     @inject(server.ServerType)
     private ServerType: string
-
-    private spongeChannel: any;
-    private spongeListener: any;
+    @inject(channel.Channel)
+    private Channel: channel.Channel
 
     @config()
     private config = {
@@ -172,6 +169,9 @@ export class MiaoChat extends interfaces.Plugin {
                 return string;
             }
         }
+        this.Channel.listen(this, MiaoMessage.CHANNEL, (data) => {
+            this.sendChatAll(MiaoMessage.decode(data).json)
+        })
     }
 
     disable() {
@@ -186,20 +186,9 @@ export class MiaoChat extends interfaces.Plugin {
         } catch (ex) {
             this.logger.console("§cCan't found me.clip.placeholderapi.PlaceholderAPI variable will not be replaced! Err: " + ex)
         }
-        var Bukkit = org.bukkit.Bukkit;
-        var PluginMessageListener = Java.type("org.bukkit.plugin.messaging.PluginMessageListener")
-        Bukkit.getMessenger().registerIncomingPluginChannel(base.getInstance(), MiaoMessage.CHANNEL, new PluginMessageListener({
-            onPluginMessageReceived: (/**String */ var1, /**Player */ var2, /**byte[] */var3) => {
-                this.sendChatAll(MiaoMessage.decode(var3).json)
-            }
-        }));
-        Bukkit.getMessenger().registerOutgoingPluginChannel(base.getInstance(), MiaoMessage.CHANNEL);
     }
 
     bukkitdisable() {
-        var Bukkit = org.bukkit.Bukkit;
-        Bukkit.getMessenger().unregisterIncomingPluginChannel(base.getInstance(), MiaoMessage.CHANNEL)
-        Bukkit.getMessenger().unregisterOutgoingPluginChannel(base.getInstance(), MiaoMessage.CHANNEL)
     }
 
     spongeenable() {
@@ -218,32 +207,15 @@ export class MiaoChat extends interfaces.Plugin {
         } catch (ex) {
             this.logger.console("§cCan't found me.rojo8399.placeholderapi.PlaceholderService variable will not be replaced! Err: " + ex)
         }
-        var Sponge = org.spongepowered.api.Sponge
-        var RawDataListener = Java.type("org.spongepowered.api.network.RawDataListener")
-        var ChannelRegistrar = Sponge.getChannelRegistrar()
-        this.spongeChannel = ChannelRegistrar.getOrCreateRaw(base.getInstance(), MiaoMessage.CHANNEL)
-        this.spongeListener = new RawDataListener({
-            handlePayload: (/* ChannelBuf */ data, /**RemoteConnection */ connection, /**Platform.Type */ side) => {
-                this.sendChatAll(MiaoMessage.decode(data.readBytes(data.available())).json)
-            }
-        })
-        this.spongeChannel.addListener(this.spongeListener)
     }
 
     spongedisable() {
-        this.spongeChannel.removeListener(this.spongeListener)
     }
 
     bungeeenable() {
-        let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
-        bungee.registerChannel(MiaoMessage.CHANNEL);
-        bungee.registerChannel(MiaoMessage.NORMAL_CHANNEL);
     }
 
     bungeedisable() {
-        let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
-        bungee.unregisterChannel(MiaoMessage.CHANNEL);
-        bungee.unregisterChannel(MiaoMessage.NORMAL_CHANNEL);
     }
 
     @cmd({ servers: ["bungee"] })
@@ -289,7 +261,7 @@ export class MiaoChat extends interfaces.Plugin {
     PluginMessageEvent(e: any) {
         let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
         let event = e as net.md_5.bungee.api.event.PluginMessageEvent
-        if (event.getTag() == MiaoMessage.CHANNEL || event.getTag() == MiaoMessage.NORMAL_CHANNEL) {
+        if (event.getTag() == MiaoMessage.CHANNEL) {
             let origin = event.getSender().getAddress();
             bungee.getServers().forEach(new BiConsumer({
                 accept: (s, server) => {
@@ -361,27 +333,7 @@ export class MiaoChat extends interfaces.Plugin {
         });
         let json = tr.then(this.replace(player, plain)).json()
         this.sendChatAll(json)
-        let mm = MiaoMessage.encode(json);
-        switch (this.ServerType) {
-            case "bukkit":
-                if (mm == null) {
-                    player.sendPluginMessage(base.getInstance(), MiaoMessage.NORMAL_CHANNEL, MiaoMessage.encode(tr.string()));
-                } else {
-                    player.sendPluginMessage(base.getInstance(), MiaoMessage.CHANNEL, mm);
-                }
-                break;
-            case "sponge":
-                if (mm == null) {
-                    this.spongeChannel.sendTo(player, new Consumer({
-                        accept: (channelBuf) => channelBuf.writeBytes(MiaoMessage.encode(tr.string()))
-                    }))
-                } else {
-                    this.spongeChannel.sendTo(player, new Consumer({
-                        accept: (channelBuf) => channelBuf.writeBytes(mm)
-                    }))
-                }
-                break;
-        }
+        this.Channel.send(player, MiaoMessage.CHANNEL, MiaoMessage.encode(json))
     }
 
     sendChatAll(json: string) {

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/sponge",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,9 +27,9 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1",
-        "@ms/container": "^0.2.1",
-        "@ms/types": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0",
+        "@ms/container": "^0.3.0",
+        "@ms/types": "^0.3.0"
     }
 }

packages/sponge/src/channel.ts

@@ -0,0 +1,38 @@
+import { channel, plugin } from '@ms/api'
+import { inject, provideSingleton } from '@ms/container'
+
+const Sponge = org.spongepowered.api.Sponge
+const RawDataListener = Java.type("org.spongepowered.api.network.RawDataListener")
+const ChannelRegistrar = Sponge.getChannelRegistrar()
+const Consumer = Java.type("java.util.function.Consumer");
+
+@provideSingleton(channel.Channel)
+export class SpongeChannel extends channel.Channel {
+    @inject(plugin.PluginInstance)
+    private pluginInstance: any;
+
+    private channelMap = new Map<string, any>();
+
+    send(player: any, channel: string, data: any) {
+        if (!this.channelMap.has(channel)) { return }
+        this.channelMap.get(channel).sendTo(player, new Consumer({
+            accept: (channelBuf: any) => channelBuf.writeBytes(data)
+        }))
+    }
+    register(channel: string, listener: channel.ChannelListener) {
+        if (!this.channelMap.has(channel)) {
+            this.channelMap.set(channel, ChannelRegistrar.getOrCreateRaw(this.pluginInstance, channel))
+        }
+        let innerListener = new RawDataListener({
+            handlePayload: (/* ChannelBuf */ data: any, /**RemoteConnection */ connection: any, /**Platform.Type */ side: any) => {
+                listener(data.readBytes(data.available()))
+            }
+        })
+        this.channelMap.get(channel).addListener(innerListener);
+        return innerListener;
+    }
+    unregister(channel: string, listener: any) {
+        if (!this.channelMap.has(channel)) { return }
+        this.channelMap.get(channel).removeListener(listener);
+    }
+}

packages/sponge/src/command.ts

@@ -1,15 +1,43 @@
 import { command, plugin } from "@ms/api";
-import { inject, injectable } from "@ms/container";
+import { inject, provideSingleton } from "@ms/container";
 
 let Sponge = Java.type('org.spongepowered.api.Sponge');
-
+let Text = Java.type('org.spongepowered.api.text.Text');
 var CommandCallable = Java.type('org.spongepowered.api.command.CommandCallable');
 var CommandResult = Java.type('org.spongepowered.api.command.CommandResult');
-
-let Text = Java.type('org.spongepowered.api.text.Text');
-
 var Optional = Java.type('java.util.Optional');
 
+@provideSingleton(command.Command)
+export class SpongeCommand extends command.Command {
+    @inject(plugin.PluginInstance)
+    private pluginInstance: any
+    private commandMapping: any[] = [];
+
+    create(plugin: any, command: string) {
+        let commandKey = this.getCommandKey(plugin, command);
+        let commandCallable = new SimpleCommandCallable(command);
+        this.commandMapping[commandKey] = Sponge.getCommandManager().register(this.pluginInstance, commandCallable.callable, command, commandKey).orElse(null);
+        return commandCallable;
+    }
+    remove(plugin: any, command: string) {
+        var commandKey = this.getCommandKey(plugin, command);
+        if (this.commandMapping[commandKey]) {
+            Sponge.getCommandManager().removeMapping(this.commandMapping[commandKey]);
+            delete this.commandMapping[commandKey];
+        }
+    }
+    onCommand(plugin: any, command: any, executor: Function) {
+        command.setExecutor(super.setExecutor(plugin, command, executor));
+    }
+    onTabComplete(plugin: any, command: any, tabCompleter: Function) {
+        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter));
+    }
+
+    private getCommandKey(plugin: any, command: string) {
+        return plugin.description.name.toLowerCase() + ":" + command;
+    }
+}
+
 class SimpleCommandCallable {
     public callable: any;
     private name: string;
@@ -50,34 +78,3 @@ class SimpleCommandCallable {
     setTabCompleter = (tabCompleter: Function) => this.tabCompleter = tabCompleter;
     toString = () => `Sponge SimpleCommandCallable(${this.name})`
 }
-
-@injectable()
-export class SpongeCommand extends command.Command {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
-    private commandMapping: any[] = [];
-
-    create(plugin: any, command: string) {
-        let commandKey = this.getCommandKey(plugin, command);
-        let commandCallable = new SimpleCommandCallable(command);
-        this.commandMapping[commandKey] = Sponge.getCommandManager().register(this.pluginInstance, commandCallable.callable, command, commandKey).orElse(null);
-        return commandCallable;
-    }
-    remove(plugin: any, command: string) {
-        var commandKey = this.getCommandKey(plugin, command);
-        if (this.commandMapping[commandKey]) {
-            Sponge.getCommandManager().removeMapping(this.commandMapping[commandKey]);
-            delete this.commandMapping[commandKey];
-        }
-    }
-    onCommand(plugin: any, command: any, executor: Function) {
-        command.setExecutor(super.setExecutor(plugin, command, executor));
-    }
-    onTabComplete(plugin: any, command: any, tabCompleter: Function) {
-        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter));
-    }
-
-    private getCommandKey(plugin: any, command: string) {
-        return plugin.description.name.toLowerCase() + ":" + command;
-    }
-}

packages/sponge/src/event.ts

@@ -1,5 +1,5 @@
 import { event, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { inject, provideSingleton } from '@ms/container';
 
 let Modifier = Java.type("java.lang.reflect.Modifier");
 let Order = Java.type("org.spongepowered.api.event.Order");
@@ -19,7 +19,7 @@ let priorityMap = {
 /**
  * Sponge Event Impl
  */
-@injectable()
+@provideSingleton(event.Event)
 export class SpongeEvent extends event.Event {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;

packages/sponge/src/index.ts

@@ -1,18 +1,15 @@
 /// <reference types="@ms/types/dist/typings/sponge" />
 
-import { server, command, event, task } from '@ms/api'
+import { server } from '@ms/api'
 import { Container } from '@ms/container'
 
 import { SpongeConsole } from './console';
-import { SpongeEvent } from './event';
-import { SpongeServer } from './server';
-import { SpongeCommand } from './command';
-import { SpongeTaskManager } from './task';
+import './event';
+import './server';
+import './command';
+import './channel';
+import './task';
 
 export default function SpongeImpl(container: Container) {
     container.bind(server.Console).toConstantValue(SpongeConsole);
-    container.bind(event.Event).to(SpongeEvent).inSingletonScope();
-    container.bind(server.Server).to(SpongeServer).inSingletonScope();
-    container.bind(command.Command).to(SpongeCommand).inSingletonScope();
-    container.bind(task.TaskManager).to(SpongeTaskManager).inSingletonScope();
 }

packages/sponge/src/server.ts

@@ -1,10 +1,10 @@
 import { server } from '@ms/api'
-import { injectable } from '@ms/container';
+import { provideSingleton } from '@ms/container';
 
 let Sponge = org.spongepowered.api.Sponge;
 let TextSerializers = org.spongepowered.api.text.serializer.TextSerializers;
 
-@injectable()
+@provideSingleton(server.Server)
 export class SpongeServer implements server.Server {
     getPlayer(name: string) {
         return Sponge.getServer().getPlayer(name).orElse(null)

packages/sponge/src/task.ts

@@ -1,5 +1,5 @@
 import { task, plugin } from '@ms/api'
-import { injectable, inject } from '@ms/container';
+import { inject, provideSingleton } from '@ms/container';
 
 const Sponge = Java.type("org.spongepowered.api.Sponge");
 const Task = Java.type("org.spongepowered.api.scheduler.Task");
@@ -7,7 +7,7 @@ const Consumer = Java.type('java.util.function.Consumer');
 const Callable = Java.type('java.util.concurrent.Callable');
 const TimeUnit = Java.type('java.util.concurrent.TimeUnit');
 
-@injectable()
+@provideSingleton(task.TaskManager)
 export class SpongeTaskManager implements task.TaskManager {
     @inject(plugin.PluginInstance)
     private pluginInstance: any;

packages/types/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ms/types",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript types package",
     "keywords": [
         "miaoscript",

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ms/websocket",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -27,8 +27,8 @@
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "@ms/api": "^0.2.1",
-        "@ms/common": "^0.2.1"
+        "@ms/api": "^0.3.0",
+        "@ms/common": "^0.3.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }