diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping
index 71050c4dee..ac838d9c54 100644
--- a/mappings/net/minecraft/datafixer/Schemas.mapping
+++ b/mappings/net/minecraft/datafixer/Schemas.mapping
@@ -26,3 +26,7 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas
 		ARG 0 frogVariants
 	METHOD method_43062 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
 		ARG 0 catVariants
+	METHOD method_57075 replacingRaw (Ljava/util/Map;)Ljava/util/function/UnaryOperator;
+		ARG 0 replacements
+	METHOD method_57076 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+		ARG 1 string
diff --git a/mappings/net/minecraft/registry/RegistryBuilder.mapping b/mappings/net/minecraft/registry/RegistryBuilder.mapping
index f33677b49b..9f954761ce 100644
--- a/mappings/net/minecraft/registry/RegistryBuilder.mapping
+++ b/mappings/net/minecraft/registry/RegistryBuilder.mapping
@@ -26,7 +26,10 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 	METHOD method_49352 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7883;)V
 		ARG 1 registry
 	METHOD method_55283 createWrapper (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/class_7876;Ljava/util/Map;)Lnet/minecraft/class_7225$class_7226;
+		ARG 0 registryRef
 		ARG 1 lifecycle
+		ARG 2 owner
+		ARG 3 entries
 	METHOD method_55285 (Lnet/minecraft/class_7876;Lnet/minecraft/class_5321;Lnet/minecraft/class_8990;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
 		ARG 6 key
 	METHOD method_55286 applyPatches (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_5321;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;)Lnet/minecraft/class_7225$class_7226;
@@ -38,6 +41,8 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 6 lazyWrapper
 	METHOD method_55287 (Lnet/minecraft/class_7876;Lnet/minecraft/class_8990;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 5 entry
+	METHOD method_55288 (Ljava/util/Map;Lnet/minecraft/class_5455$class_6892;)V
+		ARG 1 registry
 	METHOD method_55289 createFullWrapperLookup (Lnet/minecraft/class_5455;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8990$class_8991;Ljava/util/Map;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7225$class_7874;
 		ARG 1 registryManager
 		ARG 2 base
@@ -45,6 +50,9 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 4 initializedRegistries
 		ARG 5 patches
 	METHOD method_55290 createWrapperLookup (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_5455;Ljava/util/stream/Stream;)Lnet/minecraft/class_7225$class_7874;
+		ARG 0 entryOwner
+		ARG 1 registryManager
+		ARG 2 wrappers
 	METHOD method_55291 (Lnet/minecraft/class_7877$class_7878;Lnet/minecraft/class_7877$class_7883;)Lnet/minecraft/class_7225$class_7226;
 		ARG 1 registry
 	METHOD method_55292 (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_8990$class_8991;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7225$class_7874;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226;
@@ -55,8 +63,13 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		ARG 5 entry
 	METHOD method_55295 (Ljava/util/Set;Lnet/minecraft/class_5321;)Z
 		ARG 1 key
+	METHOD method_57094 (Ljava/util/Map;Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_7225$class_7226;)V
+		ARG 2 wrapper
 	CLASS 2
 		FIELD field_40947 keysToEntries Ljava/util/Map;
+	CLASS 3
+		METHOD method_57095 get (Lnet/minecraft/class_5321;)Ljava/util/Optional;
+			ARG 1 registryRef
 	CLASS class_7878 Registries
 		METHOD method_46787 createRegisterable ()Lnet/minecraft/class_7891;
 		METHOD method_46790 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5455$class_6892;)V
@@ -73,9 +86,6 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 		METHOD method_55298 checkOrphanedValues ()V
 		METHOD method_55299 checkUnreferencedKeys ()V
 	CLASS class_7879 AnyOwner
-		COMMENT An owner that owns multiple registries and holds the owner object for those.
-		COMMENT {@link #ownerEquals} returns {@code true} for all owners {@linkplain #addOwner previously
-		COMMENT added}.
 		METHOD method_55300 downcast ()Lnet/minecraft/class_7876;
 	CLASS class_7880 EntryListCreatingLookup
 		FIELD field_40945 entryOwner Lnet/minecraft/class_7876;
@@ -110,3 +120,15 @@ CLASS net/minecraft/class_7877 net/minecraft/registry/RegistryBuilder
 			ARG 1 owner
 			ARG 2 key
 	CLASS class_8993 FullPatchesRegistriesPair
+	CLASS class_9256 WrapperInfoPair
+		METHOD method_57096 of (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7877$class_9256;
+			ARG 0 wrapper
+		METHOD method_57097 of (Lnet/minecraft/class_7877$class_7879;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7877$class_9256;
+			ARG 0 owner
+			ARG 1 wrapper
+	CLASS class_9257 UntaggedDelegatingLookup
+		FIELD field_49169 base Lnet/minecraft/class_7225$class_7226;
+		METHOD <init> (Lnet/minecraft/class_7876;Lnet/minecraft/class_7225$class_7226;)V
+			ARG 1 entryOwner
+			ARG 2 base
+	CLASS class_9258 UntaggedLookup
diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping
index 10367aa09b..fc805f9d24 100644
--- a/mappings/net/minecraft/registry/RegistryOps.mapping
+++ b/mappings/net/minecraft/registry/RegistryOps.mapping
@@ -40,6 +40,8 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps
 	CLASS class_7862 RegistryInfo
 		FIELD comp_1131 entryLookup Lnet/minecraft/class_7871;
 		METHOD comp_1131 entryLookup ()Lnet/minecraft/class_7871;
+		METHOD method_57074 fromWrapper (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_6903$class_7862;
+			ARG 0 wrapper
 	CLASS class_7863 RegistryInfoGetter
 		METHOD method_46623 getRegistryInfo (Lnet/minecraft/class_5321;)Ljava/util/Optional;
 			ARG 1 registryRef
diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping
index 080bc6b477..bec587ceef 100644
--- a/mappings/net/minecraft/registry/RegistryWrapper.mapping
+++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping
@@ -35,6 +35,8 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper
 		METHOD method_46762 getWrapperOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225$class_7226;
 			ARG 1 registryRef
 		METHOD method_55282 streamAllRegistryKeys ()Ljava/util/stream/Stream;
+		METHOD method_57093 getOps (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6903;
+			ARG 1 delegate
 		CLASS 1
 			METHOD method_46764 (Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7871;
 				ARG 0 lookup