From e57e86ce75f90bb58065ba44ea0136e071e1b21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Thu, 19 Mar 2020 16:43:45 +0200 Subject: [PATCH] Realms mappings (#1170) * Realms mappings * More missing names * getname -> getName Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Enigma pls Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../com/mojang/realmsclient/KeyCombo.mapping | 5 +++- .../realmsclient/RealmsMainScreen.mapping | 22 ++++++++++++++++ .../realmsclient/client/FileDownload.mapping | 13 +++++++++- .../realmsclient/client/FileUpload.mapping | 1 + .../realmsclient/client/RealmsClient.mapping | 1 + .../realmsclient/dto/RealmsServer.mapping | 7 ++++-- .../dto/RealmsWorldOptions.mapping | 8 +++--- .../realmsclient/dto/RegionPingResult.mapping | 2 +- .../realmsclient/dto/ValueObject.mapping | 4 ++- .../realmsclient/dto/WorldTemplate.mapping | 5 ++++ .../gui/RealmsWorldSlotButton.mapping | 14 +++++++++++ .../RealmsConfigureWorldScreen.mapping | 25 +++++++++++++++---- .../RealmsLongRunningMcoTaskScreen.mapping | 6 ++++- .../gui/screens/RealmsPlayerScreen.mapping | 4 +++ .../screens/RealmsResetWorldScreen.mapping | 1 + .../screens/RealmsScreenWithCallback.mapping | 1 + .../RealmsSelectWorldTemplateScreen.mapping | 22 +++++++++++++++- .../screens/RealmsSlotOptionsScreen.mapping | 11 ++++++++ .../net/minecraft/realms/CheckedGson.mapping | 2 +- mappings/net/minecraft/realms/Realms.mapping | 6 +++++ .../net/minecraft/realms/RealmsBridge.mapping | 2 ++ .../realms/RealmsObjectSelectionList.mapping | 13 ++++++++++ 22 files changed, 157 insertions(+), 18 deletions(-) diff --git a/mappings/com/mojang/realmsclient/KeyCombo.mapping b/mappings/com/mojang/realmsclient/KeyCombo.mapping index 5c8d7dc069..4b5820f976 100644 --- a/mappings/com/mojang/realmsclient/KeyCombo.mapping +++ b/mappings/com/mojang/realmsclient/KeyCombo.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_4324 com/mojang/realmsclient/KeyCombo FIELD field_19453 chars [C FIELD field_19454 matchIndex I FIELD field_19455 onCompletion Ljava/lang/Runnable; + METHOD ([CLjava/lang/Runnable;)V + ARG 1 keys + ARG 2 task METHOD method_20832 reset ()V METHOD method_20833 keyPressed (C)Z - ARG 1 c + ARG 1 key diff --git a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping index 6c52403ce9..1a3937cf83 100644 --- a/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping +++ b/mappings/com/mojang/realmsclient/RealmsMainScreen.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen FIELD field_19474 closeButton Lnet/minecraft/class_4185; FIELD field_19475 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19476 overrideConfigure Z + FIELD field_19477 rateLimiter Lcom/google/common/util/concurrent/RateLimiter; FIELD field_19478 dontSetConnectedToRealms Z FIELD field_19480 realmsDataFetcher Lnet/minecraft/class_4360; FIELD field_19481 lastScrollYPosition I @@ -42,6 +43,24 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen FIELD field_19498 popupOpenedByUser Z FIELD field_19499 justClosedPopup Z FIELD field_19500 trialsAvailable Z + FIELD field_21517 IMAGES Ljava/util/List; + FIELD field_22548 DARKEN Lnet/minecraft/class_2960; + FIELD field_22549 CROSS_ICON Lnet/minecraft/class_2960; + FIELD field_22550 TRIAL_ICON Lnet/minecraft/class_2960; + FIELD field_22551 WIDGETS Lnet/minecraft/class_2960; + FIELD field_22552 ON_ICON Lnet/minecraft/class_2960; + FIELD field_22553 OFF_ICON Lnet/minecraft/class_2960; + FIELD field_22554 EXPIRED_ICON Lnet/minecraft/class_2960; + FIELD field_22555 EXPIRES_SOON_ICON Lnet/minecraft/class_2960; + FIELD field_22556 LEAVE_ICON Lnet/minecraft/class_2960; + FIELD field_22557 INVITATION_ICON Lnet/minecraft/class_2960; + FIELD field_22558 INVITE_ICON Lnet/minecraft/class_2960; + FIELD field_22559 WORLD_ICON Lnet/minecraft/class_2960; + FIELD field_22560 REALMS Lnet/minecraft/class_2960; + FIELD field_22561 CONFIGURE_ICON Lnet/minecraft/class_2960; + FIELD field_22562 QUESTIONMARK Lnet/minecraft/class_2960; + FIELD field_22563 NEWS_ICON Lnet/minecraft/class_2960; + FIELD field_22564 POPUP Lnet/minecraft/class_2960; METHOD method_20834 onClosePopup ()V METHOD method_20835 popupX0 ()I METHOD method_20836 popupY0 ()I @@ -145,6 +164,8 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen METHOD method_20941 switchToProd ()V METHOD method_20942 stopRealmsFetcher ()V METHOD method_20943 saveListScrollPosition ()V + METHOD method_23765 (Lnet/minecraft/class_3300;)V + ARG 0 manager CLASS class_4326 CloseButton CLASS class_4327 NewsButton CLASS class_4328 PendingInvitesButton @@ -167,3 +188,4 @@ CLASS net/minecraft/class_4325 com/mojang/realmsclient/RealmsMainScreen ARG 4 mouseX ARG 5 mouseY CLASS class_4332 ShowPopupButton + CLASS class_4866 Entry diff --git a/mappings/com/mojang/realmsclient/client/FileDownload.mapping b/mappings/com/mojang/realmsclient/client/FileDownload.mapping index 2d15a33871..f2cd174b0f 100644 --- a/mappings/com/mojang/realmsclient/client/FileDownload.mapping +++ b/mappings/com/mojang/realmsclient/client/FileDownload.mapping @@ -8,17 +8,27 @@ CLASS net/minecraft/class_4333 com/mojang/realmsclient/client/FileDownload FIELD field_19530 currentThread Ljava/lang/Thread; FIELD field_19531 requestConfig Lorg/apache/http/client/config/RequestConfig; FIELD field_19532 INVALID_FILE_NAMES [Ljava/lang/String; + FIELD field_20490 backupFile Ljava/io/File; + FIELD field_20491 httpRequest Lorg/apache/http/client/methods/HttpGet; METHOD method_20948 cancel ()V METHOD method_20955 contentLength (Ljava/lang/String;)J ARG 1 downloadLink METHOD method_20956 untarGzipArchive (Ljava/lang/String;Ljava/io/File;Lnet/minecraft/class_32;)V ARG 1 name - ARG 2 file + ARG 2 archive + ARG 3 storage METHOD method_20957 isFinished ()Z METHOD method_20960 findAvailableFolderName (Ljava/lang/String;)Ljava/lang/String; ARG 0 folder METHOD method_20961 isError ()Z METHOD method_20964 isExtracting ()Z + METHOD method_22100 downloadWorld (Lnet/minecraft/class_4889;Ljava/lang/String;Lnet/minecraft/class_4392$class_4393;Lnet/minecraft/class_32;)V + ARG 1 download + ARG 2 message + ARG 3 status + ARG 4 storage + METHOD method_25031 readNbtFile (Ljava/io/File;)V + ARG 0 file CLASS class_4334 DownloadCountingOutputStream FIELD field_19539 listener Ljava/awt/event/ActionListener; METHOD (Lnet/minecraft/class_4333;Ljava/io/OutputStream;)V @@ -35,6 +45,7 @@ CLASS net/minecraft/class_4333 com/mojang/realmsclient/client/FileDownload METHOD (Lnet/minecraft/class_4333;Ljava/lang/String;Ljava/io/File;Lnet/minecraft/class_32;Lnet/minecraft/class_4392$class_4393;)V ARG 2 worldName ARG 3 tempFile + ARG 4 storage ARG 5 downloadStatus METHOD actionPerformed (Ljava/awt/event/ActionEvent;)V ARG 1 e diff --git a/mappings/com/mojang/realmsclient/client/FileUpload.mapping b/mappings/com/mojang/realmsclient/client/FileUpload.mapping index e265450276..3644b89bfb 100644 --- a/mappings/com/mojang/realmsclient/client/FileUpload.mapping +++ b/mappings/com/mojang/realmsclient/client/FileUpload.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4337 com/mojang/realmsclient/client/FileUpload ARG 2 worldId ARG 4 slotId ARG 5 uploadInfo + ARG 7 clientVersion METHOD method_20970 cancel ()V METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429; ARG 1 currentAttempt diff --git a/mappings/com/mojang/realmsclient/client/RealmsClient.mapping b/mappings/com/mojang/realmsclient/client/RealmsClient.mapping index aae45ea5ab..0f5471080d 100644 --- a/mappings/com/mojang/realmsclient/client/RealmsClient.mapping +++ b/mappings/com/mojang/realmsclient/client/RealmsClient.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4341 com/mojang/realmsclient/client/RealmsClient FIELD field_19578 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19579 sessionId Ljava/lang/String; FIELD field_19580 username Ljava/lang/String; + FIELD field_22568 JSON Lnet/minecraft/class_4869; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/net/Proxy;)V ARG 1 sessionId ARG 2 username diff --git a/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping b/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping index 1d4844dedd..f000ac224b 100644 --- a/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping +++ b/mappings/com/mojang/realmsclient/dto/RealmsServer.mapping @@ -37,9 +37,9 @@ CLASS net/minecraft/class_4877 com/mojang/realmsclient/dto/RealmsServer ARG 1 slots METHOD method_25062 getName ()Ljava/lang/String; METHOD method_25063 parseSlots (Lcom/google/gson/JsonArray;)Ljava/util/Map; - ARG 0 jsonArray + ARG 0 json METHOD method_25064 setDescription (Ljava/lang/String;)V - ARG 1 motd + ARG 1 description METHOD method_25065 getMinigameName ()Ljava/lang/String; METHOD method_25066 parse (Ljava/lang/String;)Lnet/minecraft/class_4877; ARG 0 json @@ -52,6 +52,9 @@ CLASS net/minecraft/class_4877 com/mojang/realmsclient/dto/RealmsServer FIELD field_19432 refOwner Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 owner + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 one + ARG 2 two CLASS class_4320 State FIELD field_19433 CLOSED Lnet/minecraft/class_4877$class_4320; FIELD field_19434 OPEN Lnet/minecraft/class_4877$class_4320; diff --git a/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping b/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping index be14874ab5..7c5c59959c 100644 --- a/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping +++ b/mappings/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_4883 com/mojang/realmsclient/dto/RealmsWorldOptions FIELD field_22643 templateImage Ljava/lang/String; FIELD field_22644 adventureMap Z FIELD field_22645 empty Z - FIELD field_22646 templateImageDefault Ljava/lang/String; + FIELD field_22646 DEFAULT_WORLD_TEMPLATE_IMAGE Ljava/lang/String; METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/String;)V ARG 1 pvp ARG 2 spawnAnimals @@ -27,12 +27,12 @@ CLASS net/minecraft/class_4883 com/mojang/realmsclient/dto/RealmsWorldOptions ARG 10 slotName METHOD method_25076 getDefaults ()Lnet/minecraft/class_4883; METHOD method_25077 getSlotName (I)Ljava/lang/String; - ARG 1 i + ARG 1 index METHOD method_25078 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4883; - ARG 0 jsonObject + ARG 0 json METHOD method_25079 setEmpty (Z)V ARG 1 empty METHOD method_25080 getEmptyDefaults ()Lnet/minecraft/class_4883; METHOD method_25081 getDefaultSlotName (I)Ljava/lang/String; - ARG 1 i + ARG 1 index METHOD method_25082 toJson ()Ljava/lang/String; diff --git a/mappings/com/mojang/realmsclient/dto/RegionPingResult.mapping b/mappings/com/mojang/realmsclient/dto/RegionPingResult.mapping index 111c192714..9c56971186 100644 --- a/mappings/com/mojang/realmsclient/dto/RegionPingResult.mapping +++ b/mappings/com/mojang/realmsclient/dto/RegionPingResult.mapping @@ -4,4 +4,4 @@ CLASS net/minecraft/class_4886 com/mojang/realmsclient/dto/RegionPingResult METHOD (Ljava/lang/String;I)V ARG 1 regionName ARG 2 ping - METHOD method_25084 ping ()I + METHOD method_25084 getPing ()I diff --git a/mappings/com/mojang/realmsclient/dto/ValueObject.mapping b/mappings/com/mojang/realmsclient/dto/ValueObject.mapping index 3168f8a341..ed15e70387 100644 --- a/mappings/com/mojang/realmsclient/dto/ValueObject.mapping +++ b/mappings/com/mojang/realmsclient/dto/ValueObject.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_4352 com/mojang/realmsclient/dto/ValueObject - METHOD method_25094 (Ljava/lang/reflect/Field;)Z + METHOD method_25093 getName (Ljava/lang/reflect/Field;)Ljava/lang/String; + ARG 0 f + METHOD method_25094 isStatic (Ljava/lang/reflect/Field;)Z ARG 0 f diff --git a/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping b/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping index 0ef7ee4f87..915553069b 100644 --- a/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping +++ b/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping @@ -12,5 +12,10 @@ CLASS net/minecraft/class_4890 com/mojang/realmsclient/dto/WorldTemplate METHOD method_25096 parse (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4890; ARG 0 node CLASS class_4323 WorldTemplateType + FIELD field_19447 WORLD_TEMPLATE Lnet/minecraft/class_4890$class_4323; + FIELD field_19448 MINIGAME Lnet/minecraft/class_4890$class_4323; + FIELD field_19449 ADVENTUREMAP Lnet/minecraft/class_4890$class_4323; + FIELD field_19450 EXPERIENCE Lnet/minecraft/class_4890$class_4323; + FIELD field_19451 INSPIRATION Lnet/minecraft/class_4890$class_4323; METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/class_4890$class_4323; ARG 0 name diff --git a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping index 520c67d240..c83442bd9c 100644 --- a/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping +++ b/mappings/com/mojang/realmsclient/gui/RealmsWorldSlotButton.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton FIELD field_19675 slotIndex I FIELD field_19676 animTick I FIELD field_19677 state Lnet/minecraft/class_4367$class_4370; + FIELD field_22681 SLOT_FRAME Lnet/minecraft/class_2960; + FIELD field_22682 EMPTY_FRAME Lnet/minecraft/class_2960; + FIELD field_22683 PANORAMA_0 Lnet/minecraft/class_2960; + FIELD field_22684 PANORAMA_2 Lnet/minecraft/class_2960; + FIELD field_22685 PANORAMA_3 Lnet/minecraft/class_2960; METHOD (IIIILjava/util/function/Supplier;Ljava/util/function/Consumer;ILnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y @@ -12,6 +17,7 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton ARG 5 serverDataProvider ARG 6 toolTipSetter ARG 7 id + ARG 8 action METHOD method_21107 drawSlotFrame (IIIIZLjava/lang/String;IJLjava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Ljava/lang/String;)V ARG 1 x ARG 2 y @@ -26,6 +32,14 @@ CLASS net/minecraft/class_4367 com/mojang/realmsclient/gui/RealmsWorldSlotButton ARG 12 minigame ARG 13 action ARG 14 actionPrompt + METHOD method_25098 setMessage (Lnet/minecraft/class_4877;Ljava/lang/String;ZZLnet/minecraft/class_4367$class_4368;Ljava/lang/String;)V + ARG 1 server + ARG 2 slotName + ARG 3 isEmpty + ARG 4 isMinigame + ARG 5 action + ARG 6 promptMessage + METHOD method_25099 getState ()Lnet/minecraft/class_4367$class_4370; CLASS class_4368 Action FIELD field_19678 NOTHING Lnet/minecraft/class_4367$class_4368; FIELD field_19679 SWITCH_SLOT Lnet/minecraft/class_4367$class_4368; diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping index a2abe986b0..650c15ff5c 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsConfigureWorldScreen.mapping @@ -15,13 +15,18 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu FIELD field_19806 stateChanged Z FIELD field_19807 animTick I FIELD field_19808 clicks I + FIELD field_20493 server Lnet/minecraft/class_4877; + FIELD field_22688 ON_ICON Lnet/minecraft/class_2960; + FIELD field_22689 OFF_ICON Lnet/minecraft/class_2960; + FIELD field_22690 EXPIRED_ICON Lnet/minecraft/class_2960; + FIELD field_22691 EXPIRES_SOON_ICON Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4325;J)V ARG 1 lastScreen ARG 2 serverId METHOD method_21198 stateChanged ()V METHOD method_21199 addSlotButton (I)V - ARG 1 i - METHOD method_21200 centerButton (II)I + ARG 1 slotIndex + METHOD method_21200 buttonCenter (II)I ARG 1 i ARG 2 total METHOD method_21201 drawServerStatus (IIII)V @@ -52,10 +57,12 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu ARG 1 name ARG 2 desc METHOD method_21217 closeTheWorld (Lnet/minecraft/class_437;)V + ARG 1 screen METHOD method_21218 openTheWorld (ZLnet/minecraft/class_437;)V ARG 1 join + ARG 2 screen METHOD method_21219 getNewScreen ()Lnet/minecraft/class_4388; - METHOD method_21220 leftButton (I)I + METHOD method_21220 buttonLeft (I)I ARG 1 i METHOD method_21221 drawExpired (IIII)V ARG 1 x @@ -65,9 +72,10 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21222 switchToEmptySlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData - METHOD method_21226 show (Lnet/minecraft/class_4185;)V + METHOD method_21226 addButton (Lnet/minecraft/class_4185;)V + ARG 1 button METHOD method_21228 frame (I)I - ARG 1 i + ARG 1 ordinal METHOD method_21229 drawOpen (IIII)V ARG 1 x ARG 2 y @@ -79,3 +87,10 @@ CLASS net/minecraft/class_4388 com/mojang/realmsclient/gui/screens/RealmsConfigu METHOD method_21238 isMinigame ()Z METHOD method_21240 hideRegularButtons ()V METHOD method_21242 hideMinigameButtons ()V + METHOD method_25138 removeButton (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_25143 drawClosed (IIII)V + ARG 1 x + ARG 2 y + ARG 3 xm + ARG 4 ym diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping index bc7a4a9f10..b0f30ce251 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4398 com/mojang/realmsclient/gui/screens/RealmsLongRunningMcoTaskScreen FIELD field_19908 symbols [Ljava/lang/String; FIELD field_19909 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_19912 lastScreen Lnet/minecraft/class_437; + FIELD field_19912 parent Lnet/minecraft/class_437; FIELD field_19914 title Ljava/lang/String; FIELD field_19915 error Z FIELD field_19916 errorMessage Ljava/lang/String; @@ -10,8 +10,12 @@ CLASS net/minecraft/class_4398 com/mojang/realmsclient/gui/screens/RealmsLongRun FIELD field_19919 task Lnet/minecraft/class_4358; FIELD field_19920 buttonLength I METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4358;)V + ARG 1 parent ARG 2 task + METHOD method_21290 setError (Ljava/lang/String;)V + ARG 1 error METHOD method_21291 aborted ()Z METHOD method_21292 setTitle (Ljava/lang/String;)V ARG 1 title METHOD method_21293 cancelOrBackButtonClicked ()V + METHOD method_25166 onError ()V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping index 36fbd3c9b6..dea80fe09d 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsPlayerScreen.mapping @@ -14,6 +14,10 @@ CLASS net/minecraft/class_4406 com/mojang/realmsclient/gui/screens/RealmsPlayerS FIELD field_19970 player I FIELD field_19971 stateChanged Z FIELD field_19972 titleLabel Lnet/minecraft/class_4903; + FIELD field_22704 OP_ICON Lnet/minecraft/class_2960; + FIELD field_22705 USER_ICON Lnet/minecraft/class_2960; + FIELD field_22706 CROSS_PLAYER_ICON Lnet/minecraft/class_2960; + FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V ARG 1 lastScreen ARG 2 serverData diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping index ccdbed4045..173b90a670 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_4410 com/mojang/realmsclient/gui/screens/RealmsResetWo METHOD method_21376 setResetTitle (Ljava/lang/String;)V ARG 1 title METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V + ARG 1 callback METHOD method_21378 switchSlot ()V METHOD method_21379 setSlot (I)V ARG 1 slot diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.mapping index 486fc80d12..dd80ade4f7 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4415 com/mojang/realmsclient/gui/screens/RealmsScreenWithCallback METHOD method_21395 callback (Lnet/minecraft/class_4890;)V + ARG 1 template diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping index d68e5a3934..71ccc05a18 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen FIELD field_20069 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20070 lastScreen Lnet/minecraft/class_4415; + FIELD field_20071 templateList Lnet/minecraft/class_4419$class_4420; FIELD field_20072 selectedTemplate I FIELD field_20073 title Ljava/lang/String; FIELD field_20074 selectButton Lnet/minecraft/class_4185; @@ -15,6 +16,17 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW FIELD field_20083 displayWarning Z FIELD field_20084 hoverWarning Z FIELD field_20085 noTemplatesMessage Ljava/util/List; + FIELD field_22719 LINK_ICONS Lnet/minecraft/class_2960; + FIELD field_22720 TRAILER_ICONS Lnet/minecraft/class_2960; + FIELD field_22721 SLOT_FRAME Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4415;Lnet/minecraft/class_4877$class_4321;)V + ARG 1 callback + ARG 2 worldType + METHOD (Lnet/minecraft/class_4415;Lnet/minecraft/class_4877$class_4321;Lnet/minecraft/class_4891;)V + ARG 1 callback + ARG 2 worldType + ARG 3 list + METHOD method_21415 setPagination (Lnet/minecraft/class_4891;)V METHOD method_21423 setTitle (Ljava/lang/String;)V ARG 1 title METHOD method_21424 renderMousehoverTooltip (Ljava/lang/String;II)V @@ -23,7 +35,7 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW ARG 3 y METHOD method_21425 updateButtonStates ()V METHOD method_21429 setWarning (Ljava/lang/String;)V - ARG 1 string + ARG 1 warning METHOD method_21430 shouldSelectButtonBeActive ()Z METHOD method_21432 shouldPublisherBeVisible ()Z METHOD method_21436 shouldTrailerBeVisible ()Z @@ -32,8 +44,16 @@ CLASS net/minecraft/class_4419 com/mojang/realmsclient/gui/screens/RealmsSelectW METHOD method_21442 onTrailer ()V METHOD method_21444 onPublish ()V CLASS class_4420 WorldTemplateObjectSelectionList + METHOD (Lnet/minecraft/class_4419;)V + ARG 1 screen + METHOD (Lnet/minecraft/class_4419;Ljava/lang/Iterable;)V + ARG 2 templates + METHOD method_21446 isEmpty ()Z + METHOD method_21447 getItem (I)Lnet/minecraft/class_4890; + ARG 1 index METHOD method_21448 addEntry (Lnet/minecraft/class_4890;)V ARG 1 template + METHOD method_21450 getValues ()Ljava/util/List; CLASS class_4421 WorldTemplateObjectSelectionListEntry FIELD field_20094 mTemplate Lnet/minecraft/class_4890; METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping index 9df0b8ed0d..f43c6ccacf 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping @@ -23,7 +23,12 @@ CLASS net/minecraft/class_4423 com/mojang/realmsclient/gui/screens/RealmsSlotOpt FIELD field_20132 spawnNPCsButton Lnet/minecraft/class_4185; FIELD field_20133 spawnProtectionButton Lnet/minecraft/class_4423$class_4424; FIELD field_20134 commandBlocksButton Lnet/minecraft/class_4185; + FIELD field_20502 toastMessage Lnet/minecraft/class_4903; + FIELD field_22722 gameModeButton Lnet/minecraft/class_4185; + FIELD field_22723 DIFFICULTIES [Ljava/lang/String; + FIELD field_22724 GAME_MODES [Ljava/lang/String; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4883;Lnet/minecraft/class_4877$class_4321;I)V + ARG 1 parent ARG 2 options ARG 3 worldType ARG 4 activeSlot @@ -37,9 +42,15 @@ CLASS net/minecraft/class_4423 com/mojang/realmsclient/gui/screens/RealmsSlotOpt METHOD method_21482 forceGameModeTitle ()Ljava/lang/String; METHOD method_21484 getSlotName ()Ljava/lang/String; METHOD method_21486 saveSettings ()V + METHOD method_25258 getWorldConfigureMessage (Z)Ljava/lang/String; + ARG 0 enabled CLASS class_4424 SettingsSlider + FIELD field_22725 min D + FIELD field_22726 max D METHOD (Lnet/minecraft/class_4423;IIIIFF)V ARG 2 id ARG 3 x ARG 4 y ARG 5 width + ARG 6 min + ARG 7 max diff --git a/mappings/net/minecraft/realms/CheckedGson.mapping b/mappings/net/minecraft/realms/CheckedGson.mapping index b754f725d1..40839ca7d6 100644 --- a/mappings/net/minecraft/realms/CheckedGson.mapping +++ b/mappings/net/minecraft/realms/CheckedGson.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4869 net/minecraft/realms/CheckedGson COMMENT Checks so that only intended pojos are passed to the GSON (handles COMMENT serialization after obfuscation). - FIELD field_22578 gson Lcom/google/gson/Gson; + FIELD field_22578 GSON Lcom/google/gson/Gson; METHOD method_25037 toJson (Lnet/minecraft/class_4885;)Ljava/lang/String; ARG 1 serializable METHOD method_25038 fromJson (Ljava/lang/String;Ljava/lang/Class;)Lnet/minecraft/class_4885; diff --git a/mappings/net/minecraft/realms/Realms.mapping b/mappings/net/minecraft/realms/Realms.mapping index af8ed64e64..d84328c180 100644 --- a/mappings/net/minecraft/realms/Realms.mapping +++ b/mappings/net/minecraft/realms/Realms.mapping @@ -1,8 +1,14 @@ CLASS net/minecraft/class_4900 net/minecraft/realms/Realms FIELD field_22812 REPEATED_NARRATOR Lnet/minecraft/class_4907; METHOD method_25469 narrateNow (Ljava/lang/Iterable;)V + ARG 0 lines METHOD method_25470 narrateNow (Ljava/lang/String;)V + ARG 0 message METHOD method_25471 narrateNow ([Ljava/lang/String;)V + ARG 0 lines METHOD method_25472 joinNarrations (Ljava/lang/Iterable;)Ljava/lang/String; + ARG 0 lines METHOD method_25473 narrateRepeatedly (Ljava/lang/String;)V + ARG 0 lines METHOD method_25474 fixNarrationNewlines (Ljava/lang/String;)Ljava/lang/String; + ARG 0 lines \ No newline at end of file diff --git a/mappings/net/minecraft/realms/RealmsBridge.mapping b/mappings/net/minecraft/realms/RealmsBridge.mapping index 11a9b6b06a..31486d4145 100644 --- a/mappings/net/minecraft/realms/RealmsBridge.mapping +++ b/mappings/net/minecraft/realms/RealmsBridge.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4901 net/minecraft/realms/RealmsBridge FIELD field_22813 previousScreen Lnet/minecraft/class_437; METHOD method_25475 switchToRealms (Lnet/minecraft/class_437;)V + ARG 1 parentScreen METHOD method_25476 getNotificationScreen (Lnet/minecraft/class_437;)Lnet/minecraft/class_4905; + ARG 1 parentScreen diff --git a/mappings/net/minecraft/realms/RealmsObjectSelectionList.mapping b/mappings/net/minecraft/realms/RealmsObjectSelectionList.mapping index 2ef00c4433..8dc230baeb 100644 --- a/mappings/net/minecraft/realms/RealmsObjectSelectionList.mapping +++ b/mappings/net/minecraft/realms/RealmsObjectSelectionList.mapping @@ -1,5 +1,18 @@ CLASS net/minecraft/class_4904 net/minecraft/realms/RealmsObjectSelectionList + METHOD (IIIII)V + ARG 1 width + ARG 2 height + ARG 3 top + ARG 4 bottom + ARG 5 itemHeight METHOD method_25489 setSelected (I)V + ARG 1 index METHOD method_25490 itemClicked (IIDDI)V + ARG 1 cursorY + ARG 2 selectionIndex + ARG 3 mouseX + ARG 5 mouseY + ARG 7 listWidth METHOD method_25492 setSelectedItem (I)V + ARG 1 index METHOD method_25493 clear ()V