From 309116520b7f308de93f93ff27b67762c3c57c9a Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 15 Feb 2024 23:04:51 +0100 Subject: [PATCH] Readded DatapackBuiltinEntriesProvider (#9848) --- .../core/RegistrySetBuilder.java.patch | 25 ++++++ .../RegistryPatchGenerator.java.patch | 10 +++ .../data/DatapackBuiltinEntriesProvider.java | 76 +++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 patches/minecraft/net/minecraft/data/registries/RegistryPatchGenerator.java.patch create mode 100644 src/main/java/net/minecraftforge/common/data/DatapackBuiltinEntriesProvider.java diff --git a/patches/minecraft/net/minecraft/core/RegistrySetBuilder.java.patch b/patches/minecraft/net/minecraft/core/RegistrySetBuilder.java.patch index f3a396e2ad..528937b42b 100644 --- a/patches/minecraft/net/minecraft/core/RegistrySetBuilder.java.patch +++ b/patches/minecraft/net/minecraft/core/RegistrySetBuilder.java.patch @@ -11,6 +11,31 @@ private RegistrySetBuilder.BuildState createState(RegistryAccess p_256400_) { RegistrySetBuilder.BuildState registrysetbuilder$buildstate = RegistrySetBuilder.BuildState.create(p_256400_, this.entries.stream().map(RegistrySetBuilder.RegistryStub::key)); this.entries.forEach((p_255629_) -> { +@@ -121,18 +_,21 @@ + }; + map.put(resourcekey, lazyholder); + }); +- HolderLookup.RegistryLookup registrylookup1 = p_313198_.lookupOrThrow(p_313093_); ++ HolderLookup.RegistryLookup registrylookup1 = p_313198_.lookup(p_313093_).orElse(null); ++ Lifecycle lifecycle = registrylookup.registryLifecycle(); ++ if (registrylookup1 != null) { + registrylookup1.listElements().forEach((p_308430_) -> { + ResourceKey resourcekey = p_308430_.key(); + map.computeIfAbsent(resourcekey, (p_308437_) -> { + RegistrySetBuilder.LazyHolder lazyholder = new RegistrySetBuilder.LazyHolder<>(p_312548_, resourcekey); + lazyholder.supplier = () -> { +- return cloner.clone((T)p_308430_.value(), p_313198_, p_311605_.getValue()); ++ return cloner.clone((T) p_308430_.value(), p_313198_, p_311605_.getValue()); + }; + return lazyholder; + }); + }); +- Lifecycle lifecycle = registrylookup.registryLifecycle().add(registrylookup1.registryLifecycle()); ++ lifecycle = registrylookup.registryLifecycle().add(registrylookup1.registryLifecycle()); ++ } + return lookupFromMap(p_313093_, lifecycle, map); + } + } @@ -168,7 +_,7 @@ RegistrySetBuilder.UniversalLookup registrysetbuilder$universallookup = new RegistrySetBuilder.UniversalLookup(registrysetbuilder$compositeowner); ImmutableMap.Builder> builder = ImmutableMap.builder(); diff --git a/patches/minecraft/net/minecraft/data/registries/RegistryPatchGenerator.java.patch b/patches/minecraft/net/minecraft/data/registries/RegistryPatchGenerator.java.patch new file mode 100644 index 0000000000..36cbef677b --- /dev/null +++ b/patches/minecraft/net/minecraft/data/registries/RegistryPatchGenerator.java.patch @@ -0,0 +1,10 @@ +--- a/net/minecraft/data/registries/RegistryPatchGenerator.java ++++ b/net/minecraft/data/registries/RegistryPatchGenerator.java +@@ -20,6 +_,7 @@ + RegistryDataLoader.WORLDGEN_REGISTRIES.forEach((p_313050_) -> { + p_313050_.runWithArguments(cloner$factory::addCodec); + }); ++ RegistryDataLoader.DIMENSION_REGISTRIES.forEach(reg -> reg.runWithArguments(cloner$factory::addCodec)); + RegistrySetBuilder.PatchedRegistries registrysetbuilder$patchedregistries = p_310262_.buildPatch(registryaccess$frozen, p_309945_, cloner$factory); + HolderLookup.Provider holderlookup$provider = registrysetbuilder$patchedregistries.full(); + Optional> optional = holderlookup$provider.lookup(Registries.BIOME); diff --git a/src/main/java/net/minecraftforge/common/data/DatapackBuiltinEntriesProvider.java b/src/main/java/net/minecraftforge/common/data/DatapackBuiltinEntriesProvider.java new file mode 100644 index 0000000000..2ce00ddf42 --- /dev/null +++ b/src/main/java/net/minecraftforge/common/data/DatapackBuiltinEntriesProvider.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common.data; + +import net.minecraft.core.*; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.registries.RegistriesDatapackGenerator; +import net.minecraft.data.registries.RegistryPatchGenerator; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.data.worldgen.features.OreFeatures; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import org.jetbrains.annotations.Nullable; + +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +/** + * An extension of the {@link RegistriesDatapackGenerator} which properly handles + * referencing existing dynamic registry objects within another dynamic registry + * object. + */ +public class DatapackBuiltinEntriesProvider extends RegistriesDatapackGenerator +{ + + private final CompletableFuture fullRegistries; + + /** + * Constructs a new datapack provider which generates all registry objects + * from the provided mods using the holder. + * + * @param output the target directory of the data generator + * @param registries a future of patched registries + * @param modIds a set of mod ids to generate the dynamic registry objects of + */ + public DatapackBuiltinEntriesProvider(PackOutput output, CompletableFuture registries, Set modIds) + { + super(output, registries.thenApply(RegistrySetBuilder.PatchedRegistries::patches), modIds); + this.fullRegistries = registries.thenApply(RegistrySetBuilder.PatchedRegistries::full); + } + + /** + * Constructs a new datapack provider which generates all registry objects + * from the provided mods using the holder. All entries that need to be + * bootstrapped are provided within the {@link RegistrySetBuilder}. + * + * @param output the target directory of the data generator + * @param registries a future of a lookup for registries and their objects + * @param registryBuilder a builder containing the dynamic registry objects added by this provider + * @param modIds a set of mod ids to generate the dynamic registry objects of + */ + public DatapackBuiltinEntriesProvider(PackOutput output, CompletableFuture registries, RegistrySetBuilder registryBuilder, Set modIds) + { + this(output, RegistryPatchGenerator.createLookup(registries, registryBuilder), modIds); + } + + /** + * Gets the future of the full registry lookup containing all added elements.
+ * The returned full registry lookup can also be used for other data providers.
+ *
{@code
+     * var provider = new DatapackBuiltinEntriesProvider(generator.getPackOutput(), event.getLookupProvider(), new RegistrySetBuilder(), Set.of("example_mod"));
+     * }
+ * An example use case is the {@link TagsProvider}. + * @return the future of the full registry lookup + */ + public CompletableFuture getFullRegistries() + { + return this.fullRegistries; + } +}