1
0
mirror of https://e.coding.net/circlecloud/QuickShop.git synced 2025-10-02 12:37:27 +00:00

3 Commits
1.4.4 ... 1.5

Author SHA1 Message Date
56e0fd8430 catch all error and exception while load magic lib...
Signed-off-by: 502647092 <jtb1@163.com>
2015-10-21 14:20:06 +08:00
fa9eead0a9 update pom and add update description...
Signed-off-by: 502647092 <jtb1@163.com>
2015-10-21 09:52:15 +08:00
6ed44b3def remove Plugin Metrics...
Signed-off-by: j502647092 <jtb1@163.com>
2015-10-21 00:31:36 +08:00
3 changed files with 14 additions and 30 deletions

27
pom.xml
View File

@ -3,7 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.maxgamer</groupId> <groupId>org.maxgamer</groupId>
<artifactId>QuickShop</artifactId> <artifactId>QuickShop</artifactId>
<version>1.4.4</version> <version>1.5</version>
<description>快捷商店重置版本...</description>
<build> <build>
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
<resources> <resources>
@ -31,14 +32,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>
@ -56,6 +52,11 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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> <repositories>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
@ -65,10 +66,6 @@
<id>sumcraft-repo</id> <id>sumcraft-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>
@ -102,15 +99,5 @@
<artifactId>WowSuchCleaner</artifactId> <artifactId>WowSuchCleaner</artifactId>
<version>1.6.1</version> <version>1.6.1</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>

View File

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

View File

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