mirror of
https://e.coding.net/circlecloud/Yum.git
synced 2024-11-22 14:28:46 +00:00
use 7boos gson lib and update to 1.7.1...
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
parent
7ebc9167b9
commit
82c9bc702e
26
pom.xml
26
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>cn.citycraft</groupId>
|
<groupId>cn.citycraft</groupId>
|
||||||
<artifactId>Yum</artifactId>
|
<artifactId>Yum</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.7.1</version>
|
||||||
<name>Yum</name>
|
<name>Yum</name>
|
||||||
<description>Minecraft 服务器插件管理系统</description>
|
<description>Minecraft 服务器插件管理系统</description>
|
||||||
<build>
|
<build>
|
||||||
@ -33,14 +33,9 @@
|
|||||||
<artifactSet>
|
<artifactSet>
|
||||||
<includes>
|
<includes>
|
||||||
<include>cn.citycraft:PluginHelper</include>
|
<include>cn.citycraft:PluginHelper</include>
|
||||||
<include>org.mcstats.*:*</include>
|
|
||||||
</includes>
|
</includes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
<relocations>
|
<relocations>
|
||||||
<relocation>
|
|
||||||
<pattern>org.mcstats</pattern>
|
|
||||||
<shadedPattern>${project.groupId}.${project.artifactId}.mcstats</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>cn.citycraft.PluginHelper</pattern>
|
<pattern>cn.citycraft.PluginHelper</pattern>
|
||||||
<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
|
<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
|
||||||
@ -58,6 +53,11 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<properties>
|
||||||
|
<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
|
||||||
|
<update.description>更新7老板底层Gson库 移除Plugin Metrics...</update.description>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
</properties>
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>spigot-repo</id>
|
<id>spigot-repo</id>
|
||||||
@ -67,10 +67,6 @@
|
|||||||
<id>citycraft-repo</id>
|
<id>citycraft-repo</id>
|
||||||
<url>${jenkins.url}/plugin/repository/everything/</url>
|
<url>${jenkins.url}/plugin/repository/everything/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>Plugin Metrics</id>
|
|
||||||
<url>http://repo.mcstats.org/content/repositories/public</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
</repositories>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -85,15 +81,5 @@
|
|||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.mcstats.bukkit</groupId>
|
|
||||||
<artifactId>metrics</artifactId>
|
|
||||||
<version>R8-SNAPSHOT</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
|
|
||||||
</properties>
|
|
||||||
</project>
|
</project>
|
@ -3,10 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
package cn.citycraft.Yum;
|
package cn.citycraft.Yum;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.mcstats.Metrics;
|
|
||||||
|
|
||||||
import cn.citycraft.PluginHelper.commands.HandlerSubCommand;
|
import cn.citycraft.PluginHelper.commands.HandlerSubCommand;
|
||||||
import cn.citycraft.PluginHelper.config.FileConfig;
|
import cn.citycraft.PluginHelper.config.FileConfig;
|
||||||
@ -61,11 +58,6 @@ public class Yum extends JavaPlugin {
|
|||||||
YumManager.repo.jsonToCache(config);
|
YumManager.repo.jsonToCache(config);
|
||||||
YumManager.updaterepo();
|
YumManager.updaterepo();
|
||||||
new VersionChecker(this);
|
new VersionChecker(this);
|
||||||
try {
|
|
||||||
final Metrics metrics = new Metrics(this);
|
|
||||||
metrics.start();
|
|
||||||
} catch (final IOException e) {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -17,10 +17,11 @@ import org.bukkit.command.CommandSender;
|
|||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
import com.google.gson.JsonSyntaxException;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
|
import cn.citycraft.PluginHelper.gson.GsonLib;
|
||||||
|
import cn.citycraft.PluginHelper.gson.api.Gson;
|
||||||
import cn.citycraft.Yum.manager.Repositories.PackageInfo;
|
import cn.citycraft.Yum.manager.Repositories.PackageInfo;
|
||||||
import cn.citycraft.Yum.manager.Repositories.Plugin;
|
import cn.citycraft.Yum.manager.Repositories.Plugin;
|
||||||
import cn.citycraft.Yum.manager.Repositories.Repository;;
|
import cn.citycraft.Yum.manager.Repositories.Repository;;
|
||||||
@ -39,7 +40,7 @@ public class RepositoryManager {
|
|||||||
|
|
||||||
public RepositoryManager(final org.bukkit.plugin.Plugin plugin) {
|
public RepositoryManager(final org.bukkit.plugin.Plugin plugin) {
|
||||||
this.main = plugin;
|
this.main = plugin;
|
||||||
gson = new Gson();
|
gson = GsonLib.newGson();
|
||||||
plugins = new HashMap<String, PluginInfo>();
|
plugins = new HashMap<String, PluginInfo>();
|
||||||
repos = new ArrayList<String>();
|
repos = new ArrayList<String>();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user