From f51930aab1e8e9c9ae470e04bd5755d865d8b1d0 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 15 Oct 2023 03:02:16 +0900 Subject: [PATCH] Realms stuff --- .../minecraft/client/realms/Request.mapping | 4 ++ .../client/realms/dto/RealmsServer.mapping | 1 + .../screen/RealmsCreateWorldScreen.mapping | 18 +++++ .../RealmsLongRunningMcoTaskScreen.mapping | 4 ++ .../gui/screen/RealmsMainScreen.mapping | 65 +++++++++++++++++++ .../realms/task/RealmsConnectTask.mapping | 2 +- ...ng => RealmsPrepareConnectionTask.mapping} | 2 +- 7 files changed, 94 insertions(+), 2 deletions(-) rename mappings/net/minecraft/client/realms/task/{RealmsGetServerDetailsTask.mapping => RealmsPrepareConnectionTask.mapping} (97%) diff --git a/mappings/net/minecraft/client/realms/Request.mapping b/mappings/net/minecraft/client/realms/Request.mapping index 92e94ed0bc..a74b0ec5d4 100644 --- a/mappings/net/minecraft/client/realms/Request.mapping +++ b/mappings/net/minecraft/client/realms/Request.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_4346 net/minecraft/client/realms/Request FIELD field_19598 connected Z FIELD field_32096 READ_TIMEOUT I FIELD field_32097 CONNECT_TIMEOUT I + FIELD field_46690 IS_PRERELEASE_HEADER Ljava/lang/String; + FIELD field_46691 COOKIE_HEADER Ljava/lang/String; METHOD (Ljava/lang/String;II)V ARG 1 url ARG 2 connectTimeout @@ -54,6 +56,8 @@ CLASS net/minecraft/class_4346 net/minecraft/client/realms/Request METHOD method_21054 connect ()Lnet/minecraft/class_4346; METHOD method_21055 doConnect ()Lnet/minecraft/class_4346; METHOD method_21056 dispose ()V + METHOD method_54362 prerelease (Z)V + ARG 1 prerelease CLASS class_4347 Delete CLASS class_4348 Get CLASS class_4349 Post diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping index 43d7d52d94..f8d0b01db5 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer FIELD field_46693 parentWorldName Ljava/lang/String; FIELD field_46694 activeVersion Ljava/lang/String; FIELD field_46695 compatibility Lnet/minecraft/class_4877$class_8842; + FIELD field_46696 NO_PARENT I METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_25053 getDescription ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index f2e0df5d37..aa13ced95f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -31,6 +31,16 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_46125 CREATING_TEXT Lnet/minecraft/class_2561; FIELD field_46126 layout Lnet/minecraft/class_8132; FIELD field_46127 CREATE_REALM_TITLE Lnet/minecraft/class_2561; + FIELD field_46709 creationTask Lnet/minecraft/class_4445; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Ljava/lang/Runnable;)V + ARG 1 parent + ARG 2 serverData + ARG 3 slot + ARG 4 title + ARG 5 subtitle + ARG 6 subtitleColor + ARG 7 taskTitle + ARG 8 callback METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Lnet/minecraft/class_4445;Ljava/lang/Runnable;)V ARG 1 parent ARG 2 serverData @@ -39,6 +49,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 5 subtitle ARG 6 subtitleColor ARG 7 taskTitle + ARG 8 creationTask + ARG 9 callback METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V ARG 1 callback METHOD method_21384 frame (I)I @@ -50,7 +62,9 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea METHOD method_25213 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_32488 onSelectWorldTemplate (Lnet/minecraft/class_4890;)V + ARG 1 template METHOD method_32489 onResetNormalWorld (Lnet/minecraft/class_4413;)V + ARG 1 info METHOD method_53799 (Lnet/minecraft/class_4410;Lnet/minecraft/class_364;)V ARG 1 child METHOD method_53800 (Lnet/minecraft/class_4185;)V @@ -63,6 +77,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea METHOD method_53802 newRealm (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_4445;Ljava/lang/Runnable;)Lnet/minecraft/class_4410; ARG 0 parent ARG 1 serverData + ARG 2 creationTask + ARG 3 callback METHOD method_53804 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_53805 resetWorld (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/lang/Runnable;)Lnet/minecraft/class_4410; @@ -73,6 +89,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 1 button METHOD method_53807 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_54380 runTasks (Lnet/minecraft/class_4358;)V + ARG 1 task CLASS class_4411 FrameButton FIELD field_20032 image Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4410;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping index ca7bd6de66..a8d0e951c9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong FIELD field_33779 NARRATOR Lnet/minecraft/class_4907; FIELD field_46111 layout Lnet/minecraft/class_8667; FIELD field_46112 loading Lnet/minecraft/class_8661; + FIELD field_46707 tasks Ljava/util/List; + METHOD (Lnet/minecraft/class_437;[Lnet/minecraft/class_4358;)V + ARG 1 parent + ARG 2 tasks METHOD method_25168 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_53795 (Lnet/minecraft/class_4398;Lnet/minecraft/class_364;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index bce0327b1a..74d2a297f6 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -163,19 +163,74 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 2 result METHOD method_54320 updateLoadStatus ()V METHOD method_54324 resetPeriodicCheckers ()V + METHOD method_54326 showCompatibilityScreen (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 0 serverData + ARG 1 parent + ARG 2 title + ARG 3 description + ARG 4 confirmText + METHOD method_54327 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Z)V + ARG 0 serverData + ARG 1 parent + ARG 2 needsPreparation METHOD method_54328 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 snapshot + METHOD method_54329 (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Z)V + ARG 2 confirmed METHOD method_54330 isSnapshotRealmsEligible ()Z + METHOD method_54331 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_4329 RealmSelectionList CLASS class_4330 RealmSelectionListEntry FIELD field_19518 server Lnet/minecraft/class_4877; + FIELD field_46686 tooltip Lnet/minecraft/class_7919; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 server METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; METHOD method_52653 play ()V METHOD method_52654 createRealm ()V CLASS class_4866 Entry + METHOD method_54345 getNameY (I)I + ARG 1 y + METHOD method_54346 getVersionRight (IILnet/minecraft/class_2561;)I + ARG 1 x + ARG 2 width + ARG 3 version + METHOD method_54347 (ILnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style + METHOD method_54349 getActiveVersion (Lnet/minecraft/class_4877;I)Lnet/minecraft/class_2561; + ARG 1 server + ARG 2 color + METHOD method_54350 renderStatusIcon (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIII)V + ARG 1 server + ARG 2 context + ARG 3 x + ARG 4 y + ARG 5 mouseX + ARG 6 mouseY + METHOD method_54351 drawTextureWithTooltip (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V + ARG 1 context + ARG 2 x + ARG 3 y + ARG 4 mouseX + ARG 5 mouseY + ARG 6 texture + ARG 7 tooltip + METHOD method_54352 drawTrimmedText (Lnet/minecraft/class_332;Ljava/lang/String;IIII)V + ARG 1 context + ARG 2 string + ARG 3 left + ARG 4 y + ARG 5 right + ARG 6 color + METHOD method_54353 getTextHeight ()I + METHOD method_54354 getNameX (I)I + ARG 1 x + METHOD method_54356 getDescriptionY (I)I + ARG 1 y + METHOD method_54357 getStatusY (I)I + ARG 1 y CLASS class_8200 VisitButtonEntry FIELD field_42999 button Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V @@ -193,8 +248,10 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_43009 grid Lnet/minecraft/class_7845; FIELD field_43010 textGrid Lnet/minecraft/class_7843; FIELD field_43011 width I + FIELD field_46218 lines I METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_2561;ILnet/minecraft/class_8204;)V ARG 2 message + ARG 3 lines ARG 4 notification METHOD method_49564 setWidth (I)V ARG 1 width @@ -229,3 +286,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_46679 server Lnet/minecraft/class_4877; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 server + METHOD method_54343 (Lnet/minecraft/class_8816;)V + ARG 1 screen + METHOD method_54344 showPopup ()V + CLASS class_8841 ParentRealmSelectionListEntry + FIELD field_46684 server Lnet/minecraft/class_4877; + FIELD field_46685 tooltip Lnet/minecraft/class_7919; + METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V + ARG 2 server diff --git a/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping index f25080bc6e..4f4d406d84 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4438 net/minecraft/client/realms/task/RealmsConnectTask - FIELD field_20222 realmsConnect Lnet/minecraft/class_4902; + FIELD field_20222 realmsConnection Lnet/minecraft/class_4902; FIELD field_20223 address Lnet/minecraft/class_4878; FIELD field_26922 server Lnet/minecraft/class_4877; FIELD field_46133 TITLE Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping similarity index 97% rename from mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping rename to mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping index d4d157459a..8c5939c8a0 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerDetailsTask +CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareConnectionTask FIELD field_20224 server Lnet/minecraft/class_4877; FIELD field_20225 lastScreen Lnet/minecraft/class_437; FIELD field_36356 LOGGER Lorg/slf4j/Logger;