update to 1.5.1...

Signed-off-by: 502647092 <jtb1@163.com>

pom.xml

@@ -3,7 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.maxgamer</groupId>
 	<artifactId>QuickShop</artifactId>
-	<version>1.4.4</version>
+	<version>1.5.1</version>
+	<description>快捷商店重置版本...</description>
 	<build>
 		<finalName>${project.name}</finalName>
 		<resources>
@@ -31,14 +32,9 @@
 					<artifactSet>
 						<includes>
 							<include>cn.citycraft:PluginHelper</include>
-							<include>org.mcstats.*:*</include>
 						</includes>
 					</artifactSet>
 					<relocations>
-						<relocation>
-							<pattern>org.mcstats</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.mcstats</shadedPattern>
-						</relocation>
 						<relocation>
 							<pattern>cn.citycraft.PluginHelper</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
@@ -56,6 +52,11 @@
 			</plugin>
 		</plugins>
 	</build>
+	<properties>
+		<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
+		<update.description>完善7老板的底层Gson库...</update.description>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<repositories>
 		<repository>
 			<id>spigot-repo</id>
@@ -65,10 +66,6 @@
 			<id>sumcraft-repo</id>
 			<url>${jenkins.url}/plugin/repository/everything/</url>
 		</repository>
-		<repository>
-			<id>Plugin Metrics</id>
-			<url>http://repo.mcstats.org/content/repositories/public</url>
-		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@@ -102,15 +99,5 @@
 			<artifactId>WowSuchCleaner</artifactId>
 			<version>1.6.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.mcstats.bukkit</groupId>
-			<artifactId>metrics</artifactId>
-			<version>R8-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
-	</properties>
 </project>

src/main/java/org/maxgamer/QuickShop/Config/ConfigManager.java

@@ -90,7 +90,7 @@ public class ConfigManager {
 				fm.toJSONString();
 				plugin.getLogger().info("魔改库功能测试正常...");
 				this.enableMagicLib = true;
-			} catch (final NoClassDefFoundError | NoSuchMethodError | Exception e) {
+			} catch (final Error | Exception e) {
 				plugin.getLogger().warning("+=========================================");
 				plugin.getLogger().warning("| 警告: 启动魔改库失败 将使用GUI商店界面...");
 				plugin.getLogger().warning("+=========================================");

src/main/java/org/maxgamer/QuickShop/QuickShop.java

@@ -1,7 +1,6 @@
 package org.maxgamer.QuickShop;
 
 import java.io.File;
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -51,7 +50,6 @@ import org.maxgamer.QuickShop.Util.MsgUtil;
 import org.maxgamer.QuickShop.Util.Util;
 import org.maxgamer.QuickShop.Watcher.ItemWatcher;
 import org.maxgamer.QuickShop.Watcher.LogWatcher;
-import org.mcstats.Metrics;
 
 import cn.citycraft.PluginHelper.config.FileConfig;
 import cn.citycraft.PluginHelper.utils.VersionChecker;
@@ -182,9 +180,13 @@ public class QuickShop extends JavaPlugin {
 			logWatcher.close(); // Closes the file
 		}
 		/* Remove all display items, and any dupes we can find */
-		shopManager.clear();
+		if (shopManager != null) {
+			shopManager.clear();
+		}
 		/* Empty the buffer */
-		database.close();
+		if (database != null) {
+			database.close();
+		}
 		try {
 			this.database.getConnection().close();
 		} catch (final SQLException e) {
@@ -336,11 +338,6 @@ public class QuickShop extends JavaPlugin {
 		}
 		this.getLogger().info("载入完成! 版本: " + this.getDescription().getVersion() + " 重制 by 喵♂呜");
 		new VersionChecker(this);
-		try {
-			final Metrics metrics = new Metrics(this);
-			metrics.start();
-		} catch (final IOException e) {
-		}
 	}
 
 	@Override