From aa7608fba2918633adf3c50502d39b35a1518fb8 Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Mon, 10 Oct 2016 01:39:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B4=E7=90=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E7=B1=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 .../pw/yumc/YumCore/config/{ => annotation}/ConfigNode.java | 2 +-
 .../pw/yumc/YumCore/config/{ => annotation}/Default.java    | 2 +-
 .../pw/yumc/YumCore/config/{ => annotation}/Nullable.java   | 2 +-
 .../java/pw/yumc/YumCore/config/{ => ext}/PlayerConfig.java | 4 +++-
 .../java/pw/yumc/YumCore/config/{ => ext}/RemoteConfig.java | 3 ++-
 .../java/pw/yumc/YumCore/config/{ => ext}/YumConfig.java    | 3 ++-
 .../pw/yumc/YumCore/config/inject/AbstractInjectConfig.java | 6 +++---
 src/main/java/pw/yumc/YumCore/global/L10N.java              | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)
 rename src/main/java/pw/yumc/YumCore/config/{ => annotation}/ConfigNode.java (92%)
 rename src/main/java/pw/yumc/YumCore/config/{ => annotation}/Default.java (87%)
 rename src/main/java/pw/yumc/YumCore/config/{ => annotation}/Nullable.java (86%)
 rename src/main/java/pw/yumc/YumCore/config/{ => ext}/PlayerConfig.java (88%)
 rename src/main/java/pw/yumc/YumCore/config/{ => ext}/RemoteConfig.java (91%)
 rename src/main/java/pw/yumc/YumCore/config/{ => ext}/YumConfig.java (91%)

diff --git a/src/main/java/pw/yumc/YumCore/config/ConfigNode.java b/src/main/java/pw/yumc/YumCore/config/annotation/ConfigNode.java
similarity index 92%
rename from src/main/java/pw/yumc/YumCore/config/ConfigNode.java
rename to src/main/java/pw/yumc/YumCore/config/annotation/ConfigNode.java
index 59640cb..b128ada 100644
--- a/src/main/java/pw/yumc/YumCore/config/ConfigNode.java
+++ b/src/main/java/pw/yumc/YumCore/config/annotation/ConfigNode.java
@@ -1,4 +1,4 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/pw/yumc/YumCore/config/Default.java b/src/main/java/pw/yumc/YumCore/config/annotation/Default.java
similarity index 87%
rename from src/main/java/pw/yumc/YumCore/config/Default.java
rename to src/main/java/pw/yumc/YumCore/config/annotation/Default.java
index 783faed..29eade0 100644
--- a/src/main/java/pw/yumc/YumCore/config/Default.java
+++ b/src/main/java/pw/yumc/YumCore/config/annotation/Default.java
@@ -1,4 +1,4 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/pw/yumc/YumCore/config/Nullable.java b/src/main/java/pw/yumc/YumCore/config/annotation/Nullable.java
similarity index 86%
rename from src/main/java/pw/yumc/YumCore/config/Nullable.java
rename to src/main/java/pw/yumc/YumCore/config/annotation/Nullable.java
index 42bf36a..5d65e75 100644
--- a/src/main/java/pw/yumc/YumCore/config/Nullable.java
+++ b/src/main/java/pw/yumc/YumCore/config/annotation/Nullable.java
@@ -1,4 +1,4 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/pw/yumc/YumCore/config/PlayerConfig.java b/src/main/java/pw/yumc/YumCore/config/ext/PlayerConfig.java
similarity index 88%
rename from src/main/java/pw/yumc/YumCore/config/PlayerConfig.java
rename to src/main/java/pw/yumc/YumCore/config/ext/PlayerConfig.java
index 3c61c9f..ab87e51 100644
--- a/src/main/java/pw/yumc/YumCore/config/PlayerConfig.java
+++ b/src/main/java/pw/yumc/YumCore/config/ext/PlayerConfig.java
@@ -1,9 +1,11 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.ext;
 
 import java.io.File;
 
 import org.bukkit.entity.Player;
 
+import pw.yumc.YumCore.config.FileConfig;
+
 /**
  * 玩家配置管理类
  *
diff --git a/src/main/java/pw/yumc/YumCore/config/RemoteConfig.java b/src/main/java/pw/yumc/YumCore/config/ext/RemoteConfig.java
similarity index 91%
rename from src/main/java/pw/yumc/YumCore/config/RemoteConfig.java
rename to src/main/java/pw/yumc/YumCore/config/ext/RemoteConfig.java
index 46a8349..abeb979 100644
--- a/src/main/java/pw/yumc/YumCore/config/RemoteConfig.java
+++ b/src/main/java/pw/yumc/YumCore/config/ext/RemoteConfig.java
@@ -1,10 +1,11 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.ext;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import pw.yumc.YumCore.bukkit.Log;
+import pw.yumc.YumCore.config.FileConfig;
 
 /**
  * 远程配置文件类
diff --git a/src/main/java/pw/yumc/YumCore/config/YumConfig.java b/src/main/java/pw/yumc/YumCore/config/ext/YumConfig.java
similarity index 91%
rename from src/main/java/pw/yumc/YumCore/config/YumConfig.java
rename to src/main/java/pw/yumc/YumCore/config/ext/YumConfig.java
index fec303d..6f1a792 100644
--- a/src/main/java/pw/yumc/YumCore/config/YumConfig.java
+++ b/src/main/java/pw/yumc/YumCore/config/ext/YumConfig.java
@@ -1,9 +1,10 @@
-package pw.yumc.YumCore.config;
+package pw.yumc.YumCore.config.ext;
 
 import java.io.File;
 import java.io.IOException;
 
 import pw.yumc.YumCore.bukkit.Log;
+import pw.yumc.YumCore.config.FileConfig;
 
 public class YumConfig {
     protected static final String REMOTEFILECENTER = "http://data.yumc.pw/config/";
diff --git a/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java b/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java
index 2b3765d..1378fa0 100644
--- a/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java
+++ b/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java
@@ -12,9 +12,9 @@ import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 
 import pw.yumc.YumCore.bukkit.Log;
-import pw.yumc.YumCore.config.ConfigNode;
-import pw.yumc.YumCore.config.Default;
-import pw.yumc.YumCore.config.Nullable;
+import pw.yumc.YumCore.config.annotation.ConfigNode;
+import pw.yumc.YumCore.config.annotation.Default;
+import pw.yumc.YumCore.config.annotation.Nullable;
 
 /**
  * 抽象注入配置
diff --git a/src/main/java/pw/yumc/YumCore/global/L10N.java b/src/main/java/pw/yumc/YumCore/global/L10N.java
index f2e5c89..a7883fe 100644
--- a/src/main/java/pw/yumc/YumCore/global/L10N.java
+++ b/src/main/java/pw/yumc/YumCore/global/L10N.java
@@ -9,7 +9,7 @@ import org.bukkit.material.SpawnEgg;
 
 import pw.yumc.YumCore.bukkit.Log;
 import pw.yumc.YumCore.config.FileConfig;
-import pw.yumc.YumCore.config.YumConfig;
+import pw.yumc.YumCore.config.ext.YumConfig;
 
 /**
  * 本地化工具类