From 04e3e58c2fffd222f03061b6035b0dad9c76fa7a Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Sat, 23 Jul 2016 18:32:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 pom.xml                                                 | 4 ++++
 src/main/java/pw/yumc/Yum/listeners/PluginListener.java | 4 ++--
 src/main/java/pw/yumc/Yum/managers/ConfigManager.java   | 4 ++--
 src/main/java/pw/yumc/Yum/models/PluginInfo.java        | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ba200a..228535c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,10 @@
 							<pattern>cn.citycraft.PluginHelper</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>pw.yumc.PluginHelper</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
+						</relocation>
 					</relocations>
 				</configuration>
 				<executions>
diff --git a/src/main/java/pw/yumc/Yum/listeners/PluginListener.java b/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
index 1da56f7..e0651a2 100644
--- a/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
+++ b/src/main/java/pw/yumc/Yum/listeners/PluginListener.java
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 
-import cn.citycraft.PluginHelper.kit.PKit;
+import cn.citycraft.PluginHelper.bukkit.P;
 import cn.citycraft.PluginHelper.kit.PluginKit;
 import pw.yumc.Yum.api.YumAPI;
 import pw.yumc.Yum.managers.MonitorManager;
@@ -19,7 +19,7 @@ import pw.yumc.Yum.managers.MonitorManager;
 public class PluginListener implements Listener {
 
     public PluginListener() {
-        Bukkit.getPluginManager().registerEvents(this, PKit.i());
+        Bukkit.getPluginManager().registerEvents(this, P.instance);
         PluginKit.scp("§a性能监控系统已启用...");
     }
 
diff --git a/src/main/java/pw/yumc/Yum/managers/ConfigManager.java b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
index 446de89..215b312 100644
--- a/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
+++ b/src/main/java/pw/yumc/Yum/managers/ConfigManager.java
@@ -4,15 +4,15 @@ import java.util.List;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
+import cn.citycraft.PluginHelper.bukkit.P;
 import cn.citycraft.PluginHelper.config.FileConfig;
-import cn.citycraft.PluginHelper.kit.PKit;
 
 public class ConfigManager {
     public final static String ENABLE = "Enable";
     public final static String BLACK = "Black";
     public final static String IGNORE = "Ignore";
 
-    private final static ConfigManager i = new ConfigManager(PKit.i());
+    private final static ConfigManager i = new ConfigManager(P.instance);
 
     public final FileConfig config;
     public final FileConfig setop;
diff --git a/src/main/java/pw/yumc/Yum/models/PluginInfo.java b/src/main/java/pw/yumc/Yum/models/PluginInfo.java
index 7e77b6d..3d3a266 100644
--- a/src/main/java/pw/yumc/Yum/models/PluginInfo.java
+++ b/src/main/java/pw/yumc/Yum/models/PluginInfo.java
@@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
 import cn.citycraft.PluginHelper.PluginHelperLogger;
-import cn.citycraft.PluginHelper.kit.PKit;
+import cn.citycraft.PluginHelper.bukkit.Log;
 import cn.citycraft.PluginHelper.utils.IOUtil;
 import pw.yumc.Yum.models.RepoSerialization.Plugin;
 import pw.yumc.Yum.models.RepoSerialization.TagInfo;
@@ -19,7 +19,7 @@ public class PluginInfo implements Serializable {
         try {
             NMSVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
         } catch (final Exception e) {
-            PKit.i().getLogger().warning("服务器NMS解析失败: " + Bukkit.getServer().getClass().getPackage().getName());
+            Log.warning("服务器NMS解析失败: " + Bukkit.getServer().getClass().getPackage().getName());
             NMSVersion = "NONMS";
         }
     }