diff --git a/Plan/build.gradle b/Plan/build.gradle index b34f5488e..76f31fbe1 100644 --- a/Plan/build.gradle +++ b/Plan/build.gradle @@ -66,7 +66,7 @@ subprojects { ext.slf4jVersion = "1.7.26" ext.geoIpVersion = "2.12.0" ext.guavaVersion = "26.0-jre" - ext.bstatsVersion = "1.2" + ext.bstatsVersion = "1.4" repositories { mavenCentral() @@ -89,7 +89,7 @@ subprojects { url = "https://repo.velocitypowered.com/snapshots/" } maven { // bStats Repository - url = "http://repo.bstats.org/content/repositories/releases/" + url = "https://repo.codemc.org/repository/maven-public" } maven { // PlanPluginBridge Repository url = "https://dl.bintray.com/rsl1122/Plan-repository" diff --git a/Plan/sponge/build.gradle b/Plan/sponge/build.gradle index 6b505aa2e..68c773acf 100644 --- a/Plan/sponge/build.gradle +++ b/Plan/sponge/build.gradle @@ -14,6 +14,4 @@ dependencies { shadowJar { configurations = [project.configurations.compile] - - relocate "org.bstats", "com.djrapitops.plan.utilities.metrics" } \ No newline at end of file diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/BStatsSponge.java b/Plan/sponge/src/main/java/com/djrapitops/plan/BStatsSponge.java index fbb324f1d..3ef868a6c 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/BStatsSponge.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/BStatsSponge.java @@ -17,16 +17,16 @@ package com.djrapitops.plan; import com.djrapitops.plan.db.Database; -import org.bstats.sponge.Metrics; +import org.bstats.sponge.Metrics2; import java.io.Serializable; public class BStatsSponge { - private final Metrics metrics; + private final Metrics2 metrics; private final Database database; - public BStatsSponge(Metrics metrics, Database database) { + public BStatsSponge(Metrics2 metrics, Database database) { this.metrics = metrics; this.database = database; } @@ -46,6 +46,6 @@ public class BStatsSponge { } protected void addStringSettingPie(String id, Serializable setting) { - metrics.addCustomChart(new Metrics.SimplePie(id, setting::toString)); + metrics.addCustomChart(new Metrics2.SimplePie(id, setting::toString)); } } diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java b/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java index a33bbce07..393f890a4 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java @@ -25,7 +25,7 @@ import com.djrapitops.plan.system.settings.theme.PlanColorScheme; import com.djrapitops.plugin.SpongePlugin; import com.djrapitops.plugin.command.ColorScheme; import com.djrapitops.plugin.logging.L; -import org.bstats.sponge.Metrics; +import org.bstats.sponge.Metrics2; import org.slf4j.Logger; import org.spongepowered.api.Game; import org.spongepowered.api.Sponge; @@ -55,7 +55,7 @@ import java.io.InputStream; public class PlanSponge extends SpongePlugin implements PlanPlugin { @com.google.inject.Inject - private Metrics metrics; + private Metrics2 metrics; @com.google.inject.Inject private Logger slf4jLogger;