From b532dc7f40a6e113864791ae1153e56116c02bee Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Fri, 21 Aug 2020 11:39:27 +0200 Subject: [PATCH 1/2] Downgrade bStats again due to version-conflicts --- BlueMapBukkit/build.gradle | 2 +- .../java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java | 4 +++- BlueMapSponge/build.gradle | 2 +- .../java/de/bluecolored/bluemap/sponge/SpongePlugin.java | 9 +++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/BlueMapBukkit/build.gradle b/BlueMapBukkit/build.gradle index ea7eb230..85909d4d 100644 --- a/BlueMapBukkit/build.gradle +++ b/BlueMapBukkit/build.gradle @@ -11,7 +11,7 @@ repositories { dependencies { shadow "org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT" - compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.7' + compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5' compile (project(':BlueMapCommon')) { //exclude dependencies provided by bukkit diff --git a/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java b/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java index a1192da2..a769c7bf 100644 --- a/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java +++ b/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java @@ -85,7 +85,6 @@ public class BukkitPlugin extends JavaPlugin implements ServerInterface, Listene @Override public void onEnable() { - new MetricsLite(this, 5912); //save world so the level.dat is present on new worlds Logger.global.logInfo("Saving all worlds once, to make sure the level.dat is present..."); @@ -137,6 +136,9 @@ public class BukkitPlugin extends JavaPlugin implements ServerInterface, Listene this.pluginInstance.unload(); } }); + + //init bstats + new MetricsLite(this); } @Override diff --git a/BlueMapSponge/build.gradle b/BlueMapSponge/build.gradle index 9b3c1001..51d9a1b3 100644 --- a/BlueMapSponge/build.gradle +++ b/BlueMapSponge/build.gradle @@ -1,7 +1,7 @@ dependencies { shadow "org.spongepowered:spongeapi:7.2.0" - compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.7' + compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5' compile (project(':BlueMapCommon')) { //exclude dependencies provided by sponge diff --git a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java index 10c9e43d..64931639 100644 --- a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java +++ b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java @@ -75,6 +75,10 @@ public class SpongePlugin implements ServerInterface { @ConfigDir(sharedRoot = false) private Path configurationDir; + @Inject + @SuppressWarnings("unused") + private MetricsLite2 metrics; + private Plugin pluginInstance; private SpongeCommands commands; @@ -85,7 +89,7 @@ public class SpongePlugin implements ServerInterface { private List onlinePlayerList; @Inject - public SpongePlugin(org.slf4j.Logger logger, MetricsLite2.Factory bstatsFactory) { + public SpongePlugin(org.slf4j.Logger logger) { Logger.global = new Slf4jLogger(logger); this.onlinePlayerMap = new ConcurrentHashMap<>(); @@ -93,9 +97,6 @@ public class SpongePlugin implements ServerInterface { this.pluginInstance = new Plugin("sponge", this); this.commands = new SpongeCommands(pluginInstance); - - //init bstats metrics - bstatsFactory.make(5911); } @Listener From 54dc6660506a094e09939b02dfd54cf0926d8109 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Fri, 21 Aug 2020 11:40:51 +0200 Subject: [PATCH 2/2] Push version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cc5e365c..f97e5c4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -coreVersion=0.10.2 +coreVersion=0.10.3 targetVersion=mc1.13 \ No newline at end of file