Clean up and multiversion ApplyCosmetics

Author: Deftu

src/main/kotlin/org/polyfrost/polyplus/client/PolyPlusClient.kt

@@ -29,6 +29,7 @@ import org.polyfrost.polyplus.client.network.http.PolyAuthorization
 import org.polyfrost.polyplus.client.network.http.PolyCosmetics
 import org.polyfrost.polyplus.client.network.websocket.PolyConnection
 import org.polyfrost.polyplus.client.network.websocket.ServerboundPacket
+import org.polyfrost.polyplus.utils.EarlyInitializable
 import org.polyfrost.polyui.data.PolyImage
 import org.polyfrost.polyui.utils.image
 
@@ -59,9 +60,7 @@ object PolyPlusClient {
 
         listOf(
             ApplyCosmetics
-        ).forEach {
-            EventManager.INSTANCE.register(it)
-        }
+        ).forEach(EarlyInitializable::earlyInitialize)
 
         DiscordPresence.initialize()
         PolyConnection.initialize {

src/main/kotlin/org/polyfrost/polyplus/client/cosmetics/ApplyCosmetics.kt

@@ -1,65 +1,99 @@
 package org.polyfrost.polyplus.client.cosmetics
 
-import dev.deftu.omnicore.api.client.player
 import net.minecraft.network.play.server.S38PacketPlayerListItem
-import net.minecraftforge.event.world.WorldEvent
 import org.apache.logging.log4j.LogManager
+import org.polyfrost.oneconfig.api.event.v1.eventHandler
 import org.polyfrost.oneconfig.api.event.v1.events.PacketEvent
-import org.polyfrost.oneconfig.api.event.v1.invoke.impl.Subscribe
+import org.polyfrost.oneconfig.api.event.v1.events.WorldEvent
 import org.polyfrost.polyplus.client.network.http.PolyCosmetics
 import org.polyfrost.polyplus.client.network.websocket.ClientboundPacket
 import org.polyfrost.polyplus.client.network.websocket.PolyConnection
 import org.polyfrost.polyplus.client.network.websocket.ServerboundPacket
 import org.polyfrost.polyplus.events.WebSocketMessage
 import org.polyfrost.polyplus.utils.Batcher
+import org.polyfrost.polyplus.utils.EarlyInitializable
 import java.time.Duration
 import java.util.UUID
 import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.collections.iterator
 
-object ApplyCosmetics {
+//#if MC >= 1.20.1
+//$$ import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket
+//#endif
+
+object ApplyCosmetics : EarlyInitializable {
     private val LOGGER = LogManager.getLogger()
     private val BATCHER = Batcher(Duration.ofMillis(200), HashSet<String>()) { players ->
         PolyConnection.sendPacket(ServerboundPacket.GetActiveCosmetics(players.toList()))
     }
 
-    @Subscribe
-    fun onWorldLoad(event: WorldEvent.Load) {
-        PolyCosmetics.reset()
+    override fun earlyInitialize() {
+        eventHandler<WorldEvent.Load> {
+            PolyCosmetics.reset()
+        }.register()
+
+        eventHandler<WebSocketMessage> { event ->
+            val cosmeticInfo = event.packet as? ClientboundPacket.CosmeticsInfo ?: return@eventHandler
+
+            // todo: have a map of type to valid ids? or ask ty to include type in the returned info. for now theyre all capes.
+            for ((uuid, active) in cosmeticInfo.all) {
+                active.forEach {
+                    PolyCosmetics.cacheActive(UUID.fromString(uuid), "cape", it)
+                    LOGGER.info("Cached cosmetic for player $uuid: cape -> $it")
+                }
+            }
+        }.register()
+
+        eventHandler<PacketEvent.Receive> { event ->
+            val packet = event.getPacket<Any>() as? S38PacketPlayerListItem ?: return@eventHandler
+
+            //#if MC >= 1.20.1
+            //$$ for (action in packet.actions()) {
+            //$$     processPlayerInfoAction(action, packet.entries())
+            //$$ }
+            //#else
+            processPlayerInfoAction(packet.action, packet.entries)
+            //#endif
+        }
+
+        //#if MC >= 1.20.1
+        //$$ eventHandler<PacketEvent.Receive> { event ->
+        //$$     val packet = event.getPacket<Any>() as? ClientboundPlayerInfoRemovePacket ?: return@eventHandler
+        //$$     for (uuid in packet.profileIds) {
+        //$$         PolyCosmetics.removeFromCache(uuid)
+        //$$     }
+        //$$ }
+        //#endif
     }
 
-    @Subscribe
-    fun onPlayerList(event: PacketEvent.Receive) {
-        // Not sure how to cleanly make this version agnostic atm.
-        val packet = try { event.getPacket<S38PacketPlayerListItem>() ?: return } catch (e: Exception) { return }
-        when (packet.action) {
+    private fun processPlayerInfoAction(action: S38PacketPlayerListItem.Action, entries: List<S38PacketPlayerListItem.AddPlayerData>) {
+        when (action) {
             S38PacketPlayerListItem.Action.ADD_PLAYER -> {
-                packet.entries.forEach {
-                    // mojang doesnt use uuidv2 so if it is, its a bot and wont have a cape.
-                    if (it.profile.id.version() != 2) BATCHER.add(it.profile.id.toString())
+                entries.forEach { playerData ->
+                    val uuid = playerData.profile?.id ?: return@forEach
+                    if (uuid.isRealPlayer()) {
+                        BATCHER.add(uuid.toString())
+                    }
                 }
             }
 
+            //#if MC < 1.20.1
             S38PacketPlayerListItem.Action.REMOVE_PLAYER -> {
-                for (entry in packet.entries) {
+                for (entry in entries) {
                     PolyCosmetics.removeFromCache(entry.profile.id)
                 }
             }
+            //#endif
 
             else -> return
         }
     }
 
-    @Subscribe
-    fun onRecieveCosmetics(event: WebSocketMessage) {
-        val cosmeticInfo = event.packet as? ClientboundPacket.CosmeticsInfo ?: return
-        // todo: have a map of type to valid ids? or ask ty to include type in the returned info. for now theyre all capes.
-        for ((uuid, active) in cosmeticInfo.all) {
-            active.forEach {
-                PolyCosmetics.cacheActive(UUID.fromString(uuid), "cape", it)
-                LOGGER.info("Cached cosmetic for player $uuid: cape -> $it")
-            }
-        }
+    /**
+     * Mojang doesn't use UUID v2 so, if it is, it's a bot and won't have cosmetics
+     */
+    private fun UUID.isRealPlayer(): Boolean {
+        return this.version() != 2
     }
 }

src/main/kotlin/org/polyfrost/polyplus/utils/EarlyInitializable.kt

@@ -0,0 +1,5 @@
+package org.polyfrost.polyplus.utils
+
+interface EarlyInitializable {
+    fun earlyInitialize()
+}