1.18-pre1 NBT stuff (#2831)

* 1.18-pre1 NBT stuff

* Fix AbstractNbtList

* Update mappings/net/minecraft/nbt/NbtHelper.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2021-11-17 23:34:14 +09:00 committed by GitHub
parent 5c1f90e127
commit ea596bba42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 207 additions and 4 deletions

View File

@ -4,6 +4,7 @@ CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte
FIELD field_21025 TYPE Lnet/minecraft/class_4614;
FIELD field_21026 ZERO Lnet/minecraft/class_2481;
FIELD field_21027 ONE Lnet/minecraft/class_2481;
FIELD field_33189 SIZE I
METHOD <init> (B)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z

View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray
COMMENT Represents an NBT byte array.
FIELD field_11493 value [B
FIELD field_21024 TYPE Lnet/minecraft/class_4614;
FIELD field_33188 SIZE I
METHOD <init> (Ljava/util/List;)V
ARG 1 value
METHOD <init> ([B)V

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
FIELD field_11515 entries Ljava/util/Map;
FIELD field_21029 TYPE Lnet/minecraft/class_4614;
FIELD field_25128 CODEC Lcom/mojang/serialization/Codec;
FIELD field_33190 SIZE I
METHOD <init> (Ljava/util/Map;)V
ARG 1 entries
METHOD equals (Ljava/lang/Object;)Z
@ -65,6 +66,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
METHOD method_10559 createCrashReport (Ljava/lang/String;Lnet/minecraft/class_4614;Ljava/lang/ClassCastException;)Lnet/minecraft/class_128;
ARG 1 key
ARG 2 reader
ARG 3 exception
METHOD method_10561 getIntArray (Ljava/lang/String;)[I
ARG 1 key
METHOD method_10562 getCompound (Ljava/lang/String;)Lnet/minecraft/class_2487;

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble
FIELD field_11520 value D
FIELD field_21030 ZERO Lnet/minecraft/class_2489;
FIELD field_21031 TYPE Lnet/minecraft/class_4614;
FIELD field_33192 SIZE I
METHOD <init> (D)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z

View File

@ -57,6 +57,7 @@ CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement
COMMENT
COMMENT @see NbtCompound#getType(String)
COMMENT @see NbtCompound#contains(String, int)
FIELD field_33264 MAX_DEPTH I
METHOD method_10707 copy ()Lnet/minecraft/class_2520;
COMMENT Copies this NBT element.
COMMENT

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat
FIELD field_11523 value F
FIELD field_21034 ZERO Lnet/minecraft/class_2494;
FIELD field_21035 TYPE Lnet/minecraft/class_4614;
FIELD field_33194 SIZE I
METHOD <init> (F)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z

View File

@ -1,6 +1,14 @@
CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_27816 BLOCK_POS_COMPARATOR Ljava/util/Comparator;
FIELD field_27817 ENTITY_POS_COMPARATOR Ljava/util/Comparator;
FIELD field_27818 COMMA_SPLITTER Lcom/google/common/base/Splitter;
FIELD field_27819 COLON_SPLITTER Lcom/google/common/base/Splitter;
FIELD field_33224 DATA_KEY Ljava/lang/String;
FIELD field_33225 LEFT_CURLY_BRACKET C
FIELD field_33226 RIGHT_CURLY_BRACKET C
FIELD field_33227 COMMA Ljava/lang/String;
FIELD field_33228 COLON C
METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680;
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;
@ -61,13 +69,89 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
COMMENT @throws IllegalArgumentException if {@code element} is not a valid representation of a UUID
COMMENT @since 20w10a
ARG 0 element
METHOD method_32260 fromNbtProviderString (Ljava/lang/String;)Lnet/minecraft/class_2487;
COMMENT {@return the {@code string} parsed as an NBT provider-formatted
COMMENT NBT compound}
COMMENT
COMMENT <p>This method first parses the string as an NBT, then performs
COMMENT several conversions from human-readable {@link NbtCompound} items
COMMENT to the actual values used in-game.
COMMENT
COMMENT @see net.minecraft.data.SnbtProvider
COMMENT @see #toNbtProviderString
ARG 0 string
METHOD method_32261 (Ljava/util/Map;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2499;
ARG 1 nbt
METHOD method_32262 (Lnet/minecraft/class_2487;Ljava/lang/String;)Ljava/lang/String;
ARG 1 key
METHOD method_32263 (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/lang/String;)V
ARG 2 property
METHOD method_32264 (Lnet/minecraft/class_2499;)D
ARG 0 nbt
METHOD method_32265 (Lnet/minecraft/class_2499;Lnet/minecraft/class_2487;)V
ARG 1 nbt
METHOD method_32266 (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V
ARG 2 nbt
METHOD method_32267 fromNbtProviderFormattedPalette (Ljava/lang/String;)Lnet/minecraft/class_2487;
ARG 0 string
METHOD method_32268 (Lnet/minecraft/class_2499;)D
ARG 0 nbt
METHOD method_32269 (Lnet/minecraft/class_2499;)D
ARG 0 nbt
METHOD method_32270 toPrettyPrintedText (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561;
ARG 0 element
METHOD method_32271 toPrettyPrintedString (Lnet/minecraft/class_2487;)Ljava/lang/String;
METHOD method_32271 toNbtProviderString (Lnet/minecraft/class_2487;)Ljava/lang/String;
COMMENT {@return the string representation of {@code compound} as used
COMMENT by the NBT provider in the data generator}
COMMENT
COMMENT <p>The passed {@code compound} will be sorted and modified in-place
COMMENT to make it more human-readable e.g. by converting {@link NbtCompound}
COMMENT in the {@code palettes} {@code NbtList} to its short string
COMMENT representation. Therefore the returned value is not an accurate
COMMENT representation of the original NBT.
COMMENT
COMMENT @see net.minecraft.data.dev.NbtProvider
COMMENT @see #fromNbtProviderString(String)
ARG 0 compound
METHOD method_32273 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
METHOD method_32272 (Lnet/minecraft/class_2499;)I
ARG 0 nbt
METHOD method_32273 toNbtProviderFormat (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 0 compound
METHOD method_32275 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
METHOD method_32274 (Lnet/minecraft/class_2499;)I
ARG 0 nbt
METHOD method_32275 fromNbtProviderFormat (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487;
ARG 0 compound
METHOD method_32277 (Lnet/minecraft/class_2487;)Ljava/lang/String;
METHOD method_32276 (Lnet/minecraft/class_2499;)I
ARG 0 nbt
METHOD method_32277 toNbtProviderFormattedPalette (Lnet/minecraft/class_2487;)Ljava/lang/String;
ARG 0 compound
METHOD method_32278 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2499;
ARG 0 nbt
METHOD method_32279 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2499;
ARG 0 nbt
METHOD method_36114 appendIndent (ILjava/lang/StringBuilder;)Ljava/lang/StringBuilder;
ARG 0 depth
ARG 1 stringBuilder
METHOD method_36115 fromFluidState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2487;
ARG 0 state
METHOD method_36116 appendFormattedString (Ljava/lang/StringBuilder;Lnet/minecraft/class_2520;IZ)Ljava/lang/StringBuilder;
ARG 0 stringBuilder
ARG 1 nbt
ARG 2 depth
ARG 3 withArrayContents
METHOD method_36117 toFormattedString (Lnet/minecraft/class_2520;Z)Ljava/lang/String;
COMMENT {@return the human-readable, non-deserializable representation of {@code nbt}}
ARG 0 nbt
ARG 1 withArrayContents
COMMENT whether to include contents of {@link NbtByteArray}, {@link NbtIntArray},
COMMENT and {@link NbtLongArray}
METHOD method_36118 toFormattedString (Lnet/minecraft/class_2520;)Ljava/lang/String;
COMMENT {@return the human-readable, non-deserializable representation of {@code nbt}}
COMMENT
COMMENT <p>This does not include contents of {@link NbtByteArray}, {@link NbtIntArray},
COMMENT and {@link NbtLongArray}. To include them, call
COMMENT {@link #toFormattedString(NbtElement, boolean)} with {@code withArrayContents}
COMMENT parameter set to true.
COMMENT
COMMENT @see #toFormattedString(NbtElement, boolean)
ARG 0 nbt

View File

@ -2,9 +2,14 @@ CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt
COMMENT Represents an NBT 32-bit integer.
FIELD field_11525 value I
FIELD field_21037 TYPE Lnet/minecraft/class_4614;
FIELD field_33196 SIZE I
METHOD <init> (I)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_23247 of (I)Lnet/minecraft/class_2497;
ARG 0 value
CLASS class_4611 Cache
FIELD field_21038 VALUES [Lnet/minecraft/class_2497;
FIELD field_33197 MAX I
FIELD field_33198 MIN I

View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray
COMMENT Represents an NBT 32-bit integer array.
FIELD field_11524 value [I
FIELD field_21036 TYPE Lnet/minecraft/class_4614;
FIELD field_33195 SIZE I
METHOD <init> (Ljava/util/List;)V
ARG 1 value
METHOD <init> ([I)V

View File

@ -7,6 +7,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList
FIELD field_11550 value Ljava/util/List;
FIELD field_11551 type B
FIELD field_21039 TYPE Lnet/minecraft/class_4614;
FIELD field_33199 SIZE I
METHOD <init> (Ljava/util/List;B)V
ARG 1 list
ARG 2 type

View File

@ -2,9 +2,14 @@ CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong
COMMENT Represents an NBT 64-bit integer.
FIELD field_11553 value J
FIELD field_21041 TYPE Lnet/minecraft/class_4614;
FIELD field_33201 SIZE I
METHOD <init> (J)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_23251 of (J)Lnet/minecraft/class_2503;
ARG 0 value
CLASS class_4612 Cache
FIELD field_21042 VALUES [Lnet/minecraft/class_2503;
FIELD field_33202 MAX I
FIELD field_33203 MIN I

View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray
COMMENT Represents an NBT 64-bit integer array.
FIELD field_11552 value [J
FIELD field_21040 TYPE Lnet/minecraft/class_4614;
FIELD field_33200 SIZE I
METHOD <init> (Lit/unimi/dsi/fastutil/longs/LongSet;)V
ARG 1 value
METHOD <init> (Ljava/util/List;)V

View File

@ -5,3 +5,4 @@ CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtNull
COMMENT and is the type of empty NBT lists.
FIELD field_21032 TYPE Lnet/minecraft/class_4614;
FIELD field_21033 INSTANCE Lnet/minecraft/class_2491;
FIELD field_33193 SIZE I

View File

@ -24,18 +24,30 @@ CLASS net/minecraft/class_2509 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 buf
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 entries
METHOD createNumeric (Ljava/lang/Number;)Ljava/lang/Object;
ARG 1 value
METHOD createShort (S)Ljava/lang/Object;
ARG 1 value
METHOD createString (Ljava/lang/String;)Ljava/lang/Object;
ARG 1 string
METHOD getByteBuffer (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 element
METHOD getIntStream (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
@ -59,17 +71,78 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
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 map
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_10638 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;
ARG 2 key
METHOD method_10649 (Lnet/minecraft/class_2520;)Ljava/lang/Long;
ARG 0 nbt
METHOD method_10658 (Lnet/minecraft/class_2520;)Ljava/lang/Integer;
ARG 0 nbt
METHOD method_10659 (Lnet/minecraft/class_2520;)Ljava/lang/Byte;
ARG 0 nbt
METHOD method_10666 (Ljava/lang/String;Ljava/lang/String;)Z
ARG 1 k
METHOD method_10667 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520;
ARG 0 nbt
METHOD method_10670 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 2 k
METHOD method_29144 createList (BB)Lnet/minecraft/class_2483;
ARG 0 knownType
ARG 1 valueType
METHOD method_29145 isTypeEqual (BBB)Z
ARG 0 knownType
ARG 1 valueType
ARG 2 expectedType
METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
ARG 0 entry
METHOD method_29148 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 3 key
METHOD method_29149 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
ARG 1 nbt
METHOD method_29150 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Ljava/util/List;)V
ARG 0 destination
ARG 1 source
ARG 2 additionalValues
METHOD method_29151 addAll (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V
ARG 0 destination
ARG 1 source
ARG 2 additionalValue
METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V
ARG 1 entry
METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V
ARG 2 entryConsumer
METHOD method_29158 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
ARG 1 nbt
METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 0 key
METHOD method_29160 (Lnet/minecraft/class_2483;Lnet/minecraft/class_2520;)V
ARG 1 nbt
METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 2 key
METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
ARG 1 element
ARG 2 key
CLASS 1
METHOD get (Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 nbt
METHOD get (Ljava/lang/String;)Ljava/lang/Object;
ARG 1 key
METHOD method_29166 (Lnet/minecraft/class_2487;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;
ARG 2 key
CLASS class_5320 MapBuilder
METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 key
ARG 2 value
ARG 3 nbt
METHOD build (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 nbt
ARG 2 mergedValue

View File

@ -2,9 +2,14 @@ CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort
COMMENT Represents an NBT 16-bit integer.
FIELD field_11588 value S
FIELD field_21043 TYPE Lnet/minecraft/class_4614;
FIELD field_33231 SIZE I
METHOD <init> (S)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_23254 of (S)Lnet/minecraft/class_2516;
ARG 0 value
CLASS class_4613 Cache
FIELD field_21044 VALUES [Lnet/minecraft/class_2516;
FIELD field_33232 MAX I
FIELD field_33233 MIN I

View File

@ -3,6 +3,11 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString
FIELD field_11590 value Ljava/lang/String;
FIELD field_21045 TYPE Lnet/minecraft/class_4614;
FIELD field_21046 EMPTY Lnet/minecraft/class_2519;
FIELD field_33241 SIZE I
FIELD field_33242 DOUBLE_QUOTE C
FIELD field_33243 SINGLE_QUOTE C
FIELD field_33244 BACKSLASH C
FIELD field_33245 NULL C
METHOD <init> (Ljava/lang/String;)V
ARG 1 value
METHOD equals (Ljava/lang/Object;)Z

View File

@ -13,6 +13,12 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
FIELD field_11607 DOUBLE_PATTERN_IMPLICIT Ljava/util/regex/Pattern;
FIELD field_11608 EXPECTED_KEY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_11609 LONG_PATTERN Ljava/util/regex/Pattern;
FIELD field_33265 COMMA C
FIELD field_33266 COLON C
FIELD field_33267 SQUARE_OPEN_BRACKET C
FIELD field_33268 SQUARE_CLOSE_BRACKET C
FIELD field_33269 RIGHT_CURLY_BRACKET C
FIELD field_33270 LEFT_CURLY_BRACKET C
METHOD <init> (Lcom/mojang/brigadier/StringReader;)V
ARG 1 reader
METHOD method_10716 readComma ()Z
@ -20,9 +26,15 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
METHOD method_10718 parse (Ljava/lang/String;)Lnet/minecraft/class_2487;
ARG 0 string
METHOD method_10719 expect (C)V
ARG 1 c
METHOD method_10720 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 type
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_10724 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 receivedType
ARG 1 expectedType
METHOD method_10725 readString ()Ljava/lang/String;
METHOD method_10726 parseElementPrimitiveArray ()Lnet/minecraft/class_2520;
METHOD method_10727 parseCompound ()Lnet/minecraft/class_2487;
@ -30,5 +42,8 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
ARG 1 arrayTypeReader
ARG 2 typeReader
METHOD method_10729 parseList ()Lnet/minecraft/class_2520;
METHOD method_10730 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 receivedType
ARG 1 expectedType
METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520;
ARG 1 input