From 3c8fea6ed0dfb7f33ab64935d9585b98c5f76300 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Wed, 28 Sep 2016 23:30:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- pom.xml | 11 ----------- .../yumc}/LuckLottery/LuckLottery.java | 18 +++++++++--------- .../command/LuckLotteryCommand.java | 14 +++++++------- .../yumc}/LuckLottery/config/OfflineDate.java | 2 +- .../yumc}/LuckLottery/config/PlayerData.java | 8 ++++---- .../yumc}/LuckLottery/listen/PlayerListen.java | 14 +++++++------- .../yumc}/LuckLottery/runnable/LaterShow.java | 4 ++-- .../LuckLottery/runnable/LotteryReward.java | 10 +++++----- .../yumc}/LuckLottery/utils/ChatUtils.java | 2 +- .../yumc}/LuckLottery/utils/InvUtils.java | 2 +- .../yumc}/LuckLottery/utils/LotteryUtils.java | 8 ++++---- .../yumc}/LuckLottery/utils/Perm.java | 2 +- 12 files changed, 42 insertions(+), 53 deletions(-) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/LuckLottery.java (86%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/command/LuckLotteryCommand.java (89%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/config/OfflineDate.java (91%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/config/PlayerData.java (94%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/listen/PlayerListen.java (88%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/runnable/LaterShow.java (78%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/runnable/LotteryReward.java (89%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/utils/ChatUtils.java (93%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/utils/InvUtils.java (97%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/utils/LotteryUtils.java (92%) rename src/main/java/{cn/citycraft => pw/yumc}/LuckLottery/utils/Perm.java (89%) diff --git a/pom.xml b/pom.xml index 9603114..7dd7010 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,6 @@ pw.yumc:YumCore - cn.citycraft:PluginHelper @@ -39,10 +38,6 @@ pw.yumc.YumCore ${project.groupId}.${project.artifactId} - - cn.citycraft.PluginHelper - ${project.groupId}.${project.artifactId} - @@ -79,12 +74,6 @@ jar 1.10.2-R0.1-SNAPSHOT - - cn.citycraft - PluginHelper - jar - 1.0 - pw.yumc YumCore diff --git a/src/main/java/cn/citycraft/LuckLottery/LuckLottery.java b/src/main/java/pw/yumc/LuckLottery/LuckLottery.java similarity index 86% rename from src/main/java/cn/citycraft/LuckLottery/LuckLottery.java rename to src/main/java/pw/yumc/LuckLottery/LuckLottery.java index e96ca29..1db8bc1 100644 --- a/src/main/java/cn/citycraft/LuckLottery/LuckLottery.java +++ b/src/main/java/pw/yumc/LuckLottery/LuckLottery.java @@ -1,17 +1,17 @@ -package cn.citycraft.LuckLottery; +package pw.yumc.LuckLottery; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; -import cn.citycraft.LuckLottery.command.LuckLotteryCommand; -import cn.citycraft.LuckLottery.config.OfflineDate; -import cn.citycraft.LuckLottery.config.PlayerData; -import cn.citycraft.LuckLottery.listen.PlayerListen; -import cn.citycraft.LuckLottery.runnable.LotteryReward; -import cn.citycraft.LuckLottery.utils.ChatUtils; -import cn.citycraft.LuckLottery.utils.LotteryUtils; import net.milkbowl.vault.economy.Economy; +import pw.yumc.LuckLottery.command.LuckLotteryCommand; +import pw.yumc.LuckLottery.config.OfflineDate; +import pw.yumc.LuckLottery.config.PlayerData; +import pw.yumc.LuckLottery.listen.PlayerListen; +import pw.yumc.LuckLottery.runnable.LotteryReward; +import pw.yumc.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.LotteryUtils; import pw.yumc.YumCore.config.FileConfig; import pw.yumc.YumCore.statistic.Statistics; import pw.yumc.YumCore.update.SubscribeTask; @@ -67,7 +67,7 @@ public class LuckLottery extends JavaPlugin { @Override public void onLoad() { plugin = this; - config = new FileConfig(this); + config = new FileConfig(); offlinedata = new OfflineDate(this); PlayerData.reloadPlayerLottery(); ChatUtils.setPluginname(config.getMessage("pluginname")); diff --git a/src/main/java/cn/citycraft/LuckLottery/command/LuckLotteryCommand.java b/src/main/java/pw/yumc/LuckLottery/command/LuckLotteryCommand.java similarity index 89% rename from src/main/java/cn/citycraft/LuckLottery/command/LuckLotteryCommand.java rename to src/main/java/pw/yumc/LuckLottery/command/LuckLotteryCommand.java index 2c8b3fb..7c2d6b4 100644 --- a/src/main/java/cn/citycraft/LuckLottery/command/LuckLotteryCommand.java +++ b/src/main/java/pw/yumc/LuckLottery/command/LuckLotteryCommand.java @@ -1,16 +1,16 @@ -package cn.citycraft.LuckLottery.command; +package pw.yumc.LuckLottery.command; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; -import cn.citycraft.LuckLottery.LuckLottery; -import cn.citycraft.LuckLottery.config.PlayerData; -import cn.citycraft.LuckLottery.utils.ChatUtils; -import cn.citycraft.LuckLottery.utils.InvUtils; -import cn.citycraft.LuckLottery.utils.LotteryUtils; -import cn.citycraft.LuckLottery.utils.Perm; +import pw.yumc.LuckLottery.LuckLottery; +import pw.yumc.LuckLottery.config.PlayerData; +import pw.yumc.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.InvUtils; +import pw.yumc.LuckLottery.utils.LotteryUtils; +import pw.yumc.LuckLottery.utils.Perm; import pw.yumc.YumCore.commands.CommandArgument; import pw.yumc.YumCore.commands.CommandExecutor; import pw.yumc.YumCore.commands.CommandManager; diff --git a/src/main/java/cn/citycraft/LuckLottery/config/OfflineDate.java b/src/main/java/pw/yumc/LuckLottery/config/OfflineDate.java similarity index 91% rename from src/main/java/cn/citycraft/LuckLottery/config/OfflineDate.java rename to src/main/java/pw/yumc/LuckLottery/config/OfflineDate.java index 5e8832d..6b3b5dc 100644 --- a/src/main/java/cn/citycraft/LuckLottery/config/OfflineDate.java +++ b/src/main/java/pw/yumc/LuckLottery/config/OfflineDate.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.config; +package pw.yumc.LuckLottery.config; import java.util.List; diff --git a/src/main/java/cn/citycraft/LuckLottery/config/PlayerData.java b/src/main/java/pw/yumc/LuckLottery/config/PlayerData.java similarity index 94% rename from src/main/java/cn/citycraft/LuckLottery/config/PlayerData.java rename to src/main/java/pw/yumc/LuckLottery/config/PlayerData.java index ab84c07..e100fdf 100644 --- a/src/main/java/cn/citycraft/LuckLottery/config/PlayerData.java +++ b/src/main/java/pw/yumc/LuckLottery/config/PlayerData.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.config; +package pw.yumc.LuckLottery.config; import java.util.HashMap; import java.util.Map; @@ -9,9 +9,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; -import cn.citycraft.LuckLottery.LuckLottery; -import cn.citycraft.LuckLottery.utils.ChatUtils; -import cn.citycraft.LuckLottery.utils.LotteryUtils; +import pw.yumc.LuckLottery.LuckLottery; +import pw.yumc.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.LotteryUtils; import pw.yumc.YumCore.config.FileConfig; public class PlayerData { diff --git a/src/main/java/cn/citycraft/LuckLottery/listen/PlayerListen.java b/src/main/java/pw/yumc/LuckLottery/listen/PlayerListen.java similarity index 88% rename from src/main/java/cn/citycraft/LuckLottery/listen/PlayerListen.java rename to src/main/java/pw/yumc/LuckLottery/listen/PlayerListen.java index e73af18..a5fe42d 100644 --- a/src/main/java/cn/citycraft/LuckLottery/listen/PlayerListen.java +++ b/src/main/java/pw/yumc/LuckLottery/listen/PlayerListen.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.listen; +package pw.yumc.LuckLottery.listen; import java.util.List; @@ -14,12 +14,12 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import cn.citycraft.LuckLottery.LuckLottery; -import cn.citycraft.LuckLottery.config.PlayerData; -import cn.citycraft.LuckLottery.runnable.LaterShow; -import cn.citycraft.LuckLottery.utils.ChatUtils; -import cn.citycraft.LuckLottery.utils.InvUtils; -import cn.citycraft.LuckLottery.utils.LotteryUtils; +import pw.yumc.LuckLottery.LuckLottery; +import pw.yumc.LuckLottery.config.PlayerData; +import pw.yumc.LuckLottery.runnable.LaterShow; +import pw.yumc.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.InvUtils; +import pw.yumc.LuckLottery.utils.LotteryUtils; public class PlayerListen implements Listener { LuckLottery plugin; diff --git a/src/main/java/cn/citycraft/LuckLottery/runnable/LaterShow.java b/src/main/java/pw/yumc/LuckLottery/runnable/LaterShow.java similarity index 78% rename from src/main/java/cn/citycraft/LuckLottery/runnable/LaterShow.java rename to src/main/java/pw/yumc/LuckLottery/runnable/LaterShow.java index 512308f..119215d 100644 --- a/src/main/java/cn/citycraft/LuckLottery/runnable/LaterShow.java +++ b/src/main/java/pw/yumc/LuckLottery/runnable/LaterShow.java @@ -1,11 +1,11 @@ -package cn.citycraft.LuckLottery.runnable; +package pw.yumc.LuckLottery.runnable; import java.util.List; import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import cn.citycraft.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.ChatUtils; public class LaterShow implements Runnable { diff --git a/src/main/java/cn/citycraft/LuckLottery/runnable/LotteryReward.java b/src/main/java/pw/yumc/LuckLottery/runnable/LotteryReward.java similarity index 89% rename from src/main/java/cn/citycraft/LuckLottery/runnable/LotteryReward.java rename to src/main/java/pw/yumc/LuckLottery/runnable/LotteryReward.java index 6cf369b..88654fa 100644 --- a/src/main/java/cn/citycraft/LuckLottery/runnable/LotteryReward.java +++ b/src/main/java/pw/yumc/LuckLottery/runnable/LotteryReward.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.runnable; +package pw.yumc.LuckLottery.runnable; import java.util.Map; import java.util.Map.Entry; @@ -7,10 +7,10 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; -import cn.citycraft.LuckLottery.LuckLottery; -import cn.citycraft.LuckLottery.config.PlayerData; -import cn.citycraft.LuckLottery.utils.ChatUtils; -import cn.citycraft.LuckLottery.utils.LotteryUtils; +import pw.yumc.LuckLottery.LuckLottery; +import pw.yumc.LuckLottery.config.PlayerData; +import pw.yumc.LuckLottery.utils.ChatUtils; +import pw.yumc.LuckLottery.utils.LotteryUtils; public class LotteryReward implements Runnable { LuckLottery plugin; diff --git a/src/main/java/cn/citycraft/LuckLottery/utils/ChatUtils.java b/src/main/java/pw/yumc/LuckLottery/utils/ChatUtils.java similarity index 93% rename from src/main/java/cn/citycraft/LuckLottery/utils/ChatUtils.java rename to src/main/java/pw/yumc/LuckLottery/utils/ChatUtils.java index fcefd12..fcb6193 100644 --- a/src/main/java/cn/citycraft/LuckLottery/utils/ChatUtils.java +++ b/src/main/java/pw/yumc/LuckLottery/utils/ChatUtils.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.utils; +package pw.yumc.LuckLottery.utils; import java.util.List; diff --git a/src/main/java/cn/citycraft/LuckLottery/utils/InvUtils.java b/src/main/java/pw/yumc/LuckLottery/utils/InvUtils.java similarity index 97% rename from src/main/java/cn/citycraft/LuckLottery/utils/InvUtils.java rename to src/main/java/pw/yumc/LuckLottery/utils/InvUtils.java index 77630a6..725a64f 100644 --- a/src/main/java/cn/citycraft/LuckLottery/utils/InvUtils.java +++ b/src/main/java/pw/yumc/LuckLottery/utils/InvUtils.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.utils; +package pw.yumc.LuckLottery.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/cn/citycraft/LuckLottery/utils/LotteryUtils.java b/src/main/java/pw/yumc/LuckLottery/utils/LotteryUtils.java similarity index 92% rename from src/main/java/cn/citycraft/LuckLottery/utils/LotteryUtils.java rename to src/main/java/pw/yumc/LuckLottery/utils/LotteryUtils.java index 05e5685..4bbfbd7 100644 --- a/src/main/java/cn/citycraft/LuckLottery/utils/LotteryUtils.java +++ b/src/main/java/pw/yumc/LuckLottery/utils/LotteryUtils.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.utils; +package pw.yumc.LuckLottery.utils; import java.security.SecureRandom; import java.util.ArrayList; @@ -10,9 +10,9 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import cn.citycraft.LuckLottery.LuckLottery; -import cn.citycraft.LuckLottery.config.PlayerData; -import cn.citycraft.LuckLottery.runnable.LotteryReward; +import pw.yumc.LuckLottery.LuckLottery; +import pw.yumc.LuckLottery.config.PlayerData; +import pw.yumc.LuckLottery.runnable.LotteryReward; public class LotteryUtils { protected static LuckLottery plugin = LuckLottery.plugin; diff --git a/src/main/java/cn/citycraft/LuckLottery/utils/Perm.java b/src/main/java/pw/yumc/LuckLottery/utils/Perm.java similarity index 89% rename from src/main/java/cn/citycraft/LuckLottery/utils/Perm.java rename to src/main/java/pw/yumc/LuckLottery/utils/Perm.java index c5c51b2..aa12cce 100644 --- a/src/main/java/cn/citycraft/LuckLottery/utils/Perm.java +++ b/src/main/java/pw/yumc/LuckLottery/utils/Perm.java @@ -1,4 +1,4 @@ -package cn.citycraft.LuckLottery.utils; +package pw.yumc.LuckLottery.utils; public class Perm { public static final String ShowAll = "lucklottery.showall";