fix ItemStack and ItemStackList rule types

Author: LukynkaCZE

src/main/kotlin/io/github/dockyardmc/DockyardServer.kt

@@ -135,7 +135,7 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
         lateinit var versionInfo: Resources.DockyardVersionInfo
         lateinit var instance: DockyardServer
         val minecraftVersion = MinecraftVersions.v1_21_6
-        var allowAnyVersion: Boolean = false
+        var allowAnyVersion: Boolean = true
 
         val scheduler = GlobalScheduler("main_scheduler")
 

src/main/kotlin/io/github/dockyardmc/data/DataComponentPatch.kt

@@ -188,6 +188,22 @@ class DataComponentPatch(internal val components: Int2ObjectMap<DataComponent?>,
         }.getHashed()
     }
 
+    fun writeNoxesiumType(buffer: ByteBuf) {
+        val components = this.components.filter { it.value != null }
+        val emptyComponents = this.components.filter { it.value == null }
+
+        buffer.writeVarInt(components.size)
+        buffer.writeVarInt(emptyComponents.size)
+
+        components.forEach { (key, value) ->
+            buffer.writeString(DataComponentRegistry.getIdentifierById(key))
+            value!!.write(buffer)
+        }
+        emptyComponents.forEach { (key, _) ->
+            buffer.writeString(DataComponentRegistry.getIdentifierById(key))
+        }
+    }
+
     override fun write(buffer: ByteBuf) {
         var added = 0
         components.values.forEach { component ->

src/main/kotlin/io/github/dockyardmc/data/DataComponentRegistry.kt

@@ -15,6 +15,10 @@ object DataComponentRegistry {
     val dataComponentsByIdReversed = Object2IntOpenHashMap<KClass<out DataComponent>>()
     val dataComponentsByIdentifierReversed = Object2ObjectOpenHashMap<KClass<out DataComponent>, String>()
 
+    fun getIdentifierById(id: Int): String {
+        return dataComponentsByIdentifierReversed.getValue(dataComponentsById.getValue(id))
+    }
+
     val CUSTOM_DATA = register("minecraft:custom_data", CustomDataComponent::class)
     val MAX_STACK_SIZE = register("minecraft:max_stack_size", MaxStackSizeComponent::class)
     val MAX_DAMAGE = register("minecraft:max_damage", MaxDamageComponent::class)

src/main/kotlin/io/github/dockyardmc/noxesium/Noxesium.kt

@@ -1,23 +1,19 @@
 package io.github.dockyardmc.noxesium
 
 import com.noxcrew.noxesium.api.NoxesiumReferences
-import com.noxcrew.noxesium.api.protocol.ClientSettings
 import cz.lukynka.prettylog.LogType
 import cz.lukynka.prettylog.log
-import io.github.dockyardmc.events.EventPool
-import io.github.dockyardmc.events.Events
-import io.github.dockyardmc.events.PluginMessageReceivedEvent
-import io.github.dockyardmc.events.RegisterPluginChannelsEvent
+import io.github.dockyardmc.events.*
 import io.github.dockyardmc.events.noxesium.NoxesiumClientInformationEvent
 import io.github.dockyardmc.events.noxesium.NoxesiumClientSettingsEvent
 import io.github.dockyardmc.events.noxesium.NoxesiumPacketReceiveEvent
-import io.github.dockyardmc.nbt.nbt
 import io.github.dockyardmc.noxesium.protocol.NoxesiumPacket
 import io.github.dockyardmc.noxesium.protocol.clientbound.*
 import io.github.dockyardmc.noxesium.protocol.serverbound.*
 import io.github.dockyardmc.noxesium.rules.NoxesiumEntityRuleContainer
 import io.github.dockyardmc.noxesium.rules.NoxesiumRuleContainer
 import io.github.dockyardmc.player.Player
+import io.github.dockyardmc.player.PlayerManager
 import io.github.dockyardmc.profiler.profiler
 import io.github.dockyardmc.protocol.packets.ProtocolState
 import io.github.dockyardmc.protocol.packets.play.clientbound.ClientboundPlayPluginMessagePacket
@@ -45,7 +41,6 @@ object Noxesium {
     val globalRuleContainer: NoxesiumRuleContainer = NoxesiumRuleContainer()
     val globalEntityRuleContainer: NoxesiumEntityRuleContainer = NoxesiumEntityRuleContainer()
 
-    private val settings: MutableMap<Player, ClientSettings> = mutableMapOf()
     private val waiting: MutableList<Player> = mutableListOf()
 
     fun addPlayer(player: Player) {
@@ -111,7 +106,7 @@ object Noxesium {
 
             eventPool.on<NoxesiumClientSettingsEvent> { event ->
                 if (!_players.contains(event.player)) return@on
-                settings[event.player] = event.clientSettings
+                event.player.noxesiumIntegration.settings = event.clientSettings
             }
 
             eventPool.on<RegisterPluginChannelsEvent> { event ->
@@ -123,6 +118,17 @@ object Noxesium {
                 }
             }
 
+            eventPool.on<PlayerDisconnectEvent> { event ->
+                val player = event.player
+                this.globalEntityRuleContainer.removeEntity(player)
+                this.globalEntityRuleContainer.removeViewer(player)
+                this.globalRuleContainer.removeViewer(player)
+
+                PlayerManager.players.forEach { loopPlayer ->
+                    loopPlayer.noxesiumIntegration.entityRulesContainer.removeEntity(event.player)
+                }
+            }
+
         }
     }
 

src/main/kotlin/io/github/dockyardmc/noxesium/rules/NoxesiumRuleContainer.kt

@@ -1,6 +1,7 @@
 package io.github.dockyardmc.noxesium.rules
 
 import com.noxcrew.noxesium.api.util.DebugOption
+import io.github.dockyardmc.item.ItemStack
 import io.github.dockyardmc.noxesium.protocol.clientbound.ClientboundNoxesiumResetPacket
 import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.utils.Disposable
@@ -54,9 +55,9 @@ class NoxesiumRuleContainer : Viewable(), Disposable {
         set(NoxesiumRules.Server.DISABLE_BOAT_COLLISION.createRule(value))
     }
 
-//    fun customCreativeItems(value: List<ItemStack>) {
-//        rules.set(NoxesiumRules.Server.CUSTOM_CREATIVE_ITEMS.createRule(value))
-//    }
+    fun customCreativeItems(value: List<ItemStack>) {
+        set(NoxesiumRules.Server.CUSTOM_CREATIVE_ITEMS.createRule(value))
+    }
 
     fun disableDefferedChunkUpdates(value: Boolean) {
         set(NoxesiumRules.Server.DISABLE_DEFFERED_CHUNK_UPDATES.createRule(value))
@@ -78,7 +79,6 @@ class NoxesiumRuleContainer : Viewable(), Disposable {
         set(NoxesiumRules.Server.RESTRICT_DEBUG_OPTIONS.createRule(value.map { it.keyCode }))
     }
 
-    @Suppress("UNCHECKED_CAST")
     private fun updateViewer(player: Player) {
         // Reset all server rules
         player.sendPacket(ClientboundNoxesiumResetPacket(0x01).getPluginMessagePacket())

src/main/kotlin/io/github/dockyardmc/noxesium/rules/NoxesiumRules.kt

@@ -3,7 +3,9 @@ package io.github.dockyardmc.noxesium.rules
 import com.noxcrew.noxesium.api.protocol.rule.EntityRuleIndices
 import com.noxcrew.noxesium.api.protocol.rule.ServerRuleIndices
 import com.noxcrew.noxesium.api.qib.QibDefinition
-import io.github.dockyardmc.extentions.*
+import io.github.dockyardmc.extentions.asRGB
+import io.github.dockyardmc.extentions.writeString
+import io.github.dockyardmc.extentions.writeVarInt
 import io.github.dockyardmc.item.ItemStack
 import io.github.dockyardmc.protocol.types.writeList
 import io.github.dockyardmc.protocol.types.writeMap
@@ -96,14 +98,29 @@ object NoxesiumRules {
     }
 
     class ItemStackServerRule(index: Int, defaultV: ItemStack = ItemStack.AIR) : NoxesiumServerRule<ItemStack>(index, defaultV) {
+        companion object {
+            fun write(value: ItemStack, buffer: ByteBuf) {
+                if (value.isEmpty()) {
+                    buffer.writeVarInt(0)
+                } else {
+                    buffer.writeVarInt(1)
+                    buffer.writeString(value.material.identifier)
+                    value.components.writeNoxesiumType(buffer)
+                }
+            }
+        }
+
         override fun write(value: ItemStack, buffer: ByteBuf) {
-            value.write(buffer)
+            ItemStackServerRule.write(value, buffer)
         }
     }
 
     class ItemStackListServerRule(index: Int, defaultV: List<ItemStack> = listOf()) : NoxesiumServerRule<List<ItemStack>>(index, defaultV) {
         override fun write(value: List<ItemStack>, buffer: ByteBuf) {
-            buffer.writeList(value, ItemStack::write)
+            buffer.writeVarInt(value.size)
+            value.forEach { itemStack ->
+                ItemStackServerRule.write(itemStack, buffer)
+            }
         }
     }
 

src/main/kotlin/io/github/dockyardmc/player/systems/NoxesiumIntegration.kt

@@ -1,5 +1,6 @@
 package io.github.dockyardmc.player.systems
 
+import com.noxcrew.noxesium.api.protocol.ClientSettings
 import cz.lukynka.bindables.Bindable
 import io.github.dockyardmc.entity.Entity
 import io.github.dockyardmc.noxesium.Noxesium
@@ -17,6 +18,7 @@ class NoxesiumIntegration(val player: Player) : PlayerSystem {
     val rulesContainer: NoxesiumRuleContainer = NoxesiumRuleContainer()
     val entityRulesContainer: NoxesiumEntityRuleContainer = NoxesiumEntityRuleContainer()
     val isUsingNoxesium: Bindable<Boolean> = player.bindablePool.provideBindable(false)
+    var settings: ClientSettings? = null
 
     private var scheduledActions: MutableList<() -> Unit> = mutableListOf()