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

23w40a client #3686

Merged
merged 2 commits into from
Oct 6, 2023
Merged

23w40a client #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6231c6c
23w40a client
apple502j Oct 6, 2023
de547d8
Merge branch '23w40a' of https://github.com/FabricMC/yarn into 23w40a…
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
11 changes: 7 additions & 4 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,8 +183,9 @@ 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_46551 disconnecting Z
FIELD field_46552 startTime J
FIELD field_46553 ticks J
FIELD field_46553 uptimeInTicks J
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
METHOD method_1476 checkIs64Bit ()Z
Expand Down Expand Up @@ -308,10 +309,11 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
ARG 1 spawnChunkRadius
METHOD method_18095 getSplashTextLoader ()Lnet/minecraft/class_4008;
METHOD method_18096 disconnect (Lnet/minecraft/class_437;)V
ARG 1 disconnectionScreen
METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V
ARG 1 world
METHOD method_18098 reset (Lnet/minecraft/class_437;)V
ARG 1 screen
ARG 1 resettingScreen
METHOD method_18099 disconnect ()V
METHOD method_18321 getPaintingManager ()Lnet/minecraft/class_4044;
METHOD method_18502 setOverlay (Lnet/minecraft/class_4071;)V
Expand Down Expand Up @@ -511,6 +513,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
ARG 1 uuid
METHOD method_52702 getSymlinkFinder ()Lnet/minecraft/class_8580;
METHOD method_52703 enterReconfiguration (Lnet/minecraft/class_437;)V
ARG 1 reconfigurationScreen
METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile;
METHOD method_53465 onFinishedLoading (Lnet/minecraft/class_310$class_8764;)V
ARG 1 loadingContext
Expand All @@ -535,8 +538,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
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
METHOD method_54117 addUptimesToCrashReport (Lnet/minecraft/class_129;)V
ARG 1 section
CLASS class_5859 ChatRestriction
COMMENT Represents the restrictions on chat on a Minecraft client.
COMMENT
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ CLASS net/minecraft/class_434 net/minecraft/client/gui/screen/DownloadingTerrain
FIELD field_26544 TEXT Lnet/minecraft/class_2561;
FIELD field_36365 MIN_LOAD_TIME_MS J
FIELD field_36368 loadStartTime J
FIELD field_46575 shouldClose Ljava/util/function/BooleanSupplier;
METHOD <init> (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldClose
6 changes: 5 additions & 1 deletion mappings/net/minecraft/client/gui/screen/PopupScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
FIELD field_46554 BACKGROUND Lnet/minecraft/class_2960;
FIELD field_46554 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
FIELD field_46555 VERTICAL_SPACING I
FIELD field_46556 MARGIN_WIDTH I
FIELD field_46557 BUTTON_HORIZONTAL_SPACING I
Expand All @@ -21,6 +21,10 @@ CLASS net/minecraft/class_8816 net/minecraft/client/gui/screen/PopupScreen
ARG 5 message
ARG 6 buttons
ARG 7 onClosed
METHOD method_54122 (Lnet/minecraft/class_8816$class_8818;Lnet/minecraft/class_4185;)V
ARG 2 button
METHOD method_54123 (Lnet/minecraft/class_8816;Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_54124 createButtonLayout ()Lnet/minecraft/class_8667;
CLASS class_8817 Builder
FIELD field_46568 backgroundScreen Lnet/minecraft/class_437;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl
ARG 2 dataFixer
ARG 3 storageSession
ARG 4 eraseCache
METHOD method_2747 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V
ARG 0 map
7 changes: 6 additions & 1 deletion mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
FIELD field_45946 pingMeasurer Lnet/minecraft/class_8761;
FIELD field_45947 displayedUnsecureChatWarning Z
FIELD field_46187 worldCleared Z
FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819;
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
ARG 1 client
METHOD method_16690 getSessionId ()Ljava/util/UUID;
Expand Down Expand Up @@ -122,7 +123,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
METHOD method_46529 isSecureChatEnforced ()Z
METHOD method_47657 updateKeyPair (Lnet/minecraft/class_7427;)V
ARG 1 keyPair
METHOD method_47658 clearWorld ()V
METHOD method_47658 unloadWorld ()V
METHOD method_48296 getConnection ()Lnet/minecraft/class_2535;
METHOD method_51684 unloadChunk (Lnet/minecraft/class_2666;)V
ARG 1 packet
Expand All @@ -131,3 +132,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
METHOD method_52802 refreshTagBasedData ()V
METHOD method_53876 createEntity (Lnet/minecraft/class_2604;)Lnet/minecraft/class_1297;
ARG 1 packet
METHOD method_54133 startWorldLoading (Lnet/minecraft/class_746;Lnet/minecraft/class_638;)V
ARG 1 player
ARG 2 world
METHOD method_54134 clearWorld ()V
13 changes: 13 additions & 0 deletions mappings/net/minecraft/client/network/WorldLoadingState.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS net/minecraft/class_8819 net/minecraft/client/network/WorldLoadingState
FIELD field_46579 player Lnet/minecraft/class_746;
FIELD field_46580 world Lnet/minecraft/class_638;
FIELD field_46581 renderer Lnet/minecraft/class_761;
FIELD field_46582 currentStep Lnet/minecraft/class_8819$class_8820;
METHOD <init> (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_761;)V
ARG 1 player
ARG 2 world
ARG 3 renderer
METHOD method_54135 tick ()V
METHOD method_54136 isReady ()Z
METHOD method_54137 handleChunksComingPacket ()V
CLASS class_8820 Step
2 changes: 1 addition & 1 deletion mappings/net/minecraft/client/option/GameOptions.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
FIELD field_1870 viewDistance Lnet/minecraft/class_7172;
FIELD field_1871 pickItemKey Lnet/minecraft/class_304;
COMMENT A key binding for holding an item corresponding to the {@linkplain net.minecraft.entity.Entity#getPickBlockStack() entity}
COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.BlockView,
COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.WorldView,
COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at.
COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default.
FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172;
Expand Down
6 changes: 3 additions & 3 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,8 +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;
FIELD field_46538 INFO_POPUP_TYPE Ljava/lang/String;
FIELD field_46539 OPEN_LINK_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Ljava/util/UUID;ZZLjava/lang/String;)V
ARG 1 uuid
ARG 2 dismissable
Expand Down Expand Up @@ -63,7 +63,7 @@ CLASS net/minecraft/class_8204 net/minecraft/client/realms/dto/RealmsNotificatio
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
ARG 2 dismissCallback
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
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
ARG 1 server
METHOD method_49550 refresh ()V
METHOD method_49551 addNotificationEntry (Lnet/minecraft/class_8204;)Z
ARG 1 notification
METHOD method_49553 request (Lnet/minecraft/class_4325$class_8203;Ljava/util/function/Consumer;)V
ARG 0 request
ARG 1 resultConsumer
Expand Down Expand Up @@ -152,6 +153,12 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
METHOD method_53791 showBuyRealmsScreen ()V
METHOD method_53792 resetPendingInvitesCount ()V
METHOD method_53793 resetServerList ()V
METHOD method_54104 markAsSeen (Ljava/util/Collection;)V
ARG 1 notifications
METHOD method_54105 (Ljava/util/List;Lnet/minecraft/class_4341;)Ljava/lang/Object;
ARG 1 client
METHOD method_54106 (Ljava/util/List;Ljava/lang/Object;)V
ARG 2 result
CLASS class_4329 RealmSelectionList
CLASS class_4330 RealmSelectionListEntry
FIELD field_19518 server Lnet/minecraft/class_4877;
Expand Down
6 changes: 0 additions & 6 deletions mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
CLASS net/minecraft/class_4413 net/minecraft/client/realms/gui/screen/ResetWorldInfo
FIELD comp_1976 seed Ljava/lang/String;
FIELD comp_1977 levelType Lnet/minecraft/class_5672;
FIELD comp_1978 generateStructures Z
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5672;Z)V
ARG 1 seed
ARG 2 levelType
ARG 3 generateStructures
METHOD comp_1976 seed ()Ljava/lang/String;
METHOD comp_1977 levelType ()Lnet/minecraft/class_5672;
METHOD comp_1978 generateStructures ()Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 entity
ARG 4 rotation
METHOD method_23166 renderShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;FFLnet/minecraft/class_4538;F)V
ARG 0 matrices
ARG 1 vertexConsumers
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/client/util/MacWindowUtil.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ CLASS net/minecraft/class_6417 net/minecraft/client/util/MacWindowUtil
ARG 0 handle
METHOD method_41718 setApplicationIconImage (Lnet/minecraft/class_7367;)V
ARG 0 iconSupplier
METHOD method_54101 fixStyleMask (J)V
ARG 0 handle
METHOD method_54102 getStyleMask (Lca/weblite/objc/NSObject;)J
ARG 0 handle
METHOD method_54103 (Lca/weblite/objc/NSObject;)V
ARG 0 windowHandle