Sync with FLK 1.12.3, target MC 1.21

.github/workflows/publish-snapshot.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17]
+        java: [21]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/setup-java@v3

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
       - uses: actions/checkout@v3
       - run: chmod +x ./gradlew
 

.github/workflows/push.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17]
+        java: [21]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/setup-java@v3

build.gradle.kts

@@ -5,7 +5,7 @@ import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.dokka.gradle.AbstractDokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import java.time.Year
 
 @Suppress(
@@ -39,7 +39,8 @@ val flkVersion: String by project
 version = "${project.version}+kt.${project.libs.versions.kotlin.orNull}+flk.$flkVersion"
 val projectVersion = project.version as String + if (System.getenv("SNAPSHOTS_URL") != null && System.getenv("MAVEN_URL") == null) "-SNAPSHOT" else ""
 
-val javaVersion = 17 // The current version of Java used by Minecraft
+// 8 <= 1.17-alpha.21.18.a, 16 >= 1.17-alpha.21.19.a, 17 >= 1.18-beta.2, 21 >= 1.20.5-alpha.24.14.a
+val javaVersion = 21 // The current version of Java used by Minecraft
 
 repositories {
     mavenCentral()
@@ -78,6 +79,12 @@ allprojects {
     kotlin {
         // Enable explicit API mode, as this is a library
         explicitApi()
+        jvmToolchain(javaVersion)
+        compilerOptions {
+            languageVersion = KotlinVersion.fromVersion(
+                rootProject.libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast(".")
+            )
+        }
     }
 
     tasks {
@@ -91,14 +98,6 @@ allprojects {
             }
         }
 
-        withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = javaVersion.toString()
-                languageVersion =
-                    rootProject.libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast(".")
-            }
-        }
-
         // Every dokka task
         withType<AbstractDokkaTask> {
             pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {

gradle.properties

@@ -5,5 +5,5 @@ org.gradle.parallel=true
 kotlin.incremental=true
 kotlin.code.style=official
 
-version=4.0.0
-flkVersion=1.10.19
+version=5.0.0
+flkVersion=1.11.0

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-atomic = "0.23.2"
-coroutines = "1.8.0"
-datetime = "0.5.0"
+atomic = "0.24.0"
+coroutines = "1.8.1"
+datetime = "0.6.0"
 dokka = "1.9.10"
-kotlin = "1.9.23"
-minecraft = "1.20.4"
+kotlin = "2.0.0"
+minecraft = "1.21"
 qsl = "8.0.0-alpha.10+1.20.4"
-quilt_loader = "0.24.0"
-quilt_mappings = "1.20.4+build.3"
+quilt_loader = "0.26.4-beta.1"
+quilt_mappings = "1.21+build.12"
 serialization = "1.6.3"
-serialization_plugin = "1.9.23" # usually same as kotlin but can lag behind
+serialization_plugin = "2.0.0" # usually same as kotlin but can lag behind
 binary_compat_plugin = "0.14.0"
 
 [libraries]
@@ -33,7 +33,7 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 licenser = { id = "dev.yumi.gradle.licenser", version = "1.1.1" }
-quilt_loom = { id = "org.quiltmc.loom", version = "1.4.2" }
+quilt_loom = { id = "org.quiltmc.loom", version = "1.7.4" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization_plugin" }
 binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary_compat_plugin" }
 minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

library/api/library.api

@@ -174,7 +174,7 @@ public final class org/quiltmc/qkl/library/brigadier/argument/ArgumentsKt {
 	public static final fun team (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun testClass (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun testFunction (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
-	public static final fun text (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
+	public static final fun text (Lnet/minecraft/command/CommandBuildContext;Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun time (Ljava/lang/String;I)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static synthetic fun time$default (Ljava/lang/String;IILjava/lang/Object;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun uuid (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
@@ -1178,10 +1178,10 @@ public final class org/quiltmc/qkl/library/text/HoverEvents {
 	public static final field INSTANCE Lorg/quiltmc/qkl/library/text/HoverEvents;
 	public final fun showEntity (Lnet/minecraft/entity/EntityType;Ljava/util/UUID;Lnet/minecraft/text/Text;)Lnet/minecraft/text/HoverEvent;
 	public static synthetic fun showEntity$default (Lorg/quiltmc/qkl/library/text/HoverEvents;Lnet/minecraft/entity/EntityType;Ljava/util/UUID;Lnet/minecraft/text/Text;ILjava/lang/Object;)Lnet/minecraft/text/HoverEvent;
-	public final fun showItem (Lnet/minecraft/item/Item;Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/text/HoverEvent;
+	public final fun showItem (Lnet/minecraft/item/Item;Lnet/minecraft/component/DataComponentMap;)Lnet/minecraft/text/HoverEvent;
 	public final fun showItem (Lnet/minecraft/item/ItemStack;)Lnet/minecraft/text/HoverEvent;
-	public final fun showItem (Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/text/HoverEvent;
-	public static synthetic fun showItem$default (Lorg/quiltmc/qkl/library/text/HoverEvents;Lnet/minecraft/item/Item;Lnet/minecraft/nbt/NbtCompound;ILjava/lang/Object;)Lnet/minecraft/text/HoverEvent;
+	public final fun showItem (Lnet/minecraft/registry/HolderLookup$Provider;Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/text/HoverEvent;
+	public static synthetic fun showItem$default (Lorg/quiltmc/qkl/library/text/HoverEvents;Lnet/minecraft/item/Item;Lnet/minecraft/component/DataComponentMap;ILjava/lang/Object;)Lnet/minecraft/text/HoverEvent;
 	public final fun showText (Lnet/minecraft/text/Text;)Lnet/minecraft/text/HoverEvent;
 }
 
@@ -1250,7 +1250,7 @@ public final class org/quiltmc/qkl/library/text/TextDslKt {
 	public static synthetic fun italic$default (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static final fun keyBind (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/String;)V
 	public static final fun literal (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/String;)V
-	public static final fun nbt (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/String;ZLjava/util/Optional;Lnet/minecraft/text/data/TextData;)V
+	public static final fun nbt (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/String;ZLjava/util/Optional;Lnet/minecraft/text/data/TextDataSource;)V
 	public static final fun obfuscated (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun obfuscated$default (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/Boolean;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public static final fun scoreboard (Lorg/quiltmc/qkl/library/text/TextBuilder;Ljava/lang/String;Ljava/lang/String;)V
@@ -1267,6 +1267,6 @@ public final class org/quiltmc/qkl/library/text/TextDslKt {
 }
 
 public final class org/quiltmc/qkl/library/worlds/DimensionExtensionsKt {
-	public static final fun teleportGeneral (Lnet/minecraft/entity/Entity;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/TeleportTarget;)Lnet/minecraft/entity/Entity;
+	public static final fun teleportGeneral (Lnet/minecraft/entity/Entity;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/DimensionTransition;)Lnet/minecraft/entity/Entity;
 }
 

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/BrigadierDsl.kt

@@ -63,7 +63,7 @@ public fun commandBuildContext(
     featureFlags: FeatureFlagBitSet,
     action: CommandBuildContext.() -> Unit
 ): CommandBuildContext {
-    val context = CommandBuildContext.createConfigurable(dynamicRegistryManager, featureFlags)
+    val context = CommandBuildContext.createSimple(dynamicRegistryManager, featureFlags)
     context.apply(action)
     return context
 }

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/IdentifierArguments.kt

@@ -29,6 +29,7 @@ import net.minecraft.loot.condition.LootCondition
 import net.minecraft.loot.function.LootFunction
 import net.minecraft.recipe.RecipeHolder
 import net.minecraft.server.command.ServerCommandSource
+import net.minecraft.unmapped.C_jjjbxeeq
 import net.minecraft.util.Identifier
 import org.quiltmc.qkl.library.brigadier.*
 
@@ -81,7 +82,7 @@ public fun ArgumentReader<
                 IdentifierArgumentType
                 >
         >.asPredicate(): LootCondition {
-    return IdentifierArgumentType.getPredicateArgument(context, name)
+    return C_jjjbxeeq.method_58488(context, name).value()
 }
 
 /**
@@ -100,7 +101,7 @@ public fun ArgumentReader<
                 IdentifierArgumentType
                 >
         >.asItemModifier(): LootFunction {
-    return IdentifierArgumentType.getItemModifierArgument(context, name)
+    return C_jjjbxeeq.method_58485(context, name).value()
 }
 
 /**

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/TextArguments.kt

@@ -23,6 +23,7 @@
 package org.quiltmc.qkl.library.brigadier.argument
 
 
+import net.minecraft.command.CommandBuildContext
 import net.minecraft.command.argument.ColorArgumentType
 import net.minecraft.command.argument.MessageArgumentType
 import net.minecraft.command.argument.TextArgumentType
@@ -132,7 +133,8 @@ public fun <S> color(
  */
 @BrigadierDsl
 public fun <S> text(
+    context: CommandBuildContext,
     name: String
 ): DefaultArgumentConstructor<S, TextArgumentType> {
-    return argument(name, TextArgumentType.text())
+    return argument(name, TextArgumentType.text(context))
 }

library/src/main/kotlin/org/quiltmc/qkl/library/client/tooltip/TooltipEvents.kt

@@ -20,7 +20,7 @@
 package org.quiltmc.qkl.library.client.tooltip
 
 import net.minecraft.client.gui.tooltip.TooltipComponent
-import net.minecraft.client.item.TooltipContext
+import net.minecraft.client.item.TooltipConfig
 import net.minecraft.client.item.TooltipData
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.ItemStack
@@ -33,7 +33,7 @@ import org.quiltmc.qsl.tooltip.api.client.TooltipComponentCallback
 public typealias TooltipCallback = (
     stack: ItemStack,
     player: PlayerEntity?,
-    ctx: TooltipContext,
+    ctx: TooltipConfig,
     lines: List<Text>
 ) -> Unit
 

library/src/main/kotlin/org/quiltmc/qkl/library/networking/ServerEvents.kt

@@ -19,10 +19,10 @@
 package org.quiltmc.qkl.library.networking
 
 import net.minecraft.entity.Entity
-import net.minecraft.network.ServerConfigurationPacketHandler
 import net.minecraft.network.packet.payload.CustomPayload
 import net.minecraft.network.packet.s2c.login.payload.CustomQueryPayload
 import net.minecraft.server.MinecraftServer
+import net.minecraft.server.network.ServerConfigurationNetworkHandler
 import net.minecraft.server.network.ServerLoginNetworkHandler
 import net.minecraft.server.network.ServerPlayNetworkHandler
 import net.minecraft.server.network.ServerPlayerEntity
@@ -74,11 +74,11 @@ public fun EventRegistration.onLoginDisconnect(callback: GenericLoginCallback) {
 //endregion
 
 //region: Server configuration events
-public typealias ServerConfigurationCallback = ServerConfigurationPacketHandler.(
+public typealias ServerConfigurationCallback = ServerConfigurationNetworkHandler.(
     server: MinecraftServer
 ) -> Unit
 
-public typealias ServerConfigurationReadyCallback = ServerConfigurationPacketHandler.(
+public typealias ServerConfigurationReadyCallback = ServerConfigurationNetworkHandler.(
     sender: PacketSender<CustomPayload>,
     server: MinecraftServer
 ) -> Unit
@@ -121,7 +121,7 @@ public fun EventRegistration.onConfigurationAddTasks(callback: ServerConfigurati
 //endregion
 
 //region: S2C configuration channel events
-public typealias S2CConfigurationChannelCallback = ServerConfigurationPacketHandler.(
+public typealias S2CConfigurationChannelCallback = ServerConfigurationNetworkHandler.(
     packetSender: PacketSender<CustomPayload>,
     server: MinecraftServer,
     channels: List<Identifier>

library/src/main/kotlin/org/quiltmc/qkl/library/recipe/RecipeExtensions.kt

@@ -21,9 +21,9 @@ import net.minecraft.item.Item
 import net.minecraft.item.ItemConvertible
 import net.minecraft.item.ItemStack
 import net.minecraft.recipe.*
+import net.minecraft.registry.RegistryKeys
 import net.minecraft.registry.tag.TagKey
 import net.minecraft.util.Identifier
-import net.minecraft.registry.RegistryKeys
 import org.quiltmc.qsl.recipe.api.RecipeManagerHelper
 import org.quiltmc.qsl.recipe.api.builder.ShapedRecipeBuilder
 import org.quiltmc.qsl.recipe.api.builder.ShapelessRecipeBuilder
@@ -179,9 +179,9 @@ public fun foodCookingRecipe(
     smokerCookTime: Int = cookTime / 2,
     campfireCookTime: Int = cookTime * 3
 ): Array<RecipeHolder<out AbstractCookingRecipe>> {
-    val smeltingId = Identifier(baseId.namespace, "${baseId.path}_smelting")
-    val smokingId = Identifier(baseId.namespace, "${baseId.path}_smoking")
-    val campfireId = Identifier(baseId.namespace, "${baseId.path}_campfire")
+    val smeltingId = Identifier.of(baseId.namespace, "${baseId.path}_smelting")
+    val smokingId = Identifier.of(baseId.namespace, "${baseId.path}_smoking")
+    val campfireId = Identifier.of(baseId.namespace, "${baseId.path}_campfire")
 
     val ingredient = coerceIngredient(input)
 

library/src/main/kotlin/org/quiltmc/qkl/library/registry/RegistryDsl.kt

@@ -16,8 +16,8 @@
 
 package org.quiltmc.qkl.library.registry
 
-import net.minecraft.util.Identifier
 import net.minecraft.registry.Registry
+import net.minecraft.util.Identifier
 
 /**
  * Marks functions as part of QKL Registry DSL.
@@ -46,7 +46,7 @@ public data class RegistryObject<T>(val modid: String, val path: String, val t:
      * */
     @RegistryDsl
     public infix fun toRegistry(registry: Registry<in T>): T {
-        return Registry.register(registry, Identifier(modid, path), t)
+        return Registry.register(registry, Identifier.of(modid, path), t)
     }
 }
 
@@ -85,9 +85,9 @@ public data class RegistryAction<T>(val modid: String?, val registry: Registry<T
     @RegistryDsl
     public infix fun <R : T> R.withId(id: String): R {
         val identifier = if (':' in id || modid == null) {
-            Identifier(id)
+            Identifier.parse(id)
         } else {
-            Identifier(modid, id)
+            Identifier.of(modid, id)
         }
         return Registry.register(registry, identifier, this)
     }

library/src/main/kotlin/org/quiltmc/qkl/library/serialization/internal/util/DataUtil.kt

@@ -39,7 +39,7 @@ internal tailrec fun <T : Any> DynamicOps<T>.getExtendedWithDefault(): ExtendedD
 }
 
 internal fun <R> DataResult<R>.unwrap(): R {
-    return getOrThrow(false) {}
+    return getOrThrow()
 }
 
 internal fun <R> DataResult<R>.orNull(): R? {

library/src/main/kotlin/org/quiltmc/qkl/library/serialization/options/CodecOptionsBuilder.kt

@@ -19,9 +19,8 @@
 package org.quiltmc.qkl.library.serialization.options
 
 import com.mojang.serialization.Codec
-import com.mojang.serialization.DataResult.PartialResult
-import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.Contextual
+import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.modules.SerializersModule
 import net.minecraft.registry.Registry