forked from FabricMC/yarn
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '24w09a' of https://github.com/FabricMC/yarn into 24w09a…
…-stuff # Conflicts: # mappings/net/minecraft/network/codec/PacketCodecs.mapping
- Loading branch information
Showing
27 changed files
with
198 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ | |
!/gradle | ||
!/src | ||
!/unpick-definitions | ||
!/mappings | ||
|
||
# Files | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
mappings/net/minecraft/client/gui/screen/OutOfMemoryScreen.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOptionsScreen | ||
FIELD field_21335 parent Lnet/minecraft/class_437; | ||
FIELD field_21336 gameOptions Lnet/minecraft/class_315; | ||
FIELD field_49503 layour Lnet/minecraft/class_8132; | ||
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V | ||
ARG 1 parent | ||
ARG 2 gameOptions | ||
ARG 3 title | ||
METHOD method_31387 initFooter ()V | ||
METHOD method_57732 initHeader ()V |
2 changes: 2 additions & 0 deletions
2
mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
mappings/net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
CLASS net/minecraft/class_4387 net/minecraft/client/realms/gui/screen/RealmsClientIncompatibleScreen | ||
FIELD field_19787 parent Lnet/minecraft/class_437; | ||
FIELD field_26477 INCOMPATIBLE_TITLE Lnet/minecraft/class_2561; | ||
FIELD field_49453 layout Lnet/minecraft/class_8132; | ||
FIELD field_49454 GAME_VERSION Lnet/minecraft/class_2561; | ||
FIELD field_49455 UNSUPPORTED_SNAPSHOT_VERSION Lnet/minecraft/class_2561; | ||
FIELD field_49456 OUTDATED_STABLE_VERSION Lnet/minecraft/class_2561; | ||
METHOD <init> (Lnet/minecraft/class_437;)V | ||
ARG 1 parent | ||
METHOD method_57675 getErrorText ()Lnet/minecraft/class_2561; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
CLASS net/minecraft/class_9326 net/minecraft/component/ComponentChanges | ||
FIELD field_49588 EMPTY Lnet/minecraft/class_9326; | ||
FIELD field_49589 CODEC Lcom/mojang/serialization/Codec; | ||
FIELD field_49590 PACKET_CODEC Lnet/minecraft/class_9139; | ||
FIELD field_49591 changes Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; | ||
FIELD field_49592 REMOVE_PREFIX Ljava/lang/String; | ||
METHOD <init> (Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;)V | ||
ARG 1 changes | ||
METHOD equals (Ljava/lang/Object;)Z | ||
ARG 1 o | ||
METHOD method_57841 builder ()Lnet/minecraft/class_9326$class_9327; | ||
METHOD method_57842 toString (Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;)Ljava/lang/String; | ||
ARG 0 changes | ||
METHOD method_57843 (Ljava/util/Map;)Lnet/minecraft/class_9326; | ||
ARG 0 changes | ||
METHOD method_57844 (Lnet/minecraft/class_9326;)Ljava/util/Map; | ||
ARG 0 changes | ||
METHOD method_57845 get (Lnet/minecraft/class_9331;)Ljava/util/Optional; | ||
ARG 1 type | ||
METHOD method_57846 entrySet ()Ljava/util/Set; | ||
METHOD method_57847 size ()I | ||
METHOD method_57848 isEmpty ()Z | ||
CLASS 1 | ||
METHOD method_57851 encode (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;Ljava/lang/Object;)V | ||
ARG 0 buf | ||
ARG 1 type | ||
ARG 2 value | ||
CLASS class_9327 Builder | ||
FIELD field_49593 changes Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; | ||
METHOD method_57852 build ()Lnet/minecraft/class_9326; | ||
METHOD method_57853 remove (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9326$class_9327; | ||
ARG 1 type | ||
METHOD method_57854 add (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_9326$class_9327; | ||
ARG 1 type | ||
ARG 2 value | ||
METHOD method_57855 add (Lnet/minecraft/class_9336;)Lnet/minecraft/class_9326$class_9327; | ||
ARG 1 component | ||
CLASS class_9328 Type | ||
FIELD field_49594 CODEC Lcom/mojang/serialization/Codec; | ||
METHOD method_57856 getValueCodec ()Lcom/mojang/serialization/Codec; | ||
METHOD method_57858 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; | ||
ARG 0 id | ||
METHOD method_57859 (Lnet/minecraft/class_9326$class_9328;)Lcom/mojang/serialization/DataResult; | ||
ARG 0 type |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
CLASS net/minecraft/class_9335 net/minecraft/component/ComponentMapImpl | ||
FIELD field_49654 baseComponents Lnet/minecraft/class_9323; | ||
FIELD field_49655 extraComponents Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; | ||
FIELD field_49656 copyOnWrite Z | ||
METHOD <init> (Lnet/minecraft/class_9323;)V | ||
ARG 1 baseComponents | ||
METHOD <init> (Lnet/minecraft/class_9323;Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;Z)V | ||
ARG 1 baseComponents | ||
ARG 2 extraComponents | ||
ARG 3 copyOnWrite | ||
METHOD equals (Ljava/lang/Object;)Z | ||
ARG 1 o | ||
METHOD method_57933 copyFrom (Lnet/minecraft/class_9323;)V | ||
ARG 1 components | ||
METHOD method_57934 shouldReuseChangesMap (Lnet/minecraft/class_9323;Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;)Z | ||
ARG 0 baseComponents | ||
ARG 1 changes | ||
METHOD method_57935 create (Lnet/minecraft/class_9323;Lnet/minecraft/class_9326;)Lnet/minecraft/class_9335; | ||
ARG 0 baseComponents | ||
ARG 1 changes | ||
METHOD method_57936 applyChanges (Lnet/minecraft/class_9326;)V | ||
ARG 1 changes | ||
METHOD method_57937 applyChange (Lnet/minecraft/class_9331;Ljava/util/Optional;)V | ||
ARG 1 type | ||
ARG 2 optional | ||
METHOD method_57938 set (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; | ||
ARG 1 type | ||
ARG 2 value | ||
METHOD method_57939 remove (Lnet/minecraft/class_9331;)Ljava/lang/Object; | ||
ARG 1 type | ||
METHOD method_57940 getChanges ()Lnet/minecraft/class_9326; | ||
METHOD method_57941 copy ()Lnet/minecraft/class_9335; | ||
METHOD method_57942 onWrite ()V |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
CLASS net/minecraft/class_9262 net/minecraft/text/RawFilteredPair | ||
METHOD method_57134 of (Lnet/minecraft/class_5837;)Lnet/minecraft/class_9262; | ||
ARG 0 message | ||
METHOD method_57135 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; | ||
ARG 0 baseCodec | ||
METHOD method_57136 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; | ||
ARG 1 instance | ||
METHOD method_57137 of (Ljava/lang/Object;)Lnet/minecraft/class_9262; | ||
ARG 0 raw | ||
METHOD method_57138 map (Ljava/util/function/Function;)Lnet/minecraft/class_9262; | ||
ARG 1 mapper | ||
METHOD method_57139 createPacketCodec (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; | ||
ARG 0 basePacketCodec | ||
METHOD method_57140 get (Z)Ljava/lang/Object; | ||
ARG 1 shouldFilter | ||
METHOD method_57141 resolve (Ljava/util/function/Function;)Ljava/util/Optional; | ||
ARG 1 resolver |