Merge pull request #19 from RedCokeDevelopment/dev

Version 0.1.4

Author: RedTeaDev

MCServerPing.iml

@@ -6,7 +6,7 @@
 
     <groupId>dev.redcoke</groupId>
     <artifactId>mcserverping</artifactId>
-    <version>0.1.3</version>
+    <version>0.1.4</version>
 
     <name>MCServerPing</name>
     <description>A Java API for obtaining info about a Minecraft Server</description>
@@ -81,18 +81,18 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>dnsjava</groupId>
             <artifactId>dnsjava</artifactId>
-            <version>3.4.3</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
@@ -103,18 +103,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.0-M1</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.3.1</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.0-M1</version>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

mcserverping.iml

@@ -112,16 +112,16 @@ public static MCServerPingResponse getPing(final String address, final int port)
       in.readFully(data);
       json = new String(data, StandardCharsets.UTF_8);
 
-      // Ping ->
-      out.writeByte(0x09); // Packet Size
-      out.writeByte(0x01); // Ping Packet
-      out.writeLong(System.currentTimeMillis());
-
-      // Ping <-
-      readVarInt(in);
-      id = readVarInt(in);
-      io(id == -1, "Server ended data stream unexpectedly.");
-      io(id != 0x01, "Server returned invalid packet"); // Check Ping Packet
+//      // Ping ->
+//      out.writeByte(0x09); // Packet Size
+//      out.writeByte(0x01); // Ping Packet
+//      out.writeLong(System.currentTimeMillis());
+//
+//      // Ping <-
+//      readVarInt(in);
+//      id = readVarInt(in);
+//      io(id == -1, "Server ended data stream unexpectedly.");
+//      io(id != 0x01, "Server returned invalid packet"); // Check Ping Packet
 
     }
 

pom.xml

@@ -15,7 +15,7 @@ public final class MCServerPingResponse {
   private final JsonArray descriptionExtras;
   private final String serverIcon;
 
-  public MCServerPingResponse(int ping, String name, int protocol, int playerMax, int playerOnline, String motd, JsonArray descriptionExtras, String serverIcon) {
+  public MCServerPingResponse(int ping, String name, int protocol, Integer playerMax, Integer playerOnline, String motd, JsonArray descriptionExtras, String serverIcon) {
     this.ping = ping;
     this.version = name;
     this.protocol = protocol;
@@ -27,15 +27,20 @@ public MCServerPingResponse(int ping, String name, int protocol, int playerMax,
   }
 
   public static MCServerPingResponse serverPingFromJsonObj(JsonObject jsonObj) {
+    int serverPing = jsonObj.get("ping").getAsInt();
+    String versionName = jsonObj.get("version").getAsString();
+    int serverProtocol = jsonObj.get("protocol").getAsInt();
+    Integer playerMax = null;
+    Integer playerOnline = null;
+    if (jsonObj.has("players")) { // Players object is optional somehow
+      playerMax = jsonObj.get("players").getAsJsonObject().get("max").getAsInt();
+      playerOnline = jsonObj.get("players").getAsJsonObject().get("online").getAsInt();
+    }
+    String serverMOTD = jsonObj.get("description").getAsJsonObject().get("text").getAsString();
+    JsonArray serverDescriptionExtra = (jsonObj.get("description").getAsJsonObject().get("extra") == null) ? null : jsonObj.get("description").getAsJsonObject().get("extra").getAsJsonArray();
+    String favIcon = jsonObj.get("favicon").getAsString();
     return new MCServerPingResponse(
-            jsonObj.get("ping").getAsInt(),
-            jsonObj.get("version").getAsJsonObject().get("name").getAsString(),
-            jsonObj.get("version").getAsJsonObject().get("protocol").getAsInt(),
-            jsonObj.get("players").getAsJsonObject().get("max").getAsInt(),
-            jsonObj.get("players").getAsJsonObject().get("online").getAsInt(),
-            jsonObj.get("description").getAsJsonObject().get("text").getAsString(),
-            (jsonObj.get("description").getAsJsonObject().get("extra") == null) ? null : jsonObj.get("description").getAsJsonObject().get("extra").getAsJsonArray(),
-            (jsonObj.get("favicon") == null) ? null : jsonObj.get("favicon").getAsString()
+            serverPing, versionName, serverProtocol, playerMax, playerOnline, serverMOTD, serverDescriptionExtra, favIcon
     );
   }
 
@@ -51,11 +56,11 @@ public int getProtocol() {
     return protocol;
   }
 
-  public int getPlayerMax() {
+  public Integer getPlayerMax() {
     return maxPlayers;
   }
 
-  public int getPlayerOnline() {
+  public Integer getPlayerOnline() {
     return onlinePlayers;
   }
 

src/main/java/dev/redcoke/mcserverping/MCServerPing.java

@@ -0,0 +1,22 @@
+package dev.redcoke.mcserverping;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+class MCServerPingDemoTest {
+  @Test
+  void test() {
+    List<String> servers = List.of("hypixel.net", "2b2t.org", "play.cubecraft.net", "play.potwmc.com");
+    for (var server : servers) {
+      try {
+        MCServerPing.getPing(server, 25565).getAsJsonString();
+      } catch (IOException | TimeoutException ex) {
+        Assertions.fail(ex);
+      }
+    }
+  }
+}