From 15cdad81b0f3b8badd0e3f23b70dd711f47dc416 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Thu, 24 Feb 2022 06:58:44 +0900 Subject: [PATCH] 1.18.2-pre3 stuff (#3030) * 1.18.2-pre3 stuff * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../net/minecraft/client/gui/Element.mapping | 1 + .../gui/screen/RealmsMainScreen.mapping | 1 + .../client/util/MonitorTracker.mapping | 1 + .../minecraft/command/CommandSource.mapping | 12 +++++++ .../argument/RegistryKeyArgumentType.mapping | 33 +++++++++++++++++++ .../net/minecraft/item/FilledMapItem.mapping | 4 +-- .../command/PlaceFeatureCommand.mapping | 3 ++ .../server/filter/TextFilterer.mapping | 21 ++++++++++++ mappings/net/minecraft/util/Util.mapping | 10 ++++++ 9 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping index 6bbb4e688e..84835ee49f 100644 --- a/mappings/net/minecraft/client/gui/Element.mapping +++ b/mappings/net/minecraft/client/gui/Element.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element COMMENT COMMENT Mouse coordinate is bounded by the size of the window in COMMENT pixels. + FIELD field_37268 MAX_DOUBLE_CLICK_INTERVAL J METHOD method_16014 mouseMoved (DD)V COMMENT Callback for when a mouse move event has been captured. COMMENT diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 594a2d7c7d..42041106c9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -81,6 +81,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_26466 popupText Lnet/minecraft/class_5489; FIELD field_33774 TRIAL_NARRATION Lnet/minecraft/class_2561; FIELD field_33776 UNINITIALIZED_BUTTON_NARRATION Lnet/minecraft/class_2561; + FIELD field_37267 lastPlayButtonClickTime J METHOD (Lnet/minecraft/class_437;)V ARG 1 lastScreen METHOD method_20834 onClosePopup ()V diff --git a/mappings/net/minecraft/client/util/MonitorTracker.mapping b/mappings/net/minecraft/client/util/MonitorTracker.mapping index 6b168e0dff..1d8b7b808e 100644 --- a/mappings/net/minecraft/client/util/MonitorTracker.mapping +++ b/mappings/net/minecraft/client/util/MonitorTracker.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_323 net/minecraft/client/util/MonitorTracker FIELD field_1991 monitorFactory Lnet/minecraft/class_3676; FIELD field_1993 pointerToMonitorMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_37266 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3676;)V ARG 1 monitorFactory METHOD method_15991 clamp (III)I diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index 28dd60f5de..e44712f30a 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -19,6 +19,15 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource ARG 0 candidates ARG 1 builder ARG 2 prefix + METHOD method_41213 listIdSuggestions (Lnet/minecraft/class_5321;Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/concurrent/CompletableFuture; + ARG 1 registryRef + ARG 2 suggestedIdType + ARG 3 builder + ARG 4 context + METHOD method_41214 suggestIdentifiers (Lnet/minecraft/class_2378;Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V + ARG 1 registry + ARG 2 suggestedIdType + ARG 3 builder METHOD method_9250 forEachMatching (Ljava/lang/Iterable;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 0 candidates ARG 1 remaining @@ -100,3 +109,6 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource ARG 1 x ARG 2 y ARG 3 z + CLASS class_7078 SuggestedIdType + METHOD method_41215 canSuggestTags ()Z + METHOD method_41216 canSuggestElements ()Z diff --git a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping new file mode 100644 index 0000000000..3e3ade66d9 --- /dev/null +++ b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumentType + FIELD field_37269 EXAMPLES Ljava/util/Collection; + FIELD field_37270 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_37271 INVALID_CONFIGURED_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_37272 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_5321;)V + ARG 1 registryRef + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_41219 getAttribute (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1320; + ARG 0 context + ARG 1 name + METHOD method_41220 getKey (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/class_5321; + ARG 0 context + ARG 1 name + ARG 2 registryRef + ARG 3 invalidException + METHOD method_41221 getRegistry (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; + ARG 0 context + ARG 1 registryRef + METHOD method_41223 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD method_41224 registryKey (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7079; + ARG 0 registryRef + METHOD method_41225 getConfiguredFeatureEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880; + ARG 0 context + ARG 1 name + METHOD method_41226 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 id + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader + CLASS class_7080 Serializer diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 902748d3c1..348c979b5b 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -19,8 +19,8 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 6 dimension METHOD method_38988 isAquaticBiome ([ZII)Z ARG 0 biomes - ARG 1 scale - ARG 2 x + ARG 1 x + ARG 2 z METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state diff --git a/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping b/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping index 888fb53ffd..807e20750d 100644 --- a/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceFeatureCommand.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceFeatureCommand ARG 0 source METHOD method_39989 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I ARG 0 source + ARG 1 feature ARG 2 pos METHOD method_39990 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_41202 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index 057958ffeb..79af900e80 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -11,6 +11,16 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer FIELD field_26832 ignorer Lnet/minecraft/class_5514$class_5515; FIELD field_26833 executor Ljava/util/concurrent/ExecutorService; FIELD field_36318 roomId Ljava/lang/String; + METHOD (Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_5514$class_5515;I)V + ARG 1 chatEndpoint + ARG 2 joinEndpoint + ARG 3 leaveEndpoint + ARG 4 apiKey + ARG 5 ruleId + ARG 6 serverId + ARG 7 roomId + ARG 8 ignorer + ARG 9 parallelism METHOD method_31295 sendJsonRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; ARG 1 payload ARG 2 endpoint @@ -27,6 +37,8 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer ARG 3 executor METHOD method_31300 consumeFully (Ljava/io/InputStream;)V ARG 1 inputStream + METHOD method_31301 (Ljava/lang/Runnable;)Ljava/lang/Thread; + ARG 0 runnable METHOD method_31304 sendRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)V ARG 1 payload ARG 2 endpoint @@ -35,6 +47,11 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer ARG 2 endpoint METHOD method_33805 load (Ljava/lang/String;)Lnet/minecraft/class_5514; ARG 0 config + METHOD method_41206 getEndpoint (Ljava/net/URI;Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL; + ARG 0 root + ARG 1 endpoints + ARG 2 key + ARG 3 fallback CLASS class_5515 HashIgnorer FIELD field_26834 NEVER_IGNORE Lnet/minecraft/class_5514$class_5515; FIELD field_26835 IGNORE_IF_MATCHES_ALL Lnet/minecraft/class_5514$class_5515; @@ -59,6 +76,10 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer FIELD field_26838 executor Ljava/util/concurrent/Executor; METHOD (Lnet/minecraft/class_5514;Lcom/mojang/authlib/GameProfile;)V ARG 2 gameProfile + METHOD method_31315 (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + ARG 1 text + METHOD method_33809 (Ljava/lang/Throwable;)Ljava/util/List; + ARG 0 throwable CLASS class_5517 FailedHttpRequestException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 62a2dcee60..82702e3adc 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -155,6 +155,16 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_40083 getRandomOrEmpty (Ljava/util/List;Ljava/util/Random;)Ljava/util/Optional; ARG 0 list ARG 1 random + METHOD method_41203 backupAndReplace (Ljava/io/File;Ljava/io/File;Ljava/io/File;Z)V + ARG 0 current + ARG 1 newPath + ARG 2 backup + ARG 3 noRestoreOnFail + METHOD method_41204 backupAndReplace (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V + ARG 0 current + ARG 1 newPath + ARG 2 backup + ARG 3 noRestoreOnFail METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable ARG 1 object