Standardise WrapperLookup params and fields to "registries" (#3956)

* Standardise RW.WrapperLookup params and fields to "registries" Some old more descriptive names like `nonReloadables`, `first`/`second`, `fullRegistry` and `base`/`patches` were retained. * Add some special Minecraft classes to conventions * Add more renames --------- Co-authored-by: Shnupbups <[email protected]>
FabricMC · Aug 27, 2024 · 62e6179 · 62e6179
1 parent 0151be6
commit 62e6179
Show file tree

Hide file tree

Showing 77 changed files with 133 additions and 117 deletions.
diff --git a/CONVENTIONS.md b/CONVENTIONS.md
@@ -115,6 +115,16 @@ front of the coordinate (`velocityX`, not `xVelocity`).
 
 Name screen coordinates `x` and `y`, rather than `left` and `top`.
 
+### Special classes
+
+Unless a more descriptive name is better, these Minecraft classes should get specific names as fields and parameters:
+
+| Class                                                  | Name              |
+| ------------------------------------------------------ | ----------------- |
+| `net.minecraft.client.render.VertexConsumerProvider`   | `vertexConsumers` |
+| `net.minecraft.client.util.math.MatrixStack`           | `matrices`        |
+| `net.minecraft.registry.RegistryWrapper.WrapperLookup` | `registries`      |
+
 ## Javadocs
 
 Write sentences for class, method and field javadocs, starting with an uppercase and ending with a period. Start method docs with verbs, like `Gets` or `Called`. Use HTML tags such as `<p>` if the docs have several paragraphs, as line wraps are converted to spaces in the generated documentation. Feel free to start a new line whenever you feel the current line is too long. Note that some ending tags such as `</p>` are not mandatory for Javadocs to render correctly.

diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -77,7 +77,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 0 pos
 		ARG 1 state
 		ARG 2 nbt
-		ARG 3 registryLookup
+		ARG 3 registries
 	METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		COMMENT Writes data to {@code nbt}. Subclasses should override this if they
 		COMMENT store a persistent data.
@@ -88,7 +88,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #readNbt
 		ARG 1 nbt
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680;
 		COMMENT {@return the cached block state at the block entity's position}
 		COMMENT
@@ -117,7 +117,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #writeNbt
 		ARG 1 nbt
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_11015 isRemoved ()Z
 	METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
 		COMMENT {@return the block entity's position}
@@ -137,7 +137,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT <p>To send all NBT data of this block entity saved to disk, return {@link #createNbt}.
 		COMMENT
 		COMMENT @see #toUpdatePacket
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_17897 (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;Ljava/lang/String;Lnet/minecraft/class_2586;)Lnet/minecraft/class_2586;
 		ARG 3 blockEntity
 	METHOD method_17899 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/lang/String;Lnet/minecraft/class_2591;)Lnet/minecraft/class_2586;
@@ -203,7 +203,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithId
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data with block entity type ID}
 		COMMENT
@@ -212,7 +212,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT
 		COMMENT @see #createNbt
 		COMMENT @see #createNbtWithIdentifyingData
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		COMMENT {@return the block entity's NBT data}
 		COMMENT
@@ -222,7 +222,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		COMMENT @see #writeNbt
 		COMMENT @see #createNbtWithIdentifyingData
 		COMMENT @see #createNbtWithId
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_5431 markDirty ()V
 		COMMENT Marks this block entity as dirty and that it needs to be saved.
 		COMMENT This also triggers {@linkplain World#updateComparators comparator update}.
@@ -253,18 +253,18 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 		ARG 0 error
 	METHOD method_58690 read (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 nbt
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_58691 readComponentlessNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 nbt
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_58692 createComponentlessNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_58693 getComponents ()Lnet/minecraft/class_9323;
 	METHOD method_59535 createComponentlessNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_59894 tryParseCustomName (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2561;
 		ARG 0 json
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_61175 validateSupports (Lnet/minecraft/class_2680;)V
 		ARG 1 state
 	METHOD method_61176 supports (Lnet/minecraft/class_2680;)Z

diff --git a/mappings/net/minecraft/block/jukebox/JukeboxSong.mapping b/mappings/net/minecraft/block/jukebox/JukeboxSong.mapping
@@ -10,5 +10,5 @@ CLASS net/minecraft/class_9793 net/minecraft/block/jukebox/JukeboxSong
 	METHOD method_60752 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_60753 getSongEntryFromStack (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;)Ljava/util/Optional;
-		ARG 0 registryLookup
+		ARG 0 registries
 		ARG 1 stack
diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping
@@ -68,7 +68,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 	METHOD method_47420 updateDisplayParameters (Lnet/minecraft/class_7699;ZLnet/minecraft/class_7225$class_7874;)V
 		ARG 1 enabledFeatures
 		ARG 2 showOperatorTab
-		ARG 3 registryLookup
+		ARG 3 registries
 	METHOD method_47421 refreshSelectedTab (Ljava/util/Collection;)V
 		ARG 1 displayStacks
 	METHOD method_47422 getTabX (Lnet/minecraft/class_1761;)I
@@ -82,7 +82,7 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv
 		ARG 1 searchManager
 		ARG 2 enabledFeatures
 		ARG 3 showOperatorTab
-		ARG 4 registryLookup
+		ARG 4 registries
 	CLASS class_482 LockableSlot
 	CLASS class_483 CreativeScreenHandler
 		FIELD field_2897 itemList Lnet/minecraft/class_2371;

diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping
@@ -16,7 +16,7 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry
 	METHOD method_56838 (Lnet/minecraft/class_748;)Ljava/util/List;
 		ARG 0 entry
 	METHOD method_56839 deserialize (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List;
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_56840 (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_1799;
 		ARG 1 stack
 	METHOD method_56841 (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping
@@ -26,7 +26,7 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager
 		ARG 1 context
 		ARG 2 type
 	METHOD method_60357 addItemTooltipReloader (Lnet/minecraft/class_7225$class_7874;Ljava/util/List;)V
-		ARG 1 registryLookup
+		ARG 1 registries
 		ARG 2 stacks
 	METHOD method_60358 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_8786;)Lnet/minecraft/class_2960;
 		ARG 2 recipe

diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	COMMENT callbacks (such as {@link net.minecraft.server.command.CommandManager} constructor)
 	COMMENT provides an instance with proper configurations.
 	METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157;
-		ARG 0 wrapperLookup
+		ARG 0 registries
 		ARG 1 enabledFeatures
 	CLASS 1
 		METHOD method_56810 (Lnet/minecraft/class_7699;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226;

diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping
@@ -18,7 +18,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage
 		ARG 2 nbt
 	METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566;
 		ARG 2 nbt
-		ARG 3 registryLookup
+		ARG 3 registries
 	METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645;
 		ARG 1 namespace
 	CLASS class_4566 PersistentState

diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping
@@ -68,7 +68,7 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum
 		FIELD field_50068 itemSubPredicateTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226;
 		FIELD field_50069 nbtOps Lnet/minecraft/class_6903;
 		METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-			ARG 1 registryLookup
+			ARG 1 registries
 		METHOD method_58544 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;
 			ARG 0 entry
 		METHOD method_58545 (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_1799;)Z

diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping
@@ -14,7 +14,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 	FIELD field_51458 MALFORMED_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_51831 EXCLAMATION_MARK C
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_58517 consume (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2291$class_9219;)V
 		ARG 1 reader
 		ARG 2 callbacks

diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType
-	FIELD field_48929 registryLookup Lnet/minecraft/class_7225$class_7874;
+	FIELD field_48929 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_51438 INVALID_OPTIONS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_9935 EXAMPLES Ljava/util/Collection;
 	FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
@@ -17,13 +17,13 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu
 		ARG 0 registryAccess
 	METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 id
 	METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394;
 		ARG 0 reader
 		ARG 1 type
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394;
 		ARG 0 context
 		ARG 1 name

diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_9433 net/minecraft/command/argument/RegistryEntryArgum
 	FIELD field_50037 FAILED_TO_PARSE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_50038 EXAMPLES Ljava/util/Collection;
 	FIELD field_50039 INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
-	FIELD field_50040 registryLookup Lnet/minecraft/class_7225$class_7874;
+	FIELD field_50040 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_50041 canLookupRegistry Z
 	FIELD field_50042 entryCodec Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V

diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping
@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType
 	FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_47554 EXAMPLES Ljava/util/Collection;
-	FIELD field_48932 registryLookup Lnet/minecraft/class_7225$class_7874;
+	FIELD field_48932 registries Lnet/minecraft/class_7225$class_7874;
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019;
 		ARG 0 registryAccess
 	METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583;

diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping
@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType
-	FIELD field_48917 registryLookup Lnet/minecraft/class_7225$class_7874;
+	FIELD field_48917 registries Lnet/minecraft/class_7225$class_7874;
 	FIELD field_9841 EXAMPLES Ljava/util/Collection;
 	FIELD field_9842 INVALID_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
 		ARG 0 context
 		ARG 1 name

diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
@@ -33,7 +33,7 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp
 	METHOD method_58449 withShowInTooltip (Z)Lnet/minecraft/class_9304;
 		ARG 1 showInTooltip
 	METHOD method_59716 getTooltipOrderList (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_5321;Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885;
-		ARG 0 registryLookup
+		ARG 0 registries
 		ARG 1 registryRef
 		ARG 2 tooltipOrderTag
 	CLASS class_9305 Builder

diff --git a/mappings/net/minecraft/component/type/NbtComponent.mapping b/mappings/net/minecraft/component/type/NbtComponent.mapping
@@ -22,7 +22,7 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent
 		ARG 0 component
 	METHOD method_57449 applyToBlockEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_7225$class_7874;)Z
 		ARG 1 blockEntity
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_57450 contains (Ljava/lang/String;)Z
 		ARG 1 key
 	METHOD method_57451 apply (Ljava/util/function/Consumer;)Lnet/minecraft/class_9279;

diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
@@ -23,7 +23,7 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentCo
 		ARG 2 text
 	METHOD method_57524 exceedsSerializedLengthLimit (Lnet/minecraft/class_2561;Lnet/minecraft/class_7225$class_7874;)Z
 		ARG 0 text
-		ARG 1 lookup
+		ARG 1 registries
 	METHOD method_57525 getPages (Z)Ljava/util/List;
 		ARG 1 shouldFilter
 	METHOD method_57526 (ZLnet/minecraft/class_9262;)Lnet/minecraft/class_2561;

diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping
@@ -15,7 +15,7 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider
 		ARG 0 key
 	METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 writer
-		ARG 1 registryLookup
+		ARG 1 registries
 		ARG 2 codec
 		ARG 3 value
 		ARG 4 path

diff --git a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping
@@ -18,7 +18,7 @@ CLASS net/minecraft/class_7228 net/minecraft/data/report/BiomeParametersProvider
 	METHOD method_42032 resolvePath (Lnet/minecraft/class_2960;)Ljava/nio/file/Path;
 		ARG 1 id
 	METHOD method_46810 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
-		ARG 2 lookup
+		ARG 2 registries
 	METHOD method_49648 (Ljava/util/List;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_8197$class_5305;Lnet/minecraft/class_6544$class_6547;)V
 		ARG 4 preset
 		ARG 5 entries
diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping
@@ -7,4 +7,4 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider
 	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;
-		ARG 2 registryLookup
+		ARG 2 registries
diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping
@@ -5,4 +5,4 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider
 		ARG 1 output
 		ARG 2 registryLookupFuture
 	METHOD method_46811 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
-		ARG 2 lookup
+		ARG 2 registries
diff --git a/mappings/net/minecraft/data/report/ItemListProvider.mapping b/mappings/net/minecraft/data/report/ItemListProvider.mapping
@@ -7,6 +7,6 @@ CLASS net/minecraft/class_9338 net/minecraft/data/report/ItemListProvider
 	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;
-		ARG 2 registryLookup
+		ARG 2 registries
 	METHOD method_60581 (Ljava/lang/String;)Ljava/lang/IllegalStateException;
 		ARG 0 components
diff --git a/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping b/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping
@@ -6,7 +6,7 @@ CLASS net/minecraft/class_5475 net/minecraft/data/server/DynamicRegistriesProvid
 		ARG 2 registryLookupFuture
 	METHOD method_39678 writeRegistryEntries (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)Ljava/util/Optional;
 		ARG 1 writer
-		ARG 2 lookup
+		ARG 2 registries
 		ARG 3 ops
 		ARG 4 registry
 	METHOD method_39680 writeToPath (Ljava/nio/file/Path;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
@@ -20,6 +20,6 @@ CLASS net/minecraft/class_5475 net/minecraft/data/server/DynamicRegistriesProvid
 	METHOD method_46813 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7403;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;Lnet/minecraft/class_7225$class_7226;)Ljava/util/concurrent/CompletableFuture;
 		ARG 5 wrapper
 	METHOD method_46814 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
-		ARG 2 lookup
+		ARG 2 registries
 	METHOD method_46816 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_7655$class_7657;)Ljava/util/stream/Stream;
 		ARG 4 entry
diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping
@@ -9,4 +9,4 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/Advancement
 	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
 	METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage;
-		ARG 2 lookup
+		ARG 2 registries
diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_7785 net/minecraft/data/server/advancement/AdvancementTabGenerator
 	METHOD method_10335 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;)V
-		ARG 1 lookup
+		ARG 1 registries
 		ARG 2 exporter
 	METHOD method_55578 reference (Ljava/lang/String;)Lnet/minecraft/class_8779;
 		COMMENT {@return an advancement to use as a reference in {@link

diff --git a/...minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/...minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van
 		ARG 0 builder
 	METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;Ljava/util/List;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
-		ARG 1 registryLookup
+		ARG 1 registries
 		ARG 2 biomes
 	METHOD method_37315 createLookingAtEntityUsing (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_175;
 		ARG 0 lookingAt
@@ -17,7 +17,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van
 		ARG 0 range
 		ARG 1 entity
 	METHOD method_49356 buildAdventuringTime (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;Lnet/minecraft/class_8779;Lnet/minecraft/class_8197$class_5305;)V
-		ARG 0 registryLookup
+		ARG 0 registries
 		ARG 1 exporter
 		ARG 2 parent
 		ARG 3 biomeSourceListPreset

diff --git a/...minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping b/...minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping
@@ -26,6 +26,6 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/Van
 		ARG 0 entry
 	METHOD method_59775 requireAllWolvesTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
-		ARG 1 registryLookup
+		ARG 1 registries
 	METHOD method_59776 (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_5321;)V
 		ARG 2 key