Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

23w40a text #3683

Merged
merged 3 commits into from
Oct 6, 2023
Merged

23w40a text #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12c62aa
23w40a text
apple502j Oct 5, 2023
0f6ef34
Merge branch '23w40a' of https://github.com/FabricMC/yarn into 23w40a…
apple502j Oct 6, 2023
f3381d1
Javadocs
apple502j Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions mappings/net/minecraft/class_8828.mapping
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions mappings/net/minecraft/text/BlockNbtDataSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtDataSource
FIELD comp_733 rawPos Ljava/lang/String;
FIELD comp_734 pos Lnet/minecraft/class_2267;
FIELD field_46614 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46615 TYPE Lnet/minecraft/class_7419$class_8827;
METHOD <init> (Ljava/lang/String;)V
ARG 1 rawPath
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2267;)V
Expand All @@ -11,3 +13,5 @@ CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtDataSource
ARG 1 o
METHOD method_16121 parsePos (Ljava/lang/String;)Lnet/minecraft/class_2267;
ARG 0 string
METHOD method_54226 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
11 changes: 11 additions & 0 deletions mappings/net/minecraft/text/ClickEvent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent
FIELD field_11740 value Ljava/lang/String;
FIELD field_11741 action Lnet/minecraft/class_2558$class_2559;
FIELD field_46594 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_2558$class_2559;Ljava/lang/String;)V
ARG 1 action
ARG 2 value
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_10844 getValue ()Ljava/lang/String;
METHOD method_10845 getAction ()Lnet/minecraft/class_2558$class_2559;
METHOD method_54149 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54150 (Lnet/minecraft/class_2558;)Ljava/lang/String;
ARG 0 event
METHOD method_54151 (Lnet/minecraft/class_2558;)Lnet/minecraft/class_2558$class_2559;
ARG 0 event
CLASS class_2559 Action
FIELD field_11742 name Ljava/lang/String;
FIELD field_11744 userDefinable Z
FIELD field_46595 UNVALIDATED_CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46596 CODEC Lcom/mojang/serialization/MapCodec;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;Z)V
ARG 3 name
ARG 4 userDefinable
METHOD method_10847 isUserDefinable ()Z
METHOD method_54152 validate (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/DataResult;
ARG 0 action
4 changes: 4 additions & 0 deletions mappings/net/minecraft/text/EntityNbtDataSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtDataSource
FIELD comp_735 rawSelector Ljava/lang/String;
FIELD comp_736 selector Lnet/minecraft/class_2300;
FIELD field_46617 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46618 TYPE Lnet/minecraft/class_7419$class_8827;
METHOD <init> (Ljava/lang/String;)V
ARG 1 rawPath
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2300;)V
Expand All @@ -11,3 +13,5 @@ CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtDataSource
ARG 1 o
METHOD method_10923 parseSelector (Ljava/lang/String;)Lnet/minecraft/class_2300;
ARG 0 rawSelector
METHOD method_54227 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
73 changes: 72 additions & 1 deletion mappings/net/minecraft/text/HoverEvent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,114 @@
CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent
FIELD field_46601 CODEC Lcom/mojang/serialization/Codec;
FIELD field_46602 data Lnet/minecraft/class_2568$class_8826;
METHOD <init> (Lnet/minecraft/class_2568$class_5247;Ljava/lang/Object;)V
ARG 1 action
ARG 2 contents
METHOD <init> (Lnet/minecraft/class_2568$class_8826;)V
ARG 1 data
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_10891 getValue (Lnet/minecraft/class_2568$class_5247;)Ljava/lang/Object;
ARG 1 action
METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247;
METHOD method_54182 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2568;
ARG 0 either
METHOD method_54183 (Lnet/minecraft/class_2568$class_8826;)Lnet/minecraft/class_2568$class_8826;
ARG 0 data
METHOD method_54184 (Lnet/minecraft/class_2568;)Lcom/mojang/datafixers/util/Either;
ARG 0 event
METHOD method_54185 (Lnet/minecraft/class_2568$class_8826;)Lnet/minecraft/class_2568$class_8826;
ARG 0 data
CLASS class_5247 Action
FIELD field_24346 name Ljava/lang/String;
FIELD field_24347 parsable Z
FIELD field_46603 UNVALIDATED_CODEC Lcom/mojang/serialization/Codec;
FIELD field_46604 CODEC Lcom/mojang/serialization/Codec;
FIELD field_46605 codec Lcom/mojang/serialization/Codec;
FIELD field_46606 legacyCodec Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/lang/String;ZLcom/mojang/serialization/Codec;Ljava/util/function/Function;)V
ARG 1 name
ARG 2 parsable
ARG 4 serializer
ARG 3 contentCodec
ARG 4 legacySerializer
METHOD method_27667 isParsable ()Z
METHOD method_27676 cast (Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 o
METHOD method_54186 validate (Lnet/minecraft/class_2568$class_5247;)Lcom/mojang/serialization/DataResult;
ARG 0 action
METHOD method_54187 (Lnet/minecraft/class_2568$class_8826;)Ljava/lang/Object;
ARG 0 action
METHOD method_54189 (Ljava/lang/Object;)Lnet/minecraft/class_2568$class_8826;
ARG 1 text
METHOD method_54191 (Ljava/lang/Object;)Lnet/minecraft/class_2568$class_8826;
ARG 1 content
CLASS class_5248 EntityContent
FIELD field_24351 entityType Lnet/minecraft/class_1299;
FIELD field_24352 uuid Ljava/util/UUID;
FIELD field_24353 name Ljava/util/Optional;
FIELD field_24354 tooltip Ljava/util/List;
FIELD field_46607 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_1299;Ljava/util/UUID;Ljava/util/Optional;)V
ARG 1 entityType
ARG 2 uuid
ARG 3 name
METHOD <init> (Lnet/minecraft/class_1299;Ljava/util/UUID;Lnet/minecraft/class_2561;)V
ARG 1 entityType
ARG 2 uuid
ARG 3 name
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_27682 asTooltip ()Ljava/util/List;
METHOD method_54193 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54195 legacySerializer (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult;
ARG 0 text
METHOD method_54196 (Lnet/minecraft/class_2568$class_5248;)Ljava/util/Optional;
ARG 0 content
METHOD method_54197 (Lnet/minecraft/class_2568$class_5248;)Ljava/util/UUID;
ARG 0 content
METHOD method_54198 (Lnet/minecraft/class_2568$class_5248;)Lnet/minecraft/class_1299;
ARG 0 content
CLASS class_5249 ItemStackContent
FIELD field_24355 item Lnet/minecraft/class_1792;
FIELD field_24356 count I
FIELD field_24357 nbt Ljava/util/Optional;
FIELD field_24358 stack Lnet/minecraft/class_1799;
FIELD field_46608 ITEM_STACK_CODEC Lcom/mojang/serialization/Codec;
FIELD field_46609 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_1792;ILjava/util/Optional;)V
ARG 1 item
ARG 2 count
ARG 3 nbt
METHOD <init> (Lnet/minecraft/class_1792;ILnet/minecraft/class_2487;)V
ARG 1 item
ARG 2 count
ARG 3 nbt
METHOD <init> (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_27683 asStack ()Lnet/minecraft/class_1799;
METHOD method_54199 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2568$class_5249;
ARG 0 item
METHOD method_54201 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2568$class_5249;
ARG 0 either
METHOD method_54202 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54203 legacySerializer (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult;
ARG 0 text
METHOD method_54204 (Lnet/minecraft/class_2568$class_5249;)Lnet/minecraft/class_2568$class_5249;
ARG 0 content
METHOD method_54205 (Lnet/minecraft/class_2568$class_5249;)Ljava/util/Optional;
ARG 0 content
METHOD method_54206 (Lnet/minecraft/class_2568$class_5249;)Ljava/lang/Integer;
ARG 0 content
METHOD method_54207 (Lnet/minecraft/class_2568$class_5249;)Lnet/minecraft/class_1792;
ARG 0 content
CLASS class_8826 EventData
FIELD field_46610 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46611 LEGACY_CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_54208 (Lnet/minecraft/class_2568$class_5247;)Lcom/mojang/serialization/Codec;
ARG 0 action
METHOD method_54209 (Lnet/minecraft/class_2568$class_5247;)Lcom/mojang/serialization/Codec;
ARG 0 action
6 changes: 6 additions & 0 deletions mappings/net/minecraft/text/KeybindTextContent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ CLASS net/minecraft/class_2572 net/minecraft/text/KeybindTextContent
COMMENT is not thread-safe.
FIELD field_11767 key Ljava/lang/String;
FIELD field_11768 translated Ljava/util/function/Supplier;
FIELD field_46619 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46620 TYPE Lnet/minecraft/class_7417$class_8823;
METHOD <init> (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;
METHOD method_54228 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54229 (Lnet/minecraft/class_2572;)Ljava/lang/String;
ARG 0 content
3 changes: 3 additions & 0 deletions mappings/net/minecraft/text/NbtDataSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
CLASS net/minecraft/class_7419 net/minecraft/text/NbtDataSource
COMMENT A data source for the NBT text content. Unmodifiable.
FIELD field_46616 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_10916 get (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream;
ARG 1 source
METHOD method_54225 getType ()Lnet/minecraft/class_7419$class_8827;
CLASS class_8827 Type
4 changes: 4 additions & 0 deletions mappings/net/minecraft/text/NbtTextContent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtTextContent
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;
FIELD field_46621 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46622 TYPE Lnet/minecraft/class_7417$class_8823;
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
Expand Down Expand Up @@ -36,3 +38,5 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtTextContent
ARG 2 current
METHOD method_43484 getSeparator ()Ljava/util/Optional;
METHOD method_43485 getDataSource ()Lnet/minecraft/class_7419;
METHOD method_54230 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
13 changes: 13 additions & 0 deletions mappings/net/minecraft/text/PlainTextContent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS net/minecraft/class_8828 net/minecraft/text/PlainTextContent
FIELD field_46623 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46624 TYPE Lnet/minecraft/class_7417$class_8823;
FIELD field_46625 EMPTY Lnet/minecraft/class_8828;
METHOD comp_737 string ()Ljava/lang/String;
METHOD method_54231 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54232 of (Ljava/lang/String;)Lnet/minecraft/class_8828;
ARG 0 string
CLASS class_2585 Literal
FIELD comp_737 string Ljava/lang/String;
METHOD <init> (Ljava/lang/String;)V
ARG 1 string
5 changes: 5 additions & 0 deletions mappings/net/minecraft/text/ScoreTextContent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent
FIELD field_11786 selector Lnet/minecraft/class_2300;
FIELD field_11787 name Ljava/lang/String;
FIELD field_33290 SENDER_PLACEHOLDER Ljava/lang/String;
FIELD field_46626 INNER_CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46627 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46628 TYPE Lnet/minecraft/class_7417$class_8823;
METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
ARG 1 name
ARG 2 objective
Expand All @@ -18,3 +21,5 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent
METHOD method_27701 parseEntitySelector (Ljava/lang/String;)Lnet/minecraft/class_2300;
ARG 0 name
METHOD method_36137 getSelector ()Lnet/minecraft/class_2300;
METHOD method_54233 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
4 changes: 4 additions & 0 deletions mappings/net/minecraft/text/SelectorTextContent.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ CLASS net/minecraft/class_2579 net/minecraft/text/SelectorTextContent
FIELD field_11790 selector Lnet/minecraft/class_2300;
FIELD field_11791 LOGGER Lorg/slf4j/Logger;
FIELD field_33540 separator Ljava/util/Optional;
FIELD field_46629 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46630 TYPE Lnet/minecraft/class_7417$class_8823;
METHOD <init> (Ljava/lang/String;Ljava/util/Optional;)V
ARG 1 pattern
ARG 2 separator
Expand All @@ -13,3 +15,5 @@ CLASS net/minecraft/class_2579 net/minecraft/text/SelectorTextContent
METHOD method_36339 getSeparator ()Ljava/util/Optional;
METHOD method_43486 readSelector (Ljava/lang/String;)Lnet/minecraft/class_2300;
ARG 0 pattern
METHOD method_54234 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
4 changes: 4 additions & 0 deletions mappings/net/minecraft/text/StorageNbtDataSource.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
CLASS net/minecraft/class_4616 net/minecraft/text/StorageNbtDataSource
FIELD field_46631 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46632 TYPE Lnet/minecraft/class_7419$class_8827;
METHOD method_54235 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
32 changes: 30 additions & 2 deletions mappings/net/minecraft/text/Style.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,36 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style
ARG 3 underlined
ARG 4 strikethrough
ARG 5 obfuscated
CLASS class_2584 Serializer
COMMENT A JSON serializer for {@link Style}.
METHOD method_54210 with (Lnet/minecraft/class_2583;Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_2583;
ARG 0 newStyle
ARG 1 oldAttribute
ARG 2 newAttribute
CLASS class_2584 Codecs
COMMENT Contains codecs to serialize {@link Style}s.
FIELD field_46612 MAP_CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_46613 CODEC Lcom/mojang/serialization/Codec;
METHOD method_54211 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_54212 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54213 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54214 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54215 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54216 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54217 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54218 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54219 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54220 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
METHOD method_54221 (Lnet/minecraft/class_2583;)Ljava/util/Optional;
ARG 0 style
CLASS class_7418 Writer
FIELD field_39012 shouldAppendComma Z
METHOD method_43478 appendComma ()V
Expand Down
Loading