ok

Author: chariskar

src/main/kotlin/net/chariskar/breakthemod/Breakthemod.kt

@@ -20,7 +20,7 @@ import net.chariskar.breakthemod.client.api.Command
 import net.chariskar.breakthemod.client.api.engine.NearbyEngine
 import net.chariskar.breakthemod.client.commands.Debug
 import net.chariskar.breakthemod.client.commands.discordId
-import net.chariskar.breakthemod.client.commands.findPlayer
+import net.chariskar.breakthemod.client.commands.FindPlayer
 import net.chariskar.breakthemod.client.commands.goto
 import net.chariskar.breakthemod.client.commands.help
 import net.chariskar.breakthemod.client.commands.lastSeen
@@ -59,7 +59,7 @@ class Breakthemod : ClientModInitializer {
             onlineStaff(),
             townless(),
             goto(),
-            findPlayer(),
+            FindPlayer(),
             lastSeen(),
             discordId(),
             locate(),

…reakthemod/client/commands/findPlayer.kt …reakthemod/client/commands/FindPlayer.ktsrc/main/kotlin/net/chariskar/breakthemod/client/commands/findPlayer.kt renamed to src/main/kotlin/net/chariskar/breakthemod/client/commands/FindPlayer.kt src/main/kotlin/net/chariskar/breakthemod/client/commands/findPlayer.kt renamed to src/main/kotlin/net/chariskar/breakthemod/client/commands/FindPlayer.kt

@@ -19,7 +19,7 @@ import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
 import net.minecraft.text.Text
 import net.minecraft.util.Formatting
 
-class findPlayer : Command() {
+class FindPlayer : Command() {
     init {
         name = "findPlayer"
         description = "Tells you where a player is based on the map api."
@@ -45,6 +45,8 @@ class findPlayer : Command() {
         val players: MutableList<MapResponse>? = null
     )
 
+
+
     override fun execute(ctx: CommandContext<FabricClientCommandSource>): Int {
         val name: String = ctx.getArgument("name", String::class.java)
         scope.launch {
@@ -80,6 +82,7 @@ class findPlayer : Command() {
         }
         return 0
     }
+
     override fun register(dispatcher: CommandDispatcher<FabricClientCommandSource>) {
         dispatcher.register(
             LiteralArgumentBuilder.literal<FabricClientCommandSource>(name)

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

@@ -79,8 +79,8 @@ class Nation(val name: String) {
 
     @Serializable
     data class Ranks(
-        var Chancellor: List<Resident>? = null,
-        var Colonist: List<Resident>? = null,
-        var Diplomat: List<Resident>? = null
+        var Chancellor: List<Reference>? = null,
+        var Colonist: List<Reference>? = null,
+        var Diplomat: List<Reference>? = null
     )
 }

src/test/kotlin/net/chariskar/breakthemod/apiTest/EarthmcApiTest.kt

@@ -1,7 +1,9 @@
 package net.chariskar.breakthemod.apiTest;
 
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import net.chariskar.breakthemod.Main
+import net.chariskar.breakthemod.TestScope
 import net.chariskar.breakthemod.client.api.Fetch
 import net.chariskar.breakthemod.client.objects.Nation
 import net.chariskar.breakthemod.client.objects.Resident
@@ -15,10 +17,11 @@ import kotlin.test.assertIs
  * Test class for [net.chariskar.breakthemod.client.api.Fetch]
  * */
 class EarthmcApiTest {
+    val scope = TestScope.scope
 
     @Test
     fun `test GET request`() {
-        runBlocking {
+        scope.launch {
             val result = Fetch.getRequest<StaffList>(Main.config.staffRepoUrl)
             assertNotNull(result)
             assertIs<StaffList>(result)
@@ -27,7 +30,7 @@ class EarthmcApiTest {
 
     @Test
     fun `test towns`() {
-        runBlocking {
+        scope.launch {
             val result = Fetch.getTown("paris")
             assertNotNull(result)
             assertIs<Town>(result)
@@ -36,7 +39,7 @@ class EarthmcApiTest {
 
     @Test
     fun `test nations`() {
-        runBlocking {
+        scope.launch {
             val result = Fetch.getNation("france")
             assertNotNull(result)
             assertIs<Nation>(result)
@@ -45,7 +48,7 @@ class EarthmcApiTest {
 
     @Test
     fun `test players`() {
-        runBlocking {
+        scope.launch {
             val result = Fetch.getResident("charis_k")
             assertNotNull(result)
             assertIs<Resident>(result)