From 8417dd9ca2dd9247bb8e08f697ed9fcf42bc798b Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 23 Jan 2021 04:39:44 +1100 Subject: [PATCH] client gui (#1975) --- .../gui/hud/InGameOverlayRenderer.mapping | 8 ++++++++ .../client/gui/hud/PlayerListHud.mapping | 5 +++++ .../client/gui/hud/SpectatorHud.mapping | 4 ++++ .../client/gui/hud/SubtitlesHud.mapping | 1 + .../hud/spectator/SpectatorMenuCommand.mapping | 1 + .../hud/spectator/SpectatorMenuState.mapping | 3 +++ .../spectator/TeamTeleportSpectatorMenu.mapping | 2 ++ .../client/gui/screen/CommandSuggestor.mapping | 5 +++++ .../client/gui/screen/ConfirmScreen.mapping | 1 + .../screen/CustomizeBuffetLevelScreen.mapping | 11 +++++++++++ .../gui/screen/CustomizeFlatLevelScreen.mapping | 17 +++++++++++++++++ .../client/gui/screen/FatalErrorScreen.mapping | 1 + .../gui/screen/GameModeSelectionScreen.mapping | 4 ++++ .../gui/screen/LevelLoadingScreen.mapping | 1 + .../client/gui/screen/NoticeScreen.mapping | 3 ++- .../client/gui/screen/PresetsScreen.mapping | 2 ++ .../client/gui/screen/ScreenTexts.mapping | 4 ++++ .../client/gui/screen/StatsScreen.mapping | 15 +++++++++++++++ .../screen/advancement/AdvancementTab.mapping | 3 +++ .../advancement/AdvancementTabType.mapping | 1 + .../advancement/AdvancementWidget.mapping | 3 +++ .../advancement/AdvancementsScreen.mapping | 3 +++ .../ingame/AbstractInventoryScreen.mapping | 4 ++++ .../gui/screen/ingame/BeaconScreen.mapping | 5 +++++ .../gui/screen/ingame/BookEditScreen.mapping | 5 +++++ .../client/gui/screen/ingame/BookScreen.mapping | 1 + .../ingame/CartographyTableScreen.mapping | 1 + .../screen/ingame/CommandBlockScreen.mapping | 2 ++ .../ingame/CreativeInventoryScreen.mapping | 6 ++++++ .../gui/screen/ingame/EnchantingPhrases.mapping | 2 ++ .../gui/screen/ingame/ForgingScreen.mapping | 1 + .../gui/screen/ingame/FurnaceScreen.mapping | 2 +- .../gui/screen/ingame/LecternScreen.mapping | 4 ++-- .../client/gui/screen/ingame/LoomScreen.mapping | 1 + .../gui/screen/ingame/SignEditScreen.mapping | 1 + .../gui/screen/ingame/SmokerScreen.mapping | 2 +- .../gui/screen/ingame/StonecutterScreen.mapping | 1 + .../screen/ingame/StructureBlockScreen.mapping | 2 ++ .../multiplayer/MultiplayerScreen.mapping | 1 + .../MultiplayerServerListWidget.mapping | 2 ++ .../gui/screen/pack/PackListWidget.mapping | 2 ++ .../screen/pack/ResourcePackOrganizer.mapping | 1 + .../recipebook/RecipeAlternativesWidget.mapping | 2 ++ .../recipebook/RecipeBookGhostSlots.mapping | 2 ++ .../screen/recipebook/RecipeBookResults.mapping | 4 ++++ .../screen/recipebook/RecipeBookWidget.mapping | 3 +++ .../gui/screen/world/CreateWorldScreen.mapping | 4 ++++ .../screen/world/EditGameRulesScreen.mapping | 2 ++ .../gui/screen/world/SelectWorldScreen.mapping | 1 + .../gui/tooltip/BundleTooltipComponent.mapping | 1 + .../tooltip/OrderedTextTooltipComponent.mapping | 2 ++ .../gui/widget/AbstractButtonWidget.mapping | 3 +++ .../client/gui/widget/ButtonListWidget.mapping | 1 + .../gui/widget/CyclingButtonWidget.mapping | 6 ++++-- .../gui/widget/DoubleOptionSliderWidget.mapping | 2 ++ .../client/gui/widget/EntryListWidget.mapping | 1 + .../client/gui/widget/SliderWidget.mapping | 1 + .../client/gui/widget/TextFieldWidget.mapping | 2 ++ .../gui/widget/TexturedButtonWidget.mapping | 14 ++++++++++++++ 59 files changed, 188 insertions(+), 7 deletions(-) diff --git a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping index 82fb9d23d6..c859f19638 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping @@ -1,7 +1,15 @@ CLASS net/minecraft/class_4603 net/minecraft/client/gui/hud/InGameOverlayRenderer FIELD field_20986 UNDERWATER_TEXTURE Lnet/minecraft/class_2960; METHOD method_23067 renderOverlays (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_23068 renderInWallOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_1058;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 sprite + ARG 2 matrices METHOD method_23069 renderUnderwaterOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V METHOD method_23070 renderFireOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_24225 getInWallBlockState (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2680; + ARG 0 player diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index 7c0645717b..0461da58c5 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -12,11 +12,16 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; ARG 1 entry METHOD method_1919 render (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V + ARG 1 matrices + ARG 3 scoreboard + ARG 4 objective METHOD method_1920 clear ()V METHOD method_1921 tick (Z)V ARG 1 visible METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILnet/minecraft/class_640;Lnet/minecraft/class_4587;)V + ARG 1 objective METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V + ARG 1 matrices METHOD method_1924 setFooter (Lnet/minecraft/class_2561;)V ARG 1 footer METHOD method_1925 setHeader (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index fefd624b77..22e4c82761 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -7,13 +7,17 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1975 renderSpectatorMenu (Lnet/minecraft/class_4587;FIILnet/minecraft/class_539;)V + ARG 1 matrices METHOD method_1976 cycleSlot (D)V ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 render (Lnet/minecraft/class_4587;F)V + ARG 1 matrices METHOD method_1979 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1980 isOpen ()Z METHOD method_1981 getSpectatorMenuHeight ()F METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_4587;IIFFLnet/minecraft/class_537;)V + ARG 1 matrices METHOD method_1983 useSelectedCommand ()V diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index 36259dbe2d..8b80abd5bd 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud FIELD field_2186 pos Lnet/minecraft/class_243; FIELD field_2188 text Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_359;Lnet/minecraft/class_2561;Lnet/minecraft/class_243;)V + ARG 2 text ARG 3 pos METHOD method_1958 reset (Lnet/minecraft/class_243;)V ARG 1 pos diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index 6ae0600d9b..9c5fbe8829 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD method_2783 use (Lnet/minecraft/class_531;)V ARG 1 menu METHOD method_2784 renderIcon (Lnet/minecraft/class_4587;FI)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuState.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuState.mapping index 08beb1fe18..5a4f491371 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuState.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuState.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_539 net/minecraft/client/gui/hud/spectator/SpectatorMenuState FIELD field_3269 selectedSlot I FIELD field_3271 commands Ljava/util/List; + METHOD (Ljava/util/List;I)V + ARG 1 commands + ARG 2 selectedSlot METHOD method_2786 getCommand (I)Lnet/minecraft/class_537; ARG 1 slot METHOD method_2787 getSelectedSlot ()I diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping index bca8767f64..f7c5966f69 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_540 net/minecraft/client/gui/hud/spectator/TeamTelepor FIELD field_3274 scoreboardEntries Ljava/util/List; FIELD field_3275 team Lnet/minecraft/class_268; FIELD field_3276 skinId Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_540;Lnet/minecraft/class_268;)V + ARG 2 team diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping index f606a86a8d..6920653916 100644 --- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor FIELD field_21612 window Lnet/minecraft/class_4717$class_464; FIELD field_21613 windowActive Z FIELD field_21614 completingSuggestions Z + FIELD field_25885 RED_FORMAT Lnet/minecraft/class_2583; + FIELD field_25886 GRAY_FORMAT Lnet/minecraft/class_2583; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_342;Lnet/minecraft/class_327;ZZIIZI)V ARG 1 client ARG 2 owner @@ -38,6 +40,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 3 mouseY ARG 5 button METHOD method_23923 render (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_23924 keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode @@ -60,6 +63,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 0 original ARG 1 suggestion METHOD method_23937 show ()V + METHOD method_23958 getNarration ()Ljava/lang/String; CLASS class_464 SuggestionWindow FIELD field_21630 lastNarrationIndex I FIELD field_2765 completed Z @@ -82,6 +86,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 2 y ARG 3 button METHOD method_2373 render (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2374 select (I)V ARG 1 index METHOD method_2375 complete ()V diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index b8d4174188..ee2e2f404a 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -16,3 +16,4 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen ARG 4 yesTranslated ARG 5 noTranslated METHOD method_2125 disableButtons (I)V + ARG 1 ticks diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index 76556bf20e..6da824724a 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -1,7 +1,18 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen FIELD field_2438 confirmButton Lnet/minecraft/class_4185; FIELD field_2441 biomeSelectionList Lnet/minecraft/class_415$class_4190; + FIELD field_24562 parent Lnet/minecraft/class_437; + FIELD field_25040 biome Lnet/minecraft/class_1959; + FIELD field_25888 biomeRegistry Lnet/minecraft/class_2378; FIELD field_26535 BUFFET_BIOME_TEXT Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_5455;Ljava/util/function/Consumer;Lnet/minecraft/class_1959;)V + ARG 1 parent + ARG 4 biome METHOD method_2151 refreshConfirmButton ()V CLASS class_4190 BuffetBiomesListWidget + FIELD field_18736 screen Lnet/minecraft/class_415; CLASS class_4191 BuffetBiomeItem + FIELD field_24564 biome Lnet/minecraft/class_1959; + FIELD field_26536 text Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_1959;)V + ARG 2 biome diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping index 3388069c3d..4f9f09a6e7 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping @@ -5,5 +5,22 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/CustomizeFlatLevel FIELD field_2422 parent Lnet/minecraft/class_525; FIELD field_2424 layers Lnet/minecraft/class_413$class_4192; FIELD field_2425 heightText Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_525;Ljava/util/function/Consumer;Lnet/minecraft/class_3232;)V + ARG 1 parent + ARG 3 config + METHOD method_2145 updateRemoveLayerButton ()V + METHOD method_2147 hasLayerSelected ()Z + METHOD method_29054 setConfig (Lnet/minecraft/class_3232;)V + ARG 1 config + METHOD method_29055 getConfig ()Lnet/minecraft/class_3232; CLASS class_4192 SuperflatLayersListWidget CLASS class_4193 SuperflatLayerItem + METHOD method_19373 (Lnet/minecraft/class_4587;II)V + ARG 1 matrices + ARG 2 x + ARG 3 y + METHOD method_19375 renderItemStack (Lnet/minecraft/class_4587;IILnet/minecraft/class_1799;)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 stack diff --git a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping index afb1e3964c..0558269bea 100644 --- a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_421 net/minecraft/client/gui/screen/FatalErrorScreen FIELD field_2467 message Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 title + ARG 2 message diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping index 91a73cb7cb..7815cf4e35 100644 --- a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping @@ -13,16 +13,19 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection ARG 1 gameMode METHOD method_28068 apply ()V METHOD method_28069 checkForClose ()Z + METHOD method_30106 getPreviousGameMode ()Lnet/minecraft/class_1934; CLASS class_5290 GameMode FIELD field_24580 VALUES [Lnet/minecraft/class_5289$class_5290; FIELD field_24581 text Lnet/minecraft/class_2561; FIELD field_24582 command Ljava/lang/String; FIELD field_24583 icon Lnet/minecraft/class_1799; METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_1799;)V + ARG 3 text ARG 4 command ARG 5 icon METHOD method_28070 getText ()Lnet/minecraft/class_2561; METHOD method_28074 renderIcon (Lnet/minecraft/class_918;II)V + ARG 1 itemRenderer ARG 2 x ARG 3 y METHOD method_28075 getCommand ()Ljava/lang/String; @@ -32,6 +35,7 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290; FIELD field_24587 selected Z METHOD (Lnet/minecraft/class_5289;Lnet/minecraft/class_5289$class_5290;II)V + ARG 2 gameMode ARG 3 x ARG 4 y METHOD method_28080 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index dffbdeac75..7d7500d7ac 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree METHOD method_17537 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map METHOD method_17538 drawChunkMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_3953;IIII)V + ARG 0 matrices diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping index 5279ebcc42..78299b9bb9 100644 --- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen FIELD field_2345 actionHandler Ljava/lang/Runnable; FIELD field_2346 notice Lnet/minecraft/class_2561; FIELD field_2348 noticeLines Lnet/minecraft/class_5489; - FIELD field_2349 buttonString Lnet/minecraft/class_2561; + FIELD field_2349 buttonText Lnet/minecraft/class_2561; METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 actionHandler ARG 2 title @@ -11,3 +11,4 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen ARG 1 actionHandler ARG 2 title ARG 3 notice + ARG 4 buttonText diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index f737fdaec5..1cef6b9783 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen + FIELD field_25044 config Lnet/minecraft/class_3232; FIELD field_2518 PRESETS Ljava/util/List; FIELD field_2519 parent Lnet/minecraft/class_413; FIELD field_2520 shareText Lnet/minecraft/class_2561; @@ -6,6 +7,7 @@ CLASS net/minecraft/class_430 net/minecraft/client/gui/screen/PresetsScreen FIELD field_2523 customPresetField Lnet/minecraft/class_342; FIELD field_2524 listText Lnet/minecraft/class_2561; FIELD field_2525 selectPresetButton Lnet/minecraft/class_4185; + FIELD field_27985 BIOME_KEY Lnet/minecraft/class_5321; METHOD (Lnet/minecraft/class_413;)V ARG 1 parent METHOD method_20102 updateSelectButton (Z)V diff --git a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping index 3a5e2bf630..8292bc71aa 100644 --- a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping @@ -9,4 +9,8 @@ CLASS net/minecraft/class_5244 net/minecraft/client/gui/screen/ScreenTexts FIELD field_24339 BACK Lnet/minecraft/class_2561; FIELD field_26625 CONNECT_FAILED Lnet/minecraft/class_2561; METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; + ARG 0 text + ARG 1 value + METHOD method_32700 composeGenericOptionText (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + ARG 0 text ARG 1 value diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 72561e23f2..49a748f8d7 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -16,12 +16,18 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen METHOD method_2267 createButtons ()V METHOD method_2270 createLists ()V METHOD method_2282 renderIcon (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_2285 getColumnX (I)I ARG 1 index METHOD method_2289 renderStatItem (Lnet/minecraft/class_4587;IILnet/minecraft/class_1792;)V + ARG 1 matrices + ARG 4 item + METHOD method_27027 getStatString (Lnet/minecraft/class_3445;)Ljava/lang/String; + ARG 0 stat CLASS class_4198 GeneralStatsListWidget CLASS class_4197 Entry FIELD field_18749 stat Lnet/minecraft/class_3445; + FIELD field_26547 text Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_447$class_4198;Lnet/minecraft/class_3445;)V ARG 2 stat CLASS class_4200 ItemStatsListWidget @@ -37,6 +43,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561; ARG 1 item METHOD method_19407 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + ARG 1 matrices METHOD method_19408 selectStatType (Lnet/minecraft/class_3448;)V ARG 1 statType METHOD method_19409 getHeaderIndex (Lnet/minecraft/class_3448;)I @@ -46,6 +53,14 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen CLASS class_450 ItemComparator CLASS class_4199 Entry METHOD method_19405 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_3445;IIZ)V + ARG 1 matrices CLASS class_4202 EntityStatsListWidget CLASS class_4201 Entry FIELD field_18762 entityType Lnet/minecraft/class_1299; + FIELD field_26548 entityTypeName Lnet/minecraft/class_2561; + FIELD field_26549 killedText Lnet/minecraft/class_2561; + FIELD field_26550 killedAny Z + FIELD field_26551 killedByText Lnet/minecraft/class_2561; + FIELD field_26552 killedByAny Z + METHOD (Lnet/minecraft/class_447$class_4202;Lnet/minecraft/class_1299;)V + ARG 2 entityType diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index c96ca41c3e..a4b370c9be 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -29,12 +29,15 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc ARG 1 advancement METHOD method_2309 getTitle ()Lnet/minecraft/class_2561; METHOD method_2310 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_2311 drawBackground (Lnet/minecraft/class_4587;IIZ)V + ARG 1 matrices METHOD method_2312 getScreen ()Lnet/minecraft/class_457; METHOD method_2313 move (DD)V ARG 1 offsetX ARG 3 offsetY METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index fec5b68c77..c7ef96af78 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc ARG 6 height ARG 7 tabCount METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;IIZI)V + ARG 1 matrices METHOD method_2302 getTabX (I)I ARG 1 index METHOD method_2303 isClickOnTab (IIIDD)Z diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 7fe86af3e7..6725df8fe8 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -20,7 +20,9 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2322 addChild (Lnet/minecraft/class_456;)V ARG 1 widget METHOD method_2323 renderLines (Lnet/minecraft/class_4587;IIZ)V + ARG 1 matrices METHOD method_2325 renderWidgets (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2326 getY ()I METHOD method_2327 getX ()I METHOD method_2328 getParent (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; @@ -33,6 +35,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2330 wrapDescription (Lnet/minecraft/class_2561;I)Ljava/util/List; ARG 2 width METHOD method_2331 drawTooltip (Lnet/minecraft/class_4587;IIFII)V + ARG 1 matrices ARG 5 y METHOD method_2332 addToTree ()V METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index e6cd21f25e..0021d74fe4 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -11,10 +11,13 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc METHOD (Lnet/minecraft/class_632;)V ARG 1 advancementHandler METHOD method_2334 drawWidgets (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; ARG 1 advancement METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices ARG 2 mouseY METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index c3d1fa378f..902766ca2d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen FIELD field_2900 drawStatusEffects Z METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_2476 applyStatusEffectOffset ()V METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 9e2ddd4e25..08096a385f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -21,18 +21,23 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree CLASS class_469 EffectButtonWidget FIELD field_17416 primary Z FIELD field_18223 sprite Lnet/minecraft/class_1058; + FIELD field_26562 text Lnet/minecraft/class_2561; FIELD field_2813 effect Lnet/minecraft/class_1291; METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;Z)V ARG 2 x ARG 3 y ARG 4 statusEffect ARG 5 primary + METHOD method_30902 getTextForEffect (Lnet/minecraft/class_1291;Z)Lnet/minecraft/class_2561; + ARG 1 effect + ARG 2 primary CLASS class_470 BaseButtonWidget FIELD field_2815 disabled Z METHOD (II)V ARG 1 x ARG 2 y METHOD method_18641 renderExtra (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index 7bc4c8301b..8fe4c6fcb5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2848 doneButton Lnet/minecraft/class_4185; FIELD field_2849 cancelButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V + ARG 1 player ARG 2 itemStack ARG 3 hand METHOD method_17046 countPages ()I @@ -44,6 +45,9 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_27576 getPageContent ()Lnet/minecraft/class_473$class_5233; METHOD method_27577 invalidatePageContent ()V METHOD method_27578 createPageContent ()Lnet/minecraft/class_473$class_5233; + METHOD method_27584 setClipboard (Ljava/lang/String;)V + ARG 1 clipboard + METHOD method_27595 getClipboard ()Ljava/lang/String; CLASS class_475 Line FIELD field_24278 style Lnet/minecraft/class_2583; FIELD field_24279 content Ljava/lang/String; @@ -51,6 +55,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_2853 y I FIELD field_2854 x I METHOD (Lnet/minecraft/class_2583;Ljava/lang/String;II)V + ARG 1 style ARG 2 content ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index 70ea4c2cd3..71c2310e68 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD (Lnet/minecraft/class_3872$class_3931;)V ARG 1 pageProvider METHOD (Lnet/minecraft/class_3872$class_3931;Z)V + ARG 1 contents ARG 2 playPageTurnSound METHOD method_17048 getTextAt (DD)Lnet/minecraft/class_2583; ARG 1 x diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index 56f31e233c..c6879f89d7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 3 title METHOD method_17566 drawMap (Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V METHOD method_17567 drawMap (Lnet/minecraft/class_4587;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping index 18b1d83356..05ae42f5a9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CommandBlockScreen.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_477 net/minecraft/client/gui/screen/ingame/CommandBloc METHOD (Lnet/minecraft/class_2593;)V ARG 1 blockEntity METHOD method_2457 updateCommandBlock ()V + METHOD method_32647 setButtonsActive (Z)V + ARG 1 active diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index c3980a92d2..bf8c428446 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -32,13 +32,19 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 1 mouseX ARG 3 mouseY METHOD method_2468 renderTabIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;)V + ARG 1 matrices + ARG 2 group METHOD method_2469 getSelectedTab ()I METHOD method_2470 isCreativeInventorySlot (Lnet/minecraft/class_1735;)Z ARG 1 slot METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;II)Z + ARG 1 matrices + ARG 2 group CLASS class_482 LockableSlot CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; + METHOD (Lnet/minecraft/class_1657;)V + ARG 1 player METHOD method_2473 scrollItems (F)V ARG 1 position METHOD method_2474 shouldShowScrollbar ()Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping index c9da9540b5..074cb499de 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_487 net/minecraft/client/gui/screen/ingame/EnchantingPhrases + FIELD field_24283 FONT_ID Lnet/minecraft/class_2960; + FIELD field_24284 STYLE Lnet/minecraft/class_2583; FIELD field_2916 phrases [Ljava/lang/String; FIELD field_2917 INSTANCE Lnet/minecraft/class_487; FIELD field_2918 random Ljava/util/Random; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 5c897f086c..0f7fcc4b57 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScr ARG 3 title ARG 4 texture METHOD method_25444 renderForeground (Lnet/minecraft/class_4587;IIF)V + ARG 1 matrices ARG 2 mouseY METHOD method_25445 setup ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping index 2ef47d7a6b..864f4b9a29 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3873 net/minecraft/client/gui/screen/ingame/FurnaceScreen FIELD field_17127 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3858;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping index f4b16cc6db..eae629a13a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3935 net/minecraft/client/gui/screen/ingame/LecternScreen - FIELD field_17422 container Lnet/minecraft/class_3916; + FIELD field_17422 handler Lnet/minecraft/class_3916; FIELD field_17423 listener Lnet/minecraft/class_1712; METHOD (Lnet/minecraft/class_3916;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_17572 sendButtonPressPacket (I)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 8b6a6a6b58..83284de353 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2968 scrollPosition F FIELD field_2970 firstPatternButtonId I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V + ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping index e381207e3f..a04e362b06 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SignEditScreen.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_498 net/minecraft/client/gui/screen/ingame/SignEditScreen FIELD field_21525 model Lnet/minecraft/class_837$class_4702; FIELD field_24285 text [Ljava/lang/String; + FIELD field_27390 signType Lnet/minecraft/class_4719; FIELD field_3029 currentRow I FIELD field_3030 ticksSinceOpened I FIELD field_3031 sign Lnet/minecraft/class_2625; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping index 88de42e268..15efd474d4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3874 net/minecraft/client/gui/screen/ingame/SmokerScreen FIELD field_17128 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 2f5f6acf26..b7f086f831 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte ARG 2 y ARG 3 scrollOffset METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V + ARG 1 matrices METHOD method_17953 getMaxScroll ()I METHOD method_17954 shouldScroll ()Z METHOD method_17955 onInventoryChange ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping index d094eddd5b..d8bff84b4b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_497 net/minecraft/client/gui/screen/ingame/StructureBl FIELD field_26578 DETECT_SIZE_TEXT Lnet/minecraft/class_2561; FIELD field_26579 SHOW_AIR_TEXT Lnet/minecraft/class_2561; FIELD field_26580 SHOW_BOUNDING_BOX_TEXT Lnet/minecraft/class_2561; + FIELD field_27993 MODES Lcom/google/common/collect/ImmutableList; + FIELD field_27994 MODES_EXCEPT_DATA Lcom/google/common/collect/ImmutableList; FIELD field_2978 inputSizeZ Lnet/minecraft/class_342; FIELD field_2979 buttonMirror Lnet/minecraft/class_5676; FIELD field_2980 structureBlock Lnet/minecraft/class_2633; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index d2c4b5d642..18a881e3a6 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction METHOD method_2528 setTooltip (Ljava/util/List;)V + ARG 1 tooltipText METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 4ba6b486bb..2881ccc56e 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -53,6 +53,8 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi ARG 3 server METHOD method_20133 getServer ()Lnet/minecraft/class_642; METHOD method_20134 draw (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V + ARG 1 matrices METHOD method_22110 swapEntries (II)V ARG 1 i ARG 2 j + METHOD method_29978 saveFile ()V diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping index 84c4823d5e..6e87f23d0a 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackListWidget.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/pack/PackListWidge FIELD field_19130 widget Lnet/minecraft/class_521; FIELD field_25476 screen Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_521;Lnet/minecraft/class_437;Lnet/minecraft/class_5369$class_5371;)V + ARG 1 client ARG 2 widget ARG 3 screen + ARG 4 pack METHOD method_20152 isSelectable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping index 7064208bc9..88cf6ed7f3 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack FIELD field_25626 resourcePackManager Lnet/minecraft/class_3283; METHOD (Ljava/lang/Runnable;Ljava/util/function/Function;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V ARG 1 updateCallback + ARG 3 resourcePackManager METHOD method_29639 getDisabledPacks ()Ljava/util/stream/Stream; METHOD method_29642 apply ()V METHOD method_29643 getEnabledPacks ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index 1213697081..a2d9de104d 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 6 areaCenterY ARG 7 delta METHOD method_2618 renderGrid (Lnet/minecraft/class_4587;IIIIII)V + ARG 1 matrices CLASS class_509 AlternativeButtonWidget FIELD field_3114 recipe Lnet/minecraft/class_1860; FIELD field_3115 craftable Z @@ -33,6 +34,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 4 recipe ARG 5 craftable METHOD method_2619 alignRecipe (Lnet/minecraft/class_1860;)V + ARG 1 recipe CLASS class_510 InputSlot FIELD field_3118 x I FIELD field_3119 y I diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index 413d763c59..902db1abc7 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 recipe METHOD method_2566 getRecipe ()Lnet/minecraft/class_1860; METHOD method_2567 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;IIZF)V + ARG 1 matrices + ARG 2 client METHOD method_2569 addSlot (Lnet/minecraft/class_1856;II)V ARG 1 ingredient ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping index dadd15ec66..2e9ea6c1f3 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping @@ -17,7 +17,9 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2627 setResults (Ljava/util/List;Z)V ARG 2 resetCurrentPage METHOD method_2628 drawTooltip (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V + ARG 1 recipes METHOD method_2630 setGui (Lnet/minecraft/class_507;)V METHOD method_2631 getLastClickedRecipe ()Lnet/minecraft/class_1860; METHOD method_2632 mouseClicked (DDIIIII)Z @@ -30,8 +32,10 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 9 areaHeight METHOD method_2633 getRecipeBook ()Lnet/minecraft/class_3439; METHOD method_2634 draw (Lnet/minecraft/class_4587;IIIIF)V + ARG 1 matrices METHOD method_2635 getLastClickedResults ()Lnet/minecraft/class_516; METHOD method_2636 initialize (Lnet/minecraft/class_310;II)V + ARG 1 client ARG 2 parentLeft ARG 3 parentTop METHOD method_2637 getMinecraftClient ()Lnet/minecraft/class_310; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index b4ae8a89df..809ae12403 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2579 reset (Z)V ARG 1 narrow METHOD method_2581 drawGhostSlots (Lnet/minecraft/class_4587;IIZF)V + ARG 1 matrices METHOD method_2585 setBookButtonTexture ()V METHOD method_2586 refreshSearchResults ()V METHOD method_2587 refreshInputs ()V @@ -52,7 +53,9 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V ARG 1 slot METHOD method_2601 drawTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_2602 drawGhostSlotTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_2603 refreshResults (Z)V ARG 1 resetCurrentPage METHOD method_2604 isWide ()Z diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index c94c187e6a..abb81097c9 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 2 dataPackSettings ARG 3 moreOptionsDialog METHOD method_22365 tweakDefaultsTo (Lnet/minecraft/class_525$class_4539;)V + ARG 1 mode METHOD method_2710 setMoreOptionsOpen (Z)V ARG 1 moreOptionsOpen METHOD method_2721 toggleMoreOptions ()V @@ -54,10 +55,13 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS ARG 1 button METHOD method_31130 create (Lnet/minecraft/class_437;)Lnet/minecraft/class_525; ARG 0 parent + METHOD method_32672 getDifficulty ()Lnet/minecraft/class_1267; CLASS class_4539 Mode FIELD field_20628 translationSuffix Ljava/lang/String; FIELD field_20629 defaultGameMode Lnet/minecraft/class_1934; + FIELD field_27999 text Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1934;)V ARG 3 translationSuffix ARG 4 defaultGameMode + METHOD method_32673 asText ()Lnet/minecraft/class_2561; CLASS class_5376 WorldCreationException diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index a2d869c789..cb5c1a72a0 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -43,6 +43,8 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul METHOD (Lnet/minecraft/class_5235;Ljava/util/List;)V ARG 2 description CLASS class_5241 RuleListWidget + METHOD (Lnet/minecraft/class_5235;Lnet/minecraft/class_1928;)V + ARG 2 gameRules CLASS 1 METHOD method_27640 createRuleWidget (Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_5235$class_5238;)V ARG 1 key diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index b8521d96f3..2b63e2a35a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS METHOD method_19940 worldSelected (Z)V ARG 1 active METHOD method_2739 setTooltip (Ljava/util/List;)V + ARG 1 tooltipText diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index d3dc8d92d8..9293689d17 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipComponent FIELD field_27995 inventory Lnet/minecraft/class_2371; + FIELD field_28359 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping index 58b5cb8bf0..dc232195ed 100644 --- a/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_5683 net/minecraft/client/gui/tooltip/OrderedTextTooltipComponent FIELD field_27997 text Lnet/minecraft/class_5481; + METHOD (Lnet/minecraft/class_5481;)V + ARG 1 text diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping index b807d8ef47..60ea33ca49 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg METHOD method_25354 playDownSound (Lnet/minecraft/class_1144;)V ARG 1 soundManager METHOD method_25355 setMessage (Lnet/minecraft/class_2561;)V + ARG 1 message METHOD method_25356 getYImage (Z)I ARG 1 hovered METHOD method_25357 onRelease (DD)V @@ -69,3 +70,5 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg METHOD method_25368 getWidth ()I METHOD method_25369 getMessage ()Lnet/minecraft/class_2561; METHOD method_25370 isFocused ()Z + METHOD method_32602 getNarrationMessage (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + ARG 0 message diff --git a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping index 686fcfead5..d2ad1ba22f 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget ARG 1 mouseX ARG 3 mouseY METHOD method_31046 getButtonFor (Lnet/minecraft/class_316;)Lnet/minecraft/class_339; + ARG 1 option CLASS class_354 ButtonEntry FIELD field_18214 buttons Ljava/util/List; METHOD method_18622 (ILnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V diff --git a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping index ffad1de414..d14447faa5 100644 --- a/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/CyclingButtonWidget.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidget + FIELD field_27961 HAS_ALT_DOWN Ljava/util/function/BooleanSupplier; + FIELD field_27962 BOOLEAN_VALUES Ljava/util/List; FIELD field_27964 index I FIELD field_27965 value Ljava/lang/Object; METHOD (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILjava/lang/Object;Lnet/minecraft/class_5676$class_5680;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/class_5676$class_5678;Lnet/minecraft/class_5676$class_5679;Z)V @@ -7,13 +9,13 @@ CLASS net/minecraft/class_5676 net/minecraft/client/gui/widget/CyclingButtonWidg METHOD method_32603 getValue ()Ljava/lang/Object; METHOD method_32604 (Ljava/lang/Boolean;)Lnet/minecraft/class_2561; ARG 0 value - METHOD method_32605 (Ljava/lang/Object;)V + METHOD method_32605 setValue (Ljava/lang/Object;)V ARG 1 value METHOD method_32608 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; ARG 2 value METHOD method_32609 (Ljava/lang/Object;)V ARG 1 value - METHOD method_32610 (Ljava/lang/Object;)Lnet/minecraft/class_5250; + METHOD method_32610 getGenericTextForValue (Ljava/lang/Object;)Lnet/minecraft/class_5250; ARG 1 value METHOD method_32612 cycle (I)V ARG 1 amount diff --git a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping index 78da25452e..4adb3b9154 100644 --- a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSliderWidget FIELD field_18012 option Lnet/minecraft/class_4067; + FIELD field_27984 orderedTooltip Ljava/util/List; METHOD (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;Ljava/util/List;)V ARG 1 gameOptions ARG 2 x @@ -7,3 +8,4 @@ CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSlide ARG 4 width ARG 5 height ARG 6 option + ARG 7 ordererTooltip diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 4ab8f2875c..1d8be13558 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25319 getRowBottom (I)I ARG 1 index METHOD method_25320 renderDecorations (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_25321 addEntry (Lnet/minecraft/class_350$class_351;)I ARG 1 entry METHOD method_25322 getRowWidth ()I diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 2ba98be7e5..ec4f1ac562 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget ARG 2 y ARG 3 width ARG 4 height + ARG 5 text ARG 6 value METHOD method_25344 applyValue ()V METHOD method_25345 setValueFromMouse (D)V diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index eeb1751a4a..3cf87e7954 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 3 y ARG 4 width ARG 5 height + ARG 6 text METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_342;Lnet/minecraft/class_2561;)V ARG 1 textRenderer ARG 2 x @@ -29,6 +30,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 4 width ARG 5 height ARG 6 copyFrom + ARG 7 text METHOD method_16872 setX (I)V ARG 1 x METHOD method_16873 erase (I)V diff --git a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping index ad2a7f2c4a..7c71e69a2a 100644 --- a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping @@ -17,6 +17,19 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg ARG 9 textureWidth ARG 10 textureHeight ARG 11 pressAction + METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 width + ARG 4 height + ARG 5 u + ARG 6 v + ARG 7 hoveredVOffset + ARG 8 texture + ARG 9 textureWidth + ARG 10 textureHeight + ARG 11 pressAction + ARG 12 text METHOD (IIIIIIILnet/minecraft/class_2960;IILnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_5316;Lnet/minecraft/class_2561;)V ARG 1 x ARG 2 y @@ -29,6 +42,7 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg ARG 9 textureWidth ARG 10 textureHeight ARG 11 pressAction + ARG 13 text METHOD (IIIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y