FakePlayer cleanup and better logic

Author: emyfops

src/main/kotlin/com/lambda/config/serializer/GameProfileCodec.kt

@@ -50,8 +50,8 @@ object GameProfileCodec : Codec<GameProfile>, Stringifiable<GameProfile> {
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ): GameProfile {
-        val name = json.asJsonObject.get("name")?.asString ?: "nil"
-        val id = json.asJsonObject.get("id")?.asString ?: "00000000-0000-0000-0000-000000000000"
+        val name = json.asJsonObject.get("name").asString
+        val id = json.asJsonObject.get("id").asString
         val parsedId =
             if (id.length == 32) id.replaceFirst(
                 "(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})".toRegex(),

src/main/kotlin/com/lambda/module/modules/combat/FakePlayer.kt

@@ -29,13 +29,11 @@ import com.lambda.network.mojang.getProfile
 import com.lambda.threading.onShutdown
 import com.lambda.util.Timer
 import com.lambda.util.player.FakePlayerId
-import com.lambda.util.player.spawnFakePlayer
 import com.mojang.authlib.GameProfile
 import com.mojang.datafixers.util.Either
 import net.minecraft.client.network.OtherClientPlayerEntity
 import net.minecraft.client.network.PlayerListEntry
 import java.util.*
-import kotlin.jvm.optionals.getOrElse
 import kotlin.jvm.optionals.getOrNull
 import kotlin.time.Duration.Companion.seconds
 
@@ -59,16 +57,16 @@ object FakePlayer : Module(
 
     init {
         listen<TickEvent.Pre> {
-            fakePlayer = cachedProfiles[playerName]
-                ?.let { spawnFakePlayer(it, fakePlayer ?: player, addToWorld = false) }
-                ?.takeUnless { it == fakePlayer?.gameProfile }
-                ?: fakePlayer?.takeIf { playerName == it.gameProfile.name }
-                        ?: spawnFakePlayer(nilProfile, fakePlayer ?: player, addToWorld = false)
+            val newFakePlayer = cachedProfiles[playerName]
+                ?.let { newFakePlayer(it) }
+                ?.takeUnless { it.gameProfile == fakePlayer?.gameProfile } // If the current profile equals the current fake player's profile, stop.
+
+            fakePlayer = newFakePlayer
+                ?: return@listen
         }
 
         listenConcurrently<TickEvent.Pre>(priority = 1000) {
             if (!fetchTimer.timePassed(2.seconds)) return@listenConcurrently
-
             cachedProfiles.getOrPut(playerName) { fetchProfile(playerName) }
         }
 
@@ -77,24 +75,33 @@ object FakePlayer : Module(
         }
 
         listen<ConnectionEvent.Connect.Pre> { disable() }
-        onShutdown { disable() }
+
+        onShutdown { disable() } // FixMe: This doesn't work because the hook triggers after the modules are saved.
+
         onDisable { fakePlayer?.discard(); fakePlayer = null }
     }
 
+    fun SafeContext.newFakePlayer(profile: GameProfile) =
+        OtherClientPlayerEntity(world, profile).apply {
+            copyFrom(player)
+            id = FakePlayerId
+        }
+
     suspend fun SafeContext.fetchProfile(user: String): GameProfile {
-        val requestedProfile = getProfile(user).getOrElse { return nilProfile }
+        val requestedProfile = getProfile(user)
+            .getOrElse { return nilProfile }
 
         // Fetch the skin properties from mojang
         val properties = mc.apiServices.profileResolver
-            .getProfile(Either.right(requestedProfile.id)).getOrNull()?.properties
+            .getProfile(Either.right(requestedProfile.id))
+            .getOrNull()
+            ?.properties
+            ?: return nilProfile
 
-        // We use the nil profile to avoid the nil username if something wrong happens
-        // Check the GameProfile deserializer you'll understand
-        val profile = nilProfile
-        properties?.let { profile.properties.putAll(it) }
+        val profile = GameProfile(requestedProfile.id, requestedProfile.name, properties)
 
-        mc.networkHandler?.playerListEntries?.put(profile.id, PlayerListEntry(profile, false))
+	    connection.playerListEntries[profile.id] = PlayerListEntry(profile, false)
 
-        return profile
+	    return profile
     }
 }

src/main/kotlin/com/lambda/util/player/PlayerUtils.kt

@@ -20,11 +20,7 @@ package com.lambda.util.player
 import com.lambda.config.groups.BuildConfig
 import com.lambda.context.SafeContext
 import com.lambda.util.world.fastEntitySearch
-import com.mojang.authlib.GameProfile
 import net.minecraft.client.network.ClientPlayerEntity
-import net.minecraft.client.network.OtherClientPlayerEntity
-import net.minecraft.client.network.PlayerListEntry
-import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.entity.projectile.FireworkRocketEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket
@@ -58,23 +54,6 @@ fun SafeContext.copyPlayer(entity: ClientPlayerEntity) =
         isOnGround = entity.isOnGround
     }
 
-fun SafeContext.spawnFakePlayer(
-    profile: GameProfile,
-    reference: PlayerEntity = player,
-    addToWorld: Boolean = true
-): OtherClientPlayerEntity {
-    val entity = OtherClientPlayerEntity(world, profile).apply {
-        copyFrom(reference)
-
-        playerListEntry = PlayerListEntry(profile, false)
-        id = FakePlayerId
-    }
-
-    if (addToWorld) world.addEntity(entity)
-
-    return entity
-}
-
 fun SafeContext.swingHand(swingType: BuildConfig.SwingType, hand: Hand) =
     when (swingType) {
         BuildConfig.SwingType.Vanilla -> {