Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 19:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Updated bStats from 1.2 to 1.4

Browse Source
This commit is contained in:
Rsl1122 2019-04-30 19:12:41 +03:00
parent 9af59d4d2a
commit b9853ac961
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/build.gradle
View File

@ -66,7 +66,7 @@ subprojects {
ext.slf4jVersion = "1.7.26" ext.slf4jVersion = "1.7.26"
ext.geoIpVersion = "2.12.0" ext.geoIpVersion = "2.12.0"
ext.guavaVersion = "26.0-jre" ext.guavaVersion = "26.0-jre"
ext.bstatsVersion = "1.2" ext.bstatsVersion = "1.4"
repositories { repositories {
mavenCentral() mavenCentral()
@ -89,7 +89,7 @@ subprojects {
url = "https://repo.velocitypowered.com/snapshots/" url = "https://repo.velocitypowered.com/snapshots/"
} }
maven { // bStats Repository maven { // bStats Repository
url = "http://repo.bstats.org/content/repositories/releases/" url = "https://repo.codemc.org/repository/maven-public"
} }
maven { // PlanPluginBridge Repository maven { // PlanPluginBridge Repository
url = "https://dl.bintray.com/rsl1122/Plan-repository" url = "https://dl.bintray.com/rsl1122/Plan-repository"

2
Plan/sponge/build.gradle
View File

@ -14,6 +14,4 @@ dependencies {
shadowJar { shadowJar {
configurations = [project.configurations.compile] configurations = [project.configurations.compile]
relocate "org.bstats", "com.djrapitops.plan.utilities.metrics"
} }

8
Plan/sponge/src/main/java/com/djrapitops/plan/BStatsSponge.java
View File

@ -17,16 +17,16 @@
package com.djrapitops.plan; package com.djrapitops.plan;
import com.djrapitops.plan.db.Database; import com.djrapitops.plan.db.Database;
import org.bstats.sponge.Metrics; import org.bstats.sponge.Metrics2;
import java.io.Serializable; import java.io.Serializable;
public class BStatsSponge { public class BStatsSponge {
private final Metrics metrics; private final Metrics2 metrics;
private final Database database; private final Database database;
public BStatsSponge(Metrics metrics, Database database) { public BStatsSponge(Metrics2 metrics, Database database) {
this.metrics = metrics; this.metrics = metrics;
this.database = database; this.database = database;
} }
@ -46,6 +46,6 @@ public class BStatsSponge {
} }
protected void addStringSettingPie(String id, Serializable setting) { protected void addStringSettingPie(String id, Serializable setting) {
metrics.addCustomChart(new Metrics.SimplePie(id, setting::toString)); metrics.addCustomChart(new Metrics2.SimplePie(id, setting::toString));
} }
} }

4
Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java
View File

@ -25,7 +25,7 @@ import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
import com.djrapitops.plugin.SpongePlugin; import com.djrapitops.plugin.SpongePlugin;
import com.djrapitops.plugin.command.ColorScheme; import com.djrapitops.plugin.command.ColorScheme;
import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.L;
import org.bstats.sponge.Metrics; import org.bstats.sponge.Metrics2;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.spongepowered.api.Game; import org.spongepowered.api.Game;
import org.spongepowered.api.Sponge; import org.spongepowered.api.Sponge;
@ -55,7 +55,7 @@ import java.io.InputStream;
public class PlanSponge extends SpongePlugin implements PlanPlugin { public class PlanSponge extends SpongePlugin implements PlanPlugin {
@com.google.inject.Inject @com.google.inject.Inject
private Metrics metrics; private Metrics2 metrics;
@com.google.inject.Inject @com.google.inject.Inject
private Logger slf4jLogger; private Logger slf4jLogger;