From 825306ba64a09e8976b6c77ed271137e61c72d48 Mon Sep 17 00:00:00 2001 From: jb-aero Date: Sun, 20 Mar 2016 23:23:07 -0400 Subject: [PATCH] Update to latest SpongeAPI release. --- mods/sponge/metrics-lite/pom.xml | 2 +- .../metrics-lite/src/main/java/org/mcstats/MetricsLite.java | 6 ++---- mods/sponge/metrics/pom.xml | 2 +- mods/sponge/metrics/src/main/java/org/mcstats/Metrics.java | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mods/sponge/metrics-lite/pom.xml b/mods/sponge/metrics-lite/pom.xml index f98212a..e8708ba 100644 --- a/mods/sponge/metrics-lite/pom.xml +++ b/mods/sponge/metrics-lite/pom.xml @@ -25,7 +25,7 @@ org.spongepowered spongeapi - 3.0.0 + 4.0.3 provided diff --git a/mods/sponge/metrics-lite/src/main/java/org/mcstats/MetricsLite.java b/mods/sponge/metrics-lite/src/main/java/org/mcstats/MetricsLite.java index 533fbc7..b253066 100644 --- a/mods/sponge/metrics-lite/src/main/java/org/mcstats/MetricsLite.java +++ b/mods/sponge/metrics-lite/src/main/java/org/mcstats/MetricsLite.java @@ -288,10 +288,8 @@ private void postPlugin(final boolean isPing) throws IOException { // Server software specific section String pluginName = plugin.getName(); boolean onlineMode = game.getServer().getOnlineMode(); // TRUE if online mode is enabled - String pluginVersion = plugin.getVersion(); - // TODO no visible way to get MC version at the moment - // TODO added by game.getPlatform().getMinecraftVersion() -- impl in 2.1 - String serverVersion = String.format("%s %s", "Sponge", game.getPlatform().getApi().getVersion()); + String pluginVersion = plugin.getVersion().orElse("unknownVersion"); + String serverVersion = String.format("%s %s (MC: %s)", "Sponge", game.getPlatform().getApi().getVersion(), game.getPlatform().getMinecraftVersion().getName()); int playersOnline = game.getServer().getOnlinePlayers().size(); // END server software specific section -- all code below does not use any code outside of this class / Java diff --git a/mods/sponge/metrics/pom.xml b/mods/sponge/metrics/pom.xml index 9725aaf..e7a3c21 100644 --- a/mods/sponge/metrics/pom.xml +++ b/mods/sponge/metrics/pom.xml @@ -25,7 +25,7 @@ org.spongepowered spongeapi - 3.0.0 + 4.0.3 provided diff --git a/mods/sponge/metrics/src/main/java/org/mcstats/Metrics.java b/mods/sponge/metrics/src/main/java/org/mcstats/Metrics.java index b5d28ac..ce41669 100644 --- a/mods/sponge/metrics/src/main/java/org/mcstats/Metrics.java +++ b/mods/sponge/metrics/src/main/java/org/mcstats/Metrics.java @@ -336,10 +336,8 @@ private void postPlugin(final boolean isPing) throws IOException { // Server software specific section String pluginName = plugin.getName(); boolean onlineMode = game.getServer().getOnlineMode(); // TRUE if online mode is enabled - String pluginVersion = plugin.getVersion(); - // TODO no visible way to get MC version at the moment - // TODO added by game.getPlatform().getMinecraftVersion() -- impl in 2.1 - String serverVersion = String.format("%s %s", "Sponge", game.getPlatform().getApi().getVersion()); + String pluginVersion = plugin.getVersion().orElse("unknownVersion"); + String serverVersion = String.format("%s %s (MC: %s)", "Sponge", game.getPlatform().getApi().getVersion(), game.getPlatform().getMinecraftVersion().getName()); int playersOnline = game.getServer().getOnlinePlayers().size(); // END server software specific section -- all code below does not use any code outside of this class / Java