Skip to content

Commit 858f2ec

Browse files
author
Ellie Semele
authored
Update to 1.20.2 (#88)
1 parent 8865201 commit 858f2ec

File tree

25 files changed

+312
-131
lines changed

25 files changed

+312
-131
lines changed

‎build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ allprojects {
7373

7474
license {
7575
rule(file("${rootProject.projectDir}/codeformat/HEADER"))
76-
include("**/*.kt")
7776
}
7877

7978
kotlin {

‎codeformat/HEADER

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright ${YEAR} The Quilt Project
1+
Copyright ${CREATION_YEAR} The Quilt Project
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
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
1010
distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
13-
limitations under the License.
14-
15-
;;year_selection: file
13+
limitations under the License.

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,12 @@ public open class KotlinAdapter : LanguageAdapter {
116116
return Proxy.newProxyInstance(
117117
mod.classLoader,
118118
arrayOf(type)
119-
) { _, _, _ ->
120-
methods[0].call(instance)
119+
) { _, _, params ->
120+
if (params != null) {
121+
methods[0].call(instance, *params)
122+
} else {
123+
methods[0].call(instance)
124+
}
121125
} as T
122126
}
123127
else -> {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"contact": {
1414
"homepage": "https://quiltmc.org",
15-
"issues": "https://github.com/quiltmc/quilt-kotlin-libaries/issues",
15+
"issues": "https://github.com/quiltmc/quilt-kotlin-libraries/issues",
1616
"sources": "https://github.com/quiltmc/quilt-kotlin-libraries"
1717
},
1818
"license": "Apache-2.0",
@@ -22,7 +22,7 @@
2222
"depends": [
2323
{
2424
"id": "quilt_loader",
25-
"versions": ">=0.18.1"
25+
"versions": ">=0.23.0"
2626
}
2727
],
2828
"provides": [

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ org.gradle.parallel=true
55
kotlin.incremental=true
66
kotlin.code.style=official
77

8-
version=2.1.3
9-
flkVersion=1.10.10
8+
version=3.0.0
9+
flkVersion=1.10.17

‎gradle/libs.versions.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
2-
atomic = "0.22.0"
2+
atomic = "0.23.1"
33
coroutines = "1.7.3"
4-
datetime = "0.4.1"
5-
dokka = "1.9.0"
6-
kotlin = "1.9.10"
7-
minecraft = "1.20.1"
8-
qsl = "6.1.1+1.20.1"
9-
quilt_loader = "0.20.2"
10-
quilt_mappings = "1.20.1+build.23"
11-
serialization = "1.6.0"
12-
serialization_plugin = "1.9.10" # usually same as kotlin but can lag behind
4+
datetime = "0.5.0"
5+
dokka = "1.9.10"
6+
kotlin = "1.9.22"
7+
minecraft = "1.20.2"
8+
qsl = "7.0.0-alpha.9+1.20.2"
9+
quilt_loader = "0.23.0"
10+
quilt_mappings = "1.20.2+build.3"
11+
serialization = "1.6.2"
12+
serialization_plugin = "1.9.22" # usually same as kotlin but can lag behind
1313
binary_compat_plugin = "0.13.2"
1414

1515
[libraries]
@@ -28,13 +28,13 @@ serialization_core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cor
2828
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm", version.ref = "serialization" }
2929

3030
[plugins]
31-
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.1" }
31+
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.4" }
3232
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
3333
git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }
3434
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
35-
licenser = { id = "org.quiltmc.gradle.licenser", version = "2.0.1" }
35+
licenser = { id = "dev.yumi.gradle.licenser", version = "1.1.1" }
3636
quilt_loom = { id = "org.quiltmc.loom", version = "1.4.1" }
3737
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization_plugin" }
3838
binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary_compat_plugin" }
39-
minotaur = { id = "com.modrinth.minotaur", version = "2.8.2" }
39+
minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
4040
cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.4.0" }

‎gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+7-7
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎gradlew.bat

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

‎library/api/library.api

+24-13
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ public final class org/quiltmc/qkl/library/brigadier/DefaultArgumentDescriptor :
110110
public final class org/quiltmc/qkl/library/brigadier/argument/ArgumentsKt {
111111
public static final fun absoluteRotationArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/util/math/Vec2f;
112112
public static final fun angle (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
113-
public static final fun asAdvancement (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/advancement/Advancement;
113+
public static final fun asAdvancement (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/unmapped/C_unoypvme;
114114
public static final fun asItemModifier (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/loot/function/LootFunction;
115115
public static final fun asPredicate (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/loot/condition/LootCondition;
116-
public static final fun asRecipe (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/recipe/Recipe;
116+
public static final fun asRecipe (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/recipe/RecipeHolder;
117117
public static final fun blockPos (Ljava/lang/String;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
118118
public static final fun blockPredicate (Ljava/lang/String;Lnet/minecraft/command/CommandBuildContext;)Lorg/quiltmc/qkl/library/brigadier/ArgumentConstructor;
119119
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 {
213213
public static final fun valueRotationArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/command/argument/PosArgument;
214214
public static final fun valueScoreboardCriterionArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardCriterion;
215215
public static final fun valueScoreboardObjectiveArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardObjective;
216-
public static final fun valueScoreboardSlotArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)I
216+
public static final fun valueScoreboardSlotArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/scoreboard/ScoreboardDisplaySlot;
217217
public static final fun valueSingleEntityArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Lnet/minecraft/entity/Entity;
218218
public static final fun valueSingleScoreHolderArg (Lorg/quiltmc/qkl/library/brigadier/ArgumentReader;)Ljava/lang/String;
219219
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 {
318318
}
319319

320320
public final class org/quiltmc/qkl/library/client/networking/ClientEventsKt {
321+
public static final fun onClientConfigurationChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
322+
public static final fun onClientConfigurationChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
321323
public static final fun onClientPlayChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
322324
public static final fun onClientPlayChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
325+
public static final fun onConfigurationDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
326+
public static final fun onConfigurationInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
327+
public static final fun onConfigurationReady (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function3;)V
323328
public static final fun onLoginDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
324329
public static final fun onLoginInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
325330
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 {
329334
}
330335

331336
public final class org/quiltmc/qkl/library/client/resource/ResourceLoaderEventsKt {
332-
public static final fun onResourcePackReloadFinish (Lkotlin/jvm/functions/Function1;)V
333-
public static final fun onResourcePackReloadStart (Lkotlin/jvm/functions/Function1;)V
337+
public static final fun onPackReloadFinish (Lkotlin/jvm/functions/Function1;)V
338+
public static final fun onPackReloadStart (Lkotlin/jvm/functions/Function1;)V
334339
}
335340

336341
public final class org/quiltmc/qkl/library/client/screen/ScreenEventsKt {
@@ -785,6 +790,12 @@ public final class org/quiltmc/qkl/library/networking/PlayerLookupsKt {
785790
public final class org/quiltmc/qkl/library/networking/ServerEventsKt {
786791
public static final fun afterEntityTrackingStart (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
787792
public static final fun beforeEntityTrackingStart (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
793+
public static final fun onConfigurationAddTasks (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
794+
public static final fun onConfigurationChannelRegister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
795+
public static final fun onConfigurationChannelUnregister (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function4;)V
796+
public static final fun onConfigurationDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
797+
public static final fun onConfigurationInit (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
798+
public static final fun onConfigurationReady (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function3;)V
788799
public static final fun onEntityTrackingStop (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
789800
public static final fun onLoginDisconnect (Lorg/quiltmc/qkl/library/EventRegistration;Lkotlin/jvm/functions/Function2;)V
790801
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 {
804815

805816
public final class org/quiltmc/qkl/library/recipe/RecipeExtensionsKt {
806817
public static final fun coerceIngredient (Ljava/lang/Object;)Lnet/minecraft/recipe/Ingredient;
807-
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;
808-
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;
809-
public static final fun registerStaticRecipe (Lnet/minecraft/recipe/Recipe;)Lnet/minecraft/recipe/Recipe;
810-
public static final fun registerStaticRecipes ([Lnet/minecraft/recipe/Recipe;)V
811-
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;
812-
public static final fun shapelessRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/recipe/ShapelessRecipe;
818+
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;
819+
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;
820+
public static final fun registerStaticRecipe (Lnet/minecraft/recipe/RecipeHolder;)Lnet/minecraft/recipe/RecipeHolder;
821+
public static final fun registerStaticRecipes ([Lnet/minecraft/recipe/RecipeHolder;)V
822+
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;
823+
public static final fun shapelessRecipe (Lnet/minecraft/util/Identifier;Ljava/lang/String;Lnet/minecraft/item/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/recipe/RecipeHolder;
813824
}
814825

815826
public final class org/quiltmc/qkl/library/registry/RegistryAction {
@@ -943,12 +954,12 @@ public synthetic class org/quiltmc/qkl/library/serialization/annotation/CodecSer
943954
public final synthetic fun useInlineWrapper ()Lorg/quiltmc/qsl/base/api/util/TriState;
944955
}
945956

946-
public abstract interface annotation class org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic : java/lang/annotation/Annotation {
957+
public abstract interface annotation class org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable : java/lang/annotation/Annotation {
947958
public abstract fun classDiscriminator ()Ljava/lang/String;
948959
public abstract fun flatten ()Lorg/quiltmc/qsl/base/api/util/TriState;
949960
}
950961

951-
public synthetic class org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic$Impl : org/quiltmc/qkl/library/serialization/annotation/CodecSerializable$Polymorphic {
962+
public synthetic class org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable$Impl : org/quiltmc/qkl/library/serialization/annotation/PolymorphicCodecSerializable {
952963
public fun <init> (Ljava/lang/String;Lorg/quiltmc/qsl/base/api/util/TriState;)V
953964
public synthetic fun <init> (Ljava/lang/String;Lorg/quiltmc/qsl/base/api/util/TriState;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
954965
public final synthetic fun classDiscriminator ()Ljava/lang/String;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 QuiltMC
2+
* Copyright 2022 The Quilt Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 QuiltMC
2+
* Copyright 2022 The Quilt Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

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

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 The Quilt Project
2+
* Copyright 2024 The Quilt Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,15 +23,17 @@
2323
package org.quiltmc.qkl.library.brigadier.argument
2424

2525

26-
import net.minecraft.advancement.Advancement
2726
import net.minecraft.command.argument.IdentifierArgumentType
2827
import net.minecraft.loot.condition.LootCondition
2928
import net.minecraft.loot.function.LootFunction
30-
import net.minecraft.recipe.Recipe
29+
import net.minecraft.recipe.RecipeHolder
3130
import net.minecraft.server.command.ServerCommandSource
31+
import net.minecraft.unmapped.C_unoypvme
3232
import net.minecraft.util.Identifier
3333
import org.quiltmc.qkl.library.brigadier.*
3434

35+
public typealias AdvancementHolder = C_unoypvme // Mapped in later versions, should be removed.
36+
3537
/**
3638
* Reads the [Identifier] value from the
3739
* argument in the receiver [ArgumentReader].
@@ -49,7 +51,7 @@ public fun DefaultArgumentReader<IdentifierArgumentType>.value(): Identifier {
4951
/**
5052
* Reads the [Identifier] value from the
5153
* argument in the receiver [ArgumentReader]
52-
* as an [Advancement].
54+
* as an [AdvancementHolder].
5355
*
5456
* @see IdentifierArgumentType.getAdvancementArgument
5557
*
@@ -61,7 +63,7 @@ public fun ArgumentReader<
6163
DefaultArgumentDescriptor<
6264
IdentifierArgumentType
6365
>
64-
>.asAdvancement(): Advancement {
66+
>.asAdvancement(): AdvancementHolder {
6567
return IdentifierArgumentType.getAdvancementArgument(context, name)
6668
}
6769

@@ -106,7 +108,7 @@ public fun ArgumentReader<
106108
/**
107109
* Reads the [Identifier] value from the
108110
* argument in the receiver [ArgumentReader]
109-
* as a [Recipe].
111+
* as a [RecipeHolder].
110112
*
111113
* @see IdentifierArgumentType.getRecipeArgument
112114
*
@@ -118,7 +120,7 @@ public fun ArgumentReader<
118120
DefaultArgumentDescriptor<
119121
IdentifierArgumentType
120122
>
121-
>.asRecipe(): Recipe<*> {
123+
>.asRecipe(): RecipeHolder<*> {
122124
return IdentifierArgumentType.getRecipeArgument(context, name)
123125
}
124126

0 commit comments

Comments
 (0)