fixes are reduced jar size

Author: chariskar

src/main/kotlin/net/chariskar/breakthemod/client/api/Fetch.kt

@@ -36,7 +36,7 @@ import java.net.http.HttpResponse
 object Fetch {
     val logger: Logger = LoggerFactory.getLogger("breakthemod")
 
-    val json: Json =  Json {
+    val json: Json = Json {
         ignoreUnknownKeys = true
     }
 
@@ -89,6 +89,7 @@ object Fetch {
                 .header("Content-Type", "application/json")
                 .POST(HttpRequest.BodyPublishers.ofString(body))
                 .build()
+
             val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString()).await()
             var body = response.body()
             if (body.startsWith("[[") && body.endsWith("]]")) {

src/main/kotlin/net/chariskar/breakthemod/client/commands/findPlayer.kt

@@ -8,6 +8,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder
 import com.mojang.brigadier.context.CommandContext
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.chariskar.breakthemod.client.api.Command
 import net.chariskar.breakthemod.client.api.Fetch
@@ -32,16 +33,24 @@ class findPlayer : Command() {
         val query: List<List<Double>>
     )
 
+    @Serializable
+    data class MapResponse(
+        val name: String? = null,
+        val x: Double,
+        val z: Double
+    )
+
     @Serializable
     data class ApiResponse(
         val max: Int? = null,
-        val players: MutableList<Location>? = null
+        val players: MutableList<MapResponse>? = null
     )
 
     override fun execute(ctx: CommandContext<FabricClientCommandSource>): Int {
         val name: String = ctx.getArgument("name", String::class.java)
         scope.launch {
-            val players: MutableList<Location>? = Fetch.getRequest<ApiResponse>(Config.getMapUrl() + "tiles/players.json")!!.players
+            val players: MutableList<MapResponse>? = Fetch.getRequest<ApiResponse>(Config.getMapUrl() + "tiles/players.json")!!.players
+
             if (players.isNullOrEmpty()) {
                 sendMessage(Text.literal("Received empty player list from map."), Formatting.RED)
                 return@launch
@@ -51,12 +60,15 @@ class findPlayer : Command() {
             for (player in players) {
                 if (player.name.equals(name, ignoreCase = true)) {
                     playerData.found = true
-                    playerData.x = player.location?.x!!
-                    playerData.z = player.location.z!!
+                    playerData.x = player.x
+                    playerData.z = player.z
 
-                    val coords = listOf(player.location.x, player.location.z)
+                    val coords = listOf(player.x, player.z)
                     val payload = Payload(listOf(coords))
-                    val locationData: Location? = Fetch.postRequest<Location>(Fetch.ItemTypes.LOCATION.url, Json.encodeToString(payload))
+                    val payloadJson = Json.encodeToString(payload)
+
+                    val locationData: Location? = Fetch.postRequest<List<Location>>(Fetch.ItemTypes.LOCATION.url, Json.encodeToString(payload))?.first()
+
                     if (locationData != null && locationData.isWilderness == false) {
                         playerData.townName = locationData.town?.name
                     }

src/main/kotlin/net/chariskar/breakthemod/client/objects/Coordinates.kt

@@ -0,0 +1,10 @@
+package net.chariskar.breakthemod.client.objects
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Coordinates(
+    val x: Double? = null,
+    val y: Double? = null,
+    val z: Double? = null
+)

src/main/kotlin/net/chariskar/breakthemod/client/objects/Location.kt

@@ -8,24 +8,6 @@ data class Location (
     val name: String? = null,
     val location: Coordinates? = null,
     val isWilderness: Boolean? = null,
-    val town: Town? = null,
-    val nation: Nation? = null
-) {
-    @Serializable
-    data class Coordinates(
-        val x: Double? = null,
-        val z: Double? = null
-    )
-
-    @Serializable
-    data class Town (
-        val name: String? = null,
-        val uuid: SerializableUUID? = null
-    )
-
-    @Serializable
-    data class Nation (
-        val name: String? = null,
-        val uuid: SerializableUUID? = null
-    )
-}
+    val town: Reference? = null,
+    val nation: Reference? = null
+)

src/main/kotlin/net/chariskar/breakthemod/client/objects/Nation.kt

@@ -28,31 +28,19 @@ class Nation(val name: String) {
     var dynmapColour: String? = null
     var dynmapOutline: String? = null
     var wiki: String? = null
-    var king: Leader? = null
-    var capital: Capital? = null
+    var king: Reference? = null
+    var capital: Reference? = null
     var timestamps: Timestamps? = null
     var status: Status? = null
     var stats: Stats? = null
     var coordinates: Coordinates? = null
-    var residents: List<Resident>? = null
-    var towns: List<Resident>? = null
-    var allies: List<Resident>? = null
-    var enemies: List<Resident>? = null
-    var sanctioned: List<Resident>? = null
+    var residents: List<Reference>? = null
+    var towns: List<Reference>? = null
+    var allies: List<Reference>? = null
+    var enemies: List<Reference>? = null
+    var sanctioned: List<Reference>? = null
     var ranks: Ranks? = null
 
-    @Serializable
-    data class Leader(
-        var name: String? = null,
-    val uuid: SerializableUUID? = null
-    )
-
-    @Serializable
-    data class Capital(
-        var name: String? = null,
-    val uuid: SerializableUUID? = null
-    )
-
     @Serializable
     data class Timestamps(
         var registered: Long? = null
@@ -89,12 +77,6 @@ class Nation(val name: String) {
         var yaw: Float? = null
     )
 
-    @Serializable
-    data class Resident(
-        var name: String? = null,
-    val uuid: SerializableUUID? = null
-    )
-
     @Serializable
     data class Ranks(
         var Chancellor: List<Resident>? = null,

src/main/kotlin/net/chariskar/breakthemod/client/objects/PlayerLocationInfo.kt

@@ -19,7 +19,7 @@ data class PlayerLocationInfo(
     override fun toString(): String {
         return if (!found) {
             "$username is either offline or not showing up on the map."
-        } else if (isWilderness) {
+        } else if (townName == null) {
             "$username at x: $x, z: $z is in wilderness."
         } else {
             "$username at x: $x, z: $z is in town: $townName."

src/main/kotlin/net/chariskar/breakthemod/client/objects/Town.kt

@@ -27,30 +27,19 @@ data class Town(
     val board: String? = null,
     val founder: String? = null,
     val wiki: String? = null,
-    val mayor: Mayor? = null,
-    val nation: Nation? = null,
+    val mayor: Reference? = null,
+    val nation: Reference? = null,
     val timestamps: Timestamps? = null,
     val status: Status? = null,
     val stats: Stats? = null,
     val perms: Perms? = null,
     val coordinates: Coordinates? = null,
-    val residents: List<Resident>? = null,
-    val trusted: List<Resident>? = null,
-    val outlaws: List<Resident>? = null,
+    val residents: List<Reference>? = null,
+    val trusted: List<Reference>? = null,
+    val outlaws: List<Reference>? = null,
     val quarters: List<Reference>? = null,
     val ranks: Ranks? = null
 ) {
-    @Serializable
-    data class Mayor(
-        val name: String? = null,
-        val uuid: SerializableUUID? = null
-    )
-
-    @Serializable
-    data class Nation(
-        val name: String? = null,
-        val uuid: SerializableUUID? = null
-    )
 
     @Serializable
     data class Timestamps(
@@ -120,12 +109,6 @@ data class Town(
         val yaw: Float? = null
     )
 
-    @Serializable
-    data class Resident(
-        val name: String? = null,
-        val uuid: SerializableUUID? = null
-    )
-
     @Serializable
     data class Ranks(
         @SerialName("Councilor") val councillor: List<Resident>? = null,