Correct version dection for SpongeAPI 8

ME1312 · Jul 30, 2018 · cc88e6b · cc88e6b
1 parent d4f4a1c
commit cc88e6b
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 4 deletions.
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java
@@ -43,9 +43,11 @@ public SubAddHostEvent(UUID player, String host) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/...ervers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java b/...ervers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java
@@ -54,9 +54,11 @@ public String getHost() {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java
@@ -112,9 +112,11 @@ public int getPort() {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/...rvers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java b/...rvers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java
@@ -72,9 +72,11 @@ public boolean isPermanent() {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/...s.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java b/...s.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java
@@ -21,9 +21,11 @@ public SubNetworkConnectEvent(SubDataClient network) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return An empty cause list
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().build();
     }

diff --git a/...lient/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java b/...lient/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java
@@ -12,9 +12,11 @@ public class SubNetworkDisconnectEvent extends AbstractEvent implements SubEvent
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return An empty cause list
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().build();
     }

diff --git a/...rvers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java b/...rvers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java
@@ -43,9 +43,11 @@ public SubRemoveHostEvent(UUID player, String host) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/...ers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java b/...ers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java
@@ -54,9 +54,11 @@ public String getHost() {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/...vers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java b/...vers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java
@@ -63,9 +63,11 @@ public void setCommand(String value) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java
@@ -44,9 +44,11 @@ public SubStartEvent(UUID player, String server) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java
@@ -56,9 +56,11 @@ public boolean isForced() {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return The player who triggered this event under the key: player
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().named("player", player).build();
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java
@@ -31,9 +31,11 @@ public SubStoppedEvent(String server) {
     /**
      * Gets the cause of this Event
      *
+     * @deprecated Use simplified methods where available
      * @return An empty cause list
      */
     @Override
+    @Deprecated
     public Cause getCause() {
         return Cause.builder().build();
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Metrics.java
@@ -197,7 +197,7 @@ private JsonObject getServerData() {
         playerAmount = playerAmount > 200 ? 200 : playerAmount;
         int onlineMode = Sponge.getServer().getOnlineMode() ? 1 : 0;
         String minecraftVersion = Sponge.getGame().getPlatform().getMinecraftVersion().getName();
-        String spongeImplementation = Sponge.getPlatform().getImplementation().getName();
+        String spongeImplementation = plugin.api.getServerVersion() + "";
 
         // OS/Java specific data
         String javaVersion = System.getProperty("java.version");

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java
@@ -13,6 +13,9 @@
 import net.ME1312.SubServers.Client.Sponge.Network.Packet.PacketDownloadPlayerList;
 import net.ME1312.SubServers.Client.Sponge.Network.Packet.PacketDownloadServerList;
 import net.ME1312.SubServers.Client.Sponge.Network.SubDataClient;
+import org.spongepowered.api.Platform;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.plugin.PluginContainer;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
@@ -367,7 +370,10 @@ public Version getPluginBuild() {
      * @return Server Version
      */
     public Version getServerVersion() {
-        return new Version(plugin.game.getPlatform().getImplementation().getVersion().get());
+        PluginContainer container = null;
+        if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getContainer", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class<Enum>) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION")), null);
+        if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform()), null);
+        return (container == null || !container.getVersion().isPresent())?null:new Version(container.getVersion().get());
     }
 
     /**

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java
@@ -156,10 +156,14 @@ public final class VERSION implements CommandExecutor {
         @SuppressWarnings("unchecked")
         public CommandResult execute(CommandSource sender, CommandContext args) throws CommandException {
             if (canRun(sender)) {
+                PluginContainer container = null;
+                if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getContainer", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class<Enum>) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION")), null);
+                if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform()), null);
+
                 sender.sendMessage(Text.of(plugin.api.getLang("SubServers", "Command.Version").replace("$str$", "SubServers.Client.Sponge")));
                 sender.sendMessage(Text.builder("  " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")).color(TextColors.WHITE).append(Text.of(",")).build());
                 sender.sendMessage(Text.builder("  Java " + System.getProperty("java.version")).color(TextColors.WHITE).append(Text.of(",")).build());
-                sender.sendMessage(Text.builder("  " + Sponge.getPlatform().getImplementation().getName() + ' ' + Sponge.getPlatform().getImplementation().getVersion().get()).color(TextColors.WHITE).append(Text.of(",")).build());
+                sender.sendMessage(Text.builder("  " + container.getName() + ' ' + container.getVersion().get()).color(TextColors.WHITE).append(Text.of(",")).build());
                 sender.sendMessage(Text.builder("  SubServers.Client.Sponge v" + plugin.version.toExtendedString() + ((plugin.api.getPluginBuild() != null)?" (" + plugin.api.getPluginBuild() + ')':"")).color(TextColors.WHITE).build());
                 sender.sendMessage(Text.EMPTY);
                 plugin.game.getScheduler().createTaskBuilder().async().execute(() -> {
@@ -183,7 +187,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C
                             sender.sendMessage(Text.of(plugin.api.getLang("SubServers", "Command.Version.Outdated").replace("$name$", "SubServers.Client.Sponge").replace("$str$", updversion.toString()).replace("$int$", Integer.toString(updcount))));
                         }
                     } catch (Exception e) {}
-                });
+                }).submit(plugin);
                 return CommandResult.builder().successCount(1).build();
             } else {
                 sender.sendMessage(Text.of(plugin.api.getLang("SubServers", "Command.Generic.Invalid-Permission").replace("$str$", "subservers.command")));