Fix casting and wildcard for converting server info. Improve code

Author: Fernthedev

bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/BungeeInterface.java

@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 public class BungeeInterface implements MethodInterface<ProxiedPlayer, CommandSender> {
-    private FernBungeeAPI fernBungeeAPI;
+    private final FernBungeeAPI fernBungeeAPI;
     private final Logger abstractLogger;
     private final IFConsole<CommandSender> console;
 

bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/network/BungeeNetworkHandler.java

@@ -28,7 +28,8 @@ public IServerInfo getServer(String name) {
     }
 
     @Override
-    public IServerInfo toServer(ServerInfo server) {
-        return new BungeeServerInfo(server);
+    public IServerInfo toServer(Object server) {
+        if (!(server instanceof ServerInfo)) throw new IllegalArgumentException("Server data " + server + " is not an instance of " + ServerInfo.class.getName());
+        return new BungeeServerInfo((ServerInfo) server);
     }
 }

bungee/src/main/java/com/github/fernthedev/fernapi/server/bungee/network/BungeeServerInfo.java

@@ -13,7 +13,7 @@
 public class BungeeServerInfo implements IServerInfo {
 
     @NonNull
-    private ServerInfo serverInfo;
+    private final ServerInfo serverInfo;
 
     /**
      * Get the name of this server.

core/src/main/java/com/github/fernthedev/fernapi/universal/handlers/NetworkHandler.java

@@ -11,5 +11,22 @@ public interface NetworkHandler<T> {
 
     IServerInfo getServer(String name);
 
-    IServerInfo toServer(T server);
+    /**
+     * Converts server-specific ServerInfo
+     * into a cross-server compatible abstracted
+     * instance
+     *
+     * @param server server instance
+     * @return abstract server data
+     */
+    IServerInfo toServer(Object server);
+
+    /**
+     * Convenience method for type-checking
+     * @param server type checked server
+     * @return abstract server data
+     */
+    default IServerInfo toServerTyped(T server) {
+        return toServer(server);
+    }
 }

spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/network/SpigotNetworkHandler.java

@@ -18,7 +18,7 @@ public boolean isRegistered(Object sender) {
     }
 
     @Getter
-    private SpigotServerInfo serverInfo = new SpigotServerInfo(Bukkit.getServer());
+    private final SpigotServerInfo serverInfo = new SpigotServerInfo(Bukkit.getServer());
 
     @Override
     public Map<String, IServerInfo> getServers() {
@@ -39,7 +39,7 @@ public IServerInfo getServer(String name) {
     }
 
     @Override
-    public IServerInfo toServer(Server server) {
+    public IServerInfo toServer(Object server) {
         return serverInfo;
     }
 }

spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/network/SpigotServerInfo.java

@@ -46,16 +46,15 @@
 public class SpigotServerInfo implements Server, IServerInfo {
 
     @NonNull
-    private Server server;
+    private final Server server;
+
+    private final InetSocketAddress address;
 
     public SpigotServerInfo(@NonNull Server server) {
         this.server = server;
         address = new InetSocketAddress(server.getPort());
     }
 
-    private final InetSocketAddress address;
-
-
 
     /**
      * Get the name of this server.

sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/network/SpongeNetworkHandler.java

@@ -15,14 +15,11 @@ public boolean isRegistered(Object sender) {
         return true;
     }
 
-    private SpongeServerInfo serverInfo = new SpongeServerInfo(Sponge.getServer());
+    private final SpongeServerInfo serverInfo = new SpongeServerInfo(Sponge.getServer());
 
     @Override
     public Map<String, IServerInfo> getServers() {
-        Map<String, IServerInfo> map = new HashMap<>();
-
-
-        return map;
+        return new HashMap<>();
     }
 
     @Override
@@ -35,7 +32,7 @@ public IServerInfo getServer(String name) {
     }
 
     @Override
-    public IServerInfo toServer(Server server) {
+    public IServerInfo toServer(Object server) {
         return serverInfo;
     }
 }

sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/network/SpongeServerInfo.java

@@ -13,7 +13,7 @@
 public class SpongeServerInfo implements IServerInfo {
 
     @NonNull
-    private Server server;
+    private final Server server;
 
     private final InetSocketAddress address = Sponge.getServer().getBoundAddress().get();
 

velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/interfaces/VelocityServerInfo.java

@@ -24,7 +24,7 @@
 public class VelocityServerInfo implements RegisteredServer, IServerInfo {
 
     @NonNull
-    private RegisteredServer serverInfo;
+    private final RegisteredServer serverInfo;
 
     /**
      * Get the name of this server.

velocity/src/main/java/com/github/fernthedev/fernapi/server/velocity/network/VelocityNetworkHandler.java

@@ -19,7 +19,7 @@ public boolean isRegistered(Object sender) {
     }
 
     @NonNull
-    private FernVelocityAPI plugin;
+    private final FernVelocityAPI plugin;
 
     @Override
     public Map<String, IServerInfo> getServers() {
@@ -35,7 +35,8 @@ public IServerInfo getServer(String name) {
     }
 
     @Override
-    public IServerInfo toServer(ServerConnection server) {
-        return new VelocityServerInfo(server.getServer());
+    public IServerInfo toServer(Object server) {
+        if (!(server instanceof ServerConnection)) throw new IllegalArgumentException("Server data " + server + " is not an instance of " + ServerConnection.class.getName());
+        return new VelocityServerInfo(((ServerConnection) server).getServer());
     }
 }