add mods and plugins to server response

pom.xml

@@ -59,14 +59,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-
-            <!-- Exclude the default Jackson dependency -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-json</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Redis for caching -->

src/main/java/cc.fascinated/Main.java

@@ -1,6 +1,7 @@
 package cc.fascinated;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.boot.SpringApplication;
@@ -16,7 +17,9 @@ import java.util.Objects;
 @SpringBootApplication
 public class Main {
 
-    public static final Gson GSON = new Gson();
+    public static final Gson GSON = new GsonBuilder()
+            .setDateFormat("MM-dd-yyyy HH:mm:ss")
+            .create();
     public static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient();
 
     @SneakyThrows

src/main/java/cc.fascinated/common/PlayerUtils.java

@@ -60,7 +60,7 @@ public class PlayerUtils {
      * @return the part data
      */
     public static byte[] getSkinPartBytes(Skin skin, Skin.Parts part, int size) {
-        if (size == -1) {
+        if (size <= 0) {
             size = part.getDefaultSize();
         }
 

src/main/java/cc.fascinated/common/ServerUtils.java

@@ -1,6 +1,5 @@
 package cc.fascinated.common;
 
-import cc.fascinated.exception.impl.BadRequestException;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

src/main/java/cc.fascinated/config/Config.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
 @Getter
+@Configuration
 public class Config {
     public static Config INSTANCE;
 

src/main/java/cc.fascinated/controller/ServerController.java

@@ -1,7 +1,5 @@
 package cc.fascinated.controller;
 
-import cc.fascinated.common.ServerUtils;
-import cc.fascinated.common.Tuple;
 import cc.fascinated.model.cache.CachedMinecraftServer;
 import cc.fascinated.service.MojangService;
 import cc.fascinated.service.ServerService;

src/main/java/cc.fascinated/model/cache/CachedPlayerSkinPart.java

@@ -1,6 +1,9 @@
 package cc.fascinated.model.cache;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
 

src/main/java/cc.fascinated/model/mojang/JavaServerStatusToken.java

@@ -22,6 +22,16 @@ public final class JavaServerStatusToken {
      */
     private final MinecraftServer.Players players;
 
+    /**
+     * The mods running on the server.
+     */
+    private final MinecraftServer.Mod[] mods;
+
+    /**
+     * The plugins running on the server.
+     */
+    private final MinecraftServer.Plugin[] plugins;
+
     /**
      * The motd of the server.
      */

src/main/java/cc.fascinated/model/server/JavaMinecraftServer.java

@@ -28,15 +28,28 @@ public final class JavaMinecraftServer extends MinecraftServer {
      */
     private Favicon favicon;
 
+    /**
+     * The mods of the server.
+     */
+    private MinecraftServer.Mod[] mods;
+
+    /**
+     * The plugins of the server.
+     */
+    private MinecraftServer.Plugin[] plugins;
+
     /**
      * The mojang banned status of the server.
      */
     private boolean mojangBanned;
 
-    public JavaMinecraftServer(String hostname, String ip, int port, MOTD motd, @NonNull Version version, Players players, Favicon favicon) {
+    public JavaMinecraftServer(String hostname, String ip, int port, MOTD motd, Players players,
+                               @NonNull Version version, Favicon favicon, Mod[] mods, Plugin[] plugins) {
         super(hostname, ip, port, motd, players);
         this.version = version;
         this.favicon = favicon;
+        this.mods = mods;
+        this.plugins = plugins;
     }
 
     /**
@@ -59,9 +72,11 @@ public final class JavaMinecraftServer extends MinecraftServer {
                 ip,
                 port,
                 MinecraftServer.MOTD.create(motdString),
-                token.getVersion().detailedCopy(),
                 token.getPlayers(),
-                JavaMinecraftServer.Favicon.create(token.getFavicon(), ServerUtils.getAddress(hostname, port))
+                token.getVersion().detailedCopy(),
+                JavaMinecraftServer.Favicon.create(token.getFavicon(), ServerUtils.getAddress(hostname, port)),
+                token.getMods(),
+                token.getPlugins()
         );
     }
 

src/main/java/cc.fascinated/model/server/MinecraftServer.java

@@ -108,7 +108,7 @@ public class MinecraftServer {
     /**
      * Player count data for a server.
      */
-    @AllArgsConstructor @Getter @ToString
+    @AllArgsConstructor @Getter
     public static class Players {
         /**
          * The online players on this server.
@@ -141,4 +141,40 @@ public class MinecraftServer {
             @NonNull private final String name;
         }
     }
+
+    /**
+     * Mod data for a server.
+     */
+    @AllArgsConstructor @Getter
+    public static final class Mod {
+
+        /**
+         * The name of the mod.
+         */
+        private final String name;
+
+
+        /**
+         * The version of the mod.
+         */
+        private final String version;
+    }
+
+    /**
+     * Plugin data for a server.
+     */
+    @AllArgsConstructor @Getter
+    public static final class Plugin {
+
+        /**
+         * The name of the plugin.
+         */
+        private final String name;
+
+
+        /**
+         * The version of the plugin.
+         */
+        private final String version;
+    }
 }

src/main/java/cc.fascinated/repository/PlayerSkinPartCacheRepository.java

@@ -1,6 +1,5 @@
 package cc.fascinated.repository;
 
-import cc.fascinated.model.cache.CachedPlayerName;
 import cc.fascinated.model.cache.CachedPlayerSkinPart;
 import org.springframework.data.repository.CrudRepository;
 

src/main/resources/application.yml

@@ -3,9 +3,9 @@ server:
   port: 80
   servlet:
     context-path: /
-  error:
+
-    whitelabel:
+# The public URL of the application
-      enabled: false
+public-url: http://localhost:80
 
 # Spring Configuration
 spring:
@@ -17,4 +17,7 @@ spring:
       database: 0
       auth: "" # Leave blank for no auth
 
-public-url: http://localhost:80
+  # Don't serialize null values
+  jackson:
+    default-property-inclusion: non_null
+