mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Text renames (#3105) 

* Text type instances -> TextContent, Nbt data factory -> NbtDataSource
Translatable -> Translation

Signed-off-by: liach <liach@users.noreply.github.com>
Co-authored-by: Shnupbups <shnupbups@gmail.com>

* Use more efficient name

* Content -> TextContent, revert translatable for now

* Update mappings/net/minecraft/text/NbtDataSource.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: Shnupbups <shnupbups@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
This commit is contained in:
liach 2022-04-22 14:57:36 -05:00 committed by GitHub
parent fda8ec2c41
commit 8985c27adb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/class_7417.mapping
View File

@ -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;

2
mappings/net/minecraft/class_7419.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_7419
METHOD method_10916 toNbt (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream;

2
mappings/net/minecraft/text/BlockNbtText.mapping → mappings/net/minecraft/text/BlockNbtDataSource.mapping
View File

@ -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 <init> (Ljava/lang/String;)V

2
mappings/net/minecraft/text/EntityNbtText.mapping → mappings/net/minecraft/text/EntityNbtDataSource.mapping
View File

@ -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 <init> (Ljava/lang/String;)V

4
mappings/net/minecraft/text/KeybindText.mapping → mappings/net/minecraft/text/KeybindTextContent.mapping
View File

@ -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 <init> (Ljava/lang/String;)V

4
mappings/net/minecraft/text/KeybindTranslations.mapping Normal file
View File

@ -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

2
mappings/net/minecraft/text/LiteralText.mapping → mappings/net/minecraft/text/LiteralTextContent.mapping
View File

@ -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 <init> (Ljava/lang/String;)V
ARG 1 string

8
mappings/net/minecraft/text/MutableText.mapping
View File

@ -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 <init> (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

4
mappings/net/minecraft/text/NbtDataSource.mapping Normal file
View File

@ -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

5
mappings/net/minecraft/text/NbtText.mapping → mappings/net/minecraft/text/NbtTextContent.mapping
View File

@ -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 <init> (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 <init> (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;

2
mappings/net/minecraft/text/ScoreText.mapping → mappings/net/minecraft/text/ScoreTextContent.mapping
View File

@ -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;

2
mappings/net/minecraft/text/SelectorText.mapping → mappings/net/minecraft/text/SelectorTextContent.mapping
View File

@ -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;

1
mappings/net/minecraft/text/StorageNbtDataSource.mapping Normal file
View File

@ -0,0 +1 @@
CLASS net/minecraft/class_4616 net/minecraft/text/StorageNbtDataSource

3
mappings/net/minecraft/text/StorageNbtText.mapping
View File

@ -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;

2
mappings/net/minecraft/text/Text.mapping
View File

@ -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;

28
mappings/net/minecraft/text/TextContent.mapping Normal file
View File

@ -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

4
mappings/net/minecraft/text/Texts.mapping
View File

@ -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

2
mappings/net/minecraft/text/TranslatableText.mapping → mappings/net/minecraft/text/TranslatableTextContent.mapping
View File

@ -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;