From 53f71fd02f2020bebb495c5bcdda6f07d1152f6c Mon Sep 17 00:00:00 2001 From: Nerjal Nosk Date: Sat, 6 Apr 2024 12:40:54 +0200 Subject: [PATCH 1/4] enforce using Java 17 when default jvm is another one --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 093dd39643..d8b8e16bb7 100644 --- a/build.gradle +++ b/build.gradle @@ -268,6 +268,9 @@ combineUnpickDefinitions { java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } } tasks.withType(JavaCompile).configureEach { From 62566f973547e3148f82b4345ff311c239072c68 Mon Sep 17 00:00:00 2001 From: Nerjal Nosk Date: Sat, 6 Apr 2024 12:53:13 +0200 Subject: [PATCH 2/4] Fix AbstractNbtList add/remove mapping --- mappings/net/minecraft/nbt/AbstractNbtList.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/nbt/AbstractNbtList.mapping b/mappings/net/minecraft/nbt/AbstractNbtList.mapping index 7d163e35f9..02ac64e64f 100644 --- a/mappings/net/minecraft/nbt/AbstractNbtList.mapping +++ b/mappings/net/minecraft/nbt/AbstractNbtList.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList COMMENT Represents an abstraction of a mutable NBT list which holds elements of the same type. - METHOD add (ILjava/lang/Object;)V + METHOD add add (ILjava/lang/Object;)V ARG 1 index ARG 2 value METHOD method_10533 addElement (ILnet/minecraft/class_2520;)Z @@ -21,7 +21,7 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList COMMENT Gets the {@linkplain NbtElement#getType type} of element that this list holds. COMMENT COMMENT @return the type of element that this list holds - METHOD remove (I)Ljava/lang/Object; + METHOD remove remove (I)Ljava/lang/Object; ARG 1 index METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index From bdec53b5ee7be35e34ff41379b4b13a253dcc9cd Mon Sep 17 00:00:00 2001 From: Nerjal Nosk Date: Sat, 6 Apr 2024 14:08:50 +0200 Subject: [PATCH 3/4] revert non-working Jdk fix attempt --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index d8b8e16bb7..093dd39643 100644 --- a/build.gradle +++ b/build.gradle @@ -268,9 +268,6 @@ combineUnpickDefinitions { java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } } tasks.withType(JavaCompile).configureEach { From 9a47f1f963190eb055fd900f51fab41fcd7ed9b8 Mon Sep 17 00:00:00 2001 From: Nerjal Nosk Date: Sat, 6 Apr 2024 14:40:32 +0200 Subject: [PATCH 4/4] Change remapping to properly rename synthetic obfuscation methods --- mappings/net/minecraft/nbt/AbstractNbtList.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/nbt/AbstractNbtList.mapping b/mappings/net/minecraft/nbt/AbstractNbtList.mapping index 02ac64e64f..744bf08b03 100644 --- a/mappings/net/minecraft/nbt/AbstractNbtList.mapping +++ b/mappings/net/minecraft/nbt/AbstractNbtList.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList COMMENT Represents an abstraction of a mutable NBT list which holds elements of the same type. - METHOD add add (ILjava/lang/Object;)V + METHOD method_10531 add (ILjava/lang/Object;)V ARG 1 index ARG 2 value METHOD method_10533 addElement (ILnet/minecraft/class_2520;)Z @@ -21,7 +21,7 @@ CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList COMMENT Gets the {@linkplain NbtElement#getType type} of element that this list holds. COMMENT COMMENT @return the type of element that this list holds - METHOD remove remove (I)Ljava/lang/Object; + METHOD method_10531 remove (I)Ljava/lang/Object; ARG 1 index METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index