From ee2512d6e0dee4476f69d15cd71f898c44597e46 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 13 May 2022 02:27:32 +0900 Subject: [PATCH] 22w18a texts and utils (#3141) * 22w18a texts and utils * More utils stuff * valuesToIndices -> lastIndexGetter * Document Decoration, toText -> apply * Fix javadoc * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../minecraft/network/MessageFormat.mapping | 52 --------------- .../minecraft/text/BlockNbtDataSource.mapping | 3 + .../net/minecraft/text/Decoration.mapping | 64 +++++++++++++++++++ .../text/EntityNbtDataSource.mapping | 2 + .../minecraft/text/KeybindTextContent.mapping | 2 + .../text/KeybindTranslations.mapping | 4 +- .../net/minecraft/text/MutableText.mapping | 2 + .../net/minecraft/text/NbtTextContent.mapping | 3 + .../net/minecraft/text/OrderedText.mapping | 2 + .../minecraft/text/ScoreTextContent.mapping | 2 + .../text/SelectorTextContent.mapping | 2 + mappings/net/minecraft/text/Style.mapping | 37 +++++++++++ mappings/net/minecraft/text/Text.mapping | 4 ++ mappings/net/minecraft/text/TextColor.mapping | 3 + .../text/TranslatableTextContent.mapping | 2 + .../net/minecraft/util/Formatting.mapping | 1 + .../net/minecraft/util/Identifier.mapping | 7 ++ .../net/minecraft/util/JsonHelper.mapping | 32 ++++++++++ .../net/minecraft/util/StringHelper.mapping | 5 ++ mappings/net/minecraft/util/Util.mapping | 7 ++ 20 files changed, 183 insertions(+), 53 deletions(-) delete mode 100644 mappings/net/minecraft/network/MessageFormat.mapping create mode 100644 mappings/net/minecraft/text/Decoration.mapping diff --git a/mappings/net/minecraft/network/MessageFormat.mapping b/mappings/net/minecraft/network/MessageFormat.mapping deleted file mode 100644 index e1c27d5bb1..0000000000 --- a/mappings/net/minecraft/network/MessageFormat.mapping +++ /dev/null @@ -1,52 +0,0 @@ -CLASS net/minecraft/class_7463 net/minecraft/network/MessageFormat - COMMENT A message format applies on a server-sent message and its sender to - COMMENT stylize it. - FIELD field_39219 CODEC Lcom/mojang/serialization/Codec; - COMMENT The codec for chat format. - METHOD method_43830 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_43831 plain (Ljava/lang/String;)Lnet/minecraft/class_7463; - COMMENT {@return a message format that applies the translation key with the - COMMENT sender's name and the message content} - ARG 0 translationKey - METHOD method_43832 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 1 content - ARG 2 sender - METHOD method_43833 italicGray (Ljava/lang/String;)Lnet/minecraft/class_7463; - COMMENT {@return a message format that applies the translation key with the - COMMENT sender's name and the message content, and applies a gray, italic style} - ARG 0 translationKey - METHOD method_43834 getArgs (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)[Lnet/minecraft/class_2561; - ARG 1 content - ARG 2 sender - METHOD method_43835 team (Ljava/lang/String;)Lnet/minecraft/class_7463; - COMMENT {@return a message format that applies the translation key with the - COMMENT sender's team name, the sender's name, and the message content} - ARG 0 translationKey - CLASS class_7464 Parameter - COMMENT A parameter for the translation text of a message format. - FIELD field_39223 CODEC Lcom/mojang/serialization/Codec; - COMMENT The codec for a message format parameter. - FIELD field_39224 name Ljava/lang/String; - FIELD field_39225 argumentFactory Lnet/minecraft/class_7463$class_7464$class_7465; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_7463$class_7464$class_7465;)V - ARG 3 name - ARG 4 factory - METHOD method_43837 getArgument (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - COMMENT {@return an argument for this parameter given the message content and - COMMENT sender} - ARG 1 content - ARG 2 sender - METHOD method_43838 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 0 content - ARG 1 sender - METHOD method_43839 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 0 content - ARG 1 sender - METHOD method_43840 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 0 content - ARG 1 sender - CLASS class_7465 ArgumentFactory - METHOD select (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; - ARG 1 content - ARG 2 sender diff --git a/mappings/net/minecraft/text/BlockNbtDataSource.mapping b/mappings/net/minecraft/text/BlockNbtDataSource.mapping index 7de9b4753b..b829bb0c9f 100644 --- a/mappings/net/minecraft/text/BlockNbtDataSource.mapping +++ b/mappings/net/minecraft/text/BlockNbtDataSource.mapping @@ -7,4 +7,7 @@ CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtDataSource ARG 1 rawPath METHOD comp_733 rawPos ()Ljava/lang/String; METHOD comp_734 pos ()Lnet/minecraft/class_2267; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_16121 parsePos (Ljava/lang/String;)Lnet/minecraft/class_2267; + ARG 0 string diff --git a/mappings/net/minecraft/text/Decoration.mapping b/mappings/net/minecraft/text/Decoration.mapping new file mode 100644 index 0000000000..81ce1e7665 --- /dev/null +++ b/mappings/net/minecraft/text/Decoration.mapping @@ -0,0 +1,64 @@ +CLASS net/minecraft/class_7463 net/minecraft/text/Decoration + COMMENT A decoration is a pre-defined set of styling and formatting rules for messages + COMMENT sent by the server. This consists of the translation key, the style, and the parameters + COMMENT usable in the translation. The actual text format needs to be supplied via custom + COMMENT language files in resource packs. + FIELD field_39219 CODEC Lcom/mojang/serialization/Codec; + METHOD method_43830 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_43831 ofChat (Ljava/lang/String;)Lnet/minecraft/class_7463; + COMMENT {@return the decoration used in chat messages} + COMMENT + COMMENT @implNote This decoration allows use of the sender and the content parameters. It has no style. + ARG 0 translationKey + METHOD method_43832 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + COMMENT {@return the text obtained by applying the passed values to the decoration} + ARG 1 content + COMMENT the value of the content parameter + ARG 2 sender + COMMENT the sender passed to parameters, or {@code null} if inapplicable + METHOD method_43833 ofDirectMessage (Ljava/lang/String;)Lnet/minecraft/class_7463; + COMMENT {@return the decoration used in {@link net.minecraft.server.command.MessageCommand}} + COMMENT + COMMENT @implNote This decoration allows use of the sender and the content parameters. + COMMENT The text is colored gray and is displayed in italic. + ARG 0 translationKey + METHOD method_43834 collectArguments (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)[Lnet/minecraft/class_2561; + COMMENT {@return the arguments passed to {@link Text#translatable(String, Object[])}} + COMMENT + COMMENT

This is collected by supplying {@code content} and {@code sender} to the + COMMENT parameters' {@link Decoration.Parameter#apply} method. + ARG 1 content + ARG 2 sender + METHOD method_43835 ofTeamMessage (Ljava/lang/String;)Lnet/minecraft/class_7463; + COMMENT {@return the decoration used in chat messages} + COMMENT + COMMENT @implNote This decoration allows use of the team name, the sender, and the + COMMENT content parameters. It has no style. + ARG 0 translationKey + CLASS class_7464 Parameter + COMMENT Represents a parameter that the decoration uses. + FIELD field_39223 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39224 name Ljava/lang/String; + FIELD field_39225 selector Lnet/minecraft/class_7463$class_7464$class_7465; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_7463$class_7464$class_7465;)V + ARG 3 name + ARG 4 selector + METHOD method_43837 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + COMMENT {@return the text obtained by applying the passed values to the parameter} + ARG 1 content + ARG 2 sender + METHOD method_43838 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + ARG 0 content + ARG 1 sender + METHOD method_43839 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + ARG 0 content + ARG 1 sender + METHOD method_43840 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + ARG 0 content + ARG 1 sender + CLASS class_7465 Selector + COMMENT A functional interface that selects the text from the passed values. + METHOD select (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; + ARG 1 content + ARG 2 sender diff --git a/mappings/net/minecraft/text/EntityNbtDataSource.mapping b/mappings/net/minecraft/text/EntityNbtDataSource.mapping index a6663f5c45..fae1fc80e7 100644 --- a/mappings/net/minecraft/text/EntityNbtDataSource.mapping +++ b/mappings/net/minecraft/text/EntityNbtDataSource.mapping @@ -7,5 +7,7 @@ CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtDataSource ARG 1 rawPath METHOD comp_735 rawSelector ()Ljava/lang/String; METHOD comp_736 selector ()Lnet/minecraft/class_2300; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10923 parseSelector (Ljava/lang/String;)Lnet/minecraft/class_2300; ARG 0 rawSelector diff --git a/mappings/net/minecraft/text/KeybindTextContent.mapping b/mappings/net/minecraft/text/KeybindTextContent.mapping index f1f798c40c..a3be4046d9 100644 --- a/mappings/net/minecraft/text/KeybindTextContent.mapping +++ b/mappings/net/minecraft/text/KeybindTextContent.mapping @@ -5,5 +5,7 @@ CLASS net/minecraft/class_2572 net/minecraft/text/KeybindTextContent FIELD field_11768 translated Ljava/util/function/Supplier; METHOD (Ljava/lang/String;)V ARG 1 key + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10901 getKey ()Ljava/lang/String; METHOD method_27691 getTranslated ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/text/KeybindTranslations.mapping b/mappings/net/minecraft/text/KeybindTranslations.mapping index 1f5e974c78..450aef55ec 100644 --- a/mappings/net/minecraft/text/KeybindTranslations.mapping +++ b/mappings/net/minecraft/text/KeybindTranslations.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_7420 net/minecraft/text/KeybindTranslations - FIELD field_39013 FACTORY Ljava/util/function/Function; + FIELD field_39013 factory Ljava/util/function/Function; + METHOD method_43481 (Ljava/lang/String;)Ljava/util/function/Supplier; + ARG 0 key METHOD method_43482 setFactory (Ljava/util/function/Function;)V ARG 0 factory diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping index d1e94fd02c..031ffdfb03 100644 --- a/mappings/net/minecraft/text/MutableText.mapping +++ b/mappings/net/minecraft/text/MutableText.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_5250 net/minecraft/text/MutableText ARG 1 content ARG 2 siblings ARG 3 style + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; COMMENT Appends a text to this text's siblings. ARG 1 text diff --git a/mappings/net/minecraft/text/NbtTextContent.mapping b/mappings/net/minecraft/text/NbtTextContent.mapping index bcff3c882d..41f5c92c04 100644 --- a/mappings/net/minecraft/text/NbtTextContent.mapping +++ b/mappings/net/minecraft/text/NbtTextContent.mapping @@ -15,6 +15,9 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtTextContent ARG 1 rawPath ARG 2 interpret ARG 3 separator + ARG 4 dataSource + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10917 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/lang/String;)Ljava/util/stream/Stream; ARG 3 text METHOD method_10918 (Lnet/minecraft/class_2487;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/text/OrderedText.mapping b/mappings/net/minecraft/text/OrderedText.mapping index a570046361..c669057f60 100644 --- a/mappings/net/minecraft/text/OrderedText.mapping +++ b/mappings/net/minecraft/text/OrderedText.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_5481 net/minecraft/text/OrderedText ARG 1 second METHOD method_30743 (Lnet/minecraft/class_5481;Lnet/minecraft/class_5481;Lnet/minecraft/class_5224;)Z ARG 2 visitor + METHOD method_30744 (Lnet/minecraft/class_5224;)Z + ARG 0 visitor METHOD method_30745 map (Lnet/minecraft/class_5224;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lnet/minecraft/class_5224; ARG 0 visitor ARG 1 codePointMapper diff --git a/mappings/net/minecraft/text/ScoreTextContent.mapping b/mappings/net/minecraft/text/ScoreTextContent.mapping index 255a9aa1ca..29681674c4 100644 --- a/mappings/net/minecraft/text/ScoreTextContent.mapping +++ b/mappings/net/minecraft/text/ScoreTextContent.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 objective + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10928 getObjective ()Ljava/lang/String; METHOD method_10930 getName ()Ljava/lang/String; METHOD method_27699 getPlayerName (Lnet/minecraft/class_2168;)Ljava/lang/String; diff --git a/mappings/net/minecraft/text/SelectorTextContent.mapping b/mappings/net/minecraft/text/SelectorTextContent.mapping index edad277de1..5b65af2ecd 100644 --- a/mappings/net/minecraft/text/SelectorTextContent.mapping +++ b/mappings/net/minecraft/text/SelectorTextContent.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_2579 net/minecraft/text/SelectorTextContent METHOD (Ljava/lang/String;Ljava/util/Optional;)V ARG 1 pattern ARG 2 separator + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_10932 getPattern ()Ljava/lang/String; METHOD method_36138 getSelector ()Lnet/minecraft/class_2300; METHOD method_36339 getSeparator ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index 3d677c929e..ce7348f12c 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style FIELD field_24360 EMPTY Lnet/minecraft/class_2583; COMMENT An empty style. FIELD field_24361 font Lnet/minecraft/class_2960; + FIELD field_39241 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5251;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2558;Lnet/minecraft/class_2568;Ljava/lang/String;Lnet/minecraft/class_2960;)V ARG 1 color ARG 2 bold @@ -143,6 +144,33 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 1 strikethrough METHOD method_36141 withObfuscated (Ljava/lang/Boolean;)Lnet/minecraft/class_2583; ARG 1 obfuscated + METHOD method_43869 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_43870 of (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2583; + ARG 0 color + ARG 1 bold + ARG 2 italic + ARG 3 underlined + ARG 4 strikethrough + ARG 5 obfuscated + ARG 6 insertion + ARG 7 font + METHOD method_43871 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43872 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43873 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43874 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43875 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43876 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43877 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style + METHOD method_43878 (Lnet/minecraft/class_2583;)Ljava/util/Optional; + ARG 0 style CLASS class_2584 Serializer COMMENT A JSON serializer for {@link Style}. METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; @@ -166,3 +194,12 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 1 style ARG 2 type ARG 3 context + CLASS class_7418 Writer + FIELD field_39012 shouldAppendComma Z + METHOD method_43478 appendComma ()V + METHOD method_43479 append (Ljava/lang/String;Ljava/lang/Boolean;)V + ARG 1 key + ARG 2 value + METHOD method_43480 append (Ljava/lang/String;Ljava/lang/Object;)V + ARG 1 key + ARG 2 value diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index 1d25bb480f..c782f90360 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -95,6 +95,10 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 1 type ARG 2 context ARG 3 json + METHOD method_43474 optimizeArgument (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 text + METHOD method_43858 toSortedJsonString (Lnet/minecraft/class_2561;)Ljava/lang/String; + ARG 0 text METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; ARG 1 text ARG 2 type diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping index 3069de7519..2319f7bd4f 100644 --- a/mappings/net/minecraft/text/TextColor.mapping +++ b/mappings/net/minecraft/text/TextColor.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor FIELD field_24364 rgb I FIELD field_24365 name Ljava/lang/String; FIELD field_33291 RGB_PREFIX Ljava/lang/String; + FIELD field_39242 CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 rgb METHOD (ILjava/lang/String;)V @@ -40,3 +41,5 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor METHOD method_27722 (Lnet/minecraft/class_124;)Lnet/minecraft/class_5251; ARG 0 formatting METHOD method_27723 getHexCode ()Ljava/lang/String; + METHOD method_43879 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 color diff --git a/mappings/net/minecraft/text/TranslatableTextContent.mapping b/mappings/net/minecraft/text/TranslatableTextContent.mapping index 6e7fb78492..37e1802658 100644 --- a/mappings/net/minecraft/text/TranslatableTextContent.mapping +++ b/mappings/net/minecraft/text/TranslatableTextContent.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableTextContent METHOD (Ljava/lang/String;[Ljava/lang/Object;)V ARG 1 key ARG 2 args + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_11022 getKey ()Ljava/lang/String; METHOD method_11023 getArgs ()[Ljava/lang/Object; METHOD method_11024 forEachPart (Ljava/lang/String;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/util/Formatting.mapping b/mappings/net/minecraft/util/Formatting.mapping index fe6a3eb3aa..368b9e250b 100644 --- a/mappings/net/minecraft/util/Formatting.mapping +++ b/mappings/net/minecraft/util/Formatting.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_124 net/minecraft/util/Formatting FIELD field_1071 colorIndex I FIELD field_1081 modifier Z FIELD field_33292 FORMATTING_CODE_PREFIX C + FIELD field_39218 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;CILjava/lang/Integer;)V ARG 3 name ARG 4 code diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 4c1287bc15..3d93437edd 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier COMMENT

Parses a string into an {@code Identifier}. COMMENT Takes a string of the form {@code :}, for example {@code minecraft:iron_ingot}. COMMENT @return resulting identifier, or {@code null} if the string couldn't be parsed as an identifier + COMMENT @see #of(String, String) ARG 0 id METHOD method_12830 split (Ljava/lang/String;C)[Ljava/lang/String; ARG 0 id @@ -55,6 +56,12 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_42093 toTranslationKey (Ljava/lang/String;)Ljava/lang/String; ARG 1 prefix METHOD method_42094 toTranslationKey ()Ljava/lang/String; + METHOD method_43902 of (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_2960; + COMMENT {@return the identifier from the name and path, or {@code null} if the passed values + COMMENT do not form a valid identifier} + COMMENT @see #tryParse(String) + ARG 0 namespace + ARG 1 path METHOD method_43903 toShortTranslationKey ()Ljava/lang/String; COMMENT {@return the short translation key, with the default namespace omitted if present} CLASS class_2961 Serializer diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index b78483d497..e6679bb132 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element METHOD method_15255 deserialize (Ljava/io/Reader;)Lcom/google/gson/JsonObject; + ARG 0 reader METHOD method_15256 asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/class_1792; ARG 0 element ARG 1 name @@ -31,7 +32,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element METHOD method_15262 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object; + ARG 0 gson ARG 1 content + ARG 2 typeToken ARG 3 lenient METHOD method_15263 asLong (Lcom/google/gson/JsonElement;Ljava/lang/String;)J ARG 0 element @@ -45,6 +48,8 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15266 getType (Lcom/google/gson/JsonElement;)Ljava/lang/String; ARG 0 element METHOD method_15267 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader ARG 2 type ARG 3 lenient METHOD method_15268 asBoolean (Lcom/google/gson/JsonElement;Ljava/lang/String;)Z @@ -66,12 +71,19 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 2 context ARG 3 type METHOD method_15273 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 typeToken ARG 3 lenient METHOD method_15274 deserialize (Ljava/io/Reader;Z)Lcom/google/gson/JsonObject; + ARG 0 reader ARG 1 lenient METHOD method_15275 isNumber (Lcom/google/gson/JsonElement;)Z ARG 0 element METHOD method_15276 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 clazz METHOD method_15277 getFloat (Lcom/google/gson/JsonObject;Ljava/lang/String;F)F ARG 0 object ARG 1 element @@ -80,7 +92,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element METHOD method_15279 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 0 gson ARG 1 content + ARG 2 clazz ARG 3 lenient METHOD method_15280 getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J ARG 0 object @@ -101,7 +115,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 3 context ARG 4 type METHOD method_15284 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; + ARG 0 gson ARG 1 content + ARG 2 clazz METHOD method_15285 deserialize (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 content METHOD method_15286 isString (Lcom/google/gson/JsonElement;)Z @@ -116,7 +132,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element METHOD method_15290 deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object; + ARG 0 gson ARG 1 content + ARG 2 typeToken METHOD method_15291 deserialize (Lcom/google/gson/JsonElement;Ljava/lang/String;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object; ARG 0 element ARG 1 name @@ -139,6 +157,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element METHOD method_15297 deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object; + ARG 0 gson + ARG 1 reader + ARG 2 typeToken METHOD method_15298 deserialize (Ljava/lang/String;Z)Lcom/google/gson/JsonObject; ARG 0 content ARG 1 lenient @@ -212,3 +233,14 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 1 element METHOD method_37165 deserializeArray (Ljava/io/Reader;)Lcom/google/gson/JsonArray; ARG 0 reader + METHOD method_43677 writeSorted (Lcom/google/gson/stream/JsonWriter;Lcom/google/gson/JsonElement;Ljava/util/Comparator;)V + ARG 0 writer + ARG 1 json + ARG 2 comparator + METHOD method_43678 sort (Ljava/util/Collection;Ljava/util/Comparator;)Ljava/util/Collection; + ARG 0 entries + ARG 1 comparator + METHOD method_43679 deserializeArray (Ljava/lang/String;)Lcom/google/gson/JsonArray; + ARG 0 content + METHOD method_43680 toSortedString (Lcom/google/gson/JsonElement;)Ljava/lang/String; + ARG 0 json diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index f94b2d9307..04f3654ea1 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -33,3 +33,8 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper COMMENT COMMENT

A linebreak is either a CRLF sequence or a vertical tab (U+000B). ARG 0 text + METHOD method_43681 truncateChat (Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return {@code text} truncated to at most 256 characters without ellipsis} + COMMENT + COMMENT @apiNote This is used when sending chat messages. + ARG 0 text diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 3daacae24b..62ee6803a7 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -224,6 +224,13 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT and use the passed executor for applying. ARG 0 resultFactory COMMENT a function that takes the apply-stage executor and returns the future + METHOD method_43658 lastIndexGetter (Ljava/util/List;)Ljava/util/function/ToIntFunction; + COMMENT {@return a function that, when given a value in {@code values}, returns the last + COMMENT index of the value in the list} + COMMENT + COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will + COMMENT return {@code 0} when given values not in the passed list. + ARG 0 values METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable ARG 1 object