Merge branch 'neoforged:1.21.x' into 1.21.x-render-middleware

neoforged · Oct 31, 2024 · 07cba15 · 07cba15
2 parents 8b99c43 + 62eb61a
commit 07cba15
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/common/data/DataMapProvider.java b/src/main/java/net/neoforged/neoforge/common/data/DataMapProvider.java
@@ -25,7 +25,6 @@
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
-import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -63,7 +62,7 @@ public CompletableFuture<?> run(CachedOutput cache) {
         return lookupProvider.thenCompose(provider -> {
             gather(provider);
 
-            final DynamicOps<JsonElement> dynamicOps = RegistryOps.create(JsonOps.INSTANCE, provider);
+            final DynamicOps<JsonElement> dynamicOps = provider.createSerializationContext(JsonOps.INSTANCE);
 
             return CompletableFuture.allOf(this.builders.entrySet().stream().map(entry -> {
                 DataMapType<?, ?> type = entry.getKey();