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

Merge branch '23w40a' of https://github.com/FabricMC/yarn into 23w40a-client

This commit is contained in:
apple502j 2023-10-06 23:14:02 +09:00
parent 6231c6cbc8 f128da972b
commit de547d8b92
No known key found for this signature in database
GPG Key ID: 2A69798565A099A9
8 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mappings/net/minecraft/client/MinecraftClient.mapping
View File

@ -184,7 +184,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_45899 gameProfileFuture Ljava/util/concurrent/CompletableFuture;
FIELD field_45900 finishedLoading Z
FIELD field_46551 disconnecting Z
FIELD field_46552 startTimeMillis J
FIELD field_46552 startTime J
FIELD field_46553 uptimeInTicks J
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
@ -536,8 +536,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340;
METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable;
ARG 1 loadingContext
METHOD method_54116 format (D)Ljava/lang/String;
ARG 0 value
METHOD method_54116 formatSeconds (D)Ljava/lang/String;
ARG 0 seconds
METHOD method_54117 addUptimesToCrashReport (Lnet/minecraft/class_129;)V
ARG 1 section
CLASS class_5859 ChatRestriction

18
mappings/net/minecraft/client/gui/screen/PopupScreen.mapping
View File

@ -1,20 +1,20 @@
CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
FIELD field_46554 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
FIELD field_46555 SPACING I
FIELD field_46556 MARGIN I
FIELD field_46557 BUTTON_SPACING I
FIELD field_46555 VERTICAL_SPACING I
FIELD field_46556 MARGIN_WIDTH I
FIELD field_46557 BUTTON_HORIZONTAL_SPACING I
FIELD field_46558 IMAGE_WIDTH I
FIELD field_46559 IMAGE_HEIGHT I
FIELD field_46560 DEFAULT_WIDTH I
FIELD field_46561 parent Lnet/minecraft/class_437;
FIELD field_46561 backgroundScreen Lnet/minecraft/class_437;
FIELD field_46562 image Lnet/minecraft/class_2960;
FIELD field_46563 message Lnet/minecraft/class_2561;
FIELD field_46564 buttons Ljava/util/List;
FIELD field_46565 onClosed Ljava/lang/Runnable;
FIELD field_46566 maxWidth I
FIELD field_46566 innerWidth I
FIELD field_46567 layout Lnet/minecraft/class_8667;
METHOD <init> (Lnet/minecraft/class_437;ILnet/minecraft/class_2960;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/lang/Runnable;)V
ARG 1 parent
ARG 1 backgroundScreen
ARG 2 width
ARG 3 image
ARG 4 title
@ -25,9 +25,9 @@ CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
ARG 2 button
METHOD method_54123 (Lnet/minecraft/class_8816;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_54124 createButtonsLayout ()Lnet/minecraft/class_8667;
METHOD method_54124 createButtonLayout ()Lnet/minecraft/class_8667;
CLASS class_8817 Builder
FIELD field_46568 parent Lnet/minecraft/class_437;
FIELD field_46568 backgroundScreen Lnet/minecraft/class_437;
FIELD field_46569 title Lnet/minecraft/class_2561;
FIELD field_46570 message Lnet/minecraft/class_2561;
FIELD field_46571 width I
@ -35,7 +35,7 @@ CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
FIELD field_46573 buttons Ljava/util/List;
FIELD field_46574 onClosed Ljava/lang/Runnable;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V
ARG 1 parent
ARG 1 backgroundScreen
ARG 2 title
METHOD method_54125 build ()Lnet/minecraft/class_8816;
METHOD method_54126 width (I)Lnet/minecraft/class_8816$class_8817;

2
mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
View File

@ -127,6 +127,8 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
METHOD method_48296 getConnection ()Lnet/minecraft/class_2535;
METHOD method_51684 unloadChunk (Lnet/minecraft/class_2666;)V
ARG 1 packet
METHOD method_52801 warnOnUnknownPayload (Lnet/minecraft/class_8710;)V
ARG 1 payload
METHOD method_52802 refreshTagBasedData ()V
METHOD method_53876 createEntity (Lnet/minecraft/class_2604;)Lnet/minecraft/class_1297;
ARG 1 packet

2
mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping
View File

@ -62,7 +62,7 @@ CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotificatio
METHOD method_54108 (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_8816;Z)V
ARG 4 confirmed
METHOD method_54109 createScreen (Lnet/minecraft/class_437;Ljava/util/function/Consumer;)Lnet/minecraft/class_8816;
ARG 1 parent
ARG 1 backgroundScreen
ARG 2 dismissCallback
METHOD method_54110 (Lnet/minecraft/class_437;Ljava/util/function/Consumer;Lnet/minecraft/class_8816;)V
ARG 3 screen

2
mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping
View File

@ -73,7 +73,7 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti
ARG 1 pivotOffsetY
METHOD method_54131 positionBlockingArm (Lnet/minecraft/class_630;Z)V
ARG 1 arm
ARG 2 right
ARG 2 rightArm
CLASS class_573 ArmPose
FIELD field_25722 twoHanded Z
METHOD <init> (Ljava/lang/String;IZ)V

5
mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping
View File

@ -1,5 +1,7 @@
CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeModifier
FIELD field_23712 LOGGER Lorg/slf4j/Logger;
FIELD field_46247 CODEC Lcom/mojang/serialization/Codec;
FIELD field_46248 name Ljava/lang/String;
FIELD field_6323 value D
FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323;
FIELD field_6327 uuid Ljava/util/UUID;
@ -8,7 +10,10 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod
ARG 2 value
ARG 4 operation
METHOD <init> (Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V
ARG 1 uuid
ARG 2 name
ARG 3 value
ARG 5 operation
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322;

4
mappings/net/minecraft/test/GameTestState.mapping
View File

@ -14,6 +14,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch;
FIELD field_25301 rotation Lnet/minecraft/class_2470;
FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633;
FIELD field_46593 rerunUntilFailed Z
METHOD <init> (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V
ARG 1 testFunction
ARG 2 rotation
@ -69,3 +70,6 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
METHOD method_36065 getTick ()J
METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693;
METHOD method_36067 getTicksLeft ()I
METHOD method_54145 shouldRerunUntilFailed ()Z
METHOD method_54146 setRerunUntilFailed (Z)V
ARG 1 rerunUntilFailed

4
mappings/net/minecraft/test/TestContext.mapping
View File

@ -378,3 +378,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
ARG 1 entity
ARG 2 effect
ARG 3 amplifier
METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V
ARG 1 item
METHOD method_54144 dontExpectItem (Lnet/minecraft/class_1792;)V
ARG 1 item