From 8f3c48884bb0dc594735e409c8d00c6957e5626e Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:00:25 +0900 Subject: [PATCH] 23w40a client (#3686) --- .../net/minecraft/client/MinecraftClient.mapping | 11 +++++++---- .../gui/screen/DownloadingTerrainScreen.mapping | 3 +++ .../minecraft/client/gui/screen/PopupScreen.mapping | 6 +++++- .../gui/screen/world/OptimizeWorldScreen.mapping | 2 ++ .../client/network/ClientPlayNetworkHandler.mapping | 7 ++++++- .../client/network/WorldLoadingState.mapping | 13 +++++++++++++ .../net/minecraft/client/option/GameOptions.mapping | 2 +- .../client/realms/dto/RealmsNotification.mapping | 6 +++--- .../realms/gui/screen/RealmsMainScreen.mapping | 7 +++++++ .../client/realms/gui/screen/ResetWorldInfo.mapping | 6 ------ .../render/entity/EntityRenderDispatcher.mapping | 1 + .../net/minecraft/client/util/MacWindowUtil.mapping | 6 ++++++ 12 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 mappings/net/minecraft/client/network/WorldLoadingState.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 467328aa80..728b5413c7 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -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 (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -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 @@ -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 @@ -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 diff --git a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping index e3a296922f..ed37e876ae 100644 --- a/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DownloadingTerrainScreen.mapping @@ -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 (Ljava/util/function/BooleanSupplier;)V + ARG 1 shouldClose diff --git a/mappings/net/minecraft/client/gui/screen/PopupScreen.mapping b/mappings/net/minecraft/client/gui/screen/PopupScreen.mapping index 832cf0dc18..60cd47174e 100644 --- a/mappings/net/minecraft/client/gui/screen/PopupScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PopupScreen.mapping @@ -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 @@ -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; diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index 5fbc13c1c0..b55f9159ab 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -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 diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index c46551a7a4..4fd20c9e97 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -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 (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client METHOD method_16690 getSessionId ()Ljava/util/UUID; @@ -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 @@ -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 diff --git a/mappings/net/minecraft/client/network/WorldLoadingState.mapping b/mappings/net/minecraft/client/network/WorldLoadingState.mapping new file mode 100644 index 0000000000..be6bf7fa55 --- /dev/null +++ b/mappings/net/minecraft/client/network/WorldLoadingState.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 6da418ebcb..a67dc0d250 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -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; diff --git a/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping index daef16c567..5da38afa08 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsNotification.mapping @@ -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 (Ljava/util/UUID;ZZLjava/lang/String;)V ARG 1 uuid ARG 2 dismissable @@ -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 diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index e89c1a4376..1a5c4076b4 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -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 @@ -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; diff --git a/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping b/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping index bb4546f81e..2106680ace 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping @@ -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 (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 diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index c15c594b1e..bc3c812ba4 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -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 diff --git a/mappings/net/minecraft/client/util/MacWindowUtil.mapping b/mappings/net/minecraft/client/util/MacWindowUtil.mapping index 8b1ec9c0fa..d108bdf0ab 100644 --- a/mappings/net/minecraft/client/util/MacWindowUtil.mapping +++ b/mappings/net/minecraft/client/util/MacWindowUtil.mapping @@ -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