修复路径BUG 更换统计

pom.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gg.frog.mc</groupId>
 	<artifactId>permissionstime</artifactId>
-    <version>0.2.3-SNAPSHOT</version>
+	<version>0.2.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>PermissionsTime</name>
 	<description>支持跨服的权限限时插件</description>
@@ -30,23 +31,22 @@
 			<url>http://nexus.hc.to/content/repositories/pub_releases/</url>
 		</repository>
 		<repository>
-            <id>Plugin Metrics</id>
+			<id>bstats-repo</id>
-            <url>http://repo.mcstats.org/content/repositories/public</url>
+			<url>http://repo.bstats.org/content/repositories/releases/</url>
 		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-            <version>1.8-R0.1-SNAPSHOT</version>
+			<version>1.9-R0.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.mcstats.bukkit</groupId>
+			<groupId>org.bstats</groupId>
-            <artifactId>metrics</artifactId>
+			<artifactId>bstats-bukkit</artifactId>
-            <version>R8-SNAPSHOT</version>
+			<version>1.2</version>
-            <scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
@@ -103,9 +103,16 @@
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<artifactSet>
 						<includes>
-                            <include>org.mcstats.*:*</include>
+							<include>org.bstats:*</include>
 						</includes>
 					</artifactSet>
+					<relocations>
+						<relocation>
+							<pattern>org.bstats</pattern>
+							<!-- Replace this with your package! -->
+							<shadedPattern>gg.frog.mc.permissionstime</shadedPattern>
+						</relocation>
+					</relocations>
 				</configuration>
 				<executions>
 					<execution>

src/main/gg/frog/mc/permissionstime/PluginMain.java

@@ -5,6 +5,7 @@ import java.util.Locale;
 import java.util.UUID;
 import java.util.logging.Logger;
 
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -41,7 +42,6 @@ public class PluginMain extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        super.onEnable();
         pm = this;
         cm = new ConfigManager(pm);
         getServer().getConsoleSender().sendMessage(StrUtil.messageFormat(PluginCfg.PLUGIN_PREFIX + "==============================="));
@@ -64,8 +64,8 @@ public class PluginMain extends JavaPlugin {
                 }
                 if (PluginCfg.IS_METRICS) {
                     try {
-                        org.mcstats.Metrics mcstats = new org.mcstats.Metrics(pm);
+                        Metrics metrics = new Metrics(pm);
-                        mcstats.start();
+//                        metrics.addCustomChart(new Metrics.SimplePie("chart_id", () -> "My value"));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -132,7 +132,6 @@ public class PluginMain extends JavaPlugin {
 
     @Override
     public void onDisable() {
-        super.onDisable();
         getServer().getServicesManager().unregisterAll(pm);
         Bukkit.getScheduler().cancelTasks(pm);
         try {

src/main/gg/frog/mc/permissionstime/utils/FileUtil.java

@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -12,6 +14,7 @@ public class FileUtil {
 
 	public interface FindFilesDo {
 		boolean isProcess(String fileName);
+
 		void process(String fileName, InputStream is);
 	}
 
@@ -19,6 +22,7 @@ public class FileUtil {
 		JarFile jarFile = null;
 		try {
 			String jarFilePath = jarClazz.getProtectionDomain().getCodeSource().getLocation().getFile();
+			jarFilePath = URLDecoder.decode(jarFilePath, Charset.defaultCharset().name());
 			jarFile = new JarFile(jarFilePath);
 			Enumeration<JarEntry> entries = jarFile.entries();
 			while (entries.hasMoreElements()) {

src/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: PermissionsTime
-version: 0.2.3-SNAPSHOT
+version: 0.2.4-SNAPSHOT
 main: gg.frog.mc.permissionstime.PluginMain
 author: GeekFrog
 softdepend: