From 7cbaf3f42ba532a545b1c1616ac8948f97072941 Mon Sep 17 00:00:00 2001
From: MiaoWoo <admin@yumc.pw>
Date: Tue, 10 Sep 2019 17:21:27 +0800
Subject: [PATCH] feat: complate bukkit comsole and command

Signed-off-by: MiaoWoo <admin@yumc.pw>
---
 packages/bukkit/package.json   |  3 ++-
 packages/bukkit/src/command.ts | 38 ++++++++++++++--------------------
 packages/bukkit/src/index.ts   |  5 ++++-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/bukkit/package.json b/packages/bukkit/package.json
index c4e76646..36e0c080 100644
--- a/packages/bukkit/package.json
+++ b/packages/bukkit/package.json
@@ -28,6 +28,7 @@
     },
     "dependencies": {
         "@ms/api": "^0.0.0",
-        "inversify": "^5.0.1"
+        "@ms/common": "^0.0.0",
+        "@ms/container": "^0.0.0"
     }
 }
diff --git a/packages/bukkit/src/command.ts b/packages/bukkit/src/command.ts
index eae16cc2..90c7142a 100644
--- a/packages/bukkit/src/command.ts
+++ b/packages/bukkit/src/command.ts
@@ -1,26 +1,24 @@
 import '@ms/nashorn'
 
-import { injectable, postConstruct, inject } from 'inversify'
-import { command } from '@ms/api'
-import * as ref from '@ms/common/dist/reflect'
+import { command, plugin } from '@ms/api'
+import * as reflect from '@ms/common/dist/reflect'
+import { injectable, postConstruct, inject } from '@ms/container'
 
-var bukkit = require('./server');
-var plugin = bukkit.plugin.self;
-var commandMap = ref.on(bukkit.plugin.manager).get('commandMap').get();
-var PluginCommand = Java.type('org.bukkit.command.PluginCommand');
-
-var Arrays = Java.type('java.util.Arrays');
-var TabCompleter = Java.type("org.bukkit.command.TabCompleter");
-var CommandExecutor = Java.type("org.bukkit.command.CommandExecutor");
+let Bukkit = Java.type("org.bukkit.Bukkit");
+let Arrays = Java.type('java.util.Arrays');
+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()
 export class BukkitCommand extends command.Command {
-    @inject("Plugin.Self")
-    private plugin: any
+    @inject(plugin.PluginInstance)
+    private pluginInstance: any
+    private commandMap: any;
 
     @postConstruct()
     init() {
-
+        this.commandMap = reflect.on(Bukkit.pluginManager).get('commandMap').get();
     }
 
     enable(jsp) {
@@ -28,23 +26,19 @@ export class BukkitCommand extends command.Command {
         if (commands) {
             var pluginCommands = [];
             for (var name in commands) {
-                // noinspection JSUnfilteredForInLoop
                 var command = commands[name];
                 if (typeof command !== 'object') continue;
                 command.name = name;
-                // noinspection JSUnfilteredForInLoop
                 var newCmd = this.create(jsp, command);
                 if (command.description) newCmd.setDescription(command.description);
                 if (command.usage) newCmd.setUsage(command.usage);
-                /** @namespace command.aliases */
                 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']);
                 pluginCommands.push(newCmd);
-                // noinspection JSUnfilteredForInLoop
                 console.debug(`插件 ${jsp.description.name} 注册命令 ${name} ...`);
             }
-            commandMap.registerAll(jsp.description.name, Arrays.asList(pluginCommands));
+            this.commandMap.registerAll(jsp.description.name, Arrays.asList(pluginCommands));
         }
     }
 
@@ -58,10 +52,10 @@ export class BukkitCommand extends command.Command {
     }
 
     create(jsp, command) {
-        var cmd = commandMap.getCommand(command.name)
+        var cmd = this.commandMap.getCommand(command.name)
         if (cmd && cmd instanceof PluginCommand) { return cmd };
-        cmd = ref.on(PluginCommand).create(command.name, plugin).get();
-        commandMap.register(jsp.description.name, cmd);
+        cmd = reflect.on(PluginCommand).create(command.name, this.pluginInstance).get();
+        this.commandMap.register(jsp.description.name, cmd);
         return cmd;
     }
 
diff --git a/packages/bukkit/src/index.ts b/packages/bukkit/src/index.ts
index efb0b86f..b8dc39f8 100644
--- a/packages/bukkit/src/index.ts
+++ b/packages/bukkit/src/index.ts
@@ -1,7 +1,8 @@
-import { server, plugin } from '@ms/api'
+import { server, plugin, command } from '@ms/api'
 import { DefaultContainer as container } from '@ms/container'
 
 import { BukkitConsole } from './console'
+import { BukkitCommand } from './command';
 
 let BukkitServerType = 'bukkit';
 let Bukkit = Java.type("org.bukkit.Bukkit");
@@ -9,3 +10,5 @@ let Bukkit = Java.type("org.bukkit.Bukkit");
 container.bind(server.Console).toConstantValue(BukkitConsole);
 container.bind(server.ServerType).toConstantValue(BukkitServerType);
 container.bind(plugin.PluginInstance).toConstantValue(Bukkit.pluginManager.getPlugin('MiaoScript'));
+
+container.bind(command.Command).to(BukkitCommand).inSingletonScope();