Merge pull request #205 from DockyardMC/feature/noxesium

Add noxesium integration

Author: LukynkaCZE

build.gradle.kts

@@ -30,6 +30,7 @@ repositories {
     maven("https://jitpack.io")
     maven("https://repo.spongepowered.org/repository/maven-public/")
     maven("https://repo.viaversion.com")
+    maven("https://maven.noxcrew.com/public")
 }
 
 dependencies {
@@ -51,6 +52,7 @@ dependencies {
     api("io.github.dockyardmc:scroll:3.2")
     implementation("io.github.dockyardmc:wikivg-datagen:1.3")
     api("net.kyori:adventure-nbt:4.21.0")
+    api("com.noxcrew.noxesium:api:2.7.7")
 
     // Pathfinding
     api("com.github.Metaphoriker.pathetic:pathetic-engine:4.0")

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

@@ -9,6 +9,7 @@ import io.github.dockyardmc.events.ServerFinishLoadEvent
 import io.github.dockyardmc.events.WorldFinishLoadingEvent
 import io.github.dockyardmc.implementations.block.DefaultBlockHandlers
 import io.github.dockyardmc.implementations.commands.DefaultCommands
+import io.github.dockyardmc.noxesium.Noxesium
 import io.github.dockyardmc.profiler.profiler
 import io.github.dockyardmc.protocol.NetworkCompression
 import io.github.dockyardmc.protocol.packets.configurations.Tag
@@ -101,6 +102,10 @@ class DockyardServer(configBuilder: Config.() -> Unit) {
             Events.dispatch(ServerFinishLoadEvent(this))
             if (ConfigManager.config.updateChecker) UpdateChecker()
 
+            if (ConfigManager.config.implementationConfig.noxesium) {
+                Noxesium.register()
+            }
+
             if (InstrumentationUtils.isDebuggerAttached()) {
                 profiler("Setup hot reload detection") {
                     InstrumentationUtils.setupHotReloadDetection()
@@ -130,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/advancement/Advancement.kt

@@ -2,6 +2,7 @@ package io.github.dockyardmc.advancement
 
 import cz.lukynka.bindables.BindableList
 import io.github.dockyardmc.events.EventPool
+import io.github.dockyardmc.events.Events
 import io.github.dockyardmc.events.PlayerLeaveEvent
 import io.github.dockyardmc.extentions.writeString
 import io.github.dockyardmc.extentions.writeStringArray
@@ -56,7 +57,7 @@ class Advancement(
 
     override var autoViewable: Boolean = false
 
-    private val eventPool = EventPool()
+    private val eventPool = EventPool(Events, "Advancement Listeners")
 
     init {
         require(icon.material != Items.AIR) { "advancement icon can't be air" }

src/main/kotlin/io/github/dockyardmc/annotations/EventDocumentation.kt

@@ -1,3 +1,3 @@
 package io.github.dockyardmc.annotations
 
-annotation class EventDocumentation(val description: String, val cancellable: Boolean)
+annotation class EventDocumentation(val description: String, val cancellable: Boolean = false)

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

@@ -0,0 +1,42 @@
+package io.github.dockyardmc.codec
+
+import com.google.gson.JsonElement
+import io.github.dockyardmc.extentions.readTextComponent
+import io.github.dockyardmc.extentions.writeTextComponent
+import io.github.dockyardmc.scroll.Component
+import io.github.dockyardmc.scroll.extensions.toComponent
+import io.github.dockyardmc.tide.Codec
+import io.github.dockyardmc.tide.Transcoder
+import io.github.dockyardmc.tide.asObjectOrThrow
+import io.github.dockyardmc.tide.getPrimitive
+import io.netty.buffer.ByteBuf
+import net.kyori.adventure.nbt.TagStringIO
+
+object ComponentCodec : Codec<Component> {
+
+    override fun writeNetwork(buffer: ByteBuf, value: Component) {
+        buffer.writeTextComponent(value)
+    }
+
+    override fun readJson(json: JsonElement, field: String): Component {
+        val nbt = json.getPrimitive<String>(field)
+        return TagStringIO.get().asCompound(nbt).toComponent()
+    }
+
+    override fun readNetwork(buffer: ByteBuf): Component {
+        return buffer.readTextComponent()
+    }
+
+    override fun <A> readTranscoded(transcoder: Transcoder<A>, format: A, field: String): Component {
+        throw UnsupportedOperationException()
+    }
+
+    override fun <A> writeTranscoded(transcoder: Transcoder<A>, format: A, value: Component, field: String) {
+        throw UnsupportedOperationException()
+    }
+
+    override fun writeJson(json: JsonElement, value: Component, field: String) {
+        json.asObjectOrThrow().addProperty(field, TagStringIO.get().asString(value.toNBT()))
+    }
+
+}

src/main/kotlin/io/github/dockyardmc/config/Config.kt

@@ -56,6 +56,7 @@ class ImplementationConfig {
     var defaultEntityViewDistanceBlocks: Int = 64
     var defaultCommands: Boolean = true
     var spark: Boolean = true
+    var noxesium: Boolean = true
     var itemDroppingAndPickup: Boolean = true
 }
 

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/entity/InteractionEntity.kt

@@ -17,7 +17,7 @@ class Interaction(location: Location): Entity(location) {
     override val health: Bindable<Float> = bindablePool.provideBindable(0f)
     override var inventorySize: Int = 0
 
-    private val eventPool = EventPool()
+    private val eventPool = EventPool(Events, "Interaction Listeners")
 
     val width: Bindable<Float> = bindablePool.provideBindable(1f)
     val height: Bindable<Float> = bindablePool.provideBindable(1f)

src/main/kotlin/io/github/dockyardmc/entity/ai/EntityBehaviourCoordinator.kt

@@ -2,6 +2,7 @@ package io.github.dockyardmc.entity.ai
 
 import io.github.dockyardmc.entity.Entity
 import io.github.dockyardmc.events.EventPool
+import io.github.dockyardmc.events.Events
 import io.github.dockyardmc.events.system.EventFilter
 import io.github.dockyardmc.pathfinding.IsSolidPathFilter
 import io.github.dockyardmc.pathfinding.Navigator
@@ -16,7 +17,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 abstract class EntityBehaviourCoordinator(val entity: Entity) : Freezable(), Disposable {
 
-    val eventPool = EventPool().withFilter(EventFilter.containsEntity(entity))
+    val eventPool = EventPool(Events, "EBC Listeners (${entity::class.simpleName})").withFilter(EventFilter.containsEntity(entity))
     val behaviours: MutableList<EntityBehaviourNode> = mutableListOf()
     var activeBehaviour: EntityBehaviourNode? = null
     private val isEvaluating = AtomicBoolean(false)