From cf69ffc442b0a9d821916c7e37796700d3e4de78 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Sat, 9 Apr 2016 00:37:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/pw/yumc/Yum/Yum.java            | 23 ++++++++++---
 src/main/java/pw/yumc/Yum/api/YumAPI.java     |  8 ++---
 .../pw/yumc/Yum/commands/FileCommand.java     |  2 +-
 .../java/pw/yumc/Yum/commands/YumCommand.java |  6 ++--
 .../pw/yumc/Yum/managers/ConfigManager.java   | 33 +++++++++++++++++++
 5 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/pw/yumc/Yum/managers/ConfigManager.java

diff --git a/src/main/java/pw/yumc/Yum/Yum.java b/src/main/java/pw/yumc/Yum/Yum.java
index f429a06..d9d4081 100644
--- a/src/main/java/pw/yumc/Yum/Yum.java
+++ b/src/main/java/pw/yumc/Yum/Yum.java
@@ -13,8 +13,10 @@ import pw.yumc.Yum.api.YumAPI;
 import pw.yumc.Yum.commands.FileCommand;
 import pw.yumc.Yum.commands.NetCommand;
 import pw.yumc.Yum.commands.YumCommand;
+import pw.yumc.Yum.listeners.PluginNetworkListener;
 import pw.yumc.Yum.listeners.SecurityListener;
-import pw.yumc.Yum.manager.NetworkManager;
+import pw.yumc.Yum.managers.ConfigManager;
+import pw.yumc.Yum.managers.NetworkManager;
 
 /**
  * MC插件仓库
@@ -31,6 +33,17 @@ public class Yum extends JavaPlugin {
         return config;
     }
 
+    public void initCommands() {
+        new YumCommand(this);
+        new NetCommand(this);
+        new FileCommand(this);
+    }
+
+    public void initListeners() {
+        new SecurityListener(this);
+        new PluginNetworkListener(this);
+    }
+
     @Override
     public void onDisable() {
         netmgr.unregister();
@@ -39,10 +52,8 @@ public class Yum extends JavaPlugin {
     @Override
     public void onEnable() {
         new YumAPI(this);
-        new YumCommand(this);
-        new NetCommand(this);
-        new FileCommand(this);
-        new SecurityListener(this);
+        initCommands();
+        initListeners();
         new VersionChecker(this);
         YumAPI.updaterepo(Bukkit.getConsoleSender());
         YumAPI.updatecheck(Bukkit.getConsoleSender());
@@ -51,6 +62,8 @@ public class Yum extends JavaPlugin {
     @Override
     public void onLoad() {
         config = new FileConfig(this);
+        // 初始化配置
+        ConfigManager.init(getConfig());
         // 初始化更新列
         UpdatePlugin.getUpdateList();
         // 启用网络注入
diff --git a/src/main/java/pw/yumc/Yum/api/YumAPI.java b/src/main/java/pw/yumc/Yum/api/YumAPI.java
index 63bddf6..162d81a 100644
--- a/src/main/java/pw/yumc/Yum/api/YumAPI.java
+++ b/src/main/java/pw/yumc/Yum/api/YumAPI.java
@@ -11,10 +11,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 
 import cn.citycraft.CommonData.UpdatePlugin;
-import pw.yumc.Yum.manager.DownloadManager;
-import pw.yumc.Yum.manager.PluginsManager;
-import pw.yumc.Yum.manager.RepositoryManager;
-import pw.yumc.Yum.manager.module.PluginInfo;
+import pw.yumc.Yum.managers.DownloadManager;
+import pw.yumc.Yum.managers.PluginsManager;
+import pw.yumc.Yum.managers.RepositoryManager;
+import pw.yumc.Yum.models.PluginInfo;
 
 /**
  * Yum管理中心
diff --git a/src/main/java/pw/yumc/Yum/commands/FileCommand.java b/src/main/java/pw/yumc/Yum/commands/FileCommand.java
index 84cbad6..5df87e8 100644
--- a/src/main/java/pw/yumc/Yum/commands/FileCommand.java
+++ b/src/main/java/pw/yumc/Yum/commands/FileCommand.java
@@ -12,7 +12,7 @@ import cn.citycraft.PluginHelper.commands.InvokeSubCommand;
 import cn.citycraft.PluginHelper.utils.FileUtil;
 import pw.yumc.Yum.Yum;
 import pw.yumc.Yum.api.YumAPI;
-import pw.yumc.Yum.manager.DownloadManager;
+import pw.yumc.Yum.managers.DownloadManager;
 
 /**
  * File命令基类
diff --git a/src/main/java/pw/yumc/Yum/commands/YumCommand.java b/src/main/java/pw/yumc/Yum/commands/YumCommand.java
index a44dab1..b030175 100644
--- a/src/main/java/pw/yumc/Yum/commands/YumCommand.java
+++ b/src/main/java/pw/yumc/Yum/commands/YumCommand.java
@@ -24,9 +24,9 @@ import cn.citycraft.PluginHelper.commands.InvokeSubCommand;
 import cn.citycraft.PluginHelper.utils.StringUtil;
 import pw.yumc.Yum.Yum;
 import pw.yumc.Yum.api.YumAPI;
-import pw.yumc.Yum.manager.PluginsManager;
-import pw.yumc.Yum.manager.RepositoryManager;
-import pw.yumc.Yum.manager.module.RepoSerialization.Repositories;
+import pw.yumc.Yum.managers.PluginsManager;
+import pw.yumc.Yum.managers.RepositoryManager;
+import pw.yumc.Yum.models.RepoSerialization.Repositories;
 
 /**
  * Yum命令基类
diff --git a/src/main/java/pw/yumc/Yum/managers/ConfigManager.java b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
new file mode 100644
index 0000000..f185dd4
--- /dev/null
+++ b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
@@ -0,0 +1,33 @@
+package pw.yumc.Yum.managers;
+
+import java.util.List;
+
+import cn.citycraft.PluginHelper.config.FileConfig;
+
+public class ConfigManager {
+    private static boolean allowPrimaryThread;
+    private static boolean networkDebug;
+    private static List<String> blackList;
+    private static List<String> ignoreList;
+
+    public static List<String> getBlackList() {
+        return blackList;
+    }
+
+    public static List<String> getIgnoreList() {
+        return ignoreList;
+    }
+
+    public static void init(final FileConfig config) {
+        allowPrimaryThread = config.getBoolean("AllowPrimaryThread", false);
+        networkDebug = config.getBoolean("NetworkDebug", false);
+    }
+
+    public static boolean isAllowPrimaryThread() {
+        return allowPrimaryThread;
+    }
+
+    public static boolean isNetworkDebug() {
+        return networkDebug;
+    }
+}