Merge branch 'main' into block-definitions

# Conflicts:
#	src/jvmMain/kotlin/experimental/generator/BlockDefinitionGenerator.kt

Author: OmniacDev

.dockerignore

@@ -1,4 +1,3 @@
-# Auto detect text files and perform LF normalization
 * text=auto eol=lf
 *.java text eol=lf
 *.md text eol=lf

.gitattributes

@@ -40,10 +40,10 @@ Minecraft: Bedrock server software, open source and written in Kotlin
 <!-- CHORUS -->
 
 <!-- BADGES -->
-[minecraft_badge_url]: https://img.shields.io/badge/minecraft-1.21.100-black?style=flat-square
-[minecraft_url]: https://www.minecraft.net/en-us/article/minecraft-1-21-100-bedrock-changelog
+[minecraft_badge_url]: https://img.shields.io/badge/minecraft-1.21.111-black?style=flat-square
+[minecraft_url]: https://www.minecraft.net/en-us/article/the-copper-age---minecraft--bedrock-edition-1-21-111-changelog
 
-[protocol_badge_url]: https://img.shields.io/badge/protocol-v827-white?style=flat-square
+[protocol_badge_url]: https://img.shields.io/badge/protocol-v844-white?style=flat-square
 [protocol_url]: https://github.com/Mojang/bedrock-protocol-docs
 
 [kotlin_badge_url]: https://img.shields.io/badge/kotlin-2.2.0-%237F52FF?style=flat-square&logo=kotlin&labelColor=white

Dockerfile

@@ -52,6 +52,7 @@ kotlin {
                 implementation(libs.rwmutex)
                 implementation(libs.kotlin.reflect)
                 implementation(libs.kflate)
+                implementation(libs.clikt)
 
                 implementation(compose.runtime)
                 implementation(compose.components.resources)
@@ -77,7 +78,6 @@ kotlin {
                 implementation(libs.rng.sampling)
                 implementation(libs.asm)
                 implementation(libs.jose4j)
-                implementation(libs.joptsimple)
                 implementation(libs.sentry)
                 implementation(libs.sentry.log4j2)
                 implementation(libs.disruptor)

README.md

@@ -1,3 +1,3 @@
 files:
-  - source: /src/jvmMain/resources/language/eng/*.*
-    translation: /src/jvmMain/resources/language/%three_letters_code%/%original_file_name%
+  - source: /src/commonMain/resources/files/language/eng/*.*
+    translation: /src/commonMain/resources/files/language/%three_letters_code%/%original_file_name%

build.gradle.kts

@@ -15,7 +15,6 @@ io-sentry-sentry = "7.1.0"
 io-sentry-sentry-log4j2 = "7.1.0"
 leveldb = "1.0.1"
 net-minecrell-terminalconsoleappender = "1.3.0"
-net-sf-jopt-simple-jopt-simple = "5.0.4"
 log4j = "2.23.1"
 org-bitbucket-b-c-jose4j = "0.9.4"
 org-cloudburstmc-netty-netty-transport-raknet = "1.0.0.CR3-SNAPSHOT"
@@ -37,7 +36,7 @@ disruptor = "4.0.0"
 caffeine-ver = "3.2.0"
 
 # Kotlin Multiplatform Libraries
-protocol = "v827.0"
+protocol = "v844.0"
 kotlinx-io = "0.8.0"
 kotlinx-coroutines = "1.10.2"
 cryptography = "0.5.0"
@@ -51,6 +50,7 @@ kflate = "0.0.1"
 compose = "1.8.2"
 maven-publish = "0.34.0"
 shadow = "9.0.0-rc2"
+clikt = "5.0.3"
 
 [libraries]
 # Java Libraries
@@ -70,7 +70,6 @@ annotations = { module = "org.jetbrains:annotations", version.ref = "org-jetbrai
 asm = { module = "org.ow2.asm:asm", version.ref = "org-ow2-asm-asm" }
 snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "org-yaml-snakeyaml" }
 stateless4j = { module = "com.github.stateless4j:stateless4j", version.ref = "com-github-stateless4j" }
-joptsimple = { module = "net.sf.jopt-simple:jopt-simple", version.ref = "net-sf-jopt-simple-jopt-simple" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-slf4j2-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" }
 jose4j = { module = "org.bitbucket.b_c:jose4j", version.ref = "org-bitbucket-b-c-jose4j" }
@@ -105,6 +104,7 @@ fleks = { module = "io.github.quillraven.fleks:Fleks", version.ref = "fleks" }
 kotlin-poet = { module = "com.squareup:kotlinpoet", version.ref = "kotlin-poet"}
 rwmutex = { module = "com.mayakapps.rwmutex:rwmutex", version.ref = "rwmutex" }
 kflate = { module = "org.chorus-oss:kflate", version.ref = "kflate" }
+clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
 
 [bundles]
 netty = ["netty-raknet", "netty-epoll", "netty-kqueue"]

codecov.yml

@@ -0,0 +1,14 @@
+package org.chorus_oss.chorus.config
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.option
+
+class ChorusOpts : CliktCommand() {
+    val disableAnsi: Boolean by option("--disable-ansi", help = "Disables console coloring").flag()
+    val enableTitle: Boolean by option("--enable-title", help = "Enables title at the top of the window").flag()
+    val verbosity: String? by option("--verbosity", "-v", help = "Set verbosity of logging")
+    val language: String? by option("--language", help = "Set a predefined language")
+
+    override fun run() = Unit
+}