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

More 23w40a stuff #3685

Merged
merged 1 commit into from
Oct 6, 2023
Merged

More 23w40a stuff #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_45295 symlinkFinder Lnet/minecraft/class_8580;
FIELD field_45899 gameProfileFuture Ljava/util/concurrent/CompletableFuture;
FIELD field_45900 finishedLoading Z
FIELD field_46552 startTime J
FIELD field_46553 ticks J
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
METHOD method_1476 checkIs64Bit ()Z
Expand Down Expand Up @@ -531,6 +533,10 @@ 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 formatSeconds (D)Ljava/lang/String;
ARG 0 seconds
METHOD method_54117 addUptimeDetailsToCrashReport (Lnet/minecraft/class_129;)V
ARG 1 reportSection
CLASS class_5859 ChatRestriction
COMMENT Represents the restrictions on chat on a Minecraft client.
COMMENT
Expand Down
48 changes: 48 additions & 0 deletions mappings/net/minecraft/client/gui/screen/PopupScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
FIELD field_46554 BACKGROUND Lnet/minecraft/class_2960;
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 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 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 backgroundScreen
ARG 2 width
ARG 3 image
ARG 4 title
ARG 5 message
ARG 6 buttons
ARG 7 onClosed
METHOD method_54124 createButtonLayout ()Lnet/minecraft/class_8667;
CLASS class_8817 Builder
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
FIELD field_46572 image Lnet/minecraft/class_2960;
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 backgroundScreen
ARG 2 title
METHOD method_54125 build ()Lnet/minecraft/class_8816;
METHOD method_54126 width (I)Lnet/minecraft/class_8816$class_8817;
ARG 1 width
METHOD method_54127 image (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8816$class_8817;
ARG 1 image
METHOD method_54128 onClosed (Ljava/lang/Runnable;)Lnet/minecraft/class_8816$class_8817;
ARG 1 onClosed
METHOD method_54129 message (Lnet/minecraft/class_2561;)Lnet/minecraft/class_8816$class_8817;
ARG 1 message
METHOD method_54130 button (Lnet/minecraft/class_2561;Ljava/util/function/Consumer;)Lnet/minecraft/class_8816$class_8817;
ARG 1 message
ARG 2 action
CLASS class_8818 Button
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,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
34 changes: 34 additions & 0 deletions mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotificatio
FIELD field_43022 dismissable Z
FIELD field_43023 seen Z
FIELD field_43024 type Ljava/lang/String;
FIELD field_46538 INFO_POPUP Ljava/lang/String;
FIELD field_46539 DEFAULT_VISIT_URL_BUTTON_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Ljava/util/UUID;ZZLjava/lang/String;)V
ARG 1 uuid
ARG 2 dismissable
Expand Down Expand Up @@ -39,3 +41,35 @@ CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotificatio
METHOD method_49580 createButton (Lnet/minecraft/class_437;)Lnet/minecraft/class_4185;
ARG 1 currentScreen
METHOD method_49581 getDefaultMessage ()Lnet/minecraft/class_2561;
CLASS class_8814 InfoPopup
FIELD field_46540 TITLE_KEY Ljava/lang/String;
FIELD field_46541 MESSAGE_KEY Ljava/lang/String;
FIELD field_46542 IMAGE_KEY Ljava/lang/String;
FIELD field_46543 URL_BUTTON_KEY Ljava/lang/String;
FIELD field_46544 title Lnet/minecraft/class_8206;
FIELD field_46545 message Lnet/minecraft/class_8206;
FIELD field_46546 image Lnet/minecraft/class_2960;
FIELD field_46547 urlButton Lnet/minecraft/class_8204$class_8815;
METHOD <init> (Lnet/minecraft/class_8204;Lnet/minecraft/class_8206;Lnet/minecraft/class_8206;Lnet/minecraft/class_2960;Lnet/minecraft/class_8204$class_8815;)V
ARG 1 parent
ARG 2 title
ARG 3 message
ARG 4 image
ARG 5 urlButton
METHOD method_54107 fromJson (Lnet/minecraft/class_8204;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8204$class_8814;
ARG 0 parent
ARG 1 json
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 backgroundScreen
ARG 2 dismisser
METHOD method_54110 (Lnet/minecraft/class_437;Ljava/util/function/Consumer;Lnet/minecraft/class_8816;)V
ARG 3 screen
METHOD method_54112 (Ljava/util/function/Consumer;Lnet/minecraft/class_8816;)V
ARG 2 screen
CLASS class_8815 UrlButton
FIELD field_46548 URL_KEY Ljava/lang/String;
FIELD field_46549 URL_TEXT_KEY Ljava/lang/String;
METHOD method_54113 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8204$class_8815;
ARG 0 json
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/realms/dto/RealmsText.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ CLASS net/minecraft/class_8206 net/minecraft/client/realms/dto/RealmsText
FIELD field_43034 args [Ljava/lang/String;
METHOD <init> (Ljava/lang/String;[Ljava/lang/String;)V
ARG 1 translationKey
ARG 2 args
METHOD method_49582 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8206;
ARG 0 json
METHOD method_49583 toText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
ARG 1 fallback
METHOD method_54114 toText ()Lnet/minecraft/class_2561;
4 changes: 4 additions & 0 deletions mappings/net/minecraft/client/realms/util/JsonUtils.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ CLASS net/minecraft/class_4431 net/minecraft/client/realms/util/JsonUtils
ARG 0 key
ARG 1 node
ARG 2 deserializer
METHOD method_54115 getNullable (Ljava/lang/String;Lcom/google/gson/JsonObject;Ljava/util/function/Function;)Ljava/lang/Object;
ARG 0 key
ARG 1 node
ARG 2 deserializer
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti
METHOD method_32011 getModelData (Lnet/minecraft/class_5605;F)Lnet/minecraft/class_5609;
ARG 0 dilation
ARG 1 pivotOffsetY
METHOD method_54131 positionBlockingArm (Lnet/minecraft/class_630;Z)V
ARG 1 arm
ARG 2 rightArm
CLASS class_573 ArmPose
FIELD field_25722 twoHanded Z
METHOD <init> (Ljava/lang/String;IZ)V
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/test/GameTestState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 changes: 4 additions & 0 deletions mappings/net/minecraft/test/TestContext.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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