From 3f84c64cd55bc65992c0dfff94660f8422f4c62e Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Tue, 16 Apr 2019 16:13:34 +0200 Subject: [PATCH] Menu mappings (#611) --- .../gui/menu/AccessibilityScreen.mapping | 7 ++++++ .../client/gui/menu/AddServerScreen.mapping | 6 +++++ .../menu/AlwaysSelectedItemListWidget.mapping | 1 + .../menu/CustomizeBuffetLevelScreen.mapping | 15 ++++++++++++ .../gui/menu/CustomizeFlatLevelScreen.mapping | 2 ++ .../menu/DirectConnectServerScreen.mapping | 4 ++++ .../client/gui/menu/EditLevelScreen.mapping | 4 ++++ .../client/gui/menu/EndCreditsScreen.mapping | 6 +++++ .../client/gui/menu/LevelSelectScreen.mapping | 4 ++++ .../client/gui/menu/MultiplayerScreen.mapping | 24 ++++++++++++++++++- .../client/gui/menu/NewLevelScreen.mapping | 1 + .../client/gui/menu/SettingsScreen.mapping | 5 ++++ ...idget.mapping => ButtonListWidget.mapping} | 3 ++- .../options/LogarithmicGameOption.mapping | 1 + 14 files changed, 81 insertions(+), 2 deletions(-) rename mappings/net/minecraft/client/gui/widget/{VideoSettingsListWidget.mapping => ButtonListWidget.mapping} (67%) create mode 100644 mappings/net/minecraft/client/options/LogarithmicGameOption.mapping diff --git a/mappings/net/minecraft/client/gui/menu/AccessibilityScreen.mapping b/mappings/net/minecraft/client/gui/menu/AccessibilityScreen.mapping index 1068b9cdf7..aa21cbbbd1 100644 --- a/mappings/net/minecraft/client/gui/menu/AccessibilityScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/AccessibilityScreen.mapping @@ -1 +1,8 @@ CLASS cyg net/minecraft/client/gui/menu/AccessibilityScreen + FIELD a OPTIONS [Lcve; + FIELD b parent Lczk; + FIELD c gameOptions Lcvf; + FIELD d narratorButton Lcwf; + METHOD (Lczk;Lcvf;)V + ARG 1 parent + ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping index 0559b3f1ce..37e1f90de7 100644 --- a/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/AddServerScreen.mapping @@ -1,7 +1,13 @@ CLASS cyu net/minecraft/client/gui/menu/AddServerScreen FIELD a buttonAdd Lcwh; + FIELD b callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD c serverEntry Ldhh; FIELD d addressField Lcwn; FIELD e serverNameField Lcwn; FIELD f resourcePackOptionButton Lcwh; + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ldhh;)V + ARG 1 callback + ARG 2 serverEntry METHOD a addAndClose ()V + METHOD a onClose (Ljava/lang/String;)V + ARG 1 unused diff --git a/mappings/net/minecraft/client/gui/menu/AlwaysSelectedItemListWidget.mapping b/mappings/net/minecraft/client/gui/menu/AlwaysSelectedItemListWidget.mapping index f1e4dc2dda..771e4d6dab 100644 --- a/mappings/net/minecraft/client/gui/menu/AlwaysSelectedItemListWidget.mapping +++ b/mappings/net/minecraft/client/gui/menu/AlwaysSelectedItemListWidget.mapping @@ -1 +1,2 @@ CLASS cwr net/minecraft/client/gui/menu/AlwaysSelectedItemListWidget + CLASS cwr$a Item diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping index 38c751dc51..267f95308c 100644 --- a/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen.mapping @@ -1,4 +1,19 @@ CLASS cyo net/minecraft/client/gui/menu/CustomizeBuffetLevelScreen CLASS cyo$a BuffetBiomesListWidget CLASS cyo$a$a BuffetBiomeItem + FIELD b biome Lqs; + METHOD (Lcyo$a;Lqs;)V + ARG 2 biome + FIELD a CHUNK_GENERATOR_TYPES Ljava/util/List; FIELD b parent Ldcp; + FIELD c generatorOptionsTag Lib; + FIELD d biomSelectionList Lcyo$a; + FIELD e biomsListLength I + FIELD f confirmButton Lcwh; + METHOD (Ldcp;Lib;)V + ARG 1 parent + ARG 2 generatorOptionsTag + METHOD a refreshConfirmButton ()V + METHOD b initListSelectLogic ()V + METHOD c getGeneratorTag ()Lib; + \ No newline at end of file diff --git a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping index 119c134ed0..84d0eb5e65 100644 --- a/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/CustomizeFlatLevelScreen.mapping @@ -5,7 +5,9 @@ CLASS cyp net/minecraft/client/gui/menu/CustomizeFlatLevelScreen FIELD b config Lcff; FIELD c tileText Ljava/lang/String; FIELD d heightText Ljava/lang/String; + FIELD e layerList Lcyp$a; FIELD f widgetButtonRemoveLayer Lcwh; METHOD (Ldcp;Lib;)V ARG 1 parent + ARG 2 generatorOptionsTag METHOD a getConfigString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping b/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping index d7f8e2c959..10930c3b0f 100644 --- a/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/DirectConnectServerScreen.mapping @@ -2,6 +2,10 @@ CLASS cys net/minecraft/client/gui/menu/DirectConnectServerScreen FIELD a selectServerButton Lcwh; FIELD b serverEntry Ldhh; FIELD c addressField Lcwn; + FIELD d callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ldhh;)V + ARG 1 callback + ARG 2 serverEntry METHOD a saveAndClose ()V METHOD a (Ljava/lang/String;)V ARG 1 text diff --git a/mappings/net/minecraft/client/gui/menu/EditLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/EditLevelScreen.mapping index 83634901e0..6c9d422f5a 100644 --- a/mappings/net/minecraft/client/gui/menu/EditLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/EditLevelScreen.mapping @@ -1,7 +1,11 @@ CLASS dcq net/minecraft/client/gui/menu/EditLevelScreen FIELD a saveButton Lcwh; FIELD b callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; + FIELD c levelNameTextField Lcwn; FIELD d levelName Ljava/lang/String; + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;)V + ARG 1 callback + ARG 2 levelName METHOD a commit ()V METHOD a backupLevel (Lcnw;Ljava/lang/String;)V ARG 0 level diff --git a/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping b/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping index 3eea7a5999..d4f9a37ac9 100644 --- a/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/EndCreditsScreen.mapping @@ -3,3 +3,9 @@ CLASS czq net/minecraft/client/gui/menu/EndCreditsScreen FIELD b MINECRAFT_TITLE_TEXTURE Lqs; FIELD c EDITION_TITLE_TEXTURE Lqs; FIELD d VIGNETTE_TEXTURE Lqs; + FIELD e inGame Z + FIELD f respawn Ljava/lang/Runnable; + METHOD (ZLjava/lang/Runnable;)V + ARG 1 inGame + ARG 2 respawn + METHOD a respawn ()V diff --git a/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping b/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping index fc0fbdc93e..ff08baadbf 100644 --- a/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/LevelSelectScreen.mapping @@ -1,6 +1,7 @@ CLASS dcs net/minecraft/client/gui/menu/LevelSelectScreen FIELD a parent Lczk; FIELD b searchBox Lcwn; + FIELD c tooltipText Ljava/lang/String; FIELD d deleteButton Lcwh; FIELD e selectButton Lcwh; FIELD f editButton Lcwh; @@ -8,3 +9,6 @@ CLASS dcs net/minecraft/client/gui/menu/LevelSelectScreen FIELD h levelList Ldct; METHOD (Lczk;)V ARG 1 parent + METHOD a setTooltip (Ljava/lang/String;)V + ARG 1 value + METHOD a worldSelected (Z)V diff --git a/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping index 23fd3f612e..3f1c09f188 100644 --- a/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/MultiplayerScreen.mapping @@ -2,10 +2,32 @@ CLASS dbp net/minecraft/client/gui/menu/MultiplayerScreen FIELD a serverListWidget Ldbq; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD d parent Lczk; + FIELD e serverList Ldhi; FIELD f buttonEdit Lcwh; - FIELD g buttonSelect Lcwh; + FIELD g buttonJoin Lcwh; FIELD h buttonDelete Lcwh; + FIELD i tooltipText Ljava/lang/String; + FIELD j selectedEntry Ldhh; + FIELD k lanServers Ldxc$b; + FIELD l lanServerDetector Ldxc$a; + FIELD m initialized Z METHOD (Lczk;)V ARG 1 parent + METHOD a connect ()V METHOD a selectEntry (Ldbq$a;)V ARG 1 arg1 + METHOD a connect (Ldhh;)V + ARG 1 entry + METHOD a setTooltipText (Ljava/lang/String;)V + ARG 1 text + METHOD a removeEntry (Z)V + ARG 1 confirmedAction + METHOD b updateButtonActivationState ()V + METHOD b editEntry (Z)V + ARG 1 confirmedAction + METHOD c addEntry (Z)V + ARG 1 confirmedAction + METHOD d getServerList ()Ldhi; + METHOD d directConnectFromSubMenu (Z)V + ARG 1 confirmedAction + METHOD e refresh ()V diff --git a/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping b/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping index ce09f102d1..c3bffc31ef 100644 --- a/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/NewLevelScreen.mapping @@ -1,5 +1,6 @@ CLASS dcp net/minecraft/client/gui/menu/NewLevelScreen FIELD A generatorType I + FIELD a generatorOptionsTag Lib; FIELD b parent Lczk; FIELD c textFieldLevelName Lcwn; FIELD d textFieldSeed Lcwn; diff --git a/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping b/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping index bff0181a46..dab83ed142 100644 --- a/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/SettingsScreen.mapping @@ -7,3 +7,8 @@ CLASS czd net/minecraft/client/gui/menu/SettingsScreen FIELD f difficulty Lagv; METHOD (Lczk;Lcvf;)V ARG 1 parent + ARG 2 gameOptions + METHOD a getDifficultyButtonText (Lagv;)Ljava/lang/String; + ARG 1 difficulty + METHOD a tmp (Z)V + ARG 1 difficultyLocked diff --git a/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping similarity index 67% rename from mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping rename to mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping index 26b77130e4..a5e834d414 100644 --- a/mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping @@ -1,4 +1,4 @@ -CLASS cwt net/minecraft/client/gui/widget/VideoSettingsListWidget +CLASS cwt net/minecraft/client/gui/widget/ButtonListWidget CLASS cwt$a ButtonItem FIELD a buttons Ljava/util/List; METHOD (Lcvb;IIIII)V @@ -8,3 +8,4 @@ CLASS cwt net/minecraft/client/gui/widget/VideoSettingsListWidget ARG 4 top ARG 5 bottom ARG 6 itemHeight + METHOD a addAll ([Lcve;)V diff --git a/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping b/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping new file mode 100644 index 0000000000..a7cf7dc3d2 --- /dev/null +++ b/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping @@ -0,0 +1 @@ +CLASS cva net/minecraft/client/options/LogarithmicGameOption