From 1a9726310d5fa900877e38f3272da9ca751401e4 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Tue, 20 Oct 2020 18:56:32 +0200 Subject: [PATCH] Social interactions (#1808) --- .../minecraft/client/MinecraftClient.mapping | 2 ++ .../SocialInteractionsPlayerListEntry.mapping | 19 +++++++++++++++++ ...SocialInteractionsPlayerListWidget.mapping | 16 ++++++++++++++ .../SocialInteractionsScreen.mapping | 21 +++++++++++++++++++ .../network/ClientPlayNetworkHandler.mapping | 1 + .../network/SocialInteractionsManager.mapping | 12 +++++++++++ .../client/options/GameOptions.mapping | 5 +++++ .../client/tutorial/TutorialManager.mapping | 2 ++ 8 files changed, 78 insertions(+) create mode 100644 mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping create mode 100644 mappings/net/minecraft/client/network/SocialInteractionsManager.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 709f372c7d..60bc3bdc97 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -104,6 +104,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_25033 multiplayerEnabled Z FIELD field_25034 onlineChatEnabled Z FIELD field_25671 videoWarningManager Lnet/minecraft/class_5407; + FIELD field_26842 socialInteractionsManager Lnet/minecraft/class_5520; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -301,6 +302,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 5 safeMode METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; + METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; CLASS class_5366 WorldLoadAction CLASS class_5367 IntegratedResourceManager FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping new file mode 100644 index 0000000000..c94761cd68 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry + 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_26858 skinTexture Lnet/minecraft/class_2960; + 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; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Lnet/minecraft/class_2960;Lnet/minecraft/class_5522$class_5523;)V + ARG 1 client + ARG 2 parent + ARG 3 uuid + ARG 4 name + ARG 5 skinTexture + ARG 6 currentTab + METHOD method_31330 getName ()Ljava/lang/String; + METHOD method_31334 getUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping new file mode 100644 index 0000000000..0272de1a7b --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget + FIELD field_26867 parent Lnet/minecraft/class_5522; + FIELD field_26868 minecraftClient Lnet/minecraft/class_310; + FIELD field_26869 players Ljava/util/List; + FIELD field_26870 currentSearch Ljava/lang/String; + METHOD (Lnet/minecraft/class_5522;Lnet/minecraft/class_310;IIIII)V + ARG 1 parent + ARG 2 client + ARG 3 width + ARG 4 height + ARG 5 top + ARG 6 bottom + ARG 7 itemHeight + METHOD method_31346 setCurrentSearch (Ljava/lang/String;)V + ARG 1 currentSearch + METHOD method_31348 isEmpty ()Z diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping new file mode 100644 index 0000000000..b955827cea --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen + FIELD field_26871 playerCount I + FIELD field_26875 SOCIAL_INTERACTIONS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_26876 ALL_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26877 HIDDEN_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26878 SELECTED_ALL_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26879 SELECTED_HIDDEN_TAB_TITLE Lnet/minecraft/class_2561; + FIELD field_26880 SEARCH_TEXT Lnet/minecraft/class_2561; + FIELD field_26881 EMPTY_HIDDEN_TEXT Lnet/minecraft/class_2561; + FIELD field_26882 playerList Lnet/minecraft/class_5521; + FIELD field_26883 searchBox Lnet/minecraft/class_342; + FIELD field_26884 currentSearch Ljava/lang/String; + FIELD field_26885 currentTab Lnet/minecraft/class_5522$class_5523; + FIELD field_26886 allTabButton Lnet/minecraft/class_4185; + FIELD field_26887 hiddenTabButton Lnet/minecraft/class_4185; + FIELD field_26888 serverLabel Lnet/minecraft/class_2561; + METHOD method_31352 setCurrentTab (Lnet/minecraft/class_5522$class_5523;)V + ARG 1 currentTab + METHOD method_31357 onSearchChange (Ljava/lang/String;)V + ARG 1 currentSearch + CLASS class_5523 Tab diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 921a605542..9ebdae3bfc 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -61,3 +61,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_2890 getWorld ()Lnet/minecraft/class_638; METHOD method_29091 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_29356 getWorldKeys ()Ljava/util/Set; + METHOD method_31363 getPlayerUuids ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping new file mode 100644 index 0000000000..41297e878d --- /dev/null +++ b/mappings/net/minecraft/client/network/SocialInteractionsManager.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_5520 net/minecraft/client/network/SocialInteractionsManager + FIELD field_26865 client Lnet/minecraft/class_310; + FIELD field_26866 hiddenPlayers Ljava/util/Set; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_31336 getHiddenPlayers ()Ljava/util/Set; + 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 diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 7449eb6216..c67ebc2bef 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -104,6 +104,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions FIELD field_25623 syncChunkWrites Z FIELD field_26675 distortionEffectScale F FIELD field_26676 fovEffectScale F + FIELD field_26677 perspective Lnet/minecraft/class_5498; + FIELD field_26844 joinedFirstServer Z + FIELD field_26845 keySocialInteractions Lnet/minecraft/class_304; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -137,4 +140,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions ARG 1 fallbackColor METHOD method_19345 getTextBackgroundColor (F)I ARG 1 fallbackOpacity + METHOD method_31043 setPerspective (Lnet/minecraft/class_5498;)V + ARG 1 perspective METHOD method_31044 getPerspective ()Lnet/minecraft/class_5498; diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 025a0a847f..cdc2d4130a 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager FIELD field_5645 client Lnet/minecraft/class_310; FIELD field_5646 currentHandler Lnet/minecraft/class_1155; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_4905 getGameMode ()Lnet/minecraft/class_1934; METHOD method_4906 onSlotUpdate (Lnet/minecraft/class_1799;)V ARG 1 stack