From 1dca7ec9f9b5cf4f62d30ada60c4d6355a08bb13 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 13 May 2022 02:29:36 +0900 Subject: [PATCH] 22w18a search (#3148) * 22w18a searching * Rename SearchableContainer --- .../minecraft/client/MinecraftClient.mapping | 21 +++++++++++++++++-- .../search/IdentifierSearchProvider.mapping | 11 ++++++++++ .../IdentifierSearchableContainer.mapping | 3 --- .../IdentifierSearchableIterator.mapping | 7 +++++++ .../client/search/IdentifierSearcher.mapping | 18 ++++++++++++++++ .../search/ReloadableSearchProvider.mapping | 11 ++++++++++ .../client/search/SearchManager.mapping | 15 +++++++++++++ ...rchable.mapping => SearchProvider.mapping} | 4 +++- .../client/search/SearchableContainer.mapping | 2 -- .../client/search/SuffixArray.mapping | 3 +++ .../client/search/TextSearchProvider.mapping | 8 +++++++ .../search/TextSearchableContainer.mapping | 5 ----- .../search/TextSearchableIterator.mapping | 7 +++++++ .../client/search/TextSearcher.mapping | 17 +++++++++++++++ 14 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/client/search/IdentifierSearchProvider.mapping delete mode 100644 mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping create mode 100644 mappings/net/minecraft/client/search/IdentifierSearcher.mapping create mode 100644 mappings/net/minecraft/client/search/ReloadableSearchProvider.mapping rename mappings/net/minecraft/client/search/{Searchable.mapping => SearchProvider.mapping} (53%) delete mode 100644 mappings/net/minecraft/client/search/SearchableContainer.mapping create mode 100644 mappings/net/minecraft/client/search/TextSearchProvider.mapping delete mode 100644 mappings/net/minecraft/client/search/TextSearchableContainer.mapping create mode 100644 mappings/net/minecraft/client/search/TextSearcher.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b73e887ada..c9fc373dca 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -181,7 +181,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V ARG 1 world METHOD method_1483 getSoundManager ()Lnet/minecraft/class_1144; - METHOD method_1484 getSearchableContainer (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; + METHOD method_1484 getSearchProvider (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; ARG 1 key METHOD method_1485 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; ARG 0 stack @@ -254,7 +254,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1542 isInSingleplayer ()Z METHOD method_1543 getDataFixer ()Lcom/mojang/datafixers/DataFixer; METHOD method_1544 getMusicType ()Lnet/minecraft/class_5195; - METHOD method_1546 initializeSearchableContainers ()V + METHOD method_1546 initializeSearchProviders ()V METHOD method_1547 getVersionType ()Ljava/lang/String; METHOD method_1548 getSession ()Lnet/minecraft/class_320; METHOD method_1549 getSpriteAtlas (Lnet/minecraft/class_2960;)Ljava/util/function/Function; @@ -465,6 +465,23 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_43587 setCrashReportSupplier (Lnet/minecraft/class_128;)V ARG 1 crashReport METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7434; + METHOD method_43758 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; + ARG 0 resultCollection + METHOD method_43759 reloadSearchProvider (Lnet/minecraft/class_1124$class_1125;Ljava/util/List;)V + ARG 1 key + ARG 2 values + METHOD method_43760 (Ljava/util/List;)Lnet/minecraft/class_1123; + ARG 0 resultCollections + METHOD method_43761 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; + ARG 0 resultCollection + METHOD method_43762 (Ljava/util/List;)Lnet/minecraft/class_1123; + ARG 0 stacks + METHOD method_43763 (Ljava/lang/String;)Z + ARG 0 text + METHOD method_43764 (Ljava/util/List;)Lnet/minecraft/class_1123; + ARG 0 stacks + METHOD method_43765 (Lnet/minecraft/class_2561;)Ljava/lang/String; + ARG 0 text CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/search/IdentifierSearchProvider.mapping b/mappings/net/minecraft/client/search/IdentifierSearchProvider.mapping new file mode 100644 index 0000000000..84602a9da8 --- /dev/null +++ b/mappings/net/minecraft/client/search/IdentifierSearchProvider.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_1121 net/minecraft/client/search/IdentifierSearchProvider + FIELD field_39199 lastIndexComparator Ljava/util/Comparator; + FIELD field_39200 idSearcher Lnet/minecraft/class_7455; + METHOD (Ljava/util/function/Function;Ljava/util/List;)V + ARG 1 identifiersGetter + ARG 2 values + METHOD method_43791 search (Ljava/lang/String;)Ljava/util/List; + ARG 1 text + METHOD method_43792 search (Ljava/lang/String;Ljava/lang/String;)Ljava/util/List; + ARG 1 namespace + ARG 2 path diff --git a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping b/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping deleted file mode 100644 index b02f7cc205..0000000000 --- a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1121 net/minecraft/client/search/IdentifierSearchableContainer - METHOD (Ljava/util/function/Function;Ljava/util/List;)V - ARG 1 identifierFinder diff --git a/mappings/net/minecraft/client/search/IdentifierSearchableIterator.mapping b/mappings/net/minecraft/client/search/IdentifierSearchableIterator.mapping index 7f52d8c701..cca56dde3d 100644 --- a/mappings/net/minecraft/client/search/IdentifierSearchableIterator.mapping +++ b/mappings/net/minecraft/client/search/IdentifierSearchableIterator.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_1122 net/minecraft/client/search/IdentifierSearchableIterator + FIELD field_5490 namespacesIterator Lcom/google/common/collect/PeekingIterator; + FIELD field_5491 pathsIterator Lcom/google/common/collect/PeekingIterator; + FIELD field_5492 lastIndexComparator Ljava/util/Comparator; + METHOD (Ljava/util/Iterator;Ljava/util/Iterator;Ljava/util/Comparator;)V + ARG 1 namespacesIterator + ARG 2 pathsIterator + ARG 3 lastIndexComparator diff --git a/mappings/net/minecraft/client/search/IdentifierSearcher.mapping b/mappings/net/minecraft/client/search/IdentifierSearcher.mapping new file mode 100644 index 0000000000..d4a5d79c5f --- /dev/null +++ b/mappings/net/minecraft/client/search/IdentifierSearcher.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7455 net/minecraft/client/search/IdentifierSearcher + COMMENT An interface used for searching with an identifier's path or namespace. + METHOD method_43799 of ()Lnet/minecraft/class_7455; + COMMENT {@return a searcher that always returns no results} + METHOD method_43800 (Lnet/minecraft/class_1128;Ljava/lang/Object;Lnet/minecraft/class_1128;Lnet/minecraft/class_2960;)V + ARG 3 id + METHOD method_43801 searchNamespace (Ljava/lang/String;)Ljava/util/List; + COMMENT {@return the results of searching from the namespaces of the ids} + ARG 1 namespace + METHOD method_43802 of (Ljava/util/List;Ljava/util/function/Function;)Lnet/minecraft/class_7455; + COMMENT {@return a searcher that searches from {@code values}} + ARG 0 values + ARG 1 identifiersGetter + COMMENT a function that, when given a value from {@code values}, returns a + COMMENT stream of identifiers associated with the value + METHOD method_43803 searchPath (Ljava/lang/String;)Ljava/util/List; + COMMENT {@return the results of searching from the paths of the ids} + ARG 1 path diff --git a/mappings/net/minecraft/client/search/ReloadableSearchProvider.mapping b/mappings/net/minecraft/client/search/ReloadableSearchProvider.mapping new file mode 100644 index 0000000000..3482e8e522 --- /dev/null +++ b/mappings/net/minecraft/client/search/ReloadableSearchProvider.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_1123 net/minecraft/client/search/ReloadableSearchProvider + COMMENT A functional interface that provides searching and can be reloaded. + METHOD method_43797 (Ljava/lang/String;)Ljava/util/List; + ARG 0 text + METHOD method_43798 empty ()Lnet/minecraft/class_1123; + COMMENT {@return a search provider that always returns no results} + METHOD method_4799 reload ()V + COMMENT Reloads the search provider. + COMMENT + COMMENT @apiNote Implementations must supply the context (e.g. the new data) separately, + COMMENT for example by having a getter as a field on an implementing class. diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index be11945f63..88c760f47c 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -3,8 +3,23 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager FIELD field_5494 ITEM_TAG Lnet/minecraft/class_1124$class_1125; FIELD field_5495 ITEM_TOOLTIP Lnet/minecraft/class_1124$class_1125; FIELD field_5496 RECIPE_OUTPUT Lnet/minecraft/class_1124$class_1125; + METHOD method_43804 reload (Lnet/minecraft/class_1124$class_1125;Ljava/util/List;)V + ARG 1 key + ARG 2 values + METHOD method_43805 getInstance (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1124$class_7457; + ARG 1 key METHOD method_4800 get (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1129; ARG 1 key METHOD method_4801 put (Lnet/minecraft/class_1124$class_1125;Lnet/minecraft/class_1124$class_7456;)V ARG 1 key + ARG 2 providerGetter CLASS class_1125 Key + CLASS class_7456 ProviderGetter + CLASS class_7457 Instance + FIELD field_39203 providerGetter Lnet/minecraft/class_1124$class_7456; + FIELD field_39204 provider Lnet/minecraft/class_1123; + METHOD (Lnet/minecraft/class_1124$class_7456;)V + ARG 1 providerGetter + METHOD method_43806 reload ()V + METHOD method_43807 reload (Ljava/util/List;)V + ARG 1 values diff --git a/mappings/net/minecraft/client/search/Searchable.mapping b/mappings/net/minecraft/client/search/SearchProvider.mapping similarity index 53% rename from mappings/net/minecraft/client/search/Searchable.mapping rename to mappings/net/minecraft/client/search/SearchProvider.mapping index 6fdcb1dd04..e76811fca6 100644 --- a/mappings/net/minecraft/client/search/Searchable.mapping +++ b/mappings/net/minecraft/client/search/SearchProvider.mapping @@ -1,3 +1,5 @@ -CLASS net/minecraft/class_1129 net/minecraft/client/search/Searchable +CLASS net/minecraft/class_1129 net/minecraft/client/search/SearchProvider + COMMENT A functional interface that provides searching. METHOD method_4810 findAll (Ljava/lang/String;)Ljava/util/List; + COMMENT {@return the search result of {@code text}} ARG 1 text diff --git a/mappings/net/minecraft/client/search/SearchableContainer.mapping b/mappings/net/minecraft/client/search/SearchableContainer.mapping deleted file mode 100644 index 4822456867..0000000000 --- a/mappings/net/minecraft/client/search/SearchableContainer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1123 net/minecraft/client/search/SearchableContainer - METHOD method_4799 reload ()V diff --git a/mappings/net/minecraft/client/search/SuffixArray.mapping b/mappings/net/minecraft/client/search/SuffixArray.mapping index 25550a2348..abadb9c300 100644 --- a/mappings/net/minecraft/client/search/SuffixArray.mapping +++ b/mappings/net/minecraft/client/search/SuffixArray.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_1128 net/minecraft/client/search/SuffixArray FIELD field_5508 PRINT_COMPARISONS Z FIELD field_5509 textStarts Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_5510 LOGGER Lorg/slf4j/Logger; + METHOD method_38937 ([I[III)I + ARG 2 a + ARG 3 b METHOD method_4803 ([I[I[III)V ARG 3 i ARG 4 j diff --git a/mappings/net/minecraft/client/search/TextSearchProvider.mapping b/mappings/net/minecraft/client/search/TextSearchProvider.mapping new file mode 100644 index 0000000000..db808475ec --- /dev/null +++ b/mappings/net/minecraft/client/search/TextSearchProvider.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_1126 net/minecraft/client/search/TextSearchProvider + FIELD field_39197 values Ljava/util/List; + FIELD field_39198 textSearcher Lnet/minecraft/class_7454; + FIELD field_5497 textsGetter Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;)V + ARG 1 textsGetter + ARG 2 identifiersGetter + ARG 3 values diff --git a/mappings/net/minecraft/client/search/TextSearchableContainer.mapping b/mappings/net/minecraft/client/search/TextSearchableContainer.mapping deleted file mode 100644 index ee0dcb8def..0000000000 --- a/mappings/net/minecraft/client/search/TextSearchableContainer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_1126 net/minecraft/client/search/TextSearchableContainer - FIELD field_5497 textFinder Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;)V - ARG 1 textFinder - ARG 2 identifierFinder diff --git a/mappings/net/minecraft/client/search/TextSearchableIterator.mapping b/mappings/net/minecraft/client/search/TextSearchableIterator.mapping index 5cf13f78e7..604f867d81 100644 --- a/mappings/net/minecraft/client/search/TextSearchableIterator.mapping +++ b/mappings/net/minecraft/client/search/TextSearchableIterator.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_1127 net/minecraft/client/search/TextSearchableIterator + FIELD field_5499 idPathsIterator Lcom/google/common/collect/PeekingIterator; + FIELD field_5500 textsIterator Lcom/google/common/collect/PeekingIterator; + FIELD field_5501 lastIndexComparator Ljava/util/Comparator; + METHOD (Ljava/util/Iterator;Ljava/util/Iterator;Ljava/util/Comparator;)V + ARG 1 idPathsIterator + ARG 2 textsIterator + ARG 3 lastIndexComparator diff --git a/mappings/net/minecraft/client/search/TextSearcher.mapping b/mappings/net/minecraft/client/search/TextSearcher.mapping new file mode 100644 index 0000000000..7334484c65 --- /dev/null +++ b/mappings/net/minecraft/client/search/TextSearcher.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_7454 net/minecraft/client/search/TextSearcher + COMMENT A functional interface that allows searching with a text. + METHOD method_43793 of ()Lnet/minecraft/class_7454; + COMMENT {@return a searcher that always returns no results} + METHOD method_43794 (Lnet/minecraft/class_1128;Ljava/lang/Object;Ljava/lang/String;)V + ARG 2 text + METHOD method_43795 (Ljava/lang/String;)Ljava/util/List; + ARG 0 text + METHOD method_43796 of (Ljava/util/List;Ljava/util/function/Function;)Lnet/minecraft/class_7454; + COMMENT {@return a searcher that searches from {@code values}} + ARG 0 values + ARG 1 textsGetter + COMMENT a function that, when given a value from {@code values}, returns a + COMMENT stream of search texts associated with the value + METHOD search (Ljava/lang/String;)Ljava/util/List; + COMMENT {@return the results of searching with the provided {@code text}} + ARG 1 text