From 2d04635cfc6b9e9a7daf72bcc68bd7db88485eca Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 12 Sep 2023 23:39:11 +0900 Subject: [PATCH] 1.20.2-pre3 stuff (#3663) --- .../client/network/ServerInfo.mapping | 3 +++ .../screen/RealmsBrokenWorldScreen.mapping | 2 ++ .../gui/screen/RealmsMainScreen.mapping | 2 ++ .../gui/screen/RealmsTermsScreen.mapping | 1 + .../client/realms/task/OpenServerTask.mapping | 2 ++ .../task/RealmsGetServerDetailsTask.mapping | 3 +++ .../client/texture/SpriteAtlasTexture.mapping | 1 + .../effect/StatusEffectInstance.mapping | 4 +++ mappings/net/minecraft/nbt/NbtByte.mapping | 4 +++ .../net/minecraft/nbt/NbtByteArray.mapping | 4 +++ .../net/minecraft/nbt/NbtCompound.mapping | 10 ++++++++ mappings/net/minecraft/nbt/NbtDouble.mapping | 4 +++ mappings/net/minecraft/nbt/NbtFloat.mapping | 4 +++ mappings/net/minecraft/nbt/NbtInt.mapping | 4 +++ .../net/minecraft/nbt/NbtIntArray.mapping | 4 +++ mappings/net/minecraft/nbt/NbtIo.mapping | 25 ++++++++++++++++--- mappings/net/minecraft/nbt/NbtList.mapping | 8 ++++++ mappings/net/minecraft/nbt/NbtLong.mapping | 4 +++ .../net/minecraft/nbt/NbtLongArray.mapping | 4 +++ mappings/net/minecraft/nbt/NbtShort.mapping | 4 +++ .../nbt/NbtSizeValidationException.mapping | 3 +++ mappings/net/minecraft/nbt/NbtString.mapping | 4 +++ .../minecraft/nbt/NbtTagSizeTracker.mapping | 15 +++++++++-- mappings/net/minecraft/nbt/NbtType.mapping | 5 ++++ .../minecraft/recipe/CuttingRecipe.mapping | 6 +++++ .../recipe/StonecuttingRecipe.mapping | 1 + .../net/minecraft/util/PngMetadata.mapping | 8 ++++++ .../net/minecraft/village/TradeOffer.mapping | 3 +++ .../minecraft/village/TradeOfferList.mapping | 1 + 29 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/nbt/NbtSizeValidationException.mapping create mode 100644 mappings/net/minecraft/util/PngMetadata.mapping diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 09711b51a5..b3694d6b5c 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_42889 LOGGER Lorg/slf4j/Logger; FIELD field_42890 favicon [B FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; + FIELD field_46206 MAX_FAVICON_SIZE I METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V ARG 1 name ARG 2 address @@ -49,6 +50,8 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 1 favicon METHOD method_49306 getFavicon ()[B METHOD method_52811 isRealm ()Z + METHOD method_53885 validateFavicon ([B)[B + ARG 0 favicon CLASS class_643 ResourcePackPolicy COMMENT The policy of the client when this server sends a {@linkplain COMMENT net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket server diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping index f745cc93ba..6426879df9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok FIELD field_45239 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;JZ)V ARG 1 parent + ARG 2 serverId + ARG 4 minigame METHOD method_21178 addButtons ()V METHOD method_21179 getFramePositionX (I)I ARG 1 i diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index f8236c4b59..5e0a92a005 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -54,6 +54,8 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V + ARG 0 serverData + ARG 1 parent METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20884 shouldRenewButtonBeActive (Lnet/minecraft/class_4877;)Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping index 3b5264bb17..1b24dfcce0 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4426 net/minecraft/client/realms/gui/screen/RealmsTerm FIELD field_26525 SENTENCE_TWO_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V ARG 1 parent + ARG 2 realmsServer METHOD method_21505 agreedToTos ()V METHOD method_25274 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping index 19446fa347..e7ddd3461d 100644 --- a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_4437 net/minecraft/client/realms/task/OpenServerTask METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;ZLnet/minecraft/class_310;)V ARG 1 realmsServer ARG 2 returnScreen + ARG 3 join + ARG 4 client diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index bcb796d76b..d4d157459a 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerD FIELD field_20225 lastScreen Lnet/minecraft/class_437; FIELD field_36356 LOGGER Lorg/slf4j/Logger; FIELD field_46135 TITLE Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V + ARG 1 lastScreen + ARG 2 server METHOD method_25286 (Lnet/minecraft/class_4878;Ljava/lang/Throwable;)Ljava/lang/Void; ARG 2 throwable METHOD method_32511 createConnectingScreen (Lnet/minecraft/class_4878;)Lnet/minecraft/class_4398; diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index a78948a394..39e3664f6b 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_43113 width I FIELD field_43114 height I FIELD field_43115 mipLevel I + FIELD field_46207 missingSprite Lnet/minecraft/class_1058; FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_5276 animatedSprites Ljava/util/List; FIELD field_5277 spritesToLoad Ljava/util/List; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 0668962d64..a6b1f7a584 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_1291;)V + ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -51,6 +53,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData + METHOD (Lnet/minecraft/class_1293;)V + ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtByte.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping index bf05b4f471..2e08de72fe 100644 --- a/mappings/net/minecraft/nbt/NbtByte.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -24,5 +24,9 @@ CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte METHOD method_23234 of (Z)Lnet/minecraft/class_2481; COMMENT {@return the NBT byte representing the boolean {@code value}} ARG 0 value + CLASS 1 + METHOD method_53887 readByte (Ljava/io/DataInput;Lnet/minecraft/class_2505;)B + ARG 0 input + ARG 1 tracker CLASS class_4610 Cache FIELD field_21028 VALUES [Lnet/minecraft/class_2481; diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping index 4f65d169ad..e32dc4020e 100644 --- a/mappings/net/minecraft/nbt/NbtByteArray.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -21,3 +21,7 @@ CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray COMMENT also apply to this NBT byte array. METHOD method_10522 toArray (Ljava/util/List;)[B ARG 0 list + CLASS 1 + METHOD method_53886 readByteArray (Ljava/io/DataInput;Lnet/minecraft/class_2505;)[B + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index e7cb79d0c0..5308503e64 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -303,6 +303,8 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound COMMENT Returns {@code true} if this {@code NbtCompound} contains a valid UUID representation associated with the given key. COMMENT A valid UUID is represented by an int array of length 4. ARG 1 key + METHOD method_29141 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; + ARG 0 dynamic METHOD method_29142 (Lnet/minecraft/class_2487;)Lcom/mojang/serialization/Dynamic; ARG 0 nbt METHOD method_29143 toMap ()Ljava/util/Map; @@ -318,3 +320,11 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound COMMENT @see #putByteArray(String, byte[]) ARG 1 key ARG 2 value + CLASS 1 + METHOD method_53888 scanCompound (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838; + ARG 0 input + ARG 1 visitor + ARG 2 tracker + METHOD method_53889 readCompound (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping index 144674296e..85070663a1 100644 --- a/mappings/net/minecraft/nbt/NbtDouble.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble METHOD method_23241 of (D)Lnet/minecraft/class_2489; COMMENT {@return the NBT double from {@code value}} ARG 0 value + CLASS 1 + METHOD method_53890 readDouble (Ljava/io/DataInput;Lnet/minecraft/class_2505;)D + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping index 989da69b69..a217d71127 100644 --- a/mappings/net/minecraft/nbt/NbtFloat.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat METHOD method_23244 of (F)Lnet/minecraft/class_2494; COMMENT {@return the NBT float from {@code value}} ARG 0 value + CLASS 1 + METHOD method_53891 readFloat (Ljava/io/DataInput;Lnet/minecraft/class_2505;)F + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtInt.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping index 4f8d6bef79..04018d5497 100644 --- a/mappings/net/minecraft/nbt/NbtInt.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt METHOD method_23247 of (I)Lnet/minecraft/class_2497; COMMENT {@return the NBT integer from {@code value}} ARG 0 value + CLASS 1 + METHOD method_53893 readInt (Ljava/io/DataInput;Lnet/minecraft/class_2505;)I + ARG 0 input + ARG 1 tracker CLASS class_4611 Cache FIELD field_21038 VALUES [Lnet/minecraft/class_2497; FIELD field_33197 MAX I diff --git a/mappings/net/minecraft/nbt/NbtIntArray.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping index c05095ca2a..bbffbbfbef 100644 --- a/mappings/net/minecraft/nbt/NbtIntArray.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -21,3 +21,7 @@ CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray COMMENT also apply to this NBT int array. METHOD method_10590 toArray (Ljava/util/List;)[I ARG 0 list + CLASS 1 + METHOD method_53892 readIntArray (Ljava/io/DataInput;Lnet/minecraft/class_2505;)[I + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 0eff1cba9c..e129cf71c1 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -1,11 +1,17 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT A set of utility functions for reading, writing, and scanning NBT files. + COMMENT Methods that do not require {@link NbtTagSizeTracker} accept any bytes of data, + COMMENT provided that its depth does not exceed {@value NbtTagSizeTracker#DEFAULT_MAX_DEPTH}. METHOD method_10625 readCompound (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT COMMENT @return the NBT compound from the input COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound + COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails + ARG 0 input + ARG 1 tracker + METHOD method_10626 readElement (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 0 input ARG 1 tracker METHOD method_10627 readCompound (Ljava/io/DataInput;)Lnet/minecraft/class_2487; @@ -14,6 +20,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @return the NBT compound from the input COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound + COMMENT @throws NbtSizeValidationException if the NBT is too deep ARG 0 input METHOD method_10628 writeCompound (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V COMMENT Writes the {@code nbt} to {@code output}. @@ -28,6 +35,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @return the NBT compound from the stream COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound + COMMENT @throws NbtSizeValidationException if the NBT is too deep COMMENT @see #readCompressed(File) ARG 0 stream METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/io/File;)V @@ -53,6 +61,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @return the NBT compound from the file, or {@code null} if the file does not exist COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound + COMMENT @throws NbtSizeValidationException if the NBT is too deep ARG 0 file METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V COMMENT Writes the Gzip-compressed {@code nbt} to {@code stream}. @@ -67,6 +76,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @return the NBT compound from the file COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound + COMMENT @throws NbtSizeValidationException if the NBT is too deep COMMENT @see #readCompressed(InputStream) ARG 0 file METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/File;)V @@ -84,8 +94,10 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT {@link net.minecraft.nbt.scanner.NbtCollector#getRoot()}. COMMENT COMMENT @throws IOException if the IO operation fails + COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails ARG 0 input ARG 1 scanner + ARG 2 tracker METHOD method_40057 scanCompressed (Ljava/io/File;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the compressed NBT file using {@code scanner}. COMMENT @@ -94,9 +106,11 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT {@link net.minecraft.nbt.scanner.NbtCollector#getRoot()}. COMMENT COMMENT @throws IOException if the IO operation fails - COMMENT @see #scanCompressed(InputStream, NbtScanner) + COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails + COMMENT @see #scanCompressed(InputStream, NbtScanner, NbtTagSizeTracker) ARG 0 file ARG 1 scanner + ARG 2 tracker METHOD method_40058 scanCompressed (Ljava/io/InputStream;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the compressed NBT stream using {@code scanner}. COMMENT @@ -105,14 +119,18 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT {@link net.minecraft.nbt.scanner.NbtCollector#getRoot()}. COMMENT COMMENT @throws IOException if the IO operation fails - COMMENT @see #scanCompressed(File, NbtScanner) + COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails + COMMENT @see #scanCompressed(File, NbtScanner, NbtTagSizeTracker) ARG 0 stream ARG 1 scanner + ARG 2 tracker METHOD method_40059 decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream; COMMENT {@return a new input stream that decompresses the input {@code stream}} ARG 0 stream - METHOD method_52892 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; + METHOD method_52892 readElement (Ljava/io/DataInput;Lnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; ARG 0 input + ARG 1 tracker + ARG 2 typeId METHOD method_52893 writeForPacket (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating COMMENT the element type, followed by the NBT data. @@ -130,5 +148,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT COMMENT @return the NBT element from the input COMMENT @throws IOException if the IO operation fails + COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index c863f63be2..126715ef13 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -70,3 +70,11 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList COMMENT COMMENT @apiNote Modifying the returned array also modifies the NBT long array. ARG 1 index + CLASS 1 + METHOD method_53894 scanList (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838; + ARG 0 input + ARG 1 visitor + ARG 2 tracker + METHOD method_53895 readList (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2499; + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtLong.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping index 1b2676d8a2..052fd3398d 100644 --- a/mappings/net/minecraft/nbt/NbtLong.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong METHOD method_23251 of (J)Lnet/minecraft/class_2503; COMMENT {@return the NBT long from {@code value}} ARG 0 value + CLASS 1 + METHOD method_53897 readLong (Ljava/io/DataInput;Lnet/minecraft/class_2505;)J + ARG 0 input + ARG 1 tracker CLASS class_4612 Cache FIELD field_21042 VALUES [Lnet/minecraft/class_2503; FIELD field_33202 MAX I diff --git a/mappings/net/minecraft/nbt/NbtLongArray.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping index 80e83389f2..440d404671 100644 --- a/mappings/net/minecraft/nbt/NbtLongArray.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -23,3 +23,7 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray COMMENT also apply to this NBT long array. METHOD method_10617 toArray (Ljava/util/List;)[J ARG 0 list + CLASS 1 + METHOD method_53896 readLongArray (Ljava/io/DataInput;Lnet/minecraft/class_2505;)[J + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtShort.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping index 44c6bba7f1..f5383ff8c3 100644 --- a/mappings/net/minecraft/nbt/NbtShort.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -11,6 +11,10 @@ CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort METHOD method_23254 of (S)Lnet/minecraft/class_2516; COMMENT {@return the NBT short from {@code value}} ARG 0 value + CLASS 1 + METHOD method_53903 readShort (Ljava/io/DataInput;Lnet/minecraft/class_2505;)S + ARG 0 input + ARG 1 tracker CLASS class_4613 Cache FIELD field_21044 VALUES [Lnet/minecraft/class_2516; FIELD field_33232 MAX I diff --git a/mappings/net/minecraft/nbt/NbtSizeValidationException.mapping b/mappings/net/minecraft/nbt/NbtSizeValidationException.mapping new file mode 100644 index 0000000000..7c8cb97def --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtSizeValidationException.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8801 net/minecraft/nbt/NbtSizeValidationException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 8fbcfb9f6e..c04dc49b36 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -28,3 +28,7 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString ARG 0 value METHOD method_39875 skip (Ljava/io/DataInput;)V ARG 0 input + CLASS 1 + METHOD method_53904 readString (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Ljava/lang/String; + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping index a172867283..6f2246f7c1 100644 --- a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -1,10 +1,21 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker - COMMENT Tracks the size of NBT elements. Throws {@link RuntimeException} if the - COMMENT tracked element becomes larger than {@link #maxBytes} during addition. + COMMENT Tracks the size of NBT elements in bytes and in depth. Throws {@link + COMMENT NbtSizeValidationException} if the tracked element becomes larger than {@link + COMMENT #maxBytes} or if the depth exceeds {@link #maxDepth} during addition. FIELD field_11555 allocatedBytes J FIELD field_11557 maxBytes J + FIELD field_46208 DEFAULT_MAX_DEPTH I + FIELD field_46209 maxDepth I + FIELD field_46210 depth I METHOD (JI)V ARG 1 maxBytes + ARG 3 maxDepth METHOD method_47987 getAllocatedBytes ()J METHOD method_48004 add (J)V ARG 1 bytes + METHOD method_53898 ofUnlimitedBytes ()Lnet/minecraft/class_2505; + METHOD method_53899 of (J)Lnet/minecraft/class_2505; + ARG 0 maxBytes + METHOD method_53900 pushStack ()V + METHOD method_53901 popStack ()V + METHOD method_53902 getDepth ()I diff --git a/mappings/net/minecraft/nbt/NbtType.mapping b/mappings/net/minecraft/nbt/NbtType.mapping index 2ba0ab769a..0ec23be521 100644 --- a/mappings/net/minecraft/nbt/NbtType.mapping +++ b/mappings/net/minecraft/nbt/NbtType.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType METHOD method_23261 getCommandFeedbackName ()Ljava/lang/String; METHOD method_23262 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 1 input + ARG 2 tracker METHOD method_23263 isImmutable ()Z COMMENT Determines the immutability of this type. COMMENT

@@ -20,15 +21,19 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType COMMENT @return {@code true} if this NBT type is immutable, else {@code false} METHOD method_39851 skip (Ljava/io/DataInput;Lnet/minecraft/class_2505;)V ARG 1 input + ARG 2 tracker METHOD method_39852 doAccept (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838; ARG 1 input ARG 2 visitor + ARG 3 tracker METHOD method_39854 skip (Ljava/io/DataInput;ILnet/minecraft/class_2505;)V ARG 1 input ARG 2 count + ARG 3 tracker METHOD method_39877 accept (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V ARG 1 input ARG 2 visitor + ARG 3 tracker CLASS 1 METHOD method_39878 createException ()Ljava/io/IOException; CLASS class_6839 OfFixedSize diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index d966b79c66..b4a24af984 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe CLASS class_3973 Serializer FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3973$class_3974; FIELD field_46107 codec Lcom/mojang/serialization/Codec; + FIELD field_46204 RESULT_STACK_CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_3972$class_3973$class_3974;)V ARG 1 recipeFactory METHOD method_53774 (Lnet/minecraft/class_3972$class_3973$class_3974;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -23,7 +24,12 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe ARG 0 recipe METHOD method_53778 (Lnet/minecraft/class_3972;)Ljava/lang/String; ARG 0 recipe + METHOD method_53879 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799; + ARG 0 recipe + METHOD method_53880 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_3974 RecipeFactory METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; ARG 1 group ARG 2 ingredient + ARG 3 result diff --git a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping index fddb64c17b..df90a95ac3 100644 --- a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_3975 net/minecraft/recipe/StonecuttingRecipe METHOD (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V ARG 1 group ARG 2 ingredient + ARG 3 result diff --git a/mappings/net/minecraft/util/PngMetadata.mapping b/mappings/net/minecraft/util/PngMetadata.mapping new file mode 100644 index 0000000000..f3587bbf75 --- /dev/null +++ b/mappings/net/minecraft/util/PngMetadata.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8800 net/minecraft/util/PngMetadata + FIELD field_46201 PNG_SIGNATURE J + FIELD field_46202 IHDR_CHUNK_TYPE I + FIELD field_46203 IHDR_CHUNK_LENGTH I + METHOD method_53877 fromStream (Ljava/io/InputStream;)Lnet/minecraft/class_8800; + ARG 0 stream + METHOD method_53878 fromBytes ([B)Lnet/minecraft/class_8800; + ARG 0 bytes diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 9accfd74f5..c2339c45ed 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -39,6 +39,8 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 6 merchantExperience ARG 7 priceMultiplier ARG 8 demandBonus + METHOD (Lnet/minecraft/class_1914;)V + ARG 1 offer METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -92,6 +94,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer COMMENT COMMENT

Checks if the number of times this trade offer has been used COMMENT is greater than 0. + METHOD method_53881 copy ()Lnet/minecraft/class_1914; METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index e97e1f2c85..be7b00dc52 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList ARG 1 offer METHOD method_43716 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1914; ARG 0 buf2 + METHOD method_53882 copy ()Lnet/minecraft/class_1916; METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; ARG 0 buf METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914;