[UPDATE] Console commands complete.

weihao · Mar 31, 2018 · 8b1efd4 · 8b1efd4
1 parent 5567ce0
commit 8b1efd4
Show file tree

Hide file tree

Showing 23 changed files with 491 additions and 113 deletions.
diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/Main.java b/src/main/java/org/pixeltime/enchantmentsenhance/Main.java
@@ -25,10 +25,17 @@
 import org.pixeltime.enchantmentsenhance.util.Metrics;
 import org.pixeltime.enchantmentsenhance.util.Reflection_V2;
 
+/**
+ * Main plugin class.
+ * 
+ * @author HealPot
+ * @version Mar 30, 2018
+ *
+ */
 public class Main extends JavaPlugin {
+    private static Main main;
     public static final CompatibilityManager compatibility =
         new CompatibilityManager();
-    private static Main main;
     public CommandManager commandManager;
 
 
@@ -42,11 +49,22 @@ public static Main getMain() {
     }
 
 
+    /**
+     * Default constructor.
+     */
     public Main() {
         super();
     }
 
 
+    /**
+     * Mocking constructor.
+     * 
+     * @param loader
+     * @param description
+     * @param dataFolder
+     * @param file
+     */
     protected Main(
         JavaPluginLoader loader,
         PluginDescriptionFile description,
@@ -133,7 +151,7 @@ private void registerCore() {
         new DataManager();
         // Start bStats Metrics.
         new Metrics(this);
-        this.commandManager = new CommandManager();
+        commandManager = new CommandManager();
         commandManager.setup();
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/AddCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/AddCommand.java
@@ -13,36 +13,36 @@ public void onCommand(Player player, String[] args) {
         // /enhance add <player> <stone id> <amounts>
         // /cmd subcommand args[0] args[1] args[2]
         if (args.length == 3) {
-            boolean success = false;
             Player p = null;
             int stoneType = -1;
             int level = -1;
+
+            p = Bukkit.getServer().getPlayer(args[0]);
+
+            if (p == null) {
+                Util.sendMessage(SettingsManager.lang.getString(
+                    "Config.playerNotFound"), player);
+                return;
+            }
+
             try {
-                p = Bukkit.getServer().getPlayer(args[0]);
-                success = true;
+                stoneType = Integer.parseInt(args[1]);
+                level = Integer.parseInt(args[2]);
             }
             catch (Exception e) {
                 Util.sendMessage(SettingsManager.lang.getString(
-                    "Config.playerNotFound"), player);
-            }
-            if (success) {
-                try {
-                    stoneType = Integer.parseInt(args[1]);
-                    level = Integer.parseInt(args[2]);
-                }
-                catch (Exception e) {
-                    Util.sendMessage(SettingsManager.lang.getString(
-                        "Config.invalidNumber"), player);
-                }
+                    "Config.invalidNumber"), player);
+                return;
             }
+
             if (stoneType != -1 && level != -1 && p != null
                 && stoneType <= Util.stoneTypes.length) {
                 Inventory.addLevel(p, stoneType, level);
                 Util.sendMessage(SettingsManager.lang.getString(
-                    "Add.successful").replace("%player%", p.getName())
-                    .replace("%number%", Integer.toString(level)).replace(
-                        "%stone%", SettingsManager.lang.getString("Item."
-                            + stoneType)), player);
+                    "Add.successful").replace("%player%", p.getName()).replace(
+                        "%number%", Integer.toString(level)).replace("%stone%",
+                            SettingsManager.lang.getString("Item."
+                                + stoneType)), player);
             }
             else {
                 Util.sendMessage(SettingsManager.lang.getString(
@@ -71,7 +71,7 @@ public String info() {
 
     @Override
     public String[] aliases() {
-        return new String[] { "add", "give" };
+        return new String[] { "add", "give", "tianjia", "tj" };
     }
 
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/DebugCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/DebugCommand.java
@@ -2,29 +2,27 @@
 
 import org.bukkit.entity.Player;
 import org.pixeltime.enchantmentsenhance.Main;
-import org.pixeltime.enchantmentsenhance.events.blacksmith.SecretBook;
-import org.pixeltime.enchantmentsenhance.events.inventory.Backpack;
-import org.pixeltime.enchantmentsenhance.events.inventory.Inventory;
+import org.pixeltime.enchantmentsenhance.manager.SettingsManager;
 
 public class DebugCommand extends SubCommand {
 
     @Override
     public void onCommand(Player player, String[] args) {
-//        log("player custom name? :" + player.getCustomName());
-//        log("player display name? :" + player.getName());
-//        log("player entity name? :" + player.getName());
-//        log("player list name? :" + player.getPlayerListName());
-//        log("Secret Book null? :" + (SecretBook.storage == null));
-//        log("Inventory null? :" + (Inventory.backpack == null));
-//        Exception e1 = null;
-//        try {
-//            Inventory.setLevel(player, 0, 233);
-//            log(Inventory.getLevel(0, player) + "<>");
-//        }
-//        catch (NullPointerException e) {
-//            e1 = e;
-//        }
-//        log("Exception null? : " + (e1 == null));
+// log("player custom name? :" + player.getCustomName());
+// log("player display name? :" + player.getName());
+// log("player entity name? :" + player.getName());
+// log("player list name? :" + player.getPlayerListName());
+// log("Secret Book null? :" + (SecretBook.storage == null));
+// log("Inventory null? :" + (Inventory.backpack == null));
+// Exception e1 = null;
+// try {
+// Inventory.setLevel(player, 0, 233);
+// log(Inventory.getLevel(0, player) + "<>");
+// }
+// catch (NullPointerException e) {
+// e1 = e;
+// }
+// log("Exception null? : " + (e1 == null));
 
     }
 
@@ -37,13 +35,14 @@ public String name() {
 
     @Override
     public String info() {
-        return "\n&6/enhance debug &7- collects debugging information to developer to fix issues.";
+        return "\n&6/enhance debug &7- " + SettingsManager.lang.getString(
+            "Help.debug");
     }
 
 
     @Override
     public String[] aliases() {
-        return new String[] { "debug" };
+        return new String[] { "debug", "tiaoshi", "ts" };
     }
 
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/HelpCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/HelpCommand.java
@@ -27,7 +27,7 @@ public String info() {
 
     @Override
     public String[] aliases() {
-        return new String[] { "help", "hl" };
+        return new String[] { "help", "hl" ,"bangzhu", "bz"};
     }
 
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/InventoryCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/InventoryCommand.java
@@ -19,28 +19,25 @@ public void onCommand(Player player, String[] args) {
 
     @Override
     public String name() {
-        // TODO Auto-generated method stub
         return "inventory";
     }
 
 
     @Override
     public String info() {
-        // TODO Auto-generated method stub
         return "\n&6/enhance inventory &7- " + SettingsManager.lang
             .getString("Help.inventory");
     }
 
 
     @Override
     public String[] aliases() {
-        return new String[] { "inv", "inventory" };
+        return new String[] { "inv", "inventory", "beibao", "b" };
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.enhance";
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/ListCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/ListCommand.java
@@ -30,29 +30,25 @@ public void onCommand(Player player, String[] args) {
 
     @Override
     public String name() {
-        // TODO Auto-generated method stub
         return "list";
     }
 
 
     @Override
     public String info() {
-        // TODO Auto-generated method stub
         return "\n&6/enhance list &7- " + SettingsManager.lang.getString(
             "Help.list");
     }
 
 
     @Override
     public String[] aliases() {
-        // TODO Auto-generated method stub
-        return new String[] { "list", "ls"};
+        return new String[] { "list", "ls", "chakan", "ck"};
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.enhance";
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/LoreCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/LoreCommand.java
@@ -30,28 +30,25 @@ public void onCommand(Player player, String[] args) {
 
     @Override
     public String name() {
-        // TODO Auto-generated method stub
         return "lore";
     }
 
 
     @Override
     public String info() {
-        // TODO Auto-generated method stub
-        return "\n&6/enhance lore { addhand | removehand }&7- " + SettingsManager.lang.getString(
-            "Help.lore");
+        return "\n&6/enhance lore { addhand | removehand }&7- "
+            + SettingsManager.lang.getString("Help.lore");
     }
 
 
     @Override
     public String[] aliases() {
-        return new String[] { "lore" };
+        return new String[] { "lore", "shuxing", "sx" };
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.lore";
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/MenuCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/MenuCommand.java
@@ -27,13 +27,12 @@ public String info() {
 
     @Override
     public String[] aliases() {
-        return new String[] { "menu" };
+        return new String[] { "menu" ,"yemian", "ym"};
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.enhance";
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/ReformCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/ReformCommand.java
@@ -0,0 +1,40 @@
+package org.pixeltime.enchantmentsenhance.commands;
+
+import org.bukkit.entity.Player;
+import org.pixeltime.enchantmentsenhance.events.blackspirit.Reform;
+import org.pixeltime.enchantmentsenhance.manager.SettingsManager;
+
+public class ReformCommand extends SubCommand {
+
+    @Override
+    public void onCommand(Player player, String[] args) {
+        Reform newGUI = new Reform();
+        newGUI.open(player);
+    }
+
+
+    @Override
+    public String name() {
+        return "reform";
+    }
+
+
+    @Override
+    public String info() {
+        return "\n&6/enhance reform &7- " + SettingsManager.lang.getString(
+            "Help.form");
+    }
+
+
+    @Override
+    public String[] aliases() {
+        return new String[] { "reform", "rf", "gailiang", "gl" };
+    }
+
+
+    @Override
+    public String getPermission() {
+        return "Enchantmentsenhance.enhance";
+    }
+
+}
diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/ReloadCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/ReloadCommand.java
@@ -33,13 +33,12 @@ public String info() {
 
     @Override
     public String[] aliases() {
-        return new String[] { "reload", "rel" };
+        return new String[] { "reload", "rel", "chongzai", "cz" };
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.reload";
     }
 

diff --git a/src/main/java/org/pixeltime/enchantmentsenhance/commands/SelectCommand.java b/src/main/java/org/pixeltime/enchantmentsenhance/commands/SelectCommand.java
@@ -30,27 +30,25 @@ public void onCommand(Player player, String[] args) {
 
     @Override
     public String name() {
-        // TODO Auto-generated method stub
         return "select";
     }
 
 
     @Override
     public String info() {
-        return "\n&6/enhance select { n } &7- " + SettingsManager.lang.getString(
-            "Help.select");
+        return "\n&6/enhance select { n } &7- " + SettingsManager.lang
+            .getString("Help.select");
     }
 
 
     @Override
     public String[] aliases() {
-        return new String[] { "select", "sl" };
+        return new String[] { "select", "sl", "xuanze", "xz" };
     }
 
 
     @Override
     public String getPermission() {
-        // TODO Auto-generated method stub
         return "Enchantmentsenhance.enhance";
     }