From 8c37c3e68fe16642492bbf73c8358a00e5340f36 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 27 Jun 2019 19:48:47 +0800 Subject: [PATCH] Hud and Screen related changes --- .../client/gui/hud/BossBarHud.mapping | 4 ++-- .../minecraft/client/gui/hud/ChatHud.mapping | 14 ++++++++++++-- .../minecraft/client/gui/hud/DebugHud.mapping | 6 +++--- .../client/gui/hud/InGameHud.mapping | 5 +++-- .../client/gui/hud/PlayerListHud.mapping | 9 ++++++++- .../client/gui/hud/SpectatorHud.mapping | 9 +++++---- .../client/gui/hud/SubtitlesHud.mapping | 8 +++++++- .../spectator/SpectatorMenuCommand.mapping | 2 +- .../client/gui/screen/AddServerScreen.mapping | 1 + .../client/gui/screen/ChatScreen.mapping | 5 +++++ .../client/gui/screen/ConfirmScreen.mapping | 5 +++++ .../client/gui/screen/ConnectScreen.mapping | 13 +++++++++++++ .../gui/screen/LanguageOptionsScreen.mapping | 2 +- .../gui/screen/LevelLoadingScreen.mapping | 4 ++++ .../gui/screen/MouseOptionsScreen.mapping | 2 ++ .../client/gui/screen/PauseScreen.mapping | 1 + .../client/gui/screen/PresetsScreen.mapping | 19 ++++++++++++++++++- .../client/gui/widget/EntryListWidget.mapping | 2 +- .../client/util/TextComponentUtil.mapping | 2 +- 19 files changed, 93 insertions(+), 20 deletions(-) diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index fabae89cd4..a1d1b99b37 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -4,8 +4,8 @@ CLASS cwt net/minecraft/client/gui/hud/BossBarHud FIELD c bossBars Ljava/util/Map; METHOD (Lcvo;)V ARG 1 client - METHOD a draw ()V - METHOD a drawBossBar (IILagw;)V + METHOD a render ()V + METHOD a renderBossBar (IILagw;)V ARG 1 x ARG 2 y ARG 3 bossBar diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index f15328ac1e..f3b0e19a57 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -4,29 +4,39 @@ CLASS cwv net/minecraft/client/gui/hud/ChatHud FIELD c messageHistory Ljava/util/List; FIELD d messages Ljava/util/List; FIELD e visibleMessages Ljava/util/List; + FIELD f scrolledLines I METHOD (Lcvo;)V ARG 1 client METHOD a reset ()V + METHOD a scroll (D)V + ARG 1 amount METHOD a getText (DD)Ljn; ARG 1 x ARG 3 y - METHOD a draw (I)V + METHOD a render (I)V + ARG 1 timestamp METHOD a addToMessageHistory (Ljava/lang/String;)V ARG 1 message METHOD a addMessage (Ljn;)V ARG 1 message METHOD a addMessage (Ljn;I)V ARG 1 message + ARG 2 messageId METHOD a addMessage (Ljn;IIZ)V + ARG 1 message + ARG 2 messageId + ARG 3 timestamp METHOD a clear (Z)V + ARG 1 clearHistory METHOD b getMessageHistory ()Ljava/util/List; METHOD b getWidth (D)I ARG 0 widthOption METHOD b removeMessage (I)V + ARG 1 messageId METHOD c getHeight (D)I ARG 0 heightOption METHOD d isChatFocused ()Z METHOD e getWidth ()I METHOD f getHeight ()I - METHOD g getScale ()D + METHOD g getChatScale ()D METHOD h getVisibleLineCount ()I diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index ad428005de..98d011f1eb 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -20,9 +20,9 @@ CLASS cwz net/minecraft/client/gui/hud/DebugHud ARG 2 startY ARG 3 firstSample ARG 4 isClient - METHOD b draw ()V - METHOD c drawLeftText ()V - METHOD d drawRightText ()V + METHOD b render ()V + METHOD c renderLeftText ()V + METHOD d renderRightText ()V METHOD e getLeftText ()Ljava/util/List; METHOD f getRightText ()Ljava/util/List; METHOD h getWorld ()Lbhm; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index d69a3a049c..2a375f90f1 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -29,7 +29,8 @@ CLASS cwh net/minecraft/client/gui/hud/InGameHud METHOD (Lcvo;)V ARG 1 client METHOD a setDefaultTitleFade ()V - METHOD a draw (F)V + METHOD a render (F)V + ARG 1 tickDelta METHOD a renderMountJumpBar (I)V METHOD a renderHotbarItem (IIFLawb;Lbce;)V METHOD a shouldRenderSpectatorCrosshair (Lcrz;)Z @@ -59,5 +60,5 @@ CLASS cwh net/minecraft/client/gui/hud/InGameHud METHOD o getCameraPlayer ()Lawb; METHOD p getRiddenEntity ()Laiu; METHOD q renderStatusBars ()V - METHOD r drawMountHealth ()V + METHOD r renderMountHealth ()V METHOD s renderPumpkinOverlay ()V diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index 086595cc02..3914e6aa05 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -11,9 +11,16 @@ CLASS cxh net/minecraft/client/gui/hud/PlayerListHud ARG 1 client ARG 2 inGameHud METHOD a clear ()V - METHOD a draw (ILctb;Lcsy;)V + METHOD a renderLatencyIcon (IIILdhs;)V + ARG 3 y + ARG 4 playerEntry + METHOD a render (ILctb;Lcsy;)V + ARG 1 width ARG 2 scoreboard ARG 3 playerListScoreboardObjective + METHOD a renderScoreboardObjective (Lcsy;ILjava/lang/String;IILdhs;)V + METHOD a getPlayerName (Ldhs;)Ljn; + ARG 1 playerEntry METHOD a setFooter (Ljn;)V ARG 1 footer METHOD a tick (Z)V diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index e6e0d0ba59..cf97201f98 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -6,15 +6,16 @@ CLASS cxt net/minecraft/client/gui/hud/SpectatorHud FIELD e spectatorMenu Lddk; METHOD (Lcvo;)V ARG 1 client - METHOD a draw ()V - METHOD a draw (F)V - METHOD a drawSpectatorMenu (FIILddo;)V + METHOD a render ()V + METHOD a render (F)V + ARG 1 tickDelta + METHOD a renderSpectatorMenu (FIILddo;)V ARG 1 height ARG 2 x ARG 4 state METHOD a onHotbarKeyPress (I)V ARG 1 slot - METHOD a drawSpectatorCommand (IIFFLddm;)V + METHOD a renderSpectatorCommand (IIFFLddm;)V ARG 1 slot ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index c47a3758ab..0ae4f0713a 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -3,11 +3,17 @@ CLASS cxl net/minecraft/client/gui/hud/SubtitlesHud FIELD b text Ljava/lang/String; FIELD c time J FIELD d pos Lcsb; + METHOD (Lcxl;Ljava/lang/String;Lcsb;)V + ARG 2 text + ARG 3 pos METHOD a getText ()Ljava/lang/String; METHOD a reset (Lcsb;)V + ARG 1 pos METHOD b getTime ()J METHOD c getPosition ()Lcsb; FIELD a client Lcvo; FIELD b entries Ljava/util/List; FIELD c enabled Z - METHOD a draw ()V + METHOD (Lcvo;)V + ARG 1 client + METHOD a render ()V diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index 84810f083a..8da1c9a49c 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -5,4 +5,4 @@ CLASS ddm net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand ARG 2 alpha METHOD a use (Lddk;)V ARG 1 menu - METHOD aa_ enabled ()Z + METHOD aa_ isEnabled ()Z diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index 93bf42060d..5b8b98d6be 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -5,6 +5,7 @@ CLASS czh net/minecraft/client/gui/screen/AddServerScreen FIELD d addressField Lcxa; FIELD e serverNameField Lcxa; FIELD f resourcePackOptionButton Lcwu; + FIELD g addressTextFilter Ljava/util/function/Predicate; METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ldhu;)V ARG 1 callback ARG 2 serverEntry diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index da45c32e3f..a8750ca242 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -36,11 +36,16 @@ CLASS cyx net/minecraft/client/gui/screen/ChatScreen FIELD c commandExceptionsX I FIELD d commandExceptionsWidth I FIELD e WHITESPACE_PATTERN Ljava/util/regex/Pattern; + FIELD g messageHistorySize I + FIELD h originalChatText Ljava/lang/String; FIELD i parseResults Lcom/mojang/brigadier/ParseResults; FIELD j suggestionsFuture Ljava/util/concurrent/CompletableFuture; FIELD k suggestionsWindow Lcyx$a; FIELD m completingSuggestion Z + METHOD (Ljava/lang/String;)V + ARG 1 originalChatText METHOD a showSuggestions ()V + METHOD a setChatFromHistory (I)V METHOD a getRenderText (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;I)Ljava/lang/String; ARG 0 parseResults ARG 1 typedText diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index db9f43e2a7..2ea3c1f6b6 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -5,6 +5,11 @@ CLASS cyz net/minecraft/client/gui/screen/ConfirmScreen FIELD d message Ljn; FIELD e messageSplit Ljava/util/List; FIELD f buttonEnableTimer I + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljn;Ljn;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 callback + ARG 3 message + ARG 4 yesTranslated + ARG 5 noTranslated METHOD a disableButtons (I)V METHOD keyPressed (III)Z ARG 1 keyCode diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping index 38a842d129..1d8d53988f 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping @@ -1,11 +1,24 @@ CLASS cza net/minecraft/client/gui/screen/ConnectScreen + FIELD a CONNECTOR_THREADS_COUNT Ljava/util/concurrent/atomic/AtomicInteger; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c connection Ljb; + FIELD d connectingCancelled Z FIELD e parent Lczx; FIELD f status Ljn; METHOD (Lczx;Lcvo;Ldhu;)V ARG 1 parent + ARG 2 client + ARG 3 entry + METHOD (Lczx;Lcvo;Ljava/lang/String;I)V + ARG 1 parent + ARG 2 client + ARG 3 address + ARG 4 port + METHOD a connect (Ljava/lang/String;I)V + ARG 1 address + ARG 2 port METHOD a setStatus (Ljn;)V + ARG 1 status METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping index 22306060e9..7ece0aa2fb 100644 --- a/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping @@ -1,6 +1,6 @@ CLASS czl net/minecraft/client/gui/screen/LanguageOptionsScreen CLASS a LanguageSelectionListWidget - CLASS a LanguageItem + CLASS a LanguageEntry FIELD b languageDefinition Ldvk; METHOD (Lczl$a;Ldvk;)V ARG 2 languageDefinition diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index 248b5b11f6..88e05b6b84 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -1,6 +1,10 @@ CLASS czm net/minecraft/client/gui/screen/LevelLoadingScreen FIELD a progressProvider Lvv; FIELD c STATUS_TO_COLOR Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD (Lvv;)V + ARG 1 progressProvider + METHOD a (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V + ARG 0 map METHOD a drawChunkMap (Lvv;IIII)V ARG 0 progressProvider ARG 1 centerX diff --git a/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping index f218d4c450..8abbe154aa 100644 --- a/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/MouseOptionsScreen.mapping @@ -2,6 +2,8 @@ CLASS czp net/minecraft/client/gui/screen/MouseOptionsScreen FIELD a parent Lczx; FIELD b buttonList Lcxg; FIELD c OPTIONS [Lcvr; + METHOD (Lczx;)V + ARG 1 parent METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping b/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping index 497d2cbe2f..8d870f53f1 100644 --- a/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PauseScreen.mapping @@ -1,4 +1,5 @@ CLASS czt net/minecraft/client/gui/screen/PauseScreen + METHOD a initWidgets ()V METHOD render (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping index d2b2b7189a..73a491a550 100644 --- a/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping @@ -1,7 +1,15 @@ CLASS czu net/minecraft/client/gui/screen/PresetsScreen CLASS a SuperflatPreset + FIELD a icon Lbbz; + FIELD b name Ljava/lang/String; + FIELD c config Ljava/lang/String; + METHOD (Lbbz;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 icon + ARG 2 name + ARG 3 config CLASS b SuperflatPresetsListWidget - CLASS a SuperflatPresetItem + CLASS a SuperflatPresetEntry + METHOD a setPreset ()V METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY @@ -14,10 +22,19 @@ CLASS czu net/minecraft/client/gui/screen/PresetsScreen FIELD b parent Lczc; FIELD c shareText Ljava/lang/String; FIELD d listText Ljava/lang/String; + FIELD e listWidget Lczu$b; + FIELD f selectPresetButton Lcwu; FIELD g customPresetField Lcxa; METHOD (Lczc;)V ARG 1 parent METHOD a addPreset (Ljava/lang/String;Lbhl;Lbij;Ljava/util/List;[Lcfr;)V + ARG 0 name + ARG 1 icon + ARG 2 biome + ARG 3 structures + ARG 4 layers + METHOD a updateSelectButton (Z)V + ARG 1 hasSelected METHOD mouseScrolled (DDD)Z ARG 5 amount METHOD render (IIF)V diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 37020db268..e94de732a8 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -118,7 +118,7 @@ CLASS cwq net/minecraft/client/gui/widget/EntryListWidget ARG 1 renderSelection METHOD setScrollAmount (D)V ARG 1 amount - METHOD setSelected (Lcwq$a;)V + METHOD setSelected selectEntry (Lcwq$a;)V ARG 1 entry METHOD updateSize (IIII)V ARG 1 width diff --git a/mappings/net/minecraft/client/util/TextComponentUtil.mapping b/mappings/net/minecraft/client/util/TextComponentUtil.mapping index 9bf1a7c0fb..268e601510 100644 --- a/mappings/net/minecraft/client/util/TextComponentUtil.mapping +++ b/mappings/net/minecraft/client/util/TextComponentUtil.mapping @@ -1,5 +1,5 @@ CLASS cwx net/minecraft/client/util/TextComponentUtil - METHOD a (Ljava/lang/String;Z)Ljava/lang/String; + METHOD a getRenderChatMessage (Ljava/lang/String;Z)Ljava/lang/String; ARG 0 string ARG 1 forceColor METHOD a wrapLines (Ljn;ILcwg;ZZ)Ljava/util/List;