From 4905b20170d971f621ca2cbb7def5998f11737d4 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 16 Jul 2024 18:01:28 -0500 Subject: [PATCH 1/4] start nbt --- mappings/net/minecraft/nbt/NbtFloat.mapping | 2 +- .../net/minecraft/nbt/NbtFormatException.mapping | 1 + mappings/net/minecraft/nbt/NbtInt.mapping | 4 ++++ mappings/net/minecraft/nbt/NbtIntArray.mapping | 4 +++- mappings/net/minecraft/nbt/NbtList.mapping | 9 +++++++++ mappings/net/minecraft/nbt/NbtLong.mapping | 2 +- mappings/net/minecraft/nbt/NbtLongArray.mapping | 2 +- mappings/net/minecraft/nbt/NbtOps.mapping | 1 + mappings/net/minecraft/nbt/NbtType.mapping | 3 ++- .../net/minecraft/nbt/scanner/NbtScanner.mapping | 14 +++++++------- 10 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 mappings/net/minecraft/nbt/NbtFormatException.mapping diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping index 06122f4f0b..8cef4af9f9 100644 --- a/mappings/net/minecraft/nbt/NbtFloat.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/unmapped/C_nmjwsnmy net/minecraft/nbt/NbtFloat METHOD m_ugeyistl of (F)Lnet/minecraft/unmapped/C_nmjwsnmy; ARG 0 value CLASS C_rfwycmsf - METHOD m_vpkdnupw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F + METHOD m_vpkdnupw readFloat (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtFormatException.mapping b/mappings/net/minecraft/nbt/NbtFormatException.mapping new file mode 100644 index 0000000000..14e67c4c2b --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtFormatException.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_prxxuhrw net/minecraft/nbt/NbtFormatException diff --git a/mappings/net/minecraft/nbt/NbtInt.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping index 0723fd70e6..3011a6c78f 100644 --- a/mappings/net/minecraft/nbt/NbtInt.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -9,6 +9,10 @@ CLASS net/minecraft/unmapped/C_mtwrptzz net/minecraft/nbt/NbtInt ARG 1 o METHOD m_snczrdnb of (I)Lnet/minecraft/unmapped/C_mtwrptzz; ARG 0 value + CLASS C_kbxvfdkb + METHOD m_wqbmlueb readInt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)I + ARG 0 input + ARG 1 tracker CLASS C_kjktlgdl Cache FIELD f_bhlqmokc HIGH I FIELD f_haatbjko LOW I diff --git a/mappings/net/minecraft/nbt/NbtIntArray.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping index 1596803c18..0f940092e7 100644 --- a/mappings/net/minecraft/nbt/NbtIntArray.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_qkxiqejc net/minecraft/nbt/NbtIntArray ARG 1 value METHOD ([I)V ARG 1 value + METHOD clear clear ()V METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD get (I)Ljava/lang/Object; @@ -14,7 +15,8 @@ CLASS net/minecraft/unmapped/C_qkxiqejc net/minecraft/nbt/NbtIntArray METHOD m_eipocahk toArray (Ljava/util/List;)[I ARG 0 list METHOD m_tlehgtua getIntArray ()[I + METHOD size size ()I CLASS C_ytzlewdv - METHOD m_rmdqbzlz (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[I + METHOD m_rmdqbzlz readArray (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[I ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index a9620cc943..da4013b232 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_hqhtfwlr net/minecraft/nbt/NbtList COMMENT An NBT list holds values of the same {@linkplain NbtElement#getType NBT type}. COMMENT The {@linkplain AbstractNbtList#getHeldType NBT type} of an NBT list is determined COMMENT once its first element is inserted; empty NBT lists return {@link NbtElement#NULL_TYPE NULL_TYPE} as their held {@linkplain AbstractNbtList#getHeldType NBT type}. + FIELD f_carzcmxv SIZE I FIELD f_llxejsfu value Ljava/util/List; FIELD f_ssgpdobr type B FIELD f_zntedfnn TYPE Lnet/minecraft/unmapped/C_ueidorcc; @@ -38,3 +39,11 @@ CLASS net/minecraft/unmapped/C_hqhtfwlr net/minecraft/nbt/NbtList METHOD m_zjesrfve getFloat (I)F ARG 1 index METHOD size size ()I + CLASS C_bicgwqxa + METHOD m_abkyninv parseList (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; + ARG 0 input + ARG 1 scanner + ARG 2 tracker + METHOD m_ticywlad parseList (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hqhtfwlr; + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtLong.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping index e87efff0c2..f915171800 100644 --- a/mappings/net/minecraft/nbt/NbtLong.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_mbybaqku net/minecraft/nbt/NbtLong METHOD m_ftkuryps of (J)Lnet/minecraft/unmapped/C_mbybaqku; ARG 0 value CLASS C_jxppaniz - METHOD m_tkntekub (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)J + METHOD m_tkntekub readLong (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)J ARG 0 input ARG 1 tracker CLASS C_jzqitqhh Cache diff --git a/mappings/net/minecraft/nbt/NbtLongArray.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping index b766f15379..34f2428064 100644 --- a/mappings/net/minecraft/nbt/NbtLongArray.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -17,6 +17,6 @@ CLASS net/minecraft/unmapped/C_ojdqftoi net/minecraft/nbt/NbtLongArray METHOD m_kxlzbotw toArray (Ljava/util/List;)[J ARG 0 list CLASS C_rrrssqiv - METHOD m_bsmidfhx (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[J + METHOD m_bsmidfhx readArray (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[J ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index dd5a803bc2..457e140775 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps COMMENT with an ordered list of values in serialization). In fact, since COMMENT Minecraft NBT lists can only contain elements of the same type, this op COMMENT cannot compress maps. + FIELD f_zjvitncb MARKER_KEY Ljava/lang/String; METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; ARG 2 element METHOD createBoolean (Z)Ljava/lang/Object; diff --git a/mappings/net/minecraft/nbt/NbtType.mapping b/mappings/net/minecraft/nbt/NbtType.mapping index 06edf93d1e..6267ed794d 100644 --- a/mappings/net/minecraft/nbt/NbtType.mapping +++ b/mappings/net/minecraft/nbt/NbtType.mapping @@ -14,8 +14,9 @@ CLASS net/minecraft/unmapped/C_ueidorcc net/minecraft/nbt/NbtType COMMENT COMMENT @return {@code true} if this NBT type is immutable, or {@code false} otherwise METHOD m_hxfuaaoy getCommandFeedbackName ()Ljava/lang/String; - METHOD m_lcnankcv (Ljava/io/DataInput;ILnet/minecraft/unmapped/C_fozrrtcx;)V + METHOD m_lcnankcv skip (Ljava/io/DataInput;ILnet/minecraft/unmapped/C_fozrrtcx;)V ARG 1 input + ARG 2 count ARG 3 tracker METHOD m_poctbjiy read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb; ARG 1 input diff --git a/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping b/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping index ba489d54a7..dde8d4a7c5 100644 --- a/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping +++ b/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping @@ -66,20 +66,20 @@ CLASS net/minecraft/unmapped/C_avcaqucb net/minecraft/nbt/scanner/NbtScanner COMMENT @see #startListItem ARG 1 type CLASS C_bucfodok NestedResult - FIELD f_dolvioxu Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; + FIELD f_dolvioxu ENTER Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; COMMENT Proceeds to visit more data of this element, or to enter this element. COMMENT This element is either a list element or a sub NBT. - FIELD f_lpjmwtad Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; + FIELD f_lpjmwtad SKIP Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; COMMENT Skips this element and visit the next list element or sub NBT. - FIELD f_pkgsxrgf Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; + FIELD f_pkgsxrgf HALT Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; COMMENT Halts the whole scanning completely. - FIELD f_qhflrpze Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; + FIELD f_qhflrpze BREAK Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok; COMMENT Skips the whole list or compound NBT currently under scan. COMMENT Will make a call to {@link NbtScanner#endNested()}. CLASS C_ysedvtle Result - FIELD f_drwmzuin Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; + FIELD f_drwmzuin CONTINUE Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; COMMENT Proceed to visit more data of this element. - FIELD f_irsnidyo Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; + FIELD f_irsnidyo BREAK Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; COMMENT Skips the current element under scan. - FIELD f_kpjgfhsy Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; + FIELD f_kpjgfhsy HALT Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; COMMENT Halts the whole scanning completely. From 0e0aae59dcb949ef90553f6900d3bc5a0378f3ab Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 6 Aug 2024 22:23:13 -0500 Subject: [PATCH 2/4] 100% --- .../net/minecraft/nbt/NbtByteArray.mapping | 4 +- .../net/minecraft/nbt/NbtCompound.mapping | 10 ++- mappings/net/minecraft/nbt/NbtDouble.mapping | 2 +- mappings/net/minecraft/nbt/NbtElement.mapping | 5 +- mappings/net/minecraft/nbt/NbtIo.mapping | 22 +++++ mappings/net/minecraft/nbt/NbtOps.mapping | 82 +++++++++++++++++++ mappings/net/minecraft/nbt/NbtShort.mapping | 2 +- mappings/net/minecraft/nbt/NbtString.mapping | 3 +- .../net/minecraft/nbt/StringNbtReader.mapping | 3 + .../nbt/scanner/SelectiveNbtCollector.mapping | 2 + .../minecraft/nbt/visitor/FieldTree.mapping | 3 + .../nbt/visitor/NbtTextFormatter.mapping | 16 ++++ .../minecraft/nbt/visitor/SkipFields.mapping | 2 + .../nbt/visitor/StringNbtWriter.mapping | 1 + .../util/DelegatingDataOutput.mapping | 32 ++++++++ 15 files changed, 178 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/util/DelegatingDataOutput.mapping diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping index 7c84f8f274..787ce682cd 100644 --- a/mappings/net/minecraft/nbt/NbtByteArray.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_umipmxwv net/minecraft/nbt/NbtByteArray ARG 1 value METHOD ([B)V ARG 1 value + METHOD clear clear ()V METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD get (I)Ljava/lang/Object; @@ -14,7 +15,8 @@ CLASS net/minecraft/unmapped/C_umipmxwv net/minecraft/nbt/NbtByteArray METHOD m_jinrzhol getByteArray ()[B METHOD m_zreujoew toArray (Ljava/util/List;)[B ARG 0 list + METHOD size size ()I CLASS C_qzarviwo - METHOD m_kndswgtt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B + METHOD m_kndswgtt readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 32162a1797..936c50b156 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound COMMENT Represents an NBT compound object which holds unordered key-value pairs with distinct case-sensitive string keys. + FIELD f_aetpjbog ENTRY_SIZE I FIELD f_ckdatsht CODEC Lcom/mojang/serialization/Codec; FIELD f_dopajgtr entries Ljava/util/Map; FIELD f_ghusyxdr TYPE Lnet/minecraft/unmapped/C_ueidorcc; + FIELD f_qucoyxms SIZE I METHOD (Ljava/util/Map;)V ARG 1 entries METHOD equals (Ljava/lang/Object;)Z @@ -68,6 +70,7 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound METHOD m_oidzekic putInt (Ljava/lang/String;I)V ARG 1 key ARG 2 value + METHOD m_poylyjba createNbt ()Lnet/minecraft/unmapped/C_hhlwcnih; METHOD m_pvrsstff putByteArray (Ljava/lang/String;Ljava/util/List;)V ARG 1 key ARG 2 value @@ -98,6 +101,7 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound METHOD m_sfeexgrr getList (Ljava/lang/String;I)Lnet/minecraft/unmapped/C_hqhtfwlr; ARG 1 key ARG 2 type + METHOD m_smzpndim getEntries ()Ljava/util/Set; METHOD m_ulzvmblb remove (Ljava/lang/String;)V ARG 1 key METHOD m_utczects copyFrom (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih; @@ -131,13 +135,13 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound METHOD m_zsbbwdsl getByteArray (Ljava/lang/String;)[B ARG 1 key CLASS C_krlbszwn - METHOD m_heopwcei (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; + METHOD m_heopwcei parseCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle; ARG 0 input ARG 1 scanner ARG 2 tracker - METHOD m_mlnxbtqt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String; + METHOD m_mlnxbtqt readString (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String; ARG 0 input ARG 1 tracker - METHOD m_qbdkgvms (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih; + METHOD m_qbdkgvms readCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih; ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping index 14fc83da98..f578d48eea 100644 --- a/mappings/net/minecraft/nbt/NbtDouble.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/unmapped/C_xiyjytpd net/minecraft/nbt/NbtDouble METHOD m_oxqlveuv of (D)Lnet/minecraft/unmapped/C_xiyjytpd; ARG 0 value CLASS C_iubarszc - METHOD m_frmxzypg (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D + METHOD m_frmxzypg readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping index 0acd57bc2f..c5cc08e127 100644 --- a/mappings/net/minecraft/nbt/NbtElement.mapping +++ b/mappings/net/minecraft/nbt/NbtElement.mapping @@ -62,10 +62,7 @@ CLASS net/minecraft/unmapped/C_oivssbvb net/minecraft/nbt/NbtElement COMMENT COMMENT @see NbtLong FIELD f_zfdwqdmd STRING_SIZE I - METHOD m_ehqkdijp copy ()Lnet/minecraft/unmapped/C_oivssbvb; - COMMENT Copies this NBT element. - COMMENT - COMMENT @return the copied element + METHOD m_ehqkdijp shallowCopy ()Lnet/minecraft/unmapped/C_oivssbvb; METHOD m_gvxsfqzz scanAsRoot (Lnet/minecraft/unmapped/C_avcaqucb;)V ARG 1 scanner METHOD m_hbuflhqa getSizeInBytes ()I diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 371069faf4..4d0ac01950 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -1,19 +1,41 @@ CLASS net/minecraft/unmapped/C_plrkqquc net/minecraft/nbt/NbtIo + FIELD f_zwmbytoi OPEN_OPTIONS [Ljava/nio/file/OpenOption; + METHOD m_cvfqsgxo compress (Ljava/io/OutputStream;)Ljava/io/DataOutputStream; + METHOD m_dxxrvgvk writeAnyElement (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V + ARG 0 element + METHOD m_hjflxsyo decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream; METHOD m_hsrlntfm write (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V ARG 0 nbt ARG 1 output + METHOD m_jguziyiy readElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;B)Lnet/minecraft/unmapped/C_oivssbvb; + METHOD m_jsabavmz readCompressed (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih; + METHOD m_kfuaemox write (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V METHOD m_kuwxotkv write (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/io/DataOutput;)V ARG 0 compound ARG 1 output + METHOD m_kyzyffmz readCompressed (Ljava/io/InputStream;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih; + METHOD m_lvarbmqk readElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb; + ARG 0 input + METHOD m_lwpolkuf read (Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_hhlwcnih; + ARG 0 path + METHOD m_mrabewpj parseCompressed (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V + ARG 2 tracker METHOD m_nvtwzikn writeCompressed (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V METHOD m_pzvkgxhc read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih; ARG 0 input ARG 1 tracker + METHOD m_qmknfifn readAnyElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb; METHOD m_rkhihfmf writeCompressed (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/io/OutputStream;)V ARG 0 compound ARG 1 stream METHOD m_rqnlssft read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V ARG 0 input ARG 1 visitor + ARG 2 tracker + METHOD m_voryzjqe parseCompressed (Ljava/io/InputStream;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V + ARG 2 tracker + METHOD m_yicwdxov writeWithFallback (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V + ARG 1 output METHOD m_zjsgjdoa read (Ljava/io/DataInput;)Lnet/minecraft/unmapped/C_hhlwcnih; ARG 0 input + CLASS C_wbbhdkdn StringFallbackDataOutput diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index 457e140775..89f8f61b9d 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -25,14 +25,24 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps ARG 1 value METHOD createByte (B)Ljava/lang/Object; ARG 1 value + METHOD createByteList (Ljava/nio/ByteBuffer;)Ljava/lang/Object; + ARG 1 buffer METHOD createDouble (D)Ljava/lang/Object; ARG 1 value METHOD createFloat (F)Ljava/lang/Object; ARG 1 value METHOD createInt (I)Ljava/lang/Object; ARG 1 value + METHOD createIntList (Ljava/util/stream/IntStream;)Ljava/lang/Object; + ARG 1 stream + METHOD createList (Ljava/util/stream/Stream;)Ljava/lang/Object; + ARG 1 stream METHOD createLong (J)Ljava/lang/Object; ARG 1 value + METHOD createLongList (Ljava/util/stream/LongStream;)Ljava/lang/Object; + ARG 1 stream + METHOD createMap (Ljava/util/stream/Stream;)Ljava/lang/Object; + ARG 1 stream METHOD createNumeric (Ljava/lang/Number;)Ljava/lang/Object; ARG 1 value METHOD createShort (S)Ljava/lang/Object; @@ -59,17 +69,89 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps ARG 1 element METHOD getStringValue (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 element + METHOD m_kvzwcnej tryUnwrap (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_oivssbvb; + ARG 0 nbt + METHOD m_vpbkfzmz createCollector (Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/util/Optional; + ARG 0 element METHOD mapBuilder mapBuilder ()Lcom/mojang/serialization/RecordBuilder; METHOD mergeToList (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 list ARG 2 value + METHOD mergeToList (Ljava/lang/Object;Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 list + ARG 2 values METHOD mergeToMap (Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; ARG 1 element + ARG 2 values METHOD mergeToMap (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 map ARG 2 key ARG 3 value + METHOD mergeToMap (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/serialization/DataResult; + ARG 1 element + ARG 2 values METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; ARG 1 element ARG 2 key + CLASS C_cfjsyyyh SimpleListCollector + FIELD f_zdfsryne result Lnet/minecraft/unmapped/C_hqhtfwlr; + METHOD (Lnet/minecraft/unmapped/C_hqhtfwlr;)V + ARG 1 nbt + METHOD (Lnet/minecraft/unmapped/C_oivssbvb;)V + ARG 1 element CLASS C_cmafvjrt MapBuilder + METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 key + ARG 2 element + ARG 3 nbt + METHOD build (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 nbt + ARG 2 element + CLASS C_cpsqmvih ByteListCollector + FIELD f_ijtscyyp values Lit/unimi/dsi/fastutil/bytes/ByteArrayList; + METHOD (B)V + ARG 1 value + METHOD ([B)V + ARG 1 values + CLASS C_dwkvaauw LongListCollector + FIELD f_rjyiwlrj values Lit/unimi/dsi/fastutil/longs/LongArrayList; + METHOD (J)V + ARG 1 value + METHOD ([J)V + ARG 1 values + CLASS C_lrggpudd DelegatingListCollector + FIELD f_oknzgzfq INSTANCE Lnet/minecraft/unmapped/C_fybaywjo$C_lrggpudd; + CLASS C_nehsnwyp ListCollector + METHOD m_berihwml accept (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; + ARG 1 element + METHOD m_fjtdnzmx accept (Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; + ARG 1 elements + METHOD m_gxpktbdp acceptAll (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; + METHOD m_mlztdcvi getResult ()Lnet/minecraft/unmapped/C_oivssbvb; + CLASS C_rkolbfzv IntListCollector + FIELD f_pvqmoapp values Lit/unimi/dsi/fastutil/ints/IntArrayList; + METHOD (I)V + ARG 1 value + METHOD ([I)V + ARG 1 values + CLASS C_yartmlgv + METHOD entries entries ()Ljava/util/stream/Stream; + METHOD get (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 element + METHOD get (Ljava/lang/String;)Ljava/lang/Object; + ARG 1 key + CLASS C_zcsovcmj WrappingListCollector + FIELD f_kuucpbgx result Lnet/minecraft/unmapped/C_hqhtfwlr; + METHOD (Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V + ARG 1 byteList + METHOD (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V + ARG 1 intList + METHOD (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V + ARG 1 longList + METHOD (Ljava/util/Collection;)V + ARG 1 elements + METHOD m_fhjbuhyx isWrapper (Lnet/minecraft/unmapped/C_hhlwcnih;)Z + ARG 0 nbt + METHOD m_ntfjawdo wrapElement (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_hhlwcnih; + METHOD m_vxfjomvi wrapIfNeeded (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_oivssbvb; + ARG 0 element diff --git a/mappings/net/minecraft/nbt/NbtShort.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping index bc2908d665..b4f61fd730 100644 --- a/mappings/net/minecraft/nbt/NbtShort.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_mospmwws net/minecraft/nbt/NbtShort METHOD m_rvuvoulx of (S)Lnet/minecraft/unmapped/C_mospmwws; ARG 0 value CLASS C_cpjbekql - METHOD m_jvvhjgeo (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)S + METHOD m_jvvhjgeo readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)S ARG 0 input ARG 1 tracker CLASS C_hybexkey Cache diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 04e68d7643..7f07f3a9e0 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_bzopmfms net/minecraft/nbt/NbtString FIELD f_fbhlabsj NULL C FIELD f_gpwsgzrd SINGLE_QUOTE C FIELD f_jrhkwuxy ESCAPE C + FIELD f_pyxvntyi SIZE I FIELD f_ymnohvfg EMPTY Lnet/minecraft/unmapped/C_bzopmfms; FIELD f_yoyepecd value Ljava/lang/String; METHOD (Ljava/lang/String;)V @@ -18,6 +19,6 @@ CLASS net/minecraft/unmapped/C_bzopmfms net/minecraft/nbt/NbtString METHOD m_yhcxaelt skipString (Ljava/io/DataInput;)V ARG 0 input CLASS C_khgdkwrh - METHOD m_evrerdyg (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String; + METHOD m_evrerdyg readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String; ARG 0 input ARG 1 tracker diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 526c317b81..a24685f6c1 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/unmapped/C_jjafokvs net/minecraft/nbt/StringNbtReader FIELD f_dbbftgji COMMA C + FIELD f_dphkcylp CODEC Lcom/mojang/serialization/Codec; FIELD f_gmanexmy ARRAY_MIXED Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD f_hchyzgjp INT_PATTERN Ljava/util/regex/Pattern; + FIELD f_hlrulnyw LENIENT_CODEC Lcom/mojang/serialization/Codec; FIELD f_idvemkib DOUBLE_PATTERN Ljava/util/regex/Pattern; FIELD f_imrzedat EXPECTED_VALUE Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD f_kgwidfyi OBJECT_START C @@ -34,6 +36,7 @@ CLASS net/minecraft/unmapped/C_jjafokvs net/minecraft/nbt/StringNbtReader ARG 1 input METHOD m_ugaydtjf parseElementPrimitive ()Lnet/minecraft/unmapped/C_oivssbvb; METHOD m_uvwydsmr expect (C)V + ARG 1 c METHOD m_vyzmihxm parseElementPrimitiveArray ()Lnet/minecraft/unmapped/C_oivssbvb; METHOD m_wngfymzu parseList ()Lnet/minecraft/unmapped/C_oivssbvb; METHOD m_wzhkiqtt readComma ()Z diff --git a/mappings/net/minecraft/nbt/scanner/SelectiveNbtCollector.mapping b/mappings/net/minecraft/nbt/scanner/SelectiveNbtCollector.mapping index f2389e3742..fae5633490 100644 --- a/mappings/net/minecraft/nbt/scanner/SelectiveNbtCollector.mapping +++ b/mappings/net/minecraft/nbt/scanner/SelectiveNbtCollector.mapping @@ -4,4 +4,6 @@ CLASS net/minecraft/unmapped/C_whoksxux net/minecraft/nbt/scanner/SelectiveNbtCo FIELD f_cquzshaw queriesLeft I FIELD f_lqycvxet selectionStack Ljava/util/Deque; FIELD f_pjtdrarx allPossibleTypes Ljava/util/Set; + METHOD ([Lnet/minecraft/unmapped/C_lxuqtocl;)V + ARG 1 selectors METHOD m_ocgekirv getQueriesLeft ()I diff --git a/mappings/net/minecraft/nbt/visitor/FieldTree.mapping b/mappings/net/minecraft/nbt/visitor/FieldTree.mapping index e84b610b16..9bb3af3759 100644 --- a/mappings/net/minecraft/nbt/visitor/FieldTree.mapping +++ b/mappings/net/minecraft/nbt/visitor/FieldTree.mapping @@ -3,8 +3,11 @@ CLASS net/minecraft/unmapped/C_rkwhogtj net/minecraft/nbt/visitor/FieldTree FIELD f_inuegeta selectedFields Ljava/util/Map; FIELD f_ylclylmj fieldsToRecurse Ljava/util/Map; METHOD m_bdqndaht addEntry (Lnet/minecraft/unmapped/C_lxuqtocl;)V + ARG 1 selector METHOD m_drkucksc selectedFields ()Ljava/util/Map; METHOD m_eclwkwya createRoot ()Lnet/minecraft/unmapped/C_rkwhogtj; METHOD m_ffhiizju depth ()I METHOD m_lyuljdqg fieldsToRecurse ()Ljava/util/Map; METHOD m_nlvtwohc isSelected (Lnet/minecraft/unmapped/C_ueidorcc;Ljava/lang/String;)Z + ARG 1 type + ARG 2 key diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping index b5f7cf56d8..7c596e2a8c 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping @@ -4,10 +4,20 @@ CLASS net/minecraft/unmapped/C_cbswsmdy net/minecraft/nbt/visitor/NbtTextFormatt FIELD f_audxoytl SINGLE_LINE_ELEMENT_TYPES Lit/unimi/dsi/fastutil/bytes/ByteCollection; FIELD f_bcmdvmdd NUMBER_COLOR Lnet/minecraft/unmapped/C_tnezalvh; FIELD f_bcotctrd SEMICOLON Ljava/lang/String; + FIELD f_bktumuci BYTE_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; + FIELD f_buzhmuqj indentationDepth I FIELD f_bvrwnvxm KEY_VALUE_SEPARATOR Ljava/lang/String; + FIELD f_cfoaqogq MAX_LENGTH I + FIELD f_ctzxnsom SHORT_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_dewwbryf CURLY_OPEN_BRACKET Ljava/lang/String; + FIELD f_dmwazrkd FOLDED Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_dqlqlbcu SQUARE_CLOSE_BRACKET Ljava/lang/String; + FIELD f_elcnsvnq SPACED_ENTRY_SEPARATOR Ljava/lang/String; + FIELD f_hqokqjhi DOUBLE_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; + FIELD f_ieeyicwd MAX_DEPTH I FIELD f_jjvbvalb LOGGER Lorg/slf4j/Logger; + FIELD f_jpiwgzyp BYTE_ARRAY_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; + FIELD f_jxgzvfdw FLOAT_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_kylpaqih prefix Ljava/lang/String; FIELD f_lryzrtey TYPE_SUFFIX_COLOR Lnet/minecraft/unmapped/C_tnezalvh; FIELD f_mjlwrnbj NEW_LINE Ljava/lang/String; @@ -18,10 +28,16 @@ CLASS net/minecraft/unmapped/C_cbswsmdy net/minecraft/nbt/visitor/NbtTextFormatt FIELD f_rjnnlqdh result Lnet/minecraft/unmapped/C_npqneive; FIELD f_rzppynhe SIMPLE_NAME Ljava/util/regex/Pattern; FIELD f_sklpsqsb SPACE Ljava/lang/String; + FIELD f_stdgiutw LONG_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; + FIELD f_tdczxvfc WRAPPED_ENTRY_SEPARATOR Ljava/lang/String; FIELD f_uaacerjb CURLY_CLOSE_BRACKET Ljava/lang/String; FIELD f_vhgpkkrq NAME_COLOR Lnet/minecraft/unmapped/C_tnezalvh; + FIELD f_wywnbumh INT_TYPE Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_zmjfkoba SQUARE_OPEN_BRACKET Ljava/lang/String; METHOD m_gkempekg escapeName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 name METHOD m_mbadaibf apply (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 1 nbt + METHOD m_meunhhlm appendSubElement (Lnet/minecraft/unmapped/C_oivssbvb;Z)V + ARG 1 element + ARG 2 indent diff --git a/mappings/net/minecraft/nbt/visitor/SkipFields.mapping b/mappings/net/minecraft/nbt/visitor/SkipFields.mapping index 2052a643ec..7d466be74c 100644 --- a/mappings/net/minecraft/nbt/visitor/SkipFields.mapping +++ b/mappings/net/minecraft/nbt/visitor/SkipFields.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/unmapped/C_qvrhcqfv net/minecraft/nbt/visitor/SkipFields FIELD f_hwcgorye stack Ljava/util/Deque; + METHOD ([Lnet/minecraft/unmapped/C_lxuqtocl;)V + ARG 1 selectors diff --git a/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping b/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping index 6eb19ffd0e..655ee8185c 100644 --- a/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping +++ b/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/unmapped/C_bjntyqcr net/minecraft/nbt/visitor/StringNbtWrite METHOD m_fqrchqdu escapeName (Ljava/lang/String;)Ljava/lang/String; ARG 0 name METHOD m_uzldvsqt apply (Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/lang/String; + ARG 1 element diff --git a/mappings/net/minecraft/util/DelegatingDataOutput.mapping b/mappings/net/minecraft/util/DelegatingDataOutput.mapping new file mode 100644 index 0000000000..43586f04a4 --- /dev/null +++ b/mappings/net/minecraft/util/DelegatingDataOutput.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/unmapped/C_hydfible net/minecraft/util/DelegatingDataOutput + FIELD f_gjqspvzl delegate Ljava/io/DataOutput; + METHOD write write (I)V + ARG 1 i + METHOD write write ([B)V + ARG 1 bytes + METHOD write write ([BII)V + ARG 1 bytes + ARG 2 off + ARG 3 len + METHOD writeBoolean writeBoolean (Z)V + ARG 1 bl + METHOD writeByte writeByte (I)V + ARG 1 i + METHOD writeBytes writeBytes (Ljava/lang/String;)V + ARG 1 string + METHOD writeChar writeChar (I)V + ARG 1 i + METHOD writeChars writeChars (Ljava/lang/String;)V + ARG 1 string + METHOD writeDouble writeDouble (D)V + ARG 1 d + METHOD writeFloat writeFloat (F)V + ARG 1 f + METHOD writeInt writeInt (I)V + ARG 1 i + METHOD writeLong writeLong (J)V + ARG 1 l + METHOD writeShort writeShort (I)V + ARG 1 i + METHOD writeUTF writeUTF (Ljava/lang/String;)V + ARG 1 string From 3944dcb06fb5470750e559f4e16832e76dd4a2be Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 6 Aug 2024 22:54:44 -0500 Subject: [PATCH 3/4] Update mappings/net/minecraft/nbt/NbtOps.mapping Co-authored-by: Will --- mappings/net/minecraft/nbt/NbtOps.mapping | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index 89f8f61b9d..47074cfd97 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -126,7 +126,8 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps ARG 1 element METHOD m_fjtdnzmx accept (Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; ARG 1 elements - METHOD m_gxpktbdp acceptAll (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; + METHOD m_gxpktbdp accept (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp; + ARG 1 elements METHOD m_mlztdcvi getResult ()Lnet/minecraft/unmapped/C_oivssbvb; CLASS C_rkolbfzv IntListCollector FIELD f_pvqmoapp values Lit/unimi/dsi/fastutil/ints/IntArrayList; From 6008096767abefb21fb29e5cfcf3881588f30324 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Tue, 6 Aug 2024 22:54:49 -0500 Subject: [PATCH 4/4] Update mappings/net/minecraft/nbt/NbtOps.mapping Co-authored-by: Will --- mappings/net/minecraft/nbt/NbtOps.mapping | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index 47074cfd97..eedeb02d08 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -144,11 +144,11 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps CLASS C_zcsovcmj WrappingListCollector FIELD f_kuucpbgx result Lnet/minecraft/unmapped/C_hqhtfwlr; METHOD (Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V - ARG 1 byteList + ARG 1 list METHOD (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V - ARG 1 intList + ARG 1 list METHOD (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V - ARG 1 longList + ARG 1 list METHOD (Ljava/util/Collection;)V ARG 1 elements METHOD m_fhjbuhyx isWrapper (Lnet/minecraft/unmapped/C_hhlwcnih;)Z