From 2f868049b83de587844f1bc9da709f4bd5e75c8a Mon Sep 17 00:00:00 2001 From: j502647092 Date: Thu, 13 Aug 2015 08:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=88=86=E7=B1=BB..?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: j502647092 --- .../citycraft/SimpleEssential/SimpleEssential.java | 14 +++++++------- .../{handler => }/command/CommandBack.java | 3 +-- .../{handler => }/command/CommandTpa.java | 5 ++--- .../{handler => }/command/CommandTpaccept.java | 3 +-- .../{handler => }/command/CommandTpdeny.java | 3 +-- .../{handler => }/command/CommandTphere.java | 5 ++--- .../SimpleEssentialCommand.java | 2 +- .../{handler => }/teleport/TeleportControl.java | 2 +- .../{handler => }/teleport/TeleportInfo.java | 2 +- .../{handler => }/teleport/TeleportType.java | 2 +- 10 files changed, 18 insertions(+), 23 deletions(-) rename src/cn/citycraft/SimpleEssential/{handler => }/command/CommandBack.java (82%) rename src/cn/citycraft/SimpleEssential/{handler => }/command/CommandTpa.java (84%) rename src/cn/citycraft/SimpleEssential/{handler => }/command/CommandTpaccept.java (82%) rename src/cn/citycraft/SimpleEssential/{handler => }/command/CommandTpdeny.java (82%) rename src/cn/citycraft/SimpleEssential/{handler => }/command/CommandTphere.java (84%) rename src/cn/citycraft/SimpleEssential/{handler => command}/SimpleEssentialCommand.java (92%) rename src/cn/citycraft/SimpleEssential/{handler => }/teleport/TeleportControl.java (95%) rename src/cn/citycraft/SimpleEssential/{handler => }/teleport/TeleportInfo.java (83%) rename src/cn/citycraft/SimpleEssential/{handler => }/teleport/TeleportType.java (66%) diff --git a/src/cn/citycraft/SimpleEssential/SimpleEssential.java b/src/cn/citycraft/SimpleEssential/SimpleEssential.java index a930870..eecae09 100644 --- a/src/cn/citycraft/SimpleEssential/SimpleEssential.java +++ b/src/cn/citycraft/SimpleEssential/SimpleEssential.java @@ -12,15 +12,15 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.plugin.java.JavaPlugin; +import cn.citycraft.SimpleEssential.command.CommandBack; +import cn.citycraft.SimpleEssential.command.CommandTpa; +import cn.citycraft.SimpleEssential.command.CommandTpaccept; +import cn.citycraft.SimpleEssential.command.CommandTpdeny; +import cn.citycraft.SimpleEssential.command.CommandTphere; +import cn.citycraft.SimpleEssential.command.SimpleEssentialCommand; import cn.citycraft.SimpleEssential.config.Config; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; -import cn.citycraft.SimpleEssential.handler.command.CommandBack; -import cn.citycraft.SimpleEssential.handler.command.CommandTpa; -import cn.citycraft.SimpleEssential.handler.command.CommandTpaccept; -import cn.citycraft.SimpleEssential.handler.command.CommandTpdeny; -import cn.citycraft.SimpleEssential.handler.command.CommandTphere; -import cn.citycraft.SimpleEssential.handler.teleport.TeleportControl; import cn.citycraft.SimpleEssential.listen.PlayerLocationListen; +import cn.citycraft.SimpleEssential.teleport.TeleportControl; /** * @author 蒋天蓓 2015年8月11日下午3:29:32 TODO diff --git a/src/cn/citycraft/SimpleEssential/handler/command/CommandBack.java b/src/cn/citycraft/SimpleEssential/command/CommandBack.java similarity index 82% rename from src/cn/citycraft/SimpleEssential/handler/command/CommandBack.java rename to src/cn/citycraft/SimpleEssential/command/CommandBack.java index 6e52102..63ce7ac 100644 --- a/src/cn/citycraft/SimpleEssential/handler/command/CommandBack.java +++ b/src/cn/citycraft/SimpleEssential/command/CommandBack.java @@ -1,14 +1,13 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.command; +package cn.citycraft.SimpleEssential.command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import cn.citycraft.SimpleEssential.SimpleEssential; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; /** * @author 蒋天蓓 2015年8月12日下午2:04:05 TODO diff --git a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpa.java b/src/cn/citycraft/SimpleEssential/command/CommandTpa.java similarity index 84% rename from src/cn/citycraft/SimpleEssential/handler/command/CommandTpa.java rename to src/cn/citycraft/SimpleEssential/command/CommandTpa.java index 52ce16e..eebc7e9 100644 --- a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpa.java +++ b/src/cn/citycraft/SimpleEssential/command/CommandTpa.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.command; +package cn.citycraft.SimpleEssential.command; import org.bukkit.Bukkit; import org.bukkit.command.CommandException; @@ -9,8 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import cn.citycraft.SimpleEssential.SimpleEssential; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; -import cn.citycraft.SimpleEssential.handler.teleport.TeleportType; +import cn.citycraft.SimpleEssential.teleport.TeleportType; /** * @author 蒋天蓓 diff --git a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpaccept.java b/src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java similarity index 82% rename from src/cn/citycraft/SimpleEssential/handler/command/CommandTpaccept.java rename to src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java index af8f28f..a9e3b4c 100644 --- a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpaccept.java +++ b/src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java @@ -1,14 +1,13 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.command; +package cn.citycraft.SimpleEssential.command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import cn.citycraft.SimpleEssential.SimpleEssential; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; /** * @author 蒋天蓓 diff --git a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpdeny.java b/src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java similarity index 82% rename from src/cn/citycraft/SimpleEssential/handler/command/CommandTpdeny.java rename to src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java index 18c5970..1c41414 100644 --- a/src/cn/citycraft/SimpleEssential/handler/command/CommandTpdeny.java +++ b/src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java @@ -1,14 +1,13 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.command; +package cn.citycraft.SimpleEssential.command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import cn.citycraft.SimpleEssential.SimpleEssential; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; /** * @author 蒋天蓓 diff --git a/src/cn/citycraft/SimpleEssential/handler/command/CommandTphere.java b/src/cn/citycraft/SimpleEssential/command/CommandTphere.java similarity index 84% rename from src/cn/citycraft/SimpleEssential/handler/command/CommandTphere.java rename to src/cn/citycraft/SimpleEssential/command/CommandTphere.java index 6d3bc83..f48a43e 100644 --- a/src/cn/citycraft/SimpleEssential/handler/command/CommandTphere.java +++ b/src/cn/citycraft/SimpleEssential/command/CommandTphere.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.command; +package cn.citycraft.SimpleEssential.command; import org.bukkit.Bukkit; import org.bukkit.command.CommandException; @@ -9,8 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import cn.citycraft.SimpleEssential.SimpleEssential; -import cn.citycraft.SimpleEssential.handler.SimpleEssentialCommand; -import cn.citycraft.SimpleEssential.handler.teleport.TeleportType; +import cn.citycraft.SimpleEssential.teleport.TeleportType; /** * @author 蒋天蓓 2015年8月12日下午2:04:05 TODO diff --git a/src/cn/citycraft/SimpleEssential/handler/SimpleEssentialCommand.java b/src/cn/citycraft/SimpleEssential/command/SimpleEssentialCommand.java similarity index 92% rename from src/cn/citycraft/SimpleEssential/handler/SimpleEssentialCommand.java rename to src/cn/citycraft/SimpleEssential/command/SimpleEssentialCommand.java index e903d0b..99dde29 100644 --- a/src/cn/citycraft/SimpleEssential/handler/SimpleEssentialCommand.java +++ b/src/cn/citycraft/SimpleEssential/command/SimpleEssentialCommand.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler; +package cn.citycraft.SimpleEssential.command; import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; diff --git a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportControl.java b/src/cn/citycraft/SimpleEssential/teleport/TeleportControl.java similarity index 95% rename from src/cn/citycraft/SimpleEssential/handler/teleport/TeleportControl.java rename to src/cn/citycraft/SimpleEssential/teleport/TeleportControl.java index c49fa28..0511619 100644 --- a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportControl.java +++ b/src/cn/citycraft/SimpleEssential/teleport/TeleportControl.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.teleport; +package cn.citycraft.SimpleEssential.teleport; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportInfo.java b/src/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java similarity index 83% rename from src/cn/citycraft/SimpleEssential/handler/teleport/TeleportInfo.java rename to src/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java index a0814a5..456aa15 100644 --- a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportInfo.java +++ b/src/cn/citycraft/SimpleEssential/teleport/TeleportInfo.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.teleport; +package cn.citycraft.SimpleEssential.teleport; import org.bukkit.entity.Player; diff --git a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportType.java b/src/cn/citycraft/SimpleEssential/teleport/TeleportType.java similarity index 66% rename from src/cn/citycraft/SimpleEssential/handler/teleport/TeleportType.java rename to src/cn/citycraft/SimpleEssential/teleport/TeleportType.java index 2e8c688..8e8fab5 100644 --- a/src/cn/citycraft/SimpleEssential/handler/teleport/TeleportType.java +++ b/src/cn/citycraft/SimpleEssential/teleport/TeleportType.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.SimpleEssential.handler.teleport; +package cn.citycraft.SimpleEssential.teleport; /** * @author 蒋天蓓