From 05fc6f986b36bfe6eded51d09d2382ac3236aaf4 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 3 Oct 2024 16:58:56 +1000 Subject: [PATCH] 24w40a registriesFuture Changes remaining `registryLookupFuture` to `registriesFuture` to match recent conventions --- mappings/net/minecraft/data/Main.mapping | 2 +- .../net/minecraft/data/report/BiomeParametersProvider.mapping | 4 ++-- mappings/net/minecraft/data/report/BlockListProvider.mapping | 4 ++-- .../net/minecraft/data/report/CommandSyntaxProvider.mapping | 4 ++-- mappings/net/minecraft/data/report/ItemListProvider.mapping | 4 ++-- .../minecraft/data/server/DynamicRegistriesProvider.mapping | 2 +- .../data/server/advancement/AdvancementProvider.mapping | 4 ++-- .../minecraft/data/server/loottable/LootTableProvider.mapping | 4 ++-- mappings/net/minecraft/data/server/tag/TagProvider.mapping | 4 ++-- .../registry/TradeRebalanceBuiltinRegistries.mapping | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index ee0c967654..e11c5d9fcc 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/data/Main ARG 2 outputx METHOD method_46839 toFactory (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2405$class_7857; ARG 0 baseFactory - ARG 1 registryLookupFuture + ARG 1 registriesFuture METHOD method_46840 (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405; ARG 2 output METHOD method_4967 (Ljava/lang/String;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping index 20e065e5fa..2936629b7e 100644 --- a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_7228 net/minecraft/data/report/BiomeParametersProvider FIELD field_38012 LOGGER Lorg/slf4j/Logger; FIELD field_39373 path Ljava/nio/file/Path; - FIELD field_40950 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40950 registriesFuture Ljava/util/concurrent/CompletableFuture; FIELD field_43090 BIOME_KEY_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_43091 BIOME_ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output - ARG 2 registryLookupFuture + ARG 2 registriesFuture METHOD method_42030 write (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 0 path ARG 1 writer diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 7713155fd6..5423fa8957 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider FIELD field_40599 output Lnet/minecraft/class_7784; - FIELD field_49660 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_49660 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output - ARG 2 registryLookupFuture + ARG 2 registriesFuture METHOD method_57952 (Lnet/minecraft/class_6903;Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V ARG 2 entry METHOD method_57954 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index 1b55af5093..14d918c982 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider FIELD field_40600 output Lnet/minecraft/class_7784; - FIELD field_40951 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40951 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output - ARG 2 registryLookupFuture + ARG 2 registriesFuture METHOD method_46811 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; ARG 2 registries diff --git a/mappings/net/minecraft/data/report/ItemListProvider.mapping b/mappings/net/minecraft/data/report/ItemListProvider.mapping index eda3b7a619..7cb09c37a5 100644 --- a/mappings/net/minecraft/data/report/ItemListProvider.mapping +++ b/mappings/net/minecraft/data/report/ItemListProvider.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_9338 net/minecraft/data/report/ItemListProvider FIELD field_49661 output Lnet/minecraft/class_7784; - FIELD field_49662 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_49662 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output - ARG 2 registryLookupFuture + ARG 2 registriesFuture METHOD method_57955 (Lnet/minecraft/class_6903;Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V ARG 2 entry METHOD method_57959 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; diff --git a/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping b/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping index 97d0f774ea..b4f27e19d0 100644 --- a/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping +++ b/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5475 net/minecraft/data/server/DynamicRegistriesProvider FIELD field_40665 output Lnet/minecraft/class_7784; - FIELD field_40952 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40952 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registriesFuture diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping index e68fdd6b8c..c451faf58b 100644 --- a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/AdvancementProvider FIELD field_11289 tabGenerators Ljava/util/List; FIELD field_39372 pathResolver Lnet/minecraft/class_7784$class_7489; - FIELD field_40949 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40949 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)V ARG 1 output - ARG 2 registryLookupFuture + ARG 2 registriesFuture ARG 3 tabGenerators METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)V ARG 5 advancement diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index 22e8e0d4b9..09180fb3f6 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv FIELD field_11355 LOGGER Lorg/slf4j/Logger; FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_40617 lootTableIds Ljava/util/Set; - FIELD field_48978 registryLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_48978 registriesFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 lootTableIds ARG 3 lootTypeGenerators - ARG 4 registryLookupFuture + ARG 4 registriesFuture METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping index 482bcf1e4f..c4c317651d 100644 --- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryRef - ARG 3 registryLookupFuture + ARG 3 registriesFuture METHOD (Lnet/minecraft/class_7784;Lnet/minecraft/class_5321;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryRef @@ -42,7 +42,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider METHOD method_49706 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; ARG 1 registries METHOD method_49707 (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874; - ARG 1 registryLookupFuture + ARG 1 registriesFuture CLASS class_5124 ProvidedTagBuilder FIELD field_23960 builder Lnet/minecraft/class_3495; METHOD (Lnet/minecraft/class_3495;)V diff --git a/mappings/net/minecraft/registry/TradeRebalanceBuiltinRegistries.mapping b/mappings/net/minecraft/registry/TradeRebalanceBuiltinRegistries.mapping index c13132b940..73beb374e6 100644 --- a/mappings/net/minecraft/registry/TradeRebalanceBuiltinRegistries.mapping +++ b/mappings/net/minecraft/registry/TradeRebalanceBuiltinRegistries.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_9757 net/minecraft/registry/TradeRebalanceBuiltinRegistries FIELD field_51847 REGISTRY_BUILDER Lnet/minecraft/class_7877; METHOD method_60420 validate (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; - ARG 0 registryLookupFuture + ARG 0 registriesFuture