From 4e19194c55f108dd296272ed740da96851c1621f Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 6 Nov 2020 13:49:22 +0100 Subject: [PATCH] Almost completed social interactions (#1846) --- .../SocialInteractionsPlayerListEntry.mapping | 20 +++++++++++++++++++ ...SocialInteractionsPlayerListWidget.mapping | 9 +++++++++ .../SocialInteractionsScreen.mapping | 11 ++++++++++ .../network/SocialInteractionsManager.mapping | 9 +++++++++ 4 files changed, 49 insertions(+) diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 7fa9db44b4..7ca6f9f351 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -1,16 +1,36 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry + FIELD field_26850 BLACK_COLOR I + FIELD field_26851 GRAY_COLOR I + FIELD field_26852 DARK_GRAY_COLOR I + FIELD field_26853 WHITE_COLOR I FIELD field_26854 client Lnet/minecraft/class_310; FIELD field_26855 buttons Ljava/util/List; FIELD field_26856 uuid Ljava/util/UUID; FIELD field_26857 name Ljava/lang/String; + FIELD field_26859 offline Z FIELD field_26860 hideButton Lnet/minecraft/class_4185; FIELD field_26861 showButton Lnet/minecraft/class_4185; FIELD field_26862 hideTooltip Ljava/util/List; FIELD field_26863 showTooltip Ljava/util/List; + FIELD field_26864 timeCounter F + FIELD field_26903 LIGHT_GRAY_COLOR I + FIELD field_26904 skinTexture Ljava/util/function/Supplier; + FIELD field_26905 HIDDEN_TEXT Lnet/minecraft/class_2561; + FIELD field_26906 BLOCKED_TEXT Lnet/minecraft/class_2561; + FIELD field_26907 OFFLINE_TEXT Lnet/minecraft/class_2561; + FIELD field_26908 HIDDEN_OFFLINE_TEXT Lnet/minecraft/class_2561; + FIELD field_26909 BLOCKED_OFFLINE_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;)V ARG 1 client ARG 2 parent ARG 3 uuid ARG 4 name + ARG 5 skinTexture + METHOD method_31329 onButtonClick (ZLnet/minecraft/class_2561;)V + ARG 1 showButtonVisible + ARG 2 chatMessage METHOD method_31330 getName ()Ljava/lang/String; METHOD method_31334 getUuid ()Ljava/util/UUID; + METHOD method_31335 setOffline (Z)V + ARG 1 offline + METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index 0272de1a7b..0e51e72382 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -11,6 +11,15 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia ARG 5 top ARG 6 bottom ARG 7 itemHeight + METHOD method_31345 setPlayerOnline (Lnet/minecraft/class_640;Lnet/minecraft/class_5522$class_5523;)V + ARG 1 player + ARG 2 tab METHOD method_31346 setCurrentSearch (Ljava/lang/String;)V ARG 1 currentSearch + METHOD method_31347 setPlayerOffline (Ljava/util/UUID;)V + ARG 1 uuid METHOD method_31348 isEmpty ()Z + METHOD method_31349 filterPlayers ()V + METHOD method_31393 update (Ljava/util/Collection;D)V + ARG 1 uuids + ARG 2 scrollAmount diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index b955827cea..e09baffffb 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -14,8 +14,19 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26886 allTabButton Lnet/minecraft/class_4185; FIELD field_26887 hiddenTabButton Lnet/minecraft/class_4185; FIELD field_26888 serverLabel Lnet/minecraft/class_2561; + FIELD field_26913 blockedTabButton Lnet/minecraft/class_4185; + FIELD field_26914 blockingButton Lnet/minecraft/class_4185; + FIELD field_26915 BLOCKED_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26916 SELECTED_BLOCKED_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26917 EMPTY_SEARCH_TEXT Lnet/minecraft/class_2561; + FIELD field_26918 EMPTY_BLOCKED_TEXT Lnet/minecraft/class_2561; + FIELD field_26919 BLOCKING_TEXT Lnet/minecraft/class_2561; METHOD method_31352 setCurrentTab (Lnet/minecraft/class_5522$class_5523;)V ARG 1 currentTab + METHOD method_31353 setPlayerOnline (Lnet/minecraft/class_640;)V + ARG 1 player + METHOD method_31355 setPlayerOffline (Ljava/util/UUID;)V + ARG 1 uuid METHOD method_31357 onSearchChange (Ljava/lang/String;)V ARG 1 currentSearch CLASS class_5523 Tab diff --git a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping index 7163dc593d..ad0a9a5d90 100644 --- a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping +++ b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping @@ -2,15 +2,24 @@ CLASS net/minecraft/class_5520 net/minecraft/client/network/SocialInteractionsMa FIELD field_26865 client Lnet/minecraft/class_310; FIELD field_26866 hiddenPlayers Ljava/util/Set; FIELD field_26912 socialInteractionsService Lcom/mojang/authlib/minecraft/SocialInteractionsService; + FIELD field_26927 playerNameByUuid Ljava/util/Map; METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/SocialInteractionsService;)V ARG 1 client ARG 2 socialInteractionsService METHOD method_31336 getHiddenPlayers ()Ljava/util/Set; + METHOD method_31337 setPlayerOnline (Lnet/minecraft/class_640;)V + ARG 1 player METHOD method_31338 hidePlayer (Ljava/util/UUID;)V ARG 1 uuid METHOD method_31339 showPlayer (Ljava/util/UUID;)V ARG 1 uuid METHOD method_31340 isPlayerHidden (Ljava/util/UUID;)Z ARG 1 uuid + METHOD method_31341 setPlayerOffline (Ljava/util/UUID;)V + ARG 1 uuid + METHOD method_31391 isPlayerMuted (Ljava/util/UUID;)Z + ARG 1 uuid METHOD method_31392 isPlayerBlocked (Ljava/util/UUID;)Z ARG 1 uuid + METHOD method_31407 getUuid (Ljava/lang/String;)Ljava/util/UUID; + ARG 1 playerName