Update to 1.20.2 (#88)

build.gradle.kts

@@ -73,7 +73,6 @@ allprojects {
 
     license {
         rule(file("${rootProject.projectDir}/codeformat/HEADER"))
-        include("**/*.kt")
     }
 
     kotlin {

codeformat/HEADER

@@ -1,4 +1,4 @@
-Copyright ${YEAR} The Quilt Project
+Copyright ${CREATION_YEAR} The Quilt Project
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,6 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
-
-;;year_selection: file
+limitations under the License.

core/src/main/kotlin/org/quiltmc/qkl/core/adapter/KotlinAdapter.kt

@@ -116,8 +116,12 @@ public open class KotlinAdapter : LanguageAdapter {
                 return Proxy.newProxyInstance(
                     mod.classLoader,
                     arrayOf(type)
-                ) { _, _, _ ->
-                    methods[0].call(instance)
+                ) { _, _, params ->
+                    if (params != null) {
+                        methods[0].call(instance, *params)
+                    } else {
+                        methods[0].call(instance)
+                    }
                 } as T
             }
             else -> {

core/src/main/resources/quilt.mod.json

@@ -12,7 +12,7 @@
       },
       "contact": {
         "homepage": "https://quiltmc.org",
-        "issues": "https://github.com/quiltmc/quilt-kotlin-libaries/issues",
+        "issues": "https://github.com/quiltmc/quilt-kotlin-libraries/issues",
         "sources": "https://github.com/quiltmc/quilt-kotlin-libraries"
       },
       "license": "Apache-2.0",
@@ -22,7 +22,7 @@
     "depends": [
       {
         "id": "quilt_loader",
-        "versions": ">=0.18.1"
+        "versions": ">=0.23.0"
       }
     ],
     "provides": [

gradle.properties

@@ -5,5 +5,5 @@ org.gradle.parallel=true
 kotlin.incremental=true
 kotlin.code.style=official
 
-version=2.1.3
-flkVersion=1.10.10
+version=3.0.0
+flkVersion=1.10.17

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-atomic = "0.22.0"
+atomic = "0.23.1"
 coroutines = "1.7.3"
-datetime = "0.4.1"
-dokka = "1.9.0"
-kotlin = "1.9.10"
-minecraft = "1.20.1"
-qsl = "6.1.1+1.20.1"
-quilt_loader = "0.20.2"
-quilt_mappings = "1.20.1+build.23"
-serialization = "1.6.0"
-serialization_plugin = "1.9.10" # usually same as kotlin but can lag behind
+datetime = "0.5.0"
+dokka = "1.9.10"
+kotlin = "1.9.22"
+minecraft = "1.20.2"
+qsl = "7.0.0-alpha.9+1.20.2"
+quilt_loader = "0.23.0"
+quilt_mappings = "1.20.2+build.3"
+serialization = "1.6.2"
+serialization_plugin = "1.9.22" # usually same as kotlin but can lag behind
 binary_compat_plugin = "0.13.2"
 
 [libraries]
@@ -28,13 +28,13 @@ serialization_core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cor
 serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", version.ref = "serialization" }
 
 [plugins]
-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.1" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.4" }
 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 = "org.quiltmc.gradle.licenser", version = "2.0.1" }
+licenser = { id = "dev.yumi.gradle.licenser", version = "1.1.1" }
 quilt_loom = { id = "org.quiltmc.loom", version = "1.4.1" }
 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.2" }
+minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
 cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.4.0" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

library/api/library.api

@@ -110,10 +110,10 @@ public final class org/quiltmc/qkl/library/brigadier/DefaultArgumentDescriptor :
 public final class org/quiltmc/qkl/library/brigadier/argument/ArgumentsKt {
 	public static final fun absoluteRotationArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/util/math/Vec2f;
 	public static final fun angle (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
-	public static final fun asAdvancement (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/advancement/Advancement;
+	public static final fun asAdvancement (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/unmapped/C_unoypvme;
 	public static final fun asItemModifier (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/loot/function/LootFunction;
 	public static final fun asPredicate (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/loot/condition/LootCondition;
-	public static final fun asRecipe (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/recipe/Recipe;
+	public static final fun asRecipe (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/recipe/RecipeHolder;
 	public static final fun blockPos (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun blockPredicate (Ljava/lang/String;Lnet/minecraft/command/CommandBuildContext;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
 	public static final fun blockState (Ljava/lang/String;Lnet/minecraft/command/CommandBuildContext;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
@@ -213,7 +213,7 @@ public final class org/quiltmc/qkl/library/brigadier/argument/ArgumentsKt {
 	public static final fun valueRotationArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/command/argument/PosArgument;
 	public static final fun valueScoreboardCriterionArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardCriterion;
 	public static final fun valueScoreboardObjectiveArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardObjective;
-	public static final fun valueScoreboardSlotArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)I
+	public static final fun valueScoreboardSlotArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardDisplaySlot;
 	public static final fun valueSingleEntityArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/entity/Entity;
 	public static final fun valueSingleScoreHolderArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Ljava/lang/String;
 	public static final fun valueStatusEffectRegistryArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/registry/Holder$Reference;
@@ -318,8 +318,13 @@ public final class org/quiltmc/qkl/library/client/lifecycle/ClientEventsKt {
 }
 
 public final class org/quiltmc/qkl/library/client/networking/ClientEventsKt {
+	public static final fun onClientConfigurationChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
+	public static final fun onClientConfigurationChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
 	public static final fun onClientPlayChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
 	public static final fun onClientPlayChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
+	public static final fun onConfigurationDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationReady (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function3;)V
 	public static final fun onLoginDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
 	public static final fun onLoginInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
 	public static final fun onLoginQueryStart (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
@@ -329,8 +334,8 @@ public final class org/quiltmc/qkl/library/client/networking/ClientEventsKt {
 }
 
 public final class org/quiltmc/qkl/library/client/resource/ResourceLoaderEventsKt {
-	public static final fun onResourcePackReloadFinish (Lkotlin/jvm/functions/Function1;)V
-	public static final fun onResourcePackReloadStart (Lkotlin/jvm/functions/Function1;)V
+	public static final fun onPackReloadFinish (Lkotlin/jvm/functions/Function1;)V
+	public static final fun onPackReloadStart (Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class org/quiltmc/qkl/library/client/screen/ScreenEventsKt {
@@ -785,6 +790,12 @@ public final class org/quiltmc/qkl/library/networking/PlayerLookupsKt {
 public final class org/quiltmc/qkl/library/networking/ServerEventsKt {
 	public static final fun afterEntityTrackingStart (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
 	public static final fun beforeEntityTrackingStart (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationAddTasks (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
+	public static final fun onConfigurationChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
+	public static final fun onConfigurationDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
+	public static final fun onConfigurationReady (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function3;)V
 	public static final fun onEntityTrackingStop (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
 	public static final fun onLoginDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
 	public static final fun onLoginInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
@@ -804,12 +815,12 @@ public final class org/quiltmc/qkl/library/recipe/RecipeEventsKt {
 
 public final class org/quiltmc/qkl/library/recipe/RecipeExtensionsKt {
 	public static final fun coerceIngredient (Ljava/lang/Object;)Lnet/minecraft/recipe/Ingredient;
-	public static final fun foodCookingRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/recipe/CookingCategory;FIII)[Lnet/minecraft/recipe/AbstractCookingRecipe;
-	public static synthetic fun foodCookingRecipe$default (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/recipe/CookingCategory;FIIIILjava/lang/Object;)[Lnet/minecraft/recipe/AbstractCookingRecipe;
-	public static final fun registerStaticRecipe (Lnet/minecraft/recipe/Recipe;)Lnet/minecraft/recipe/Recipe;
-	public static final fun registerStaticRecipes ([Lnet/minecraft/recipe/Recipe;)V
-	public static final fun shapedRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Lkotlin/Pair;)Lnet/minecraft/recipe/ShapedRecipe;
-	public static final fun shapelessRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/recipe/ShapelessRecipe;
+	public static final fun foodCookingRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/recipe/CookingCategory;FIII)[Lnet/minecraft/recipe/RecipeHolder;
+	public static synthetic fun foodCookingRecipe$default (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/Object;Lnet/minecraft/item/ItemStack;Lnet/minecraft/recipe/CookingCategory;FIIIILjava/lang/Object;)[Lnet/minecraft/recipe/RecipeHolder;
+	public static final fun registerStaticRecipe (Lnet/minecraft/recipe/RecipeHolder;)Lnet/minecraft/recipe/RecipeHolder;
+	public static final fun registerStaticRecipes ([Lnet/minecraft/recipe/RecipeHolder;)V
+	public static final fun shapedRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Lkotlin/Pair;)Lnet/minecraft/recipe/RecipeHolder;
+	public static final fun shapelessRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/recipe/RecipeHolder;
 }
 
 public final class org/quiltmc/qkl/library/registry/RegistryAction {
@@ -943,12 +954,12 @@ public synthetic class org/quiltmc/qkl/library/serialization/annotation/CodecSer
 	public final synthetic fun useInlineWrapper ()Lorg/quiltmc/qsl/base/api/util/TriState;
 }
 
-public abstract interface annotation class org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic : java/lang/annotation/Annotation {
+public abstract interface annotation class org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable : java/lang/annotation/Annotation {
 	public abstract fun classDiscriminator ()Ljava/lang/String;
 	public abstract fun flatten ()Lorg/quiltmc/qsl/base/api/util/TriState;
 }
 
-public synthetic class org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic$Impl : org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic {
+public synthetic class org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable$Impl : org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable {
 	public fun <init> (Ljava/lang/String;Lorg/quiltmc/qsl/base/api/util/TriState;)V
 	public synthetic fun <init> (Ljava/lang/String;Lorg/quiltmc/qsl/base/api/util/TriState;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final synthetic fun classDiscriminator ()Ljava/lang/String;

library/src/main/java/org/quiltmc/qkl/library/mixin/serialization/ForwardingDynamicOpsAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/java/org/quiltmc/qkl/library/mixin/text/StyleAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Quilt Project
+ * Copyright 2024 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,17 @@
 package org.quiltmc.qkl.library.brigadier.argument
 
 
-import net.minecraft.advancement.Advancement
 import net.minecraft.command.argument.IdentifierArgumentType
 import net.minecraft.loot.condition.LootCondition
 import net.minecraft.loot.function.LootFunction
-import net.minecraft.recipe.Recipe
+import net.minecraft.recipe.RecipeHolder
 import net.minecraft.server.command.ServerCommandSource
+import net.minecraft.unmapped.C_unoypvme
 import net.minecraft.util.Identifier
 import org.quiltmc.qkl.library.brigadier.*
 
+public typealias AdvancementHolder = C_unoypvme // Mapped in later versions, should be removed.
+
 /**
  * Reads the [Identifier] value from the
  * argument in the receiver [ArgumentReader].
@@ -49,7 +51,7 @@ public fun DefaultArgumentReader<IdentifierArgumentType>.value(): Identifier {
 /**
  * Reads the [Identifier] value from the
  * argument in the receiver [ArgumentReader]
- * as an [Advancement].
+ * as an [AdvancementHolder].
  *
  * @see IdentifierArgumentType.getAdvancementArgument
  *
@@ -61,7 +63,7 @@ public fun ArgumentReader<
         DefaultArgumentDescriptor<
                 IdentifierArgumentType
                 >
-        >.asAdvancement(): Advancement {
+        >.asAdvancement(): AdvancementHolder {
     return IdentifierArgumentType.getAdvancementArgument(context, name)
 }
 
@@ -106,7 +108,7 @@ public fun ArgumentReader<
 /**
  * Reads the [Identifier] value from the
  * argument in the receiver [ArgumentReader]
- * as a [Recipe].
+ * as a [RecipeHolder].
  *
  * @see IdentifierArgumentType.getRecipeArgument
  *
@@ -118,7 +120,7 @@ public fun ArgumentReader<
         DefaultArgumentDescriptor<
                 IdentifierArgumentType
                 >
-        >.asRecipe(): Recipe<*> {
+        >.asRecipe(): RecipeHolder<*> {
     return IdentifierArgumentType.getRecipeArgument(context, name)
 }