From 80138462c26fd3366d201b06d6175d489659cbb2 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 26 Sep 2021 10:14:23 +0900 Subject: [PATCH] 21w38a telemetry (#2705) * 21w38a telemetry * Map TelemetryFields.HARDCORE * Rename MinecraftClient.socialInteractionsService * Rename to TelemetryConstants * Rename xuid param --- .../minecraft/client/MinecraftClient.mapping | 5 ++- .../net/minecraft/client/main/Main.mapping | 2 + .../network/ClientPlayNetworkHandler.mapping | 2 + .../net/minecraft/client/util/Session.mapping | 11 +++++ .../util/telemetry/TelemetryConstants.mapping | 24 +++++++++++ .../util/telemetry/TelemetrySender.mapping | 41 +++++++++++++++++++ mappings/net/minecraft/util/Util.mapping | 4 ++ 7 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping create mode 100644 mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 318cd88ad8..8bb89e392d 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -157,7 +157,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_26841 SOCIAL_INTERACTIONS_NOT_AVAILABLE Lnet/minecraft/class_2561; FIELD field_26842 socialInteractionsManager Lnet/minecraft/class_5520; FIELD field_26843 socialInteractionsToast Lnet/minecraft/class_372; - FIELD field_26902 socialInteractionsService Lcom/mojang/authlib/minecraft/UserApiService; + FIELD field_26902 userApiService Lcom/mojang/authlib/minecraft/UserApiService; FIELD field_27387 entityModelLoader Lnet/minecraft/class_5599; FIELD field_27388 blockEntityRenderDispatcher Lnet/minecraft/class_824; FIELD field_29569 recorder Lnet/minecraft/class_5962; @@ -167,6 +167,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT A message, in English, displayed in a dialog when a GLFW error is encountered. COMMENT COMMENT @see net.minecraft.client.util.Window#throwGlError(int, long) + FIELD field_34956 deviceSessionId Ljava/util/UUID; + FIELD field_34957 telemetrySender Lnet/minecraft/class_6628; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -457,6 +459,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 3 version ARG 4 options METHOD method_37286 stopRecorder ()V + METHOD method_38736 createTelemetrySender ()Lnet/minecraft/class_6628; CLASS class_5366 WorldLoadAction CLASS class_5367 IntegratedResourceManager FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283; diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping index 5d36150671..c638cca9e4 100644 --- a/mappings/net/minecraft/client/main/Main.mapping +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/client/main/Main ARG 0 s METHOD method_21612 toOptional (Ljava/lang/Integer;)Ljava/util/OptionalInt; ARG 0 i + METHOD method_38752 toOptional (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 string diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 83a11be928..e5c99f90ec 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_25063 registryManager Lnet/minecraft/class_5455; FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561; + FIELD field_34963 telemetrySender Lnet/minecraft/class_6628; FIELD field_3687 random Ljava/util/Random; FIELD field_3688 recipeManager Lnet/minecraft/class_1863; FIELD field_3689 connection Lnet/minecraft/class_2535; @@ -25,6 +26,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 screen ARG 3 connection ARG 4 profile + ARG 5 telemetrySender METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 0 player diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index 03e674e843..754fa090f2 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -3,19 +3,30 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session FIELD field_1983 accessToken Ljava/lang/String; FIELD field_1984 accountType Lnet/minecraft/class_320$class_321; FIELD field_1985 uuid Ljava/lang/String; + FIELD field_34960 xuid Ljava/util/Optional; + FIELD field_34961 clientId Ljava/util/Optional; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_320$class_321;)V ARG 1 username ARG 2 uuid ARG 3 accessToken + ARG 4 xuid + ARG 5 clientId + ARG 6 accountType METHOD method_1673 getUuid ()Ljava/lang/String; METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; METHOD method_1676 getUsername ()Ljava/lang/String; METHOD method_1677 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_35718 getAccountType ()Lnet/minecraft/class_320$class_321; + METHOD method_38740 getClientId ()Ljava/util/Optional; + METHOD method_38741 getXuid ()Ljava/util/Optional; CLASS class_321 AccountType FIELD field_1986 name Ljava/lang/String; FIELD field_1989 BY_NAME Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD method_1678 (Lnet/minecraft/class_320$class_321;)Ljava/lang/String; + ARG 0 type METHOD method_1679 byName (Ljava/lang/String;)Lnet/minecraft/class_320$class_321; + ARG 0 name + METHOD method_38742 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping new file mode 100644 index 0000000000..0f34c82e97 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryConstants.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_6610 net/minecraft/client/util/telemetry/TelemetryConstants + FIELD field_34897 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + FIELD field_34898 WORLD_LOADED Ljava/lang/String; + FIELD field_34899 SERVER_MODDED Ljava/lang/String; + FIELD field_34900 USER_ID Ljava/lang/String; + FIELD field_34901 CLIENT_ID Ljava/lang/String; + FIELD field_34902 DEVICE_SESSION_ID Ljava/lang/String; + FIELD field_34903 WORLD_SESSION_ID Ljava/lang/String; + FIELD field_34904 EVENT_TIMESTAMP_UTC Ljava/lang/String; + FIELD field_34905 BUILD_DISPLAY_NAME Ljava/lang/String; + FIELD field_34906 CLIENT_MODDED Ljava/lang/String; + FIELD field_34907 SERVER_TYPE Ljava/lang/String; + FIELD field_34908 BUILD_PLAT Ljava/lang/String; + FIELD field_34909 PLAT Ljava/lang/String; + FIELD field_34910 JAVA_VERSION Ljava/lang/String; + FIELD field_34911 PLAYER_GAME_MODE Ljava/lang/String; + FIELD field_34912 SURVIVAL I + FIELD field_34913 CREATIVE I + FIELD field_34914 ADVENTURE I + FIELD field_34915 SPECTATOR I + FIELD field_34916 HARDCORE I + FIELD field_34917 REALM Ljava/lang/String; + FIELD field_34918 LOCAL Ljava/lang/String; + FIELD field_34919 SERVER Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping new file mode 100644 index 0000000000..ad274a1156 --- /dev/null +++ b/mappings/net/minecraft/client/util/telemetry/TelemetrySender.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_6628 net/minecraft/client/util/telemetry/TelemetrySender + FIELD field_34948 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_34949 EXECUTOR Ljava/util/concurrent/Executor; + FIELD field_34950 client Lnet/minecraft/class_310; + FIELD field_34951 session Lcom/mojang/authlib/minecraft/TelemetrySession; + FIELD field_34952 sent Z + FIELD field_34953 gameMode Lnet/minecraft/class_6628$class_6629; + FIELD field_34954 serverBrand Ljava/lang/String; + METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/UUID;)V + ARG 1 client + ARG 2 userApiService + ARG 3 userId + ARG 4 clientId + ARG 5 deviceSessionId + METHOD method_38725 send ()V + METHOD method_38726 setGameModeAndSend (Lnet/minecraft/class_1934;Z)V + ARG 1 gameMode + ARG 2 hardcore + METHOD method_38727 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;)V + ARG 0 container + METHOD method_38729 (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/lang/String;)V + ARG 2 value + METHOD method_38730 send (Lnet/minecraft/class_6628$class_6629;)V + ARG 1 gameMode + METHOD method_38731 (Ljava/lang/Runnable;)Ljava/lang/Thread; + ARG 0 runnable + METHOD method_38732 setServerBrandAndSend (Ljava/lang/String;)V + ARG 1 brand + METHOD method_38733 addProperty (Ljava/lang/String;Ljava/util/Optional;Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;)V + ARG 0 name + ARG 1 propertyValue + ARG 2 container + METHOD method_38734 getServerType ()Ljava/lang/String; + CLASS class_6629 PlayerGameMode + FIELD comp_136 gameMode Lnet/minecraft/class_1934; + FIELD comp_137 hardcore Z + METHOD comp_136 gameMode ()Lnet/minecraft/class_1934; + METHOD comp_137 hardcore ()Z + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_38735 getId ()I diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 8f360ce7bf..9b1350c1ab 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -195,6 +195,10 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_29657 cache Ljava/util/Map; CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem + FIELD field_34894 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_38649 getName ()Ljava/lang/String; METHOD method_669 open (Ljava/net/URL;)V ARG 1 url METHOD method_670 open (Ljava/lang/String;)V