Allow Datapack Registry to be configured by RegistryBuilder

patches/net/minecraft/resources/RegistryDataLoader.java.patch

@@ -46,3 +46,26 @@
 
          for (Entry<ResourceLocation, Resource> entry : filetoidconverter.listMatchingResources(p_321535_).entrySet()) {
              ResourceLocation resourcelocation = entry.getKey();
+@@ -304,13 +_,20 @@
+         void apply(RegistryDataLoader.Loader<?> p_321864_, RegistryOps.RegistryInfoLookup p_321656_);
+     }
+
+-    public static record RegistryData<T>(ResourceKey<? extends Registry<T>> key, Codec<T> elementCodec, boolean requiredNonEmpty) {
++    public static record RegistryData<T>(ResourceKey<? extends Registry<T>> key, Codec<T> elementCodec, boolean requiredNonEmpty, java.util.function.Consumer<net.neoforged.neoforge.registries.RegistryBuilder<T>> registryBuilderConsumer) {
++        public RegistryData(ResourceKey<? extends Registry<T>> key, Codec<T> elementCodec, boolean requiredNonEmpty) {
++            this(key, elementCodec, requiredNonEmpty, registryBuilder -> {});
++        }
++
+         RegistryData(ResourceKey<? extends Registry<T>> p_251360_, Codec<T> p_248976_) {
+             this(p_251360_, p_248976_, false);
+         }
+
+         RegistryDataLoader.Loader<T> create(Lifecycle p_251662_, Map<ResourceKey<?>, Exception> p_251565_) {
+-            WritableRegistry<T> writableregistry = new MappedRegistry<>(this.key, p_251662_);
++            net.neoforged.neoforge.registries.RegistryBuilder<T> registryBuilder = new net.neoforged.neoforge.registries.RegistryBuilder<>(key);
++            registryBuilderConsumer.accept(registryBuilder);
++
++            WritableRegistry<T> writableregistry = (WritableRegistry<T>) registryBuilder.disableRegistrationCheck().create();
+             return new RegistryDataLoader.Loader<>(this, writableregistry, p_251565_);
+         }
+

src/main/java/net/neoforged/neoforge/registries/DataPackRegistryEvent.java

@@ -8,6 +8,7 @@
 import com.mojang.serialization.Codec;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.RegistryDataLoader;
@@ -74,6 +75,29 @@ public <T> void dataPackRegistry(ResourceKey<Registry<T>> registryKey, Codec<T>
             this.registryDataList.add(new DataPackRegistryData<>(new RegistryDataLoader.RegistryData<>(registryKey, codec, false), networkCodec));
         }
 
+        /**
+         * Registers the registry key as a datapack registry with a {@link RegistryBuilder} configurator, which will cause data to be loaded from
+         * a datapack folder based on the registry's name.
+         * <p>
+         * Data JSONs will be loaded from {@code data/<datapack_namespace>/modid/registryname/}, where {@code modid} is the namespace of the registry key.
+         *
+         * @param registryKey  the root registry key of the new datapack registry
+         * @param codec        the codec to be used for loading data from datapacks on servers
+         * @param networkCodec the codec to be used for syncing loaded data to clients.
+         *                     If {@code networkCodec} is null, data will not be synced, and clients are not required to have this
+         *                     datapack registry to join a server.
+         *                     <p>
+         *                     If {@code networkCodec} is not null, clients must have this datapack registry/mod
+         *                     when joining a server that has this datapack registry/mod.
+         *                     The data will be synced using the network codec and accessible via {@link ClientPacketListener#registryAccess()}.
+         * @param consumer     A consumer that configures the provided RegistryBuilder
+         * @see #dataPackRegistry(ResourceKey, Codec)
+         * @see #dataPackRegistry(ResourceKey, Codec, Codec)
+         */
+        public <T> void dataPackRegistry(ResourceKey<Registry<T>> registryKey, Codec<T> codec, @Nullable Codec<T> networkCodec, Consumer<RegistryBuilder<T>> consumer) {
+            this.registryDataList.add(new DataPackRegistryData<>(new RegistryDataLoader.RegistryData<>(registryKey, codec, false, consumer), networkCodec));
+        }
+
         void process() {
             for (DataPackRegistryData<?> registryData : this.registryDataList) {
                 DataPackRegistriesHooks.addRegistryCodec(registryData);