From bd5a3f41d65003d60e2ea53230b3233be399efc4 Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Thu, 18 Mar 2021 20:17:51 +0100 Subject: [PATCH] Refactor the whole net.minecraft.nbt package. (#2090) * Refactor the whole net.minecraft.nbt package. * a NBT -> an NBT * -bits -> -bit * Improve javadoc and consistency. * Update mappings/net/minecraft/nbt/AbstractNbtList.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * NbtObject -> NbtCompound... * Remove last occurences of NbtObject I have no idea how I missed those... They are quite obvious. Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update mappings/net/minecraft/nbt/NbtCompound.mapping Co-authored-by: YanisBft * Apply suggestions. * Restore addElement and setElement. * Fix some missed stuff. * Apply suggestions from code review Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: Gegy * Reformat type value part of NBT elements javadoc. * Apply suggestions from code review Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Clarify documentation. * Apply @ChloeDawn's suggestion. * rawType -> id * Apply haykam's suggestions. * Apply suggestions from code review Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * getX -> xValue in AbstractNbtNumber. * Apply more changes from code review. * Apply suggestions from haykam's code review Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: YanisBft Co-authored-by: Gegy --- .../net/minecraft/nbt/AbstractListTag.mapping | 16 ------ .../net/minecraft/nbt/AbstractNbtList.mapping | 20 +++++++ .../minecraft/nbt/AbstractNbtNumber.mapping | 33 ++++++++++++ .../minecraft/nbt/AbstractNumberTag.mapping | 8 --- .../net/minecraft/nbt/ByteArrayTag.mapping | 12 ----- mappings/net/minecraft/nbt/DoubleTag.mapping | 10 ---- mappings/net/minecraft/nbt/EndTag.mapping | 3 -- mappings/net/minecraft/nbt/FloatTag.mapping | 10 ---- .../net/minecraft/nbt/IntArrayTag.mapping | 12 ----- .../nbt/{ByteTag.mapping => NbtByte.mapping} | 7 ++- .../net/minecraft/nbt/NbtByteArray.mapping | 17 ++++++ ...ompoundTag.mapping => NbtCompound.mapping} | 35 ++++++++---- mappings/net/minecraft/nbt/NbtDouble.mapping | 13 +++++ mappings/net/minecraft/nbt/NbtElement.mapping | 36 +++++++++++++ mappings/net/minecraft/nbt/NbtFloat.mapping | 13 +++++ mappings/net/minecraft/nbt/NbtHelper.mapping | 51 ++++++++++-------- .../nbt/{IntTag.mapping => NbtInt.mapping} | 7 ++- .../net/minecraft/nbt/NbtIntArray.mapping | 17 ++++++ mappings/net/minecraft/nbt/NbtIo.mapping | 10 ++-- .../nbt/{ListTag.mapping => NbtList.mapping} | 13 +++-- .../nbt/{LongTag.mapping => NbtLong.mapping} | 7 ++- ...gArrayTag.mapping => NbtLongArray.mapping} | 9 +++- mappings/net/minecraft/nbt/NbtNull.mapping | 9 ++++ mappings/net/minecraft/nbt/NbtOps.mapping | 54 +++++++++++++++++++ .../{ShortTag.mapping => NbtShort.mapping} | 7 ++- .../{StringTag.mapping => NbtString.mapping} | 7 ++- .../{TagReader.mapping => NbtType.mapping} | 9 +++- mappings/net/minecraft/nbt/NbtTypes.mapping | 9 ++++ .../net/minecraft/nbt/StringNbtReader.mapping | 14 ++--- mappings/net/minecraft/nbt/Tag.mapping | 9 ---- mappings/net/minecraft/nbt/TagReaders.mapping | 4 -- .../nbt/visitor/NbtElementVisitor.mapping | 28 ++++++++++ .../visitor/NbtOrderedStringFormatter.mapping | 16 +++--- .../nbt/visitor/NbtTagVisitor.mapping | 28 ---------- .../nbt/visitor/NbtTextFormatter.mapping | 4 +- .../nbt/visitor/StringNbtWriter.mapping | 2 +- 36 files changed, 377 insertions(+), 182 deletions(-) delete mode 100644 mappings/net/minecraft/nbt/AbstractListTag.mapping create mode 100644 mappings/net/minecraft/nbt/AbstractNbtList.mapping create mode 100644 mappings/net/minecraft/nbt/AbstractNbtNumber.mapping delete mode 100644 mappings/net/minecraft/nbt/AbstractNumberTag.mapping delete mode 100644 mappings/net/minecraft/nbt/ByteArrayTag.mapping delete mode 100644 mappings/net/minecraft/nbt/DoubleTag.mapping delete mode 100644 mappings/net/minecraft/nbt/EndTag.mapping delete mode 100644 mappings/net/minecraft/nbt/FloatTag.mapping delete mode 100644 mappings/net/minecraft/nbt/IntArrayTag.mapping rename mappings/net/minecraft/nbt/{ByteTag.mapping => NbtByte.mapping} (64%) create mode 100644 mappings/net/minecraft/nbt/NbtByteArray.mapping rename mappings/net/minecraft/nbt/{CompoundTag.mapping => NbtCompound.mapping} (75%) create mode 100644 mappings/net/minecraft/nbt/NbtDouble.mapping create mode 100644 mappings/net/minecraft/nbt/NbtElement.mapping create mode 100644 mappings/net/minecraft/nbt/NbtFloat.mapping rename mappings/net/minecraft/nbt/{IntTag.mapping => NbtInt.mapping} (51%) create mode 100644 mappings/net/minecraft/nbt/NbtIntArray.mapping rename mappings/net/minecraft/nbt/{ListTag.mapping => NbtList.mapping} (55%) rename mappings/net/minecraft/nbt/{LongTag.mapping => NbtLong.mapping} (51%) rename mappings/net/minecraft/nbt/{LongArrayTag.mapping => NbtLongArray.mapping} (52%) create mode 100644 mappings/net/minecraft/nbt/NbtNull.mapping rename mappings/net/minecraft/nbt/{ShortTag.mapping => NbtShort.mapping} (50%) rename mappings/net/minecraft/nbt/{StringTag.mapping => NbtString.mapping} (60%) rename mappings/net/minecraft/nbt/{TagReader.mapping => NbtType.mapping} (50%) create mode 100644 mappings/net/minecraft/nbt/NbtTypes.mapping delete mode 100644 mappings/net/minecraft/nbt/Tag.mapping delete mode 100644 mappings/net/minecraft/nbt/TagReaders.mapping create mode 100644 mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping delete mode 100644 mappings/net/minecraft/nbt/visitor/NbtTagVisitor.mapping diff --git a/mappings/net/minecraft/nbt/AbstractListTag.mapping b/mappings/net/minecraft/nbt/AbstractListTag.mapping deleted file mode 100644 index 694c46b12e..0000000000 --- a/mappings/net/minecraft/nbt/AbstractListTag.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractListTag - METHOD add (ILjava/lang/Object;)V - ARG 1 index - ARG 2 value - METHOD method_10533 addTag (ILnet/minecraft/class_2520;)Z - ARG 1 index - ARG 2 tag - METHOD method_10535 setTag (ILnet/minecraft/class_2520;)Z - ARG 1 index - ARG 2 tag - METHOD method_10601 getElementType ()B - METHOD remove (I)Ljava/lang/Object; - ARG 1 index - METHOD set (ILjava/lang/Object;)Ljava/lang/Object; - ARG 1 index - ARG 2 value diff --git a/mappings/net/minecraft/nbt/AbstractNbtList.mapping b/mappings/net/minecraft/nbt/AbstractNbtList.mapping new file mode 100644 index 0000000000..1d2787c87b --- /dev/null +++ b/mappings/net/minecraft/nbt/AbstractNbtList.mapping @@ -0,0 +1,20 @@ +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 + ARG 1 index + ARG 2 value + METHOD method_10533 addElement (ILnet/minecraft/class_2520;)Z + ARG 1 index + ARG 2 element + METHOD method_10535 setElement (ILnet/minecraft/class_2520;)Z + ARG 1 index + ARG 2 element + METHOD method_10601 getHeldType ()B + 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; + ARG 1 index + METHOD set (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value diff --git a/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping b/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping new file mode 100644 index 0000000000..87a475c0ec --- /dev/null +++ b/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_2514 net/minecraft/nbt/AbstractNbtNumber + COMMENT Represents an NBT number. + COMMENT

+ COMMENT The type value {@code 99} can be used to + COMMENT {@linkplain NbtCompound#contains check for the existence of any numeric element in a NBT compound object}. + METHOD method_10696 shortValue ()S + COMMENT Gets the value as a 16-bit integer. + COMMENT + COMMENT @return the value as a short + METHOD method_10697 doubleValue ()D + COMMENT Gets the value as a 64-bit floating-point number. + COMMENT + COMMENT @return the value as a double + METHOD method_10698 byteValue ()B + COMMENT Gets the value as an 8-bit integer. + COMMENT + COMMENT @return the value as a byte + METHOD method_10699 longValue ()J + COMMENT Gets the value as a 64-bit integer. + COMMENT + COMMENT @return the value as a long + METHOD method_10700 floatValue ()F + COMMENT Gets the value as a 32-bit floating-point number. + COMMENT + COMMENT @return the value as a float + METHOD method_10701 intValue ()I + COMMENT Gets the value as a 32-bit integer. + COMMENT + COMMENT @return the value as an int + METHOD method_10702 numberValue ()Ljava/lang/Number; + COMMENT Gets the value as a generic number. + COMMENT + COMMENT @return the value as a {@link Number} diff --git a/mappings/net/minecraft/nbt/AbstractNumberTag.mapping b/mappings/net/minecraft/nbt/AbstractNumberTag.mapping deleted file mode 100644 index b21be3d7f2..0000000000 --- a/mappings/net/minecraft/nbt/AbstractNumberTag.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2514 net/minecraft/nbt/AbstractNumberTag - METHOD method_10696 getShort ()S - METHOD method_10697 getDouble ()D - METHOD method_10698 getByte ()B - METHOD method_10699 getLong ()J - METHOD method_10700 getFloat ()F - METHOD method_10701 getInt ()I - METHOD method_10702 getNumber ()Ljava/lang/Number; diff --git a/mappings/net/minecraft/nbt/ByteArrayTag.mapping b/mappings/net/minecraft/nbt/ByteArrayTag.mapping deleted file mode 100644 index 8c811f4274..0000000000 --- a/mappings/net/minecraft/nbt/ByteArrayTag.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_2479 net/minecraft/nbt/ByteArrayTag - FIELD field_11493 value [B - FIELD field_21024 READER Lnet/minecraft/class_4614; - METHOD (Ljava/util/List;)V - ARG 1 value - METHOD ([B)V - ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_10521 getByteArray ()[B - METHOD method_10522 toArray (Ljava/util/List;)[B - ARG 0 list diff --git a/mappings/net/minecraft/nbt/DoubleTag.mapping b/mappings/net/minecraft/nbt/DoubleTag.mapping deleted file mode 100644 index f224526908..0000000000 --- a/mappings/net/minecraft/nbt/DoubleTag.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_2489 net/minecraft/nbt/DoubleTag - FIELD field_11520 value D - FIELD field_21030 ZERO Lnet/minecraft/class_2489; - FIELD field_21031 READER Lnet/minecraft/class_4614; - METHOD (D)V - ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_23241 of (D)Lnet/minecraft/class_2489; - ARG 0 value diff --git a/mappings/net/minecraft/nbt/EndTag.mapping b/mappings/net/minecraft/nbt/EndTag.mapping deleted file mode 100644 index 9a4b8e75be..0000000000 --- a/mappings/net/minecraft/nbt/EndTag.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2491 net/minecraft/nbt/EndTag - FIELD field_21032 READER Lnet/minecraft/class_4614; - FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; diff --git a/mappings/net/minecraft/nbt/FloatTag.mapping b/mappings/net/minecraft/nbt/FloatTag.mapping deleted file mode 100644 index 26f17a02c6..0000000000 --- a/mappings/net/minecraft/nbt/FloatTag.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_2494 net/minecraft/nbt/FloatTag - FIELD field_11523 value F - FIELD field_21034 ZERO Lnet/minecraft/class_2494; - FIELD field_21035 READER Lnet/minecraft/class_4614; - METHOD (F)V - ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_23244 of (F)Lnet/minecraft/class_2494; - ARG 0 value diff --git a/mappings/net/minecraft/nbt/IntArrayTag.mapping b/mappings/net/minecraft/nbt/IntArrayTag.mapping deleted file mode 100644 index 76486191ed..0000000000 --- a/mappings/net/minecraft/nbt/IntArrayTag.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_2495 net/minecraft/nbt/IntArrayTag - FIELD field_11524 value [I - FIELD field_21036 READER Lnet/minecraft/class_4614; - METHOD (Ljava/util/List;)V - ARG 1 value - METHOD ([I)V - ARG 1 value - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_10588 getIntArray ()[I - METHOD method_10590 toArray (Ljava/util/List;)[I - ARG 0 list diff --git a/mappings/net/minecraft/nbt/ByteTag.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping similarity index 64% rename from mappings/net/minecraft/nbt/ByteTag.mapping rename to mappings/net/minecraft/nbt/NbtByte.mapping index bcab21bd6f..ddd1031fda 100644 --- a/mappings/net/minecraft/nbt/ByteTag.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2481 net/minecraft/nbt/ByteTag +CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte + COMMENT Represents an NBT byte. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 1}. FIELD field_11498 value B - FIELD field_21025 READER Lnet/minecraft/class_4614; + FIELD field_21025 TYPE Lnet/minecraft/class_4614; FIELD field_21026 ZERO Lnet/minecraft/class_2481; FIELD field_21027 ONE Lnet/minecraft/class_2481; METHOD (B)V diff --git a/mappings/net/minecraft/nbt/NbtByteArray.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping new file mode 100644 index 0000000000..20b38f12f0 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray + COMMENT Represents an NBT byte array. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 7}. + FIELD field_11493 value [B + FIELD field_21024 TYPE Lnet/minecraft/class_4614; + METHOD (Ljava/util/List;)V + ARG 1 value + METHOD ([B)V + ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD get (I)Ljava/lang/Object; + ARG 1 index + METHOD method_10521 getByteArray ()[B + METHOD method_10522 toArray (Ljava/util/List;)[B + ARG 0 list diff --git a/mappings/net/minecraft/nbt/CompoundTag.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping similarity index 75% rename from mappings/net/minecraft/nbt/CompoundTag.mapping rename to mappings/net/minecraft/nbt/NbtCompound.mapping index ce700957cb..081f0b8c34 100644 --- a/mappings/net/minecraft/nbt/CompoundTag.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -1,9 +1,12 @@ -CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag - FIELD field_11515 tags Ljava/util/Map; - FIELD field_21029 READER Lnet/minecraft/class_4614; +CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound + COMMENT Represents an NBT compound object which holds unordered key-value pairs with distinct case-sensitive string keys. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 10}. + FIELD field_11515 entries Ljava/util/Map; + FIELD field_21029 TYPE Lnet/minecraft/class_4614; FIELD field_25128 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;)V - ARG 1 tags + ARG 1 entries METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10537 getLong (Ljava/lang/String;)J @@ -15,6 +18,9 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10540 getType (Ljava/lang/String;)B + COMMENT Gets the {@linkplain NbtElement#getType NBT type} of the element stored at the specified key. + COMMENT + COMMENT @return the element NBT type, or {@linkplain NbtNull 0} if it does not exist ARG 1 key METHOD method_10541 getKeys ()Ljava/util/Set; METHOD method_10542 readByte (Ljava/io/DataInput;Lnet/minecraft/class_2505;)B @@ -26,6 +32,9 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10545 contains (Ljava/lang/String;)Z + COMMENT Determines whether the NBT compound object contains the specified key. + COMMENT + COMMENT @return {@code true} if the key exists, else {@code false} ARG 1 key METHOD method_10546 getSize ()I METHOD method_10547 getByteArray (Ljava/lang/String;)[B @@ -48,7 +57,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 2 type METHOD method_10555 write (Ljava/lang/String;Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V ARG 0 key - ARG 1 tag + ARG 1 element ARG 2 output METHOD method_10556 putBoolean (Ljava/lang/String;Z)V ARG 1 key @@ -57,6 +66,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key METHOD method_10559 createCrashReport (Ljava/lang/String;Lnet/minecraft/class_4614;Ljava/lang/ClassCastException;)Lnet/minecraft/class_128; ARG 1 key + ARG 2 reader METHOD method_10561 getIntArray (Ljava/lang/String;)[I ARG 1 key METHOD method_10562 getCompound (Ljava/lang/String;)Lnet/minecraft/class_2487; @@ -68,7 +78,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key METHOD method_10566 put (Ljava/lang/String;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; ARG 1 key - ARG 2 tag + ARG 2 element METHOD method_10567 putByte (Ljava/lang/String;B)V ARG 1 key ARG 2 value @@ -86,6 +96,11 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10573 contains (Ljava/lang/String;I)Z + COMMENT Returns whether the NBT compound object contains an element of the specified type at the specified key. + COMMENT

+ COMMENT The type restriction can also be {@code 99}, which only allows any type of number. + COMMENT + COMMENT @return {@code true} if the key exists and the element type is equivalent to the given {@code type}, else {@code false} ARG 1 key ARG 2 type METHOD method_10574 getDouble (Ljava/lang/String;)D @@ -109,15 +124,17 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag METHOD method_10583 getFloat (Ljava/lang/String;)F ARG 1 key METHOD method_25926 getUuid (Ljava/lang/String;)Ljava/util/UUID; - COMMENT Reads a {@link UUID} from its NBT representation in this {@code CompoundTag}. + COMMENT Reads a {@link UUID} from its NBT representation in this {@code NbtCompound}. ARG 1 key METHOD method_25927 putUuid (Ljava/lang/String;Ljava/util/UUID;)V - COMMENT Writes a {@link UUID} to its NBT representation in this {@code CompoundTag}. + COMMENT Writes a {@link UUID} to its NBT representation in this {@code NbtCompound}. ARG 1 key ARG 2 value METHOD method_25928 containsUuid (Ljava/lang/String;)Z - COMMENT Returns {@code true} if this {@code CompoundTag} contains a valid UUID representation associated with the given key. + 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_29142 (Lnet/minecraft/class_2487;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt METHOD method_29143 toMap ()Ljava/util/Map; METHOD method_33133 isEmpty ()Z diff --git a/mappings/net/minecraft/nbt/NbtDouble.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping new file mode 100644 index 0000000000..4cb4890e14 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble + COMMENT Represents an NBT 64-bit floating-point number. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 6}. + FIELD field_11520 value D + FIELD field_21030 ZERO Lnet/minecraft/class_2489; + FIELD field_21031 TYPE Lnet/minecraft/class_4614; + METHOD (D)V + ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_23241 of (D)Lnet/minecraft/class_2489; + ARG 0 value diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping new file mode 100644 index 0000000000..f427805c7c --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtElement.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement + COMMENT Represents an NBT element. + COMMENT

+ COMMENT Each type of NBT element has an associated integer {@linkplain NbtElement#getType NBT type}. The following is a list of possible types: + COMMENT

    + COMMENT
  • {@code 0} - null
    • + COMMENT
  • {@code 1} - byte
    • + COMMENT
  • {@code 2} - short
    • + COMMENT
  • {@code 3} - int
    • + COMMENT
  • {@code 4} - long
    • + COMMENT
  • {@code 5} - float
    • + COMMENT
  • {@code 6} - double
    • + COMMENT
  • {@code 7} - byte array
    • + COMMENT
  • {@code 8} - string
    • + COMMENT
  • {@code 9} - list
    • + COMMENT
  • {@code 10} - compound object
    • + COMMENT
  • {@code 11} - int array
    • + COMMENT
  • {@code 12} - long array
    • + COMMENT
+ METHOD method_10707 copy ()Lnet/minecraft/class_2520; + COMMENT Copies this NBT element. + COMMENT + COMMENT @return the copied element + METHOD method_10711 getType ()B + COMMENT Gets the type of this NBT element. + COMMENT + COMMENT @return the type + METHOD method_10713 write (Ljava/io/DataOutput;)V + ARG 1 output + METHOD method_10714 asString ()Ljava/lang/String; + METHOD method_23258 getNbtType ()Lnet/minecraft/class_4614; + COMMENT Gets the NBT type definition of this NBT element. + COMMENT + COMMENT @return the element type definition + METHOD method_32289 accept (Lnet/minecraft/class_5627;)V + ARG 1 visitor diff --git a/mappings/net/minecraft/nbt/NbtFloat.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping new file mode 100644 index 0000000000..4f37192aba --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat + COMMENT Represents an NBT 32-bit floating-point number. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 5}. + FIELD field_11523 value F + FIELD field_21034 ZERO Lnet/minecraft/class_2494; + FIELD field_21035 TYPE Lnet/minecraft/class_4614; + METHOD (F)V + ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_23244 of (F)Lnet/minecraft/class_2494; + ARG 0 value diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index 3c0835463e..0d21ea57c9 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -1,17 +1,18 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_27818 COMMA_SPLITTER Lcom/google/common/base/Splitter; METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; - ARG 0 tag + ARG 0 compound METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; ARG 0 state ARG 1 property ARG 2 key - ARG 3 propertiesTag - ARG 4 mainTag + ARG 3 properties + ARG 4 root METHOD method_10683 toGameProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; - ARG 0 tag - METHOD method_10684 fromGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; - ARG 0 tag + ARG 0 compound + METHOD method_10684 writeGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; + ARG 0 compound ARG 1 profile METHOD method_10685 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 property @@ -23,46 +24,50 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper ARG 1 subject ARG 2 equalValue METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; - COMMENT Uses the data fixer to update a tag to the latest data version. + COMMENT Uses the data fixer to update an NBT compound object to the latest data version. ARG 0 fixer COMMENT the data fixer ARG 1 fixTypes COMMENT the fix types - ARG 2 tag - COMMENT the tag to fix + ARG 2 compound + COMMENT the NBT compound object to fix ARG 3 oldVersion - COMMENT the data version of the compound tag + COMMENT the data version of the NBT compound object METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; - ARG 0 tag + ARG 0 compound METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 0 pos METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; - COMMENT Uses the data fixer to update a tag. + COMMENT Uses the data fixer to update an NBT compound object. ARG 0 fixer COMMENT the data fixer ARG 1 fixTypes COMMENT the fix types - ARG 2 tag - COMMENT the tag to fix + ARG 2 compound + COMMENT the NBT compound object to fix ARG 3 oldVersion - COMMENT the data version of the compound tag + COMMENT the data version of the NBT compound object ARG 4 targetVersion - COMMENT the data version to update the tag to + COMMENT the data version to update the NBT compound object to METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495; COMMENT Serializes a {@link UUID} into its equivalent NBT representation. COMMENT COMMENT @since 20w10a ARG 0 uuid METHOD method_25930 toUuid (Lnet/minecraft/class_2520;)Ljava/util/UUID; - COMMENT Deserializes a tag into a {@link UUID}. - COMMENT The tag's data must have the same structure as the output of {@link #fromUuid}. + COMMENT Deserializes an NBT element into a {@link UUID}. + COMMENT The NBT element's data must have the same structure as the output of {@link #fromUuid}. COMMENT - COMMENT @throws IllegalArgumentException if {@code tag} is not a valid representation of a UUID + COMMENT @throws IllegalArgumentException if {@code element} is not a valid representation of a UUID COMMENT @since 20w10a - ARG 0 tag + ARG 0 element METHOD method_32270 toPrettyPrintedText (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; - ARG 0 tag + ARG 0 element METHOD method_32271 toPrettyPrintedString (Lnet/minecraft/class_2487;)Ljava/lang/String; - ARG 0 tag + ARG 0 compound METHOD method_32273 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 0 tag + ARG 0 compound + METHOD method_32275 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 compound + METHOD method_32277 (Lnet/minecraft/class_2487;)Ljava/lang/String; + ARG 0 compound diff --git a/mappings/net/minecraft/nbt/IntTag.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping similarity index 51% rename from mappings/net/minecraft/nbt/IntTag.mapping rename to mappings/net/minecraft/nbt/NbtInt.mapping index c709aab27c..ae72bc6947 100644 --- a/mappings/net/minecraft/nbt/IntTag.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2497 net/minecraft/nbt/IntTag +CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt + COMMENT Represents an NBT 32-bit integer. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 3}. FIELD field_11525 value I - FIELD field_21037 READER Lnet/minecraft/class_4614; + FIELD field_21037 TYPE Lnet/minecraft/class_4614; 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 new file mode 100644 index 0000000000..ba25db104d --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray + COMMENT Represents an NBT 32-bit integer array. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 11}. + FIELD field_11524 value [I + FIELD field_21036 TYPE Lnet/minecraft/class_4614; + METHOD (Ljava/util/List;)V + ARG 1 value + METHOD ([I)V + ARG 1 value + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD get (I)Ljava/lang/Object; + ARG 1 index + METHOD method_10588 getIntArray ()[I + METHOD method_10590 toArray (Ljava/util/List;)[I + ARG 0 list diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 9adfe0a5ad..d9fc8dcdaf 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -9,23 +9,23 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_10627 read (Ljava/io/DataInput;)Lnet/minecraft/class_2487; ARG 0 input METHOD method_10628 write (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V - ARG 0 tag + ARG 0 compound ARG 1 output METHOD method_10629 readCompressed (Ljava/io/InputStream;)Lnet/minecraft/class_2487; ARG 0 stream METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/io/File;)V - ARG 0 tag + ARG 0 compound ARG 1 file METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V - ARG 0 tag + ARG 0 element ARG 1 output METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; ARG 0 file METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V - ARG 0 tag + ARG 0 compound ARG 1 stream METHOD method_30613 readCompressed (Ljava/io/File;)Lnet/minecraft/class_2487; ARG 0 file METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/File;)V - ARG 0 tag + ARG 0 compound ARG 1 file diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/NbtList.mapping similarity index 55% rename from mappings/net/minecraft/nbt/ListTag.mapping rename to mappings/net/minecraft/nbt/NbtList.mapping index d491de3f4d..917298305b 100644 --- a/mappings/net/minecraft/nbt/ListTag.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -1,7 +1,14 @@ -CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag +CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList + COMMENT Represents an NBT list. + COMMENT

+ 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 {@code 0} as their held {@linkplain AbstractNbtList#getHeldType NBT type}. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 9}. FIELD field_11550 value Ljava/util/List; FIELD field_11551 type B - FIELD field_21039 READER Lnet/minecraft/class_4614; + FIELD field_21039 TYPE Lnet/minecraft/class_4614; METHOD (Ljava/util/List;B)V ARG 1 list ARG 2 type @@ -18,7 +25,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag METHOD method_10604 getFloat (I)F ARG 1 index METHOD method_10605 canAdd (Lnet/minecraft/class_2520;)Z - ARG 1 tag + ARG 1 element METHOD method_10608 getString (I)Ljava/lang/String; ARG 1 index METHOD method_10609 getShort (I)S diff --git a/mappings/net/minecraft/nbt/LongTag.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping similarity index 51% rename from mappings/net/minecraft/nbt/LongTag.mapping rename to mappings/net/minecraft/nbt/NbtLong.mapping index 230e29be19..c1ad64c76d 100644 --- a/mappings/net/minecraft/nbt/LongTag.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2503 net/minecraft/nbt/LongTag +CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong + COMMENT Represents an NBT 64-bit integer. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 4}. FIELD field_11553 value J - FIELD field_21041 READER Lnet/minecraft/class_4614; + FIELD field_21041 TYPE Lnet/minecraft/class_4614; METHOD (J)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/LongArrayTag.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping similarity index 52% rename from mappings/net/minecraft/nbt/LongArrayTag.mapping rename to mappings/net/minecraft/nbt/NbtLongArray.mapping index bb075df2de..27c3f866fb 100644 --- a/mappings/net/minecraft/nbt/LongArrayTag.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2501 net/minecraft/nbt/LongArrayTag +CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray + COMMENT Represents an NBT 64-bit integer array. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 12}. FIELD field_11552 value [J - FIELD field_21040 READER Lnet/minecraft/class_4614; + FIELD field_21040 TYPE Lnet/minecraft/class_4614; METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 value METHOD (Ljava/util/List;)V @@ -9,6 +12,8 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/LongArrayTag ARG 1 value METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD get (I)Ljava/lang/Object; + ARG 1 index METHOD method_10615 getLongArray ()[J METHOD method_10617 toArray (Ljava/util/List;)[J ARG 0 list diff --git a/mappings/net/minecraft/nbt/NbtNull.mapping b/mappings/net/minecraft/nbt/NbtNull.mapping new file mode 100644 index 0000000000..fc630aba69 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtNull.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtNull + COMMENT Represents the NBT null value. + COMMENT Defines the end of an NBT compound object, + COMMENT represents nonexistent values in an NBT compound object, + COMMENT and is the type of empty NBT lists. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 0}. + FIELD field_21032 TYPE Lnet/minecraft/class_4614; + FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index acaaf9b262..f5aee0cae1 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -18,4 +18,58 @@ CLASS net/minecraft/class_2509 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.

+ METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object; + ARG 2 element + METHOD createBoolean (Z)Ljava/lang/Object; + ARG 1 value + METHOD createByte (B)Ljava/lang/Object; + ARG 1 value + 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 createLong (J)Ljava/lang/Object; + ARG 1 value + METHOD createNumeric (Ljava/lang/Number;)Ljava/lang/Object; + ARG 1 value + METHOD createShort (S)Ljava/lang/Object; + ARG 1 value + METHOD getByteBuffer (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getIntStream (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getList (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getLongStream (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getMap (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getMapEntries (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getMapValues (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getNumberValue (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getStream (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD getStringValue (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 element + METHOD mergeToList (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 list + ARG 2 value + METHOD mergeToMap (Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 element + 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 method_10666 (Ljava/lang/String;Ljava/lang/String;)Z + ARG 1 k + METHOD method_10670 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V + ARG 2 k + METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; + ARG 1 element + ARG 2 key CLASS class_5320 MapBuilder diff --git a/mappings/net/minecraft/nbt/ShortTag.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping similarity index 50% rename from mappings/net/minecraft/nbt/ShortTag.mapping rename to mappings/net/minecraft/nbt/NbtShort.mapping index eb3a2224d3..9552a31170 100644 --- a/mappings/net/minecraft/nbt/ShortTag.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2516 net/minecraft/nbt/ShortTag +CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort + COMMENT Represents an NBT 16-bit integer. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 2}. FIELD field_11588 value S - FIELD field_21043 READER Lnet/minecraft/class_4614; + FIELD field_21043 TYPE Lnet/minecraft/class_4614; METHOD (S)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/StringTag.mapping b/mappings/net/minecraft/nbt/NbtString.mapping similarity index 60% rename from mappings/net/minecraft/nbt/StringTag.mapping rename to mappings/net/minecraft/nbt/NbtString.mapping index c02cc7c195..946af08e20 100644 --- a/mappings/net/minecraft/nbt/StringTag.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -1,6 +1,9 @@ -CLASS net/minecraft/class_2519 net/minecraft/nbt/StringTag +CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString + COMMENT Represents an NBT string. + COMMENT

+ COMMENT This class uses the {@linkplain NbtElement#getType NBT type} {@code 8}. FIELD field_11590 value Ljava/lang/String; - FIELD field_21045 READER Lnet/minecraft/class_4614; + FIELD field_21045 TYPE Lnet/minecraft/class_4614; FIELD field_21046 EMPTY Lnet/minecraft/class_2519; METHOD (Ljava/lang/String;)V ARG 1 value diff --git a/mappings/net/minecraft/nbt/TagReader.mapping b/mappings/net/minecraft/nbt/NbtType.mapping similarity index 50% rename from mappings/net/minecraft/nbt/TagReader.mapping rename to mappings/net/minecraft/nbt/NbtType.mapping index dd2ba13989..49d485bb37 100644 --- a/mappings/net/minecraft/nbt/TagReader.mapping +++ b/mappings/net/minecraft/nbt/NbtType.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_4614 net/minecraft/nbt/TagReader +CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType + COMMENT Represents an NBT type. METHOD method_23259 getCrashReportName ()Ljava/lang/String; METHOD method_23260 createInvalid (I)Lnet/minecraft/class_4614; ARG 0 type @@ -8,3 +9,9 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/TagReader ARG 2 depth ARG 3 tracker METHOD method_23263 isImmutable ()Z + COMMENT Determines the immutability of this type. + COMMENT

+ COMMENT The mutability of an NBT type means the held value can be modified + COMMENT after the NBT element is instantiated. + COMMENT + COMMENT @return {@code true} if this NBT type is immutable, else {@code false} diff --git a/mappings/net/minecraft/nbt/NbtTypes.mapping b/mappings/net/minecraft/nbt/NbtTypes.mapping new file mode 100644 index 0000000000..7d855d3ee1 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtTypes.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4615 net/minecraft/nbt/NbtTypes + FIELD field_21048 VALUES [Lnet/minecraft/class_4614; + METHOD method_23265 byId (I)Lnet/minecraft/class_4614; + COMMENT Gets the associated {@linkplain NbtType NBT type} for a given {@code id}. + COMMENT

+ COMMENT This method does not support id aliases. + COMMENT + COMMENT @return the NBT type, or {@linkplain NbtType#createInvalid an invalid type} if there is no type with the given {@code id} + ARG 0 id diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 640e8ab448..56875bce47 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -16,19 +16,19 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader METHOD (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader METHOD method_10716 readComma ()Z - METHOD method_10717 parseTagArray ()Lnet/minecraft/class_2520; + METHOD method_10717 parseArray ()Lnet/minecraft/class_2520; METHOD method_10718 parse (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 0 string METHOD method_10719 expect (C)V - METHOD method_10721 readCompoundTag ()Lnet/minecraft/class_2487; - METHOD method_10722 parseTagPrimitive ()Lnet/minecraft/class_2520; - METHOD method_10723 parseTag ()Lnet/minecraft/class_2520; + METHOD method_10721 readCompound ()Lnet/minecraft/class_2487; + METHOD method_10722 parseElementPrimitive ()Lnet/minecraft/class_2520; + METHOD method_10723 parseElement ()Lnet/minecraft/class_2520; METHOD method_10725 readString ()Ljava/lang/String; - METHOD method_10726 parseTagPrimitiveArray ()Lnet/minecraft/class_2520; - METHOD method_10727 parseCompoundTag ()Lnet/minecraft/class_2487; + METHOD method_10726 parseElementPrimitiveArray ()Lnet/minecraft/class_2520; + METHOD method_10727 parseCompound ()Lnet/minecraft/class_2487; METHOD method_10728 readArray (Lnet/minecraft/class_4614;Lnet/minecraft/class_4614;)Ljava/util/List; ARG 1 arrayTypeReader ARG 2 typeReader - METHOD method_10729 parseListTag ()Lnet/minecraft/class_2520; + METHOD method_10729 parseList ()Lnet/minecraft/class_2520; METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; ARG 1 input diff --git a/mappings/net/minecraft/nbt/Tag.mapping b/mappings/net/minecraft/nbt/Tag.mapping deleted file mode 100644 index 30eb464259..0000000000 --- a/mappings/net/minecraft/nbt/Tag.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2520 net/minecraft/nbt/Tag - METHOD method_10707 copy ()Lnet/minecraft/class_2520; - METHOD method_10711 getType ()B - METHOD method_10713 write (Ljava/io/DataOutput;)V - ARG 1 output - METHOD method_10714 asString ()Ljava/lang/String; - METHOD method_23258 getReader ()Lnet/minecraft/class_4614; - METHOD method_32289 accept (Lnet/minecraft/class_5627;)V - ARG 1 visitor diff --git a/mappings/net/minecraft/nbt/TagReaders.mapping b/mappings/net/minecraft/nbt/TagReaders.mapping deleted file mode 100644 index b880d3d7ed..0000000000 --- a/mappings/net/minecraft/nbt/TagReaders.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4615 net/minecraft/nbt/TagReaders - FIELD field_21048 VALUES [Lnet/minecraft/class_4614; - METHOD method_23265 of (I)Lnet/minecraft/class_4614; - ARG 0 type diff --git a/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping b/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping new file mode 100644 index 0000000000..d9de1b43ab --- /dev/null +++ b/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_5627 net/minecraft/nbt/visitor/NbtElementVisitor + COMMENT A visitor interface for NBT elements. + METHOD method_32290 visitByteArray (Lnet/minecraft/class_2479;)V + ARG 1 element + METHOD method_32291 visitByte (Lnet/minecraft/class_2481;)V + ARG 1 element + METHOD method_32292 visitCompound (Lnet/minecraft/class_2487;)V + ARG 1 compound + METHOD method_32293 visitDouble (Lnet/minecraft/class_2489;)V + ARG 1 element + METHOD method_32294 visitNull (Lnet/minecraft/class_2491;)V + ARG 1 element + METHOD method_32295 visitFloat (Lnet/minecraft/class_2494;)V + ARG 1 element + METHOD method_32296 visitIntArray (Lnet/minecraft/class_2495;)V + ARG 1 element + METHOD method_32297 visitInt (Lnet/minecraft/class_2497;)V + ARG 1 element + METHOD method_32298 visitList (Lnet/minecraft/class_2499;)V + ARG 1 element + METHOD method_32299 visitLongArray (Lnet/minecraft/class_2501;)V + ARG 1 element + METHOD method_32300 visitLong (Lnet/minecraft/class_2503;)V + ARG 1 element + METHOD method_32301 visitShort (Lnet/minecraft/class_2516;)V + ARG 1 element + METHOD method_32302 visitString (Lnet/minecraft/class_2519;)V + ARG 1 element diff --git a/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping index cfd46fcc46..915a1119d3 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtOrderedStringFormatter.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_5625 net/minecraft/nbt/visitor/NbtOrderedStringFormatter - COMMENT Formats an NBT tag as a multiline string where named tags inside of compounds are sorted - COMMENT according to a defined ordering. + COMMENT Formats an NBT element as a multiline string where named elements inside of compound objects + COMMENT are sorted according to a defined ordering. FIELD field_27820 ENTRY_ORDER_OVERRIDES Ljava/util/Map; - COMMENT Contains the names of tags which should appear before any other tag in a compound, even - COMMENT when they would otherwise appear later lexicographically. The list of tags which should be - COMMENT prioritized differs depending on the path of the compound. + COMMENT Contains the names of elements which should appear before any other element in a compound object, even + COMMENT when they would otherwise appear later lexicographically. The list of elements which should be + COMMENT prioritized differs depending on the path of the compound object. FIELD field_27821 IGNORED_PATHS Ljava/util/Set; COMMENT Contains paths for which the indentation prefix should not be prepended to the result. FIELD field_27822 SIMPLE_NAME Ljava/util/regex/Pattern; @@ -21,10 +21,12 @@ CLASS net/minecraft/class_5625 net/minecraft/nbt/visitor/NbtOrderedStringFormatt METHOD method_32280 joinPath ()Ljava/lang/String; METHOD method_32281 escapeName (Ljava/lang/String;)Ljava/lang/String; ARG 0 name + METHOD method_32282 (Ljava/util/HashMap;)V + ARG 0 map METHOD method_32283 apply (Lnet/minecraft/class_2520;)Ljava/lang/String; - ARG 1 tag + ARG 1 element METHOD method_32284 popPathPart ()V METHOD method_32285 pushPathPart (Ljava/lang/String;)V ARG 1 part METHOD method_32286 getSortedNames (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 1 tag + ARG 1 compound diff --git a/mappings/net/minecraft/nbt/visitor/NbtTagVisitor.mapping b/mappings/net/minecraft/nbt/visitor/NbtTagVisitor.mapping deleted file mode 100644 index ed5a046af1..0000000000 --- a/mappings/net/minecraft/nbt/visitor/NbtTagVisitor.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/class_5627 net/minecraft/nbt/visitor/NbtTagVisitor - COMMENT A visitor interface for NBT tags. - METHOD method_32290 visitByteArrayTag (Lnet/minecraft/class_2479;)V - ARG 1 tag - METHOD method_32291 visitByteTag (Lnet/minecraft/class_2481;)V - ARG 1 tag - METHOD method_32292 visitCompoundTag (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_32293 visitDoubleTag (Lnet/minecraft/class_2489;)V - ARG 1 tag - METHOD method_32294 visitEndTag (Lnet/minecraft/class_2491;)V - ARG 1 tag - METHOD method_32295 visitFloatTag (Lnet/minecraft/class_2494;)V - ARG 1 tag - METHOD method_32296 visitIntArrayTag (Lnet/minecraft/class_2495;)V - ARG 1 tag - METHOD method_32297 visitIntTag (Lnet/minecraft/class_2497;)V - ARG 1 tag - METHOD method_32298 visitListTag (Lnet/minecraft/class_2499;)V - ARG 1 tag - METHOD method_32299 visitLongArrayTag (Lnet/minecraft/class_2501;)V - ARG 1 tag - METHOD method_32300 visitLongTag (Lnet/minecraft/class_2503;)V - ARG 1 tag - METHOD method_32301 visitShortTag (Lnet/minecraft/class_2516;)V - ARG 1 tag - METHOD method_32302 visitStringTag (Lnet/minecraft/class_2519;)V - ARG 1 tag diff --git a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping index 58ab772daf..4aa057334d 100644 --- a/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping +++ b/mappings/net/minecraft/nbt/visitor/NbtTextFormatter.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter - COMMENT Formats an NBT tag into a colored, multiline {@link Text} representation suitable for human-readable + COMMENT Formats an NBT element into a colored, multiline {@link Text} representation suitable for human-readable COMMENT displays. FIELD field_27831 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_27832 SINGLE_LINE_ELEMENT_TYPES Lit/unimi/dsi/fastutil/bytes/ByteCollection; @@ -19,4 +19,4 @@ CLASS net/minecraft/class_5628 net/minecraft/nbt/visitor/NbtTextFormatter METHOD method_32304 escapeName (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 name METHOD method_32305 apply (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; - ARG 1 tag + ARG 1 element diff --git a/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping b/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping index e181fa9db5..b0e50e47c3 100644 --- a/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping +++ b/mappings/net/minecraft/nbt/visitor/StringNbtWriter.mapping @@ -5,4 +5,4 @@ CLASS net/minecraft/class_5626 net/minecraft/nbt/visitor/StringNbtWriter METHOD method_32287 escapeName (Ljava/lang/String;)Ljava/lang/String; ARG 0 name METHOD method_32288 apply (Lnet/minecraft/class_2520;)Ljava/lang/String; - ARG 1 tag + ARG 1 element