From 91547c98c263eb60df115b91de3583d5b4ef44e0 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Wed, 16 Mar 2016 17:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA=E4=BF=A1=E6=81=AF...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- pom.xml | 14 ++++++-------- .../java/{cn/citycraft => pw/yumc}/Yum/Yum.java | 8 ++++---- .../{cn/citycraft => pw/yumc}/Yum/api/YumAPI.java | 10 +++++----- .../yumc}/Yum/commands/FileCommand.java | 8 ++++---- .../yumc}/Yum/commands/YumCommand.java | 12 ++++++------ .../yumc}/Yum/manager/DownloadManager.java | 2 +- .../yumc}/Yum/manager/PluginInfo.java | 8 ++++---- .../yumc}/Yum/manager/PluginsManager.java | 2 +- .../yumc}/Yum/manager/RepoCache.java | 4 ++-- .../yumc}/Yum/manager/RepoSerialization.java | 2 +- .../yumc}/Yum/manager/RepositoryManager.java | 14 +++++++------- src/main/resources/plugin.yml | 2 +- 12 files changed, 42 insertions(+), 44 deletions(-) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/Yum.java (81%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/api/YumAPI.java (94%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/commands/FileCommand.java (95%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/commands/YumCommand.java (96%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/DownloadManager.java (96%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/PluginInfo.java (91%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/PluginsManager.java (96%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/RepoCache.java (93%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/RepoSerialization.java (93%) rename src/main/java/{cn/citycraft => pw/yumc}/Yum/manager/RepositoryManager.java (95%) diff --git a/pom.xml b/pom.xml index 8ca23a5..dc83637 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - cn.citycraft + pw.yumc Yum 2.0.3 Yum @@ -53,14 +53,16 @@ + + Jenkins + http://ci.yumc.pw/job/${project.artifactId}}/ + - http://hs.yumc.pw:8080 &a全新 2.0 版本 震撼发布... &b2.0.3 &6- &a重载所有插件时忽略部分已注册服务插件...; &b2.0.2 &6- &c修复检查可更新插件功能导致全局更新失效问题...; - &b &6- - &d新增全局更新限制 无法同时进行 防止错误...; + &b &6- &d新增全局更新限制 无法同时进行 防止错误...; DEBUG UTF-8 @@ -70,10 +72,6 @@ spigot-repo https://hub.spigotmc.org/nexus/content/groups/public/ - - citycraft-repo - ${jenkins.url}/plugin/repository/everything/ - yumc-repo http://repo.yumc.pw/content/groups/public/ diff --git a/src/main/java/cn/citycraft/Yum/Yum.java b/src/main/java/pw/yumc/Yum/Yum.java similarity index 81% rename from src/main/java/cn/citycraft/Yum/Yum.java rename to src/main/java/pw/yumc/Yum/Yum.java index 6ec018a..abff9ac 100644 --- a/src/main/java/cn/citycraft/Yum/Yum.java +++ b/src/main/java/pw/yumc/Yum/Yum.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.Yum; +package pw.yumc.Yum; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -9,9 +9,9 @@ import org.bukkit.plugin.java.JavaPlugin; import cn.citycraft.CommonData.UpdatePlugin; import cn.citycraft.PluginHelper.config.FileConfig; import cn.citycraft.PluginHelper.utils.VersionChecker; -import cn.citycraft.Yum.api.YumAPI; -import cn.citycraft.Yum.commands.FileCommand; -import cn.citycraft.Yum.commands.YumCommand; +import pw.yumc.Yum.api.YumAPI; +import pw.yumc.Yum.commands.FileCommand; +import pw.yumc.Yum.commands.YumCommand; /** * MC插件仓库 diff --git a/src/main/java/cn/citycraft/Yum/api/YumAPI.java b/src/main/java/pw/yumc/Yum/api/YumAPI.java similarity index 94% rename from src/main/java/cn/citycraft/Yum/api/YumAPI.java rename to src/main/java/pw/yumc/Yum/api/YumAPI.java index 98e6770..9dc9b7a 100644 --- a/src/main/java/cn/citycraft/Yum/api/YumAPI.java +++ b/src/main/java/pw/yumc/Yum/api/YumAPI.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.api; +package pw.yumc.Yum.api; import java.io.File; import java.net.URL; @@ -11,10 +11,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; import cn.citycraft.CommonData.UpdatePlugin; -import cn.citycraft.Yum.manager.DownloadManager; -import cn.citycraft.Yum.manager.PluginInfo; -import cn.citycraft.Yum.manager.PluginsManager; -import cn.citycraft.Yum.manager.RepositoryManager; +import pw.yumc.Yum.manager.DownloadManager; +import pw.yumc.Yum.manager.PluginInfo; +import pw.yumc.Yum.manager.PluginsManager; +import pw.yumc.Yum.manager.RepositoryManager; /** * Yum管理中心 diff --git a/src/main/java/cn/citycraft/Yum/commands/FileCommand.java b/src/main/java/pw/yumc/Yum/commands/FileCommand.java similarity index 95% rename from src/main/java/cn/citycraft/Yum/commands/FileCommand.java rename to src/main/java/pw/yumc/Yum/commands/FileCommand.java index 3fdae20..0a674c3 100644 --- a/src/main/java/cn/citycraft/Yum/commands/FileCommand.java +++ b/src/main/java/pw/yumc/Yum/commands/FileCommand.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.commands; +package pw.yumc.Yum.commands; import java.io.File; @@ -10,9 +10,9 @@ import cn.citycraft.PluginHelper.commands.HandlerCommands; import cn.citycraft.PluginHelper.commands.InvokeCommandEvent; import cn.citycraft.PluginHelper.commands.InvokeSubCommand; import cn.citycraft.PluginHelper.utils.FileUtil; -import cn.citycraft.Yum.Yum; -import cn.citycraft.Yum.api.YumAPI; -import cn.citycraft.Yum.manager.DownloadManager; +import pw.yumc.Yum.Yum; +import pw.yumc.Yum.api.YumAPI; +import pw.yumc.Yum.manager.DownloadManager; /** * File命令基类 diff --git a/src/main/java/cn/citycraft/Yum/commands/YumCommand.java b/src/main/java/pw/yumc/Yum/commands/YumCommand.java similarity index 96% rename from src/main/java/cn/citycraft/Yum/commands/YumCommand.java rename to src/main/java/pw/yumc/Yum/commands/YumCommand.java index 5d50f02..ceb04bc 100644 --- a/src/main/java/cn/citycraft/Yum/commands/YumCommand.java +++ b/src/main/java/pw/yumc/Yum/commands/YumCommand.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.commands; +package pw.yumc.Yum.commands; import java.util.ArrayList; import java.util.Arrays; @@ -22,11 +22,11 @@ import cn.citycraft.PluginHelper.commands.HandlerTabComplete; import cn.citycraft.PluginHelper.commands.InvokeCommandEvent; import cn.citycraft.PluginHelper.commands.InvokeSubCommand; import cn.citycraft.PluginHelper.utils.StringUtil; -import cn.citycraft.Yum.Yum; -import cn.citycraft.Yum.api.YumAPI; -import cn.citycraft.Yum.manager.PluginsManager; -import cn.citycraft.Yum.manager.RepoSerialization.Repositories; -import cn.citycraft.Yum.manager.RepositoryManager; +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.RepoSerialization.Repositories; /** * Yum命令基类 diff --git a/src/main/java/cn/citycraft/Yum/manager/DownloadManager.java b/src/main/java/pw/yumc/Yum/manager/DownloadManager.java similarity index 96% rename from src/main/java/cn/citycraft/Yum/manager/DownloadManager.java rename to src/main/java/pw/yumc/Yum/manager/DownloadManager.java index 91ead15..0d7eda9 100644 --- a/src/main/java/cn/citycraft/Yum/manager/DownloadManager.java +++ b/src/main/java/pw/yumc/Yum/manager/DownloadManager.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.io.BufferedInputStream; import java.io.File; diff --git a/src/main/java/cn/citycraft/Yum/manager/PluginInfo.java b/src/main/java/pw/yumc/Yum/manager/PluginInfo.java similarity index 91% rename from src/main/java/cn/citycraft/Yum/manager/PluginInfo.java rename to src/main/java/pw/yumc/Yum/manager/PluginInfo.java index 2e47a9e..d7e3f16 100644 --- a/src/main/java/cn/citycraft/Yum/manager/PluginInfo.java +++ b/src/main/java/pw/yumc/Yum/manager/PluginInfo.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.io.Serializable; @@ -7,9 +7,9 @@ import org.bukkit.command.CommandSender; import cn.citycraft.PluginHelper.PluginHelperLogger; import cn.citycraft.PluginHelper.utils.IOUtil; -import cn.citycraft.Yum.manager.RepoSerialization.Plugin; -import cn.citycraft.Yum.manager.RepoSerialization.TagInfo; -import cn.citycraft.Yum.manager.RepoSerialization.URLType; +import pw.yumc.Yum.manager.RepoSerialization.Plugin; +import pw.yumc.Yum.manager.RepoSerialization.TagInfo; +import pw.yumc.Yum.manager.RepoSerialization.URLType; public class PluginInfo implements Serializable { public static final String NMSVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; diff --git a/src/main/java/cn/citycraft/Yum/manager/PluginsManager.java b/src/main/java/pw/yumc/Yum/manager/PluginsManager.java similarity index 96% rename from src/main/java/cn/citycraft/Yum/manager/PluginsManager.java rename to src/main/java/pw/yumc/Yum/manager/PluginsManager.java index dcb1848..823675d 100644 --- a/src/main/java/cn/citycraft/Yum/manager/PluginsManager.java +++ b/src/main/java/pw/yumc/Yum/manager/PluginsManager.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.io.File; import java.io.IOException; diff --git a/src/main/java/cn/citycraft/Yum/manager/RepoCache.java b/src/main/java/pw/yumc/Yum/manager/RepoCache.java similarity index 93% rename from src/main/java/cn/citycraft/Yum/manager/RepoCache.java rename to src/main/java/pw/yumc/Yum/manager/RepoCache.java index 7a1a3c7..cb738d5 100644 --- a/src/main/java/cn/citycraft/Yum/manager/RepoCache.java +++ b/src/main/java/pw/yumc/Yum/manager/RepoCache.java @@ -1,4 +1,4 @@ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.io.Serializable; import java.util.ArrayList; @@ -10,7 +10,7 @@ import java.util.Map.Entry; import cn.citycraft.PluginHelper.PluginHelperLogger; import cn.citycraft.PluginHelper.jsonresult.JsonHandle; import cn.citycraft.PluginHelper.utils.IOUtil; -import cn.citycraft.Yum.manager.RepoSerialization.Repositories; +import pw.yumc.Yum.manager.RepoSerialization.Repositories; public class RepoCache implements Serializable { PluginHelperLogger logger = PluginHelperLogger.getLogger(); diff --git a/src/main/java/cn/citycraft/Yum/manager/RepoSerialization.java b/src/main/java/pw/yumc/Yum/manager/RepoSerialization.java similarity index 93% rename from src/main/java/cn/citycraft/Yum/manager/RepoSerialization.java rename to src/main/java/pw/yumc/Yum/manager/RepoSerialization.java index 406d6bc..e06cb6a 100644 --- a/src/main/java/cn/citycraft/Yum/manager/RepoSerialization.java +++ b/src/main/java/pw/yumc/Yum/manager/RepoSerialization.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java b/src/main/java/pw/yumc/Yum/manager/RepositoryManager.java similarity index 95% rename from src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java rename to src/main/java/pw/yumc/Yum/manager/RepositoryManager.java index 54f10ec..4faa49b 100644 --- a/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java +++ b/src/main/java/pw/yumc/Yum/manager/RepositoryManager.java @@ -1,7 +1,7 @@ /** * */ -package cn.citycraft.Yum.manager; +package pw.yumc.Yum.manager; import java.util.ArrayList; import java.util.Iterator; @@ -16,12 +16,12 @@ import cn.citycraft.PluginHelper.PluginHelperLogger; import cn.citycraft.PluginHelper.jsonresult.JsonHandle; import cn.citycraft.PluginHelper.utils.IOUtil; import cn.citycraft.PluginHelper.utils.StringUtil; -import cn.citycraft.Yum.manager.RepoSerialization.PackageInfo; -import cn.citycraft.Yum.manager.RepoSerialization.Plugin; -import cn.citycraft.Yum.manager.RepoSerialization.Repositories; -import cn.citycraft.Yum.manager.RepoSerialization.Repository; -import cn.citycraft.Yum.manager.RepoSerialization.TagInfo; -import cn.citycraft.Yum.manager.RepoSerialization.URLType; +import pw.yumc.Yum.manager.RepoSerialization.PackageInfo; +import pw.yumc.Yum.manager.RepoSerialization.Plugin; +import pw.yumc.Yum.manager.RepoSerialization.Repositories; +import pw.yumc.Yum.manager.RepoSerialization.Repository; +import pw.yumc.Yum.manager.RepoSerialization.TagInfo; +import pw.yumc.Yum.manager.RepoSerialization.URLType; /** * 仓库管理类 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3190016..9950447 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ description: ${project.description} main: ${project.groupId}.${project.artifactId}.${project.artifactId} version: ${project.version}-git-${env.GIT_COMMIT} author: 喵♂呜 -website: ${jenkins.url}/job/${project.artifactId}/ +website: ${ciManagement.url} commands: yum: description: MC插件仓库