diff --git a/pom.xml b/pom.xml
index 9bb91b5..9b22193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,6 @@
local_repo
file://${project.basedir}/repo/
-
- reserve-repo
- https://dl.bintray.com/theneweconomy/java/
-
redprotect-repo
https://raw.githubusercontent.com/FabioZumbi12/RedProtect/mvn-repo/
@@ -63,14 +59,14 @@
junit
junit
- 4.13.1
+ 4.13.2
test
com.j256.ormlite
ormlite-jdbc
- 5.1
+ 6.1
compile
@@ -91,14 +87,14 @@
net.kyori
adventure-platform-bukkit
- 4.0.1
+ 4.1.1
compile
net.kyori
adventure-text-serializer-gson
- 4.9.1
+ 4.11.0
compile
@@ -112,14 +108,14 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
provided
org.bstats
bstats-bukkit
- 1.7
+ 3.0.0
compile
@@ -329,7 +325,7 @@
net.tnemc
Reserve
- 0.1.0.10
+ 0.1.5.4
provided
diff --git a/src/main/java/com/Acrobot/ChestShop/ChestShop.java b/src/main/java/com/Acrobot/ChestShop/ChestShop.java
index b79b6aa..fd6b406 100644
--- a/src/main/java/com/Acrobot/ChestShop/ChestShop.java
+++ b/src/main/java/com/Acrobot/ChestShop/ChestShop.java
@@ -66,6 +66,12 @@ import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.message.Message;
import org.bstats.bukkit.Metrics;
+import org.bstats.charts.AdvancedBarChart;
+import org.bstats.charts.DrilldownPie;
+import org.bstats.charts.MultiLineChart;
+import org.bstats.charts.SimpleBarChart;
+import org.bstats.charts.SimplePie;
+import org.bstats.charts.SingleLineChart;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Server;
@@ -433,7 +439,7 @@ public class ChestShop extends JavaPlugin {
Metrics bStats = new Metrics(this, 1109);
try {
String dist = new JarFile(this.getFile()).getManifest().getMainAttributes().getValue("Distribution-Type");
- bStats.addCustomChart(new Metrics.SimplePie("distributionType", () -> dist));
+ bStats.addCustomChart(new SimplePie("distributionType", () -> dist));
} catch (IOException ignored) {}
String serverVersion = getServer().getBukkitVersion().split("-")[0];
@@ -447,22 +453,22 @@ public class ChestShop extends JavaPlugin {
bStats.addCustomChart(createStaticDrilldownStat("versionJavaMc", javaVersion, serverVersion));
bStats.addCustomChart(createStaticDrilldownStat("versionMcJava", serverVersion, javaVersion));
- bStats.addCustomChart(new Metrics.SingleLineChart("shopAccounts", NameManager::getAccountCount));
- bStats.addCustomChart(new Metrics.MultiLineChart("transactionCount", () -> ImmutableMap.of(
+ bStats.addCustomChart(new SingleLineChart("shopAccounts", NameManager::getAccountCount));
+ bStats.addCustomChart(new MultiLineChart("transactionCount", () -> ImmutableMap.of(
"total", MetricsModule.getTotalTransactions(),
"buy", MetricsModule.getBuyTransactions(),
"sell", MetricsModule.getSellTransactions()
)));
- bStats.addCustomChart(new Metrics.MultiLineChart("itemCount", () -> ImmutableMap.of(
+ bStats.addCustomChart(new MultiLineChart("itemCount", () -> ImmutableMap.of(
"total", MetricsModule.getTotalItemsCount(),
"buy", MetricsModule.getSoldItemsCount(),
"sell", MetricsModule.getBoughtItemsCount()
)));
- bStats.addCustomChart(new Metrics.SimplePie("includeSettingsInMetrics", () -> Properties.INCLUDE_SETTINGS_IN_METRICS ? "enabled" : "disabled"));
+ bStats.addCustomChart(new SimplePie("includeSettingsInMetrics", () -> Properties.INCLUDE_SETTINGS_IN_METRICS ? "enabled" : "disabled"));
if (!Properties.INCLUDE_SETTINGS_IN_METRICS) return;
- bStats.addCustomChart(new Metrics.AdvancedBarChart("pluginProperties", () -> {
+ bStats.addCustomChart(new AdvancedBarChart("pluginProperties", () -> {
Map map = new LinkedHashMap<>();
map.put("ensure-correct-playerid", getChartArray(Properties.ENSURE_CORRECT_PLAYERID));
map.put("reverse-buttons", getChartArray(Properties.REVERSE_BUTTONS));
@@ -481,13 +487,13 @@ public class ChestShop extends JavaPlugin {
map.put("log-to-file", getChartArray(Properties.LOG_TO_FILE));
return map;
}));
- bStats.addCustomChart(new Metrics.SimpleBarChart("shopContainers",
+ bStats.addCustomChart(new SimpleBarChart("shopContainers",
() -> Properties.SHOP_CONTAINERS.stream().map(Material::name).collect(Collectors.toMap(k -> k, k -> 1))));
}
- private Metrics.DrilldownPie createStaticDrilldownStat(String statId, String value1, String value2) {
+ private DrilldownPie createStaticDrilldownStat(String statId, String value1, String value2) {
final Map> map = ImmutableMap.of(value1, ImmutableMap.of(value2, 1));
- return new Metrics.DrilldownPie(statId, () -> map);
+ return new DrilldownPie(statId, () -> map);
}
private int[] getChartArray(boolean value) {
diff --git a/src/main/java/com/Acrobot/ChestShop/Database/DaoCreator.java b/src/main/java/com/Acrobot/ChestShop/Database/DaoCreator.java
index 94a0ab2..ffc7b92 100644
--- a/src/main/java/com/Acrobot/ChestShop/Database/DaoCreator.java
+++ b/src/main/java/com/Acrobot/ChestShop/Database/DaoCreator.java
@@ -4,8 +4,8 @@ import com.Acrobot.ChestShop.ChestShop;
import com.j256.ormlite.dao.Dao;
import com.j256.ormlite.dao.DaoManager;
import com.j256.ormlite.dao.LruObjectCache;
-import com.j256.ormlite.db.SqliteDatabaseType;
import com.j256.ormlite.jdbc.JdbcConnectionSource;
+import com.j256.ormlite.jdbc.db.SqliteDatabaseType;
import com.j256.ormlite.support.ConnectionSource;
import com.j256.ormlite.table.TableUtils;
diff --git a/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java b/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java
index 2f8204f..4c8f26b 100644
--- a/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java
+++ b/src/main/java/com/Acrobot/ChestShop/Database/Migrations.java
@@ -113,7 +113,7 @@ public class Migrations {
}
try {
results.close();
- } catch (IOException e1) {
+ } catch (Exception e1) {
ChestShop.getBukkitLogger().log(Level.WARNING, "Error while closing results! " + e.getMessage());
}
ChestShop.getBukkitLogger().log(Level.INFO, success + " accounts successfully migrated. " + error + " accounts failed to migrate!");