Update to 1.21.9

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     `java-library`
 }
 
-val minecraftVersion = "1.21.8"
+val minecraftVersion = "1.21.9"
 val dockyardVersion = properties["dockyard.version"]!!
 val gitBranch = "git rev-parse --abbrev-ref HEAD".runCommand()
 val gitCommit = "git rev-parse --short=8 HEAD".runCommand()

demo/build.gradle.kts

@@ -0,0 +1,28 @@
+plugins {
+    kotlin("jvm")
+}
+
+group = "io.github.dockyardmc.demo"
+version = parent!!.version
+
+repositories {
+    mavenCentral()
+    maven("https://mvn.devos.one/releases")
+    maven("https://mvn.devos.one/snapshots")
+    maven("https://jitpack.io")
+    maven("https://repo.spongepowered.org/repository/maven-public/")
+    maven("https://repo.viaversion.com")
+    maven("https://maven.noxcrew.com/public")
+}
+
+dependencies {
+    testImplementation(kotlin("test"))
+    implementation(project(":"))
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+kotlin {
+    jvmToolchain(21)
+}

demo/src/main/kotlin/io/github/dockyardmc/demo/Clanker.kt

@@ -0,0 +1,24 @@
+package io.github.dockyardmc.demo
+
+import io.github.dockyardmc.entity.ai.EntityBehaviourCoordinator
+import io.github.dockyardmc.entity.entities.CopperGolem
+import io.github.dockyardmc.location.Location
+
+class Clanker(location: Location) : CopperGolem(location) {
+
+    val brain = ClankerBehaviourCoordinator(this)
+
+    override fun tick() {
+        super.tick()
+        brain.tick()
+    }
+
+}
+
+class ClankerBehaviourCoordinator(entity: Clanker) : EntityBehaviourCoordinator(entity) {
+
+    init {
+        this.behaviours.add(EntityWalkAroundBehaviour(this))
+    }
+
+}

demo/src/main/kotlin/io/github/dockyardmc/demo/WalkAroundBehaviourNode.kt

@@ -0,0 +1,72 @@
+package io.github.dockyardmc.demo
+
+import io.github.dockyardmc.entity.Entity
+import io.github.dockyardmc.entity.ai.EntityBehaviourCoordinator
+import io.github.dockyardmc.entity.ai.EntityBehaviourNode
+import io.github.dockyardmc.entity.ai.EntityBehaviourResult
+import io.github.dockyardmc.pathfinding.PatheticPlatformDockyard.toPathPosition
+import io.github.dockyardmc.pathfinding.PathfindingHelper
+import io.github.dockyardmc.registry.Sounds
+import io.github.dockyardmc.scheduler.runnables.ticks
+import io.github.dockyardmc.sounds.Sound
+import io.github.dockyardmc.utils.debug
+import kotlin.random.Random
+
+class EntityWalkAroundBehaviour(val coordinator: EntityBehaviourCoordinator) : EntityBehaviourNode() {
+
+    override val interruptible: Boolean = true
+    var failedTimes: Int = 0
+
+    override fun getScorer(entity: Entity): Float {
+        return 0.05f
+    }
+
+    override fun onStart(entity: Entity) {
+        var foundPath = false
+        this.cooldown = Random.nextInt(40, 80).ticks
+
+        coordinator.navigator.navigationCompleteDispatcher.subscribe {
+            getBehaviourFuture().complete(EntityBehaviourResult.SUCCESS)
+        }
+        coordinator.navigator.navigationNodeStepDispatcher.subscribe {
+            entity.playSoundToViewers(Sound(Sounds.ENTITY_COPPER_GOLEM_STEP))
+        }
+
+        entity.location.getBlocksInRadius(10).shuffled().forEach blockLoop@{ location ->
+            if (foundPath) {
+                return@blockLoop
+            }
+
+            if (!PathfindingHelper.isTraversable(location.block, location)) return@blockLoop
+            val start = entity.location.getBlockLocation().subtract(0, 1, 0).toPathPosition()
+            val end = location.toPathPosition()
+
+            coordinator.navigator.pathfinder.findPath(start, end, coordinator.navigator.filters).thenAccept { result ->
+                if (!result.successful()) {
+                    return@thenAccept
+                }
+                if (foundPath) return@thenAccept
+
+                foundPath = true
+                coordinator.navigator.cancelNavigating()
+                coordinator.navigator.updatePathfindingPath(location)
+            }
+        }
+    }
+
+    override fun onBackstageTick(tick: Int) {
+    }
+
+    override fun onFrontstageTick(tick: Int) {
+    }
+
+    override fun onGeneralTick(tick: Int) {
+    }
+
+    override fun onStop(entity: Entity, interrupted: Boolean) {
+        coordinator.navigator.cancelNavigating()
+        coordinator.navigator.navigationNodeStepDispatcher.dispose()
+        coordinator.navigator.navigationCompleteDispatcher.dispose()
+        coordinator.navigator.pathfindResultDispatcher.dispose()
+    }
+}

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.daemon.jvmargs=-Xmx3000m
-dockyard.version=0.10.7
+dockyard.version=0.10.8
 kotlin.code.style=official

settings.gradle.kts

@@ -1,2 +1,4 @@
 rootProject.name = "Dockyard"
 
+
+include("demo")

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

@@ -14,7 +14,7 @@ import io.github.dockyardmc.player.Player
 import io.github.dockyardmc.player.PlayerManager
 import io.github.dockyardmc.profiler.profiler
 import io.github.dockyardmc.protocol.NetworkCompression
-import io.github.dockyardmc.protocol.packets.configurations.Tag
+import io.github.dockyardmc.protocol.packets.configurations.clientbound.Tag
 import io.github.dockyardmc.protocol.packets.registry.ClientPacketRegistry
 import io.github.dockyardmc.protocol.packets.registry.ServerPacketRegistry
 import io.github.dockyardmc.provider.PlayerMessageProvider
@@ -45,6 +45,7 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
         profiler("Server Load") {
 
             instance = this
+            versionInfo = Resources.getDockyardVersion()
             configBuilder.invoke(config)
 
             profiler("Register packets") {
@@ -123,7 +124,6 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
     val port get() = config.port
 
     fun start() {
-        versionInfo = Resources.getDockyardVersion()
         log("Starting DockyardMC Version ${versionInfo.dockyardVersion} (${versionInfo.gitCommit}@${versionInfo.gitBranch} for MC ${minecraftVersion.versionName})", LogType.RUNTIME)
         log("DockyardMC is still under heavy development. Things will break (I warned you)", LogType.WARNING)
 
@@ -139,7 +139,7 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
     companion object : PlayerMessageProvider, PlayerPacketProvider {
         lateinit var versionInfo: Resources.DockyardVersionInfo
         lateinit var instance: DockyardServer
-        val minecraftVersion = MinecraftVersions.v1_21_8
+        val minecraftVersion = MinecraftVersions.v1_21_9
         var allowAnyVersion: Boolean = false
 
         val scheduler = GlobalScheduler("main_scheduler")

src/main/kotlin/io/github/dockyardmc/apis/Hologram.kt

@@ -6,12 +6,9 @@ import io.github.dockyardmc.entity.Entity
 import io.github.dockyardmc.entity.EntityManager.despawnEntity
 import io.github.dockyardmc.entity.EntityManager.spawnEntity
 import io.github.dockyardmc.entity.TextDisplay
-import io.github.dockyardmc.entity.metadata.EntityMetaValue
-import io.github.dockyardmc.entity.metadata.EntityMetadata
-import io.github.dockyardmc.entity.metadata.EntityMetadataType
+import io.github.dockyardmc.entity.metadata.Metadata
 import io.github.dockyardmc.location.Location
 import io.github.dockyardmc.player.Player
-import io.github.dockyardmc.player.toPersistent
 import io.github.dockyardmc.registry.EntityTypes
 import io.github.dockyardmc.registry.registries.EntityType
 import io.github.dockyardmc.scroll.extensions.toComponent
@@ -141,7 +138,7 @@ class Hologram(spawnLocation: Location, builder: HologramBuilder) : Entity(spawn
                 entity.lineWidth.value = Int.MAX_VALUE
                 lineEntities.add(entity)
             }
-            if (line !is PlayerContentLine && entity.metadataLayers.values.isNotEmpty()) entity.metadataLayers.clear()
+            if (line !is PlayerContentLine && entity.metadata.getMetadataLayers().values.isNotEmpty()) entity.metadata.clearMetadataLayers()
 
             when (line) {
                 is StaticContentLine -> setGlobalLineContent(index, line.line)
@@ -156,10 +153,7 @@ class Hologram(spawnLocation: Location, builder: HologramBuilder) : Entity(spawn
 
     private fun setPlayerLineContent(player: Player, lineIndex: Int, message: String) {
         val display = lineEntities.getOrNull(lineIndex) ?: return
-
-        if (display.metadataLayers[player.toPersistent()] == null) display.metadataLayers[player.toPersistent()] = mutableMapOf()
-        val layer = display.metadataLayers[player.toPersistent()]!!
-        layer[EntityMetadataType.TEXT_DISPLAY_TEXT] = EntityMetadata(EntityMetadataType.TEXT_DISPLAY_TEXT, EntityMetaValue.TEXT_COMPONENT, message.toComponent())
+        display.metadata.setForPlayer(player, Metadata.TextDisplay.TEXT, message.toComponent())
         display.sendMetadataPacket(player)
         onLinesUpdated.dispatch(Unit)
     }

src/main/kotlin/io/github/dockyardmc/codec/ExtendedCodecs.kt

@@ -0,0 +1,12 @@
+package io.github.dockyardmc.codec
+
+import io.github.dockyardmc.tide.codec.Codec
+import io.github.dockyardmc.tide.stream.StreamCodec
+
+fun <T> StreamCodec<T>.mutableList(): MutableListStreamCodec<T> {
+    return MutableListStreamCodec<T>(this)
+}
+
+fun <T> Codec<T>.mutableList(): MutableListCodec<T> {
+    return MutableListCodec<T>(this)
+}

src/main/kotlin/io/github/dockyardmc/codec/ExtraCodecs.kt

@@ -0,0 +1,35 @@
+package io.github.dockyardmc.codec
+
+import io.github.dockyardmc.extentions.read
+import io.github.dockyardmc.extentions.writeColor
+import io.github.dockyardmc.scroll.CustomColor
+import io.github.dockyardmc.tide.stream.StreamCodec
+import io.netty.buffer.ByteBuf
+
+object ExtraCodecs {
+    fun <T> fieldWriter(innerCodec: StreamCodec<T>): StreamCodec<T> {
+        return object : StreamCodec<T> {
+
+            override fun write(buffer: ByteBuf, value: T) {
+                innerCodec.write(buffer, value)
+            }
+
+            override fun read(buffer: ByteBuf): T {
+                return innerCodec.read(buffer)
+            }
+
+        }
+    }
+
+    val CUSTOM_COLOR_STREAM = object : StreamCodec<CustomColor> {
+
+        override fun write(buffer: ByteBuf, value: CustomColor) {
+            buffer.writeColor(value)
+        }
+
+        override fun read(buffer: ByteBuf): CustomColor {
+            return CustomColor.read(buffer)
+        }
+
+    }
+}

src/main/kotlin/io/github/dockyardmc/codec/MutableListCodec.kt

@@ -0,0 +1,24 @@
+package io.github.dockyardmc.codec
+
+import io.github.dockyardmc.tide.codec.Codec
+import io.github.dockyardmc.tide.transcoder.Transcoder
+
+class MutableListCodec<T>(val inner: Codec<T>) : Codec<MutableList<T>> {
+
+    override fun <D> encode(transcoder: Transcoder<D>, value: MutableList<T>): D {
+        val encodedList = transcoder.encodeList(value.size)
+        value.forEach { item ->
+            encodedList.add(inner.encode(transcoder, item))
+        }
+        return encodedList.build()
+    }
+
+    override fun <D> decode(transcoder: Transcoder<D>, value: D): MutableList<T> {
+        val listResult = transcoder.decodeList(value)
+        val decodedList = mutableListOf<T>()
+        listResult.forEach { item ->
+            decodedList.add(inner.decode(transcoder, item))
+        }
+        return decodedList
+    }
+}

src/main/kotlin/io/github/dockyardmc/codec/MutableListStreamCodec.kt

@@ -0,0 +1,23 @@
+package io.github.dockyardmc.codec
+
+import io.github.dockyardmc.tide.stream.StreamCodec
+import io.netty.buffer.ByteBuf
+
+class MutableListStreamCodec<T>(val inner: StreamCodec<T>) : StreamCodec<MutableList<T>> {
+
+    override fun write(buffer: ByteBuf, value: MutableList<T>) {
+        StreamCodec.VAR_INT.write(buffer, value.size)
+        value.forEach { item ->
+            inner.write(buffer, item)
+        }
+    }
+
+    override fun read(buffer: ByteBuf): MutableList<T> {
+        val size = StreamCodec.VAR_INT.read(buffer)
+        val list = mutableListOf<T>()
+        for (i in 0 until size) {
+            list.add(inner.read(buffer))
+        }
+        return list
+    }
+}

src/main/kotlin/io/github/dockyardmc/data/components/ParrotVariantComponent.kt

@@ -1,13 +1,13 @@
 package io.github.dockyardmc.data.components
 
 import io.github.dockyardmc.data.DataComponent
-import io.github.dockyardmc.entity.ParrotVariant
+import io.github.dockyardmc.entity.Parrot
 import io.github.dockyardmc.extentions.readEnum
 import io.github.dockyardmc.extentions.writeEnum
 import io.github.dockyardmc.protocol.NetworkReadable
 import io.netty.buffer.ByteBuf
 
-data class ParrotVariantComponent(val parrotColor: ParrotVariant) : DataComponent() {
+data class ParrotVariantComponent(val parrotColor: Parrot.Variant) : DataComponent() {
 
     override fun write(buffer: ByteBuf) {
         buffer.writeEnum(parrotColor)

src/main/kotlin/io/github/dockyardmc/entity/BlockDisplay.kt

@@ -1,23 +1,21 @@
 package io.github.dockyardmc.entity
 
 import cz.lukynka.bindables.Bindable
-import io.github.dockyardmc.entity.metadata.EntityMetaValue
-import io.github.dockyardmc.entity.metadata.EntityMetadata
-import io.github.dockyardmc.entity.metadata.EntityMetadataType
+import io.github.dockyardmc.entity.metadata.Metadata
 import io.github.dockyardmc.location.Location
 import io.github.dockyardmc.registry.Blocks
 import io.github.dockyardmc.registry.EntityTypes
 import io.github.dockyardmc.registry.registries.EntityType
+import io.github.dockyardmc.world.block.Block
 
-class BlockDisplay(location: Location): DisplayEntity(location) {
+class BlockDisplay(location: Location) : DisplayEntity(location) {
 
     override var type: EntityType = EntityTypes.BLOCK_DISPLAY
-    val block: Bindable<io.github.dockyardmc.world.block.Block> = Bindable(Blocks.STONE.toBlock())
+    val block: Bindable<Block> = bindablePool.provideBindable(Blocks.STONE.toBlock())
 
     init {
-        block.valueChanged {
-            val type = EntityMetadataType.BLOCK_DISPLAY_BLOCK
-            metadata[type] = EntityMetadata(type, EntityMetaValue.BLOCK_STATE, it.newValue)
+        block.valueChanged { event ->
+            metadata[Metadata.BlockDisplay.DISPLAYED_BLOCK_STATE] = event.newValue
         }
     }
 }