Merge branch 'base' into mc/1.13

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

BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java

@@ -85,7 +85,6 @@ public BukkitPlugin() {
 
 	@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 void onEnable() {
 				this.pluginInstance.unload();
 			}
 		});
+
+		//init bstats
+		new MetricsLite(this);
 	}
 
 	@Override

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

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,17 +89,14 @@ public class SpongePlugin implements ServerInterface {
 	private List<SpongePlayer> 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<>();
 		this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
 
 		this.pluginInstance = new Plugin("sponge", this);
 		this.commands = new SpongeCommands(pluginInstance);
-
-		//init bstats metrics
-		bstatsFactory.make(5911);
 	}
 
 	@Listener

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