diff --git a/mappings/net/minecraft/class_7417.mapping b/mappings/net/minecraft/class_7417.mapping deleted file mode 100644 index b3b3cfe8a3..0000000000 --- a/mappings/net/minecraft/class_7417.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7417 - METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; - METHOD method_27659 visitSelf (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; - METHOD method_27660 visitSelf (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_7419.mapping b/mappings/net/minecraft/class_7419.mapping deleted file mode 100644 index 8bda61e168..0000000000 --- a/mappings/net/minecraft/class_7419.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_7419 - METHOD method_10916 toNbt (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/text/BlockNbtText.mapping b/mappings/net/minecraft/text/BlockNbtDataSource.mapping similarity index 85% rename from mappings/net/minecraft/text/BlockNbtText.mapping rename to mappings/net/minecraft/text/BlockNbtDataSource.mapping index 4d782992ba..7de9b4753b 100644 --- a/mappings/net/minecraft/text/BlockNbtText.mapping +++ b/mappings/net/minecraft/text/BlockNbtDataSource.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtText +CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtDataSource FIELD comp_733 rawPos Ljava/lang/String; FIELD comp_734 pos Lnet/minecraft/class_2267; METHOD (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/text/EntityNbtText.mapping b/mappings/net/minecraft/text/EntityNbtDataSource.mapping similarity index 86% rename from mappings/net/minecraft/text/EntityNbtText.mapping rename to mappings/net/minecraft/text/EntityNbtDataSource.mapping index b0e1384bee..a6663f5c45 100644 --- a/mappings/net/minecraft/text/EntityNbtText.mapping +++ b/mappings/net/minecraft/text/EntityNbtDataSource.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtText +CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtDataSource FIELD comp_735 rawSelector Ljava/lang/String; FIELD comp_736 selector Lnet/minecraft/class_2300; METHOD (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/text/KeybindText.mapping b/mappings/net/minecraft/text/KeybindTextContent.mapping similarity index 59% rename from mappings/net/minecraft/text/KeybindText.mapping rename to mappings/net/minecraft/text/KeybindTextContent.mapping index 6a20f3974a..f1f798c40c 100644 --- a/mappings/net/minecraft/text/KeybindText.mapping +++ b/mappings/net/minecraft/text/KeybindTextContent.mapping @@ -1,4 +1,6 @@ -CLASS net/minecraft/class_2572 net/minecraft/text/KeybindText +CLASS net/minecraft/class_2572 net/minecraft/text/KeybindTextContent + COMMENT The keybind text content. This {@link #getTranslated()} implementation + COMMENT is not thread-safe. FIELD field_11767 key Ljava/lang/String; FIELD field_11768 translated Ljava/util/function/Supplier; METHOD (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/text/KeybindTranslations.mapping b/mappings/net/minecraft/text/KeybindTranslations.mapping new file mode 100644 index 0000000000..1f5e974c78 --- /dev/null +++ b/mappings/net/minecraft/text/KeybindTranslations.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7420 net/minecraft/text/KeybindTranslations + FIELD field_39013 FACTORY Ljava/util/function/Function; + METHOD method_43482 setFactory (Ljava/util/function/Function;)V + ARG 0 factory diff --git a/mappings/net/minecraft/text/LiteralText.mapping b/mappings/net/minecraft/text/LiteralTextContent.mapping similarity index 66% rename from mappings/net/minecraft/text/LiteralText.mapping rename to mappings/net/minecraft/text/LiteralTextContent.mapping index f234c0d89e..fed35de0d0 100644 --- a/mappings/net/minecraft/text/LiteralText.mapping +++ b/mappings/net/minecraft/text/LiteralTextContent.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2585 net/minecraft/text/LiteralText +CLASS net/minecraft/class_2585 net/minecraft/text/LiteralTextContent FIELD comp_737 string Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 string diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping index c87c785d2f..d1e94fd02c 100644 --- a/mappings/net/minecraft/text/MutableText.mapping +++ b/mappings/net/minecraft/text/MutableText.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText - COMMENT A text with mutation operations. + COMMENT The text implementation, with mutation operations. + FIELD field_39005 content Lnet/minecraft/class_7417; FIELD field_39006 siblings Ljava/util/List; FIELD field_39007 style Lnet/minecraft/class_2583; FIELD field_39008 ordered Lnet/minecraft/class_5481; FIELD field_39009 language Lnet/minecraft/class_2477; METHOD (Lnet/minecraft/class_7417;Ljava/util/List;Lnet/minecraft/class_2583;)V + ARG 1 content ARG 2 siblings ARG 3 style METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; @@ -40,3 +42,7 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText COMMENT @see Style#withParent(Style) ARG 1 styleOverride COMMENT the style that provides definitions for absent definitions in this text's style + METHOD method_43477 of (Lnet/minecraft/class_7417;)Lnet/minecraft/class_5250; + COMMENT Creates a piece of mutable text with the given content, with no sibling + COMMENT and style. + ARG 0 content diff --git a/mappings/net/minecraft/text/NbtDataSource.mapping b/mappings/net/minecraft/text/NbtDataSource.mapping new file mode 100644 index 0000000000..7113e26c8a --- /dev/null +++ b/mappings/net/minecraft/text/NbtDataSource.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7419 net/minecraft/text/NbtDataSource + COMMENT A data source for the NBT text content. Unmodifiable. + METHOD method_10916 get (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream; + ARG 1 source diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtTextContent.mapping similarity index 87% rename from mappings/net/minecraft/text/NbtText.mapping rename to mappings/net/minecraft/text/NbtTextContent.mapping index 632222bd9e..bcff3c882d 100644 --- a/mappings/net/minecraft/text/NbtText.mapping +++ b/mappings/net/minecraft/text/NbtTextContent.mapping @@ -1,14 +1,16 @@ -CLASS net/minecraft/class_2574 net/minecraft/text/NbtText +CLASS net/minecraft/class_2574 net/minecraft/text/NbtTextContent FIELD field_11776 rawPath Ljava/lang/String; FIELD field_11777 LOGGER Lorg/slf4j/Logger; FIELD field_11778 interpret Z FIELD field_11779 path Lnet/minecraft/class_2203$class_2209; FIELD field_33539 separator Ljava/util/Optional; + FIELD field_39014 dataSource Lnet/minecraft/class_7419; METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/util/Optional;Lnet/minecraft/class_7419;)V ARG 1 rawPath ARG 2 path ARG 3 interpret ARG 4 separator + ARG 5 dataSource METHOD (Ljava/lang/String;ZLjava/util/Optional;Lnet/minecraft/class_7419;)V ARG 1 rawPath ARG 2 interpret @@ -30,3 +32,4 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText ARG 1 accumulator ARG 2 current METHOD method_43484 getSeparator ()Ljava/util/Optional; + METHOD method_43485 getDataSource ()Lnet/minecraft/class_7419; diff --git a/mappings/net/minecraft/text/ScoreText.mapping b/mappings/net/minecraft/text/ScoreTextContent.mapping similarity index 92% rename from mappings/net/minecraft/text/ScoreText.mapping rename to mappings/net/minecraft/text/ScoreTextContent.mapping index f6dde5645d..255a9aa1ca 100644 --- a/mappings/net/minecraft/text/ScoreText.mapping +++ b/mappings/net/minecraft/text/ScoreTextContent.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2578 net/minecraft/text/ScoreText +CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent FIELD field_11785 objective Ljava/lang/String; FIELD field_11786 selector Lnet/minecraft/class_2300; FIELD field_11787 name Ljava/lang/String; diff --git a/mappings/net/minecraft/text/SelectorText.mapping b/mappings/net/minecraft/text/SelectorTextContent.mapping similarity index 88% rename from mappings/net/minecraft/text/SelectorText.mapping rename to mappings/net/minecraft/text/SelectorTextContent.mapping index 542726260a..edad277de1 100644 --- a/mappings/net/minecraft/text/SelectorText.mapping +++ b/mappings/net/minecraft/text/SelectorTextContent.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2579 net/minecraft/text/SelectorText +CLASS net/minecraft/class_2579 net/minecraft/text/SelectorTextContent FIELD field_11789 pattern Ljava/lang/String; FIELD field_11790 selector Lnet/minecraft/class_2300; FIELD field_11791 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/text/StorageNbtDataSource.mapping b/mappings/net/minecraft/text/StorageNbtDataSource.mapping new file mode 100644 index 0000000000..1390ea4f91 --- /dev/null +++ b/mappings/net/minecraft/text/StorageNbtDataSource.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4616 net/minecraft/text/StorageNbtDataSource diff --git a/mappings/net/minecraft/text/StorageNbtText.mapping b/mappings/net/minecraft/text/StorageNbtText.mapping deleted file mode 100644 index ab01bf84b1..0000000000 --- a/mappings/net/minecraft/text/StorageNbtText.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4616 net/minecraft/text/StorageNbtText - FIELD comp_738 id Lnet/minecraft/class_2960; - METHOD comp_738 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index d8f7b9d223..c8bf5765df 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT refer to {@link MutableText}. COMMENT COMMENT @see MutableText + METHOD method_10851 getContent ()Lnet/minecraft/class_7417; + COMMENT {@return the content of the text} METHOD method_10855 getSiblings ()Ljava/util/List; COMMENT Returns the siblings of this text. METHOD method_10858 asTruncatedString (I)Ljava/lang/String; diff --git a/mappings/net/minecraft/text/TextContent.mapping b/mappings/net/minecraft/text/TextContent.mapping new file mode 100644 index 0000000000..a404473c45 --- /dev/null +++ b/mappings/net/minecraft/text/TextContent.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7417 net/minecraft/text/TextContent + COMMENT Represents type-specific content of text. It is stored in each tree node + COMMENT in a text tree structure. Its implementations are immutable. + FIELD field_39004 EMPTY Lnet/minecraft/class_7417; + COMMENT An empty text content. + METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; + COMMENT Parses this content into a basic mutable text without custom style or + COMMENT siblings. The resulting text may or may not have this content. + ARG 1 source + ARG 2 sender + ARG 3 depth + METHOD method_27659 visit (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; + COMMENT Visits this content. Returns a value if the visitor terminates amid + COMMENT the visit, or {@code Optional.empty()} if it proceeds. + COMMENT + COMMENT @return {@code Optional.empty()} if the visit finished, or a terminating + COMMENT result from the {@code visitor} + COMMENT @see Text#visit(StringVisitable.Visitor) + ARG 1 visitor + METHOD method_27660 visit (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; + COMMENT Visits this content. Returns a value if the visitor terminates amid + COMMENT the visit, or {@code Optional.empty()} if it proceeds. + COMMENT + COMMENT @return {@code Optional.empty()} if the visit finished, or a terminating + COMMENT result from the {@code visitor} + COMMENT @see Text#visit(StringVisitable.StyledVisitor, Style) + ARG 1 visitor + ARG 2 style diff --git a/mappings/net/minecraft/text/Texts.mapping b/mappings/net/minecraft/text/Texts.mapping index 5dc0929298..8e115e18bb 100644 --- a/mappings/net/minecraft/text/Texts.mapping +++ b/mappings/net/minecraft/text/Texts.mapping @@ -47,5 +47,9 @@ CLASS net/minecraft/class_2564 net/minecraft/text/Texts METHOD method_37112 join (Ljava/util/Collection;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 texts ARG 1 separator + METHOD method_43475 brokenReplaceTranslationKey (Lnet/minecraft/class_2561;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 0 text + ARG 1 oldKey + ARG 2 updatedKey METHOD method_43476 hasTranslation (Lnet/minecraft/class_2561;)Z ARG 0 text diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableTextContent.mapping similarity index 98% rename from mappings/net/minecraft/text/TranslatableText.mapping rename to mappings/net/minecraft/text/TranslatableTextContent.mapping index 7c111be084..6e7fb78492 100644 --- a/mappings/net/minecraft/text/TranslatableText.mapping +++ b/mappings/net/minecraft/text/TranslatableTextContent.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText +CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableTextContent FIELD field_11872 ARG_FORMAT Ljava/util/regex/Pattern; FIELD field_11875 args [Ljava/lang/Object; FIELD field_11876 key Ljava/lang/String;