From e515eeded75e1fc48f913fa55b6dbfe9d755997d Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 2 Dec 2022 10:39:10 +1100 Subject: [PATCH] 1.19.3-rc1 stuff (#3439) --- .../gui/screen/pack/PackListWidget.mapping | 5 +++++ .../client/gui/screen/pack/PackScreen.mapping | 2 ++ .../client/option/GameOptions.mapping | 2 ++ .../fix/OptionsAmbientOcclusionFix.mapping | 5 +++++ .../entity/mob/SkeletonEntity.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 4 ++-- mappings/net/minecraft/nbt/NbtByte.mapping | 1 + .../net/minecraft/nbt/NbtByteArray.mapping | 1 + .../net/minecraft/nbt/NbtCompound.mapping | 1 + mappings/net/minecraft/nbt/NbtDouble.mapping | 1 + mappings/net/minecraft/nbt/NbtEnd.mapping | 1 + mappings/net/minecraft/nbt/NbtFloat.mapping | 1 + mappings/net/minecraft/nbt/NbtInt.mapping | 1 + .../net/minecraft/nbt/NbtIntArray.mapping | 1 + mappings/net/minecraft/nbt/NbtList.mapping | 1 + mappings/net/minecraft/nbt/NbtLong.mapping | 1 + .../net/minecraft/nbt/NbtLongArray.mapping | 1 + mappings/net/minecraft/nbt/NbtShort.mapping | 1 + mappings/net/minecraft/nbt/NbtString.mapping | 1 + .../minecraft/nbt/NbtTagSizeTracker.mapping | 3 +++ .../play/PlaySoundFromEntityS2CPacket.mapping | 1 + .../net/minecraft/test/TestContext.mapping | 12 +++++++++++ .../net/minecraft/util/JsonHelper.mapping | 21 ++++++++++++++++--- mappings/net/minecraft/world/World.mapping | 1 + 24 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index ba85dcf4e8..3fdc94e29a 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -3,8 +3,13 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge FIELD field_19125 RESOURCE_PACKS_TEXTURE Lnet/minecraft/class_2960; FIELD field_19126 INCOMPATIBLE Lnet/minecraft/class_2561; FIELD field_19127 INCOMPATIBLE_CONFIRM Lnet/minecraft/class_2561; + FIELD field_41715 screen Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;IILnet/minecraft/class_2561;)V ARG 1 client + ARG 2 screen + ARG 3 width + ARG 4 height + ARG 5 title CLASS class_4271 ResourcePackEntry FIELD field_19128 client Lnet/minecraft/class_310; FIELD field_19129 pack Lnet/minecraft/class_5369$class_5371; diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 875395eff8..c3d4985edc 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -27,6 +27,8 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen METHOD method_29672 (Lnet/minecraft/class_521;Lnet/minecraft/class_5369$class_5371;)V ARG 2 pack METHOD method_29673 updatePackList (Lnet/minecraft/class_521;Ljava/util/stream/Stream;)V + ARG 1 widget + ARG 2 packs METHOD method_29674 (Ljava/nio/file/Path;Ljava/nio/file/Path;Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/nio/file/Path;)V ARG 3 toCopy METHOD method_29675 (Ljava/nio/file/Path;Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/nio/file/Path;)V diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index e1b86f3449..81bd167e66 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -560,6 +560,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 optionText ARG 1 value METHOD method_47609 getTelemetryOptInExtra ()Lnet/minecraft/class_7172; + METHOD method_47999 (Ljava/lang/Boolean;)V + ARG 0 value CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping new file mode 100644 index 0000000000..ab27c5818b --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8004 net/minecraft/datafixer/fix/OptionsAmbientOcclusionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_47998 fixValue (Ljava/lang/String;)Ljava/lang/String; + ARG 0 oldValue diff --git a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping index e9a385b2f5..f4a2ab06fe 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1613 net/minecraft/entity/mob/SkeletonEntity FIELD field_28643 inPowderSnowTime I FIELD field_28644 conversionTime I FIELD field_30495 STRAY_CONVERSION_TIME_KEY Ljava/lang/String; + FIELD field_41714 TOTAL_CONVERSION_TIME I METHOD method_33589 setConversionTime (I)V ARG 1 time METHOD method_33590 isConverting ()Z diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index d6cc77bb86..4473d21fea 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -470,7 +470,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #setHolder COMMENT @see #getFrame COMMENT @see #getHolder - METHOD method_7962 isItemEqualIgnoreDamage (Lnet/minecraft/class_1799;)Z + METHOD method_7962 isItemEqual (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_7963 isDamageable ()Z COMMENT {@return whether the item can be damaged (lose durability)} @@ -595,7 +595,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT @see Item Stack NBT Operations ARG 1 key - METHOD method_7984 areItemsEqualIgnoreDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + METHOD method_7984 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 left ARG 1 right METHOD method_7985 hasNbt ()Z diff --git a/mappings/net/minecraft/nbt/NbtByte.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping index 8602240650..bf05b4f471 100644 --- a/mappings/net/minecraft/nbt/NbtByte.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte COMMENT The NBT byte representing {@code 1}. COMMENT COMMENT @apiNote This is often used to indicate a true boolean value. + FIELD field_41717 SIZE I METHOD (B)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping index b28a2a5f9f..4f65d169ad 100644 --- a/mappings/net/minecraft/nbt/NbtByteArray.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray COMMENT The backing array can be obtained via {@link #getByteArray()}. FIELD field_11493 value [B FIELD field_21024 TYPE Lnet/minecraft/class_4614; + FIELD field_41716 SIZE I METHOD (Ljava/util/List;)V ARG 1 value METHOD ([B)V diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 60b4e2e17a..9571263814 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound FIELD field_11515 entries Ljava/util/Map; FIELD field_21029 TYPE Lnet/minecraft/class_4614; FIELD field_25128 CODEC Lcom/mojang/serialization/Codec; + FIELD field_41718 SIZE I METHOD (Ljava/util/Map;)V ARG 1 entries METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping index 74e11dc608..144674296e 100644 --- a/mappings/net/minecraft/nbt/NbtDouble.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble FIELD field_21030 ZERO Lnet/minecraft/class_2489; COMMENT The NBT double representing {@code 0.0}. FIELD field_21031 TYPE Lnet/minecraft/class_4614; + FIELD field_41720 SIZE I METHOD (D)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtEnd.mapping b/mappings/net/minecraft/nbt/NbtEnd.mapping index 461651aab1..ad801d80b6 100644 --- a/mappings/net/minecraft/nbt/NbtEnd.mapping +++ b/mappings/net/minecraft/nbt/NbtEnd.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtEnd FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; COMMENT A dummy instance of the NBT end. It will never appear nested in any parsed NBT COMMENT structure and should never be used as NBT compound values or list elements. + FIELD field_41721 SIZE I diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping index 386a398c80..989da69b69 100644 --- a/mappings/net/minecraft/nbt/NbtFloat.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat FIELD field_21034 ZERO Lnet/minecraft/class_2494; COMMENT The NBT float representing {@code 0.0f}. FIELD field_21035 TYPE Lnet/minecraft/class_4614; + FIELD field_41722 SIZE I METHOD (F)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtInt.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping index 1f90520660..4f8d6bef79 100644 --- a/mappings/net/minecraft/nbt/NbtInt.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt COMMENT Instances are immutable. FIELD field_11525 value I FIELD field_21037 TYPE Lnet/minecraft/class_4614; + FIELD field_41724 SIZE I METHOD (I)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtIntArray.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping index 4d9f198cd0..c05095ca2a 100644 --- a/mappings/net/minecraft/nbt/NbtIntArray.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray COMMENT The backing array can be obtained via {@link #getIntArray()}. FIELD field_11524 value [I FIELD field_21036 TYPE Lnet/minecraft/class_4614; + FIELD field_41723 SIZE I METHOD (Ljava/util/List;)V ARG 1 value METHOD ([I)V diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index a8cf6dc2a1..c863f63be2 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList FIELD field_11550 value Ljava/util/List; FIELD field_11551 type B FIELD field_21039 TYPE Lnet/minecraft/class_4614; + FIELD field_41725 SIZE I METHOD (Ljava/util/List;B)V ARG 1 list ARG 2 type diff --git a/mappings/net/minecraft/nbt/NbtLong.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping index 4c79749bf0..1b2676d8a2 100644 --- a/mappings/net/minecraft/nbt/NbtLong.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong COMMENT Instances are immutable. FIELD field_11553 value J FIELD field_21041 TYPE Lnet/minecraft/class_4614; + FIELD field_41727 SIZE I METHOD (J)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtLongArray.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping index 2d11a0148f..80e83389f2 100644 --- a/mappings/net/minecraft/nbt/NbtLongArray.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray COMMENT The backing array can be obtained via {@link #getLongArray()}. FIELD field_11552 value [J FIELD field_21040 TYPE Lnet/minecraft/class_4614; + FIELD field_41726 SIZE I METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 value METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/nbt/NbtShort.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping index 9abf6d61d1..44c6bba7f1 100644 --- a/mappings/net/minecraft/nbt/NbtShort.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort COMMENT Instances are immutable. FIELD field_11588 value S FIELD field_21043 TYPE Lnet/minecraft/class_4614; + FIELD field_41728 SIZE I METHOD (S)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 8c7add0eb8..8fbcfb9f6e 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString FIELD field_33243 SINGLE_QUOTE C FIELD field_33244 BACKSLASH C FIELD field_33245 NULL C + FIELD field_41729 SIZE I METHOD (Ljava/lang/String;)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping index ae29239b05..439a1ed6fc 100644 --- a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -6,3 +6,6 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker FIELD field_11557 maxBytes J METHOD (J)V ARG 1 maxBytes + METHOD method_47987 getAllocatedBytes ()J + METHOD method_48004 add (J)V + ARG 1 bytes diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 1806ae9cf9..5bcd5d75d2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V + ARG 1 sound ARG 2 category ARG 3 entity ARG 4 volume diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index decc73946c..113917334d 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -349,3 +349,15 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 pos ARG 2 player ARG 3 result + METHOD method_48000 (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_48001 expectEntityHoldingItem (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)V + ARG 1 pos + ARG 2 entityType + ARG 3 item + METHOD method_48002 (Ljava/lang/Object;)Z + ARG 0 entity + METHOD method_48003 expectEntityWithItem (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)V + ARG 1 pos + ARG 2 entityType + ARG 3 item diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index df2934396d..73c894ee03 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -84,7 +84,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15276 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 gson ARG 1 reader - ARG 2 clazz + ARG 2 type METHOD method_15277 getFloat (Lcom/google/gson/JsonObject;Ljava/lang/String;F)F ARG 0 object ARG 1 element @@ -95,7 +95,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15279 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; ARG 0 gson ARG 1 content - ARG 2 clazz + ARG 2 type ARG 3 lenient METHOD method_15280 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J ARG 0 object @@ -118,7 +118,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15284 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 gson ARG 1 content - ARG 2 clazz + ARG 2 type METHOD method_15285 deserialize (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 content METHOD method_15286 isString (Lcom/google/gson/JsonElement;)Z @@ -245,3 +245,18 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 content METHOD method_43680 toSortedString (Lcom/google/gson/JsonElement;)Ljava/lang/String; ARG 0 json + METHOD method_47992 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 typeToken + ARG 3 lenient + METHOD method_47993 deserializeNullable (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 type + ARG 3 lenient + METHOD method_47994 deserializeNullable (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 content + ARG 2 type + ARG 3 lenient diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 25f210e13d..eda055c707 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -273,6 +273,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 except COMMENT the player that should not receive the sound, or {@code null} ARG 2 entity + ARG 3 sound ARG 4 category ARG 5 volume ARG 6 pitch