From 4757c9a8c4b4f66c85b116a2158a12d629c7d7ba Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Sat, 29 May 2021 20:03:14 +0900 Subject: [PATCH] Map player list hud (#2439) * Map player list hud * Remove 'which is' Co-authored-by: liach <7806504+liach@users.noreply.github.com> * lasthealth -> lastHealth Co-authored-by: YanisBft Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: YanisBft --- .../client/gui/hud/PlayerListHud.mapping | 26 ++++++++++++++++++- .../client/network/PlayerListEntry.mapping | 20 +++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index a6cead04b4..ce770bcf28 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -1,30 +1,54 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud + COMMENT Responsible for rendering the player list while the {@linkplain + COMMENT net.minecraft.client.option.GameOptions#keyPlayerList player list + COMMENT key} is pressed. + COMMENT + COMMENT

The current instance used by the client can be obtained by {@code + COMMENT MinecraftClient.getInstance().inGameHud.getPlayerListHud()}. FIELD field_2152 showTime J + COMMENT The time, in milliseconds, when this HUD was last set to visible. FIELD field_2153 header Lnet/minecraft/class_2561; FIELD field_2154 footer Lnet/minecraft/class_2561; FIELD field_2155 client Lnet/minecraft/class_310; FIELD field_2156 ENTRY_ORDERING Lcom/google/common/collect/Ordering; FIELD field_2157 inGameHud Lnet/minecraft/class_329; FIELD field_2158 visible Z + FIELD field_32205 MAX_ROWS I + FIELD field_32206 HEART_OUTLINE_U I + FIELD field_32207 BLINKING_HEART_OUTLINE_U I + FIELD field_32208 HEART_U I + FIELD field_32209 HALF_HEART_U I + FIELD field_32210 GOLDEN_HEART_U I + FIELD field_32211 HALF_GOLDEN_HEART_U I + FIELD field_32212 BLINKING_HEART_U I + FIELD field_32213 BLINKING_HALF_HEART_U I METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_329;)V ARG 1 client ARG 2 inGameHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; + COMMENT {@return the player name rendered by this HUD} ARG 1 entry METHOD method_1919 render (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V ARG 1 matrices + ARG 2 scaledWindowWidth ARG 3 scoreboard ARG 4 objective METHOD method_1920 clear ()V - METHOD method_1921 tick (Z)V + METHOD method_1921 setVisible (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 + ARG 2 y ARG 3 player + ARG 4 startX + ARG 5 endX ARG 6 entry ARG 7 matrices METHOD method_1923 renderLatencyIcon (Lnet/minecraft/class_4587;IIILnet/minecraft/class_640;)V ARG 1 matrices + ARG 2 width + ARG 3 x + ARG 4 y ARG 5 entry METHOD method_1924 setFooter (Lnet/minecraft/class_2561;)V ARG 1 footer diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index 46344ecb9c..2d43babc2e 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry - FIELD field_3738 health I + FIELD field_3736 health I + FIELD field_3737 lastHealthTime J + FIELD field_3738 lastHealth I FIELD field_3739 latency I FIELD field_3740 texturesLoaded Z FIELD field_3741 profile Lcom/mojang/authlib/GameProfile; @@ -8,6 +10,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry FIELD field_3744 gameMode Lnet/minecraft/class_1934; FIELD field_3745 model Ljava/lang/String; FIELD field_3746 showTime J + FIELD field_3747 blinkingHeartTime J METHOD (Lnet/minecraft/class_2703$class_2705;)V ARG 1 playerListPacketEntry METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268; @@ -18,12 +21,16 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry METHOD method_2957 getElytraTexture ()Lnet/minecraft/class_2960; METHOD method_2958 getGameMode ()Lnet/minecraft/class_1934; METHOD method_2959 getLatency ()I + METHOD method_2960 getHealth ()I + METHOD method_2961 getBlinkingHeartTime ()J METHOD method_2962 setDisplayName (Lnet/minecraft/class_2561;)V ARG 1 displayName METHOD method_2963 setGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode METHOD method_2964 setShowTime (J)V ARG 1 showTime + METHOD method_2965 setHealth (I)V + ARG 1 health METHOD method_2966 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_2967 hasSkinTexture ()Z COMMENT Checks if the player represented by this entry has a custom skin. @@ -34,10 +41,15 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry METHOD method_2970 setLatency (I)V ARG 1 latency METHOD method_2971 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_2972 setHealth (I)V - ARG 1 health - METHOD method_2973 getHealth ()I + METHOD method_2972 setLastHealth (I)V + ARG 1 lastHealth + METHOD method_2973 getLastHealth ()I + METHOD method_2974 getLastHealthTime ()J + METHOD method_2975 setBlinkingHeartTime (J)V + ARG 1 blinkingHeartTime METHOD method_2976 getShowTime ()J METHOD method_2977 getModel ()Ljava/lang/String; + METHOD method_2978 setLastHealthTime (J)V + ARG 1 lastHealthTime METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960; METHOD method_35757 hasCape ()Z