From fda8ec2c4139d6c455dbb4786021bf9f6914f5a5 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 22 Apr 2022 00:21:38 +0900 Subject: [PATCH] 22w16b client (#3107) * 22w16b client * Update MinecraftClient.mapping --- .../minecraft/client/MinecraftClient.mapping | 10 ++++- .../minecraft/client/gui/hud/DebugHud.mapping | 17 +++++++++ .../client/gui/screen/LoadingDisplay.mapping | 5 +++ .../screen/world/SelectWorldScreen.mapping | 1 + .../gui/screen/world/WorldListWidget.mapping | 38 ++++++++++++++++++- .../minecraft/client/util/GlException.mapping | 2 + 6 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/screen/LoadingDisplay.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 4fc9b0caa9..75f8069f6b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -223,6 +223,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 screen COMMENT the new screen, or {@code null} to just close the previous screen METHOD method_1508 handleInputEvents ()V + METHOD method_1510 (Lnet/minecraft/class_2561;)V + ARG 0 status METHOD method_1511 doItemPick ()V METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD method_1514 run ()V @@ -383,9 +385,12 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 sender METHOD method_29043 isMultiplayerEnabled ()Z METHOD method_29603 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; - ARG 1 thread - ARG 3 resourceManager + ARG 7 thread METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;)V + ARG 1 levelName + ARG 2 session + ARG 3 dataPackManager + ARG 4 saveLoader METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen @@ -465,6 +470,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 glTimer METHOD method_41733 forceStopRecorder ()V METHOD method_41734 getGpuUtilizationPercentage ()D + METHOD method_41735 createIntegratedServerLoader ()Lnet/minecraft/class_7196; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index f884312e16..0030f8f033 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2084 chunk Lnet/minecraft/class_2818; FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I + FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_15870 drawMetricsData (Lnet/minecraft/class_4587;Lnet/minecraft/class_3517;IIZ)V ARG 1 matrices ARG 2 metricsData @@ -53,9 +56,23 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_27870 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_1311;)Ljava/lang/String; ARG 1 group METHOD method_27871 getServerWorldDebugString ()Ljava/lang/String; + METHOD method_40203 (Lnet/minecraft/class_6862;)Ljava/lang/String; + ARG 0 tag METHOD method_40204 (Lnet/minecraft/class_1959;)Ljava/lang/String; ARG 0 biome_ METHOD method_40205 getBiomeString (Lnet/minecraft/class_6880;)Ljava/lang/String; ARG 0 biome METHOD method_40206 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 biomeKey + METHOD method_40207 (Lnet/minecraft/class_6862;)Ljava/lang/String; + ARG 0 tag + CLASS class_7412 AllocationRateCalculator + FIELD field_38986 INTERVAL I + FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; + FIELD field_38988 lastCalculated J + FIELD field_38989 allocatedBytes J + FIELD field_38990 collectionCount J + FIELD field_38991 allocationRate J + METHOD method_43447 getCollectionCount ()J + METHOD method_43448 get (J)J + ARG 1 allocatedBytes diff --git a/mappings/net/minecraft/client/gui/screen/LoadingDisplay.mapping b/mappings/net/minecraft/client/gui/screen/LoadingDisplay.mapping new file mode 100644 index 0000000000..f1ff16067d --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/LoadingDisplay.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7413 net/minecraft/client/gui/screen/LoadingDisplay + FIELD field_38992 TEXTS [Ljava/lang/String; + FIELD field_38993 INTERVAL J + METHOD method_43449 get (J)Ljava/lang/String; + ARG 0 tick diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index f3b687d5d3..74c85e2ac7 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -30,3 +30,4 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS ARG 1 search METHOD method_35739 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_43450 getSearchFilter ()Ljava/util/function/Supplier; diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 55fb3a5c53..7c98943026 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_3237 parent Lnet/minecraft/class_526; FIELD field_3238 LOGGER Lorg/slf4j/Logger; FIELD field_34803 CONVERSION_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_38994 loadingEntry Lnet/minecraft/class_528$class_7415; + FIELD field_38995 TIMEOUT Ljava/time/Duration; + FIELD field_38996 levelsFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/util/function/Supplier;Lnet/minecraft/class_528;)V ARG 1 parent ARG 2 client @@ -19,10 +22,34 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 6 bottom ARG 7 itemHeight ARG 8 searchFilter + ARG 9 oldWidget METHOD method_20159 getSelectedAsOptional ()Ljava/util/Optional; METHOD method_2750 filter (Ljava/lang/String;)V + ARG 1 name METHOD method_2752 getParent ()Lnet/minecraft/class_526; - CLASS class_4272 Entry + METHOD method_43453 shouldShow (Ljava/lang/String;Lnet/minecraft/class_34;)Z + ARG 1 search + ARG 2 summary + METHOD method_43454 showSummaries (Ljava/lang/String;Ljava/util/List;)V + ARG 1 search + ARG 2 summaries + METHOD method_43455 (Ljava/lang/Throwable;)Ljava/util/List; + ARG 1 throwable + METHOD method_43456 (Ljava/util/List;)Ljava/util/List; + ARG 0 summaries + METHOD method_43457 tryGet (Ljava/util/concurrent/CompletableFuture;Ljava/time/Duration;)Ljava/util/List; + ARG 1 future + ARG 2 timeout + METHOD method_43458 loadAndShow (Ljava/util/function/Supplier;)V + ARG 1 searchFilter + METHOD method_43459 (Ljava/util/function/Supplier;Ljava/util/List;)V + ARG 2 levels + METHOD method_43460 showUnableToLoadScreen (Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD method_43462 loadLevels ()Ljava/util/concurrent/CompletableFuture; + METHOD method_43463 showLoadingScreen ()V + METHOD method_43464 narrateScreenIfNarrationEnabled ()V + CLASS class_4272 WorldEntry FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; @@ -34,6 +61,8 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 2 levelList ARG 3 level METHOD method_20164 play ()V + METHOD method_20165 (Lnet/minecraft/class_6904;Ljava/nio/file/Path;Z)V + ARG 3 confirmed METHOD method_20167 (ZZ)V ARG 1 backup ARG 2 eraseCache @@ -51,3 +80,10 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid METHOD method_29990 openReadingWorldScreen ()V METHOD method_33685 delete ()V METHOD method_35740 getLevelDisplayName ()Ljava/lang/String; + CLASS class_7414 Entry + METHOD method_43465 isAvailable ()Z + CLASS class_7415 LoadingEntry + FIELD field_38997 LOADING_LIST_TEXT Lnet/minecraft/class_2561; + FIELD field_38998 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/util/GlException.mapping b/mappings/net/minecraft/client/util/GlException.mapping index 55c6d673b9..b093724840 100644 --- a/mappings/net/minecraft/client/util/GlException.mapping +++ b/mappings/net/minecraft/client/util/GlException.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4718 net/minecraft/client/util/GlException + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause