diff --git a/patches/minecraft/net/minecraft/core/RegistrySynchronization.java.patch b/patches/minecraft/net/minecraft/core/RegistrySynchronization.java.patch new file mode 100644 index 0000000000..8b23e5718d --- /dev/null +++ b/patches/minecraft/net/minecraft/core/RegistrySynchronization.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/core/RegistrySynchronization.java ++++ b/net/minecraft/core/RegistrySynchronization.java +@@ -23,7 +_,7 @@ + m_245912_(builder, Registries.f_256952_, Biome.f_47430_); + m_245912_(builder, Registries.f_256873_, ChatType.f_237005_); + m_245912_(builder, Registries.f_256787_, DimensionType.f_63843_); +- return builder.build(); ++ return net.minecraftforge.registries.DataPackRegistriesHooks.grabNetworkableRegistries(builder); // FORGE: Keep the map so custom registries can be added later + }); + public static final Codec f_244380_ = m_247146_(); + diff --git a/src/main/java/net/minecraftforge/registries/DataPackRegistriesHooks.java b/src/main/java/net/minecraftforge/registries/DataPackRegistriesHooks.java index 5b97315a93..52eb101581 100644 --- a/src/main/java/net/minecraftforge/registries/DataPackRegistriesHooks.java +++ b/src/main/java/net/minecraftforge/registries/DataPackRegistriesHooks.java @@ -5,15 +5,20 @@ package net.minecraftforge.registries; +import com.google.common.collect.ImmutableMap; import net.minecraft.core.Registry; +import net.minecraft.core.RegistrySynchronization; import net.minecraft.resources.RegistryDataLoader; import net.minecraft.resources.ResourceKey; import org.jetbrains.annotations.ApiStatus; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Set; @ApiStatus.Internal @@ -21,18 +26,33 @@ public final class DataPackRegistriesHooks { private DataPackRegistriesHooks() {} // utility class + private static final Map>, RegistrySynchronization.NetworkedRegistryData> NETWORKABLE_REGISTRIES = new LinkedHashMap<>(); private static final List> DATA_PACK_REGISTRIES = new ArrayList<>(RegistryDataLoader.WORLDGEN_REGISTRIES); private static final List> DATA_PACK_REGISTRIES_VIEW = Collections.unmodifiableList(DATA_PACK_REGISTRIES); private static final Set>> SYNCED_CUSTOM_REGISTRIES = new HashSet<>(); private static final Set>> SYNCED_CUSTOM_REGISTRIES_VIEW = Collections.unmodifiableSet(SYNCED_CUSTOM_REGISTRIES); + /* Internal forge hook for retaining mutable access to RegistryAccess's codec registry when it bootstraps. */ + public static Map>, RegistrySynchronization.NetworkedRegistryData> grabNetworkableRegistries(ImmutableMap.Builder>, RegistrySynchronization.NetworkedRegistryData> builder) + { + if (!StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass().equals(RegistrySynchronization.class)) + throw new IllegalCallerException("Attempted to call DataPackRegistriesHooks#grabNetworkableRegistries!"); + NETWORKABLE_REGISTRIES.forEach(builder::put); + NETWORKABLE_REGISTRIES.clear(); + NETWORKABLE_REGISTRIES.putAll(builder.build()); + return Collections.unmodifiableMap(NETWORKABLE_REGISTRIES); + } + /* Internal forge method, registers a datapack registry codec and folder. */ static void addRegistryCodec(DataPackRegistryEvent.DataPackRegistryData data) { RegistryDataLoader.RegistryData loaderData = data.loaderData(); DATA_PACK_REGISTRIES.add(loaderData); if (data.networkCodec() != null) + { SYNCED_CUSTOM_REGISTRIES.add(loaderData.key()); + NETWORKABLE_REGISTRIES.put(loaderData.key(), new RegistrySynchronization.NetworkedRegistryData<>(loaderData.key(), data.networkCodec())); + } } /** @@ -53,4 +73,4 @@ public final class DataPackRegistriesHooks { return SYNCED_CUSTOM_REGISTRIES_VIEW; } -} \ No newline at end of file +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 3bccadf2f1..4b52a01f52 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -187,6 +187,7 @@ public net.minecraft.data.recipes.packs.VanillaRecipeProvider f_244565_ # REDSTO public net.minecraft.data.recipes.packs.VanillaRecipeProvider f_244628_ # LAPIS_SMELTABLES public net.minecraft.data.tags.IntrinsicHolderTagsProvider$IntrinsicTagAppender public net.minecraft.data.tags.TagsProvider$TagAppender +public net.minecraft.core.RegistrySynchronization$NetworkedRegistryData protected net.minecraft.data.tags.TagsProvider f_126543_ # builders public-f net.minecraft.data.tags.TagsProvider m_6055_()Ljava/lang/String; # getName public net.minecraft.gametest.framework.GameTestServer (Ljava/lang/Thread;Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/server/WorldStem;Ljava/util/Collection;Lnet/minecraft/core/BlockPos;)V # constructor diff --git a/src/test/java/net/minecraftforge/debug/misc/DataPackRegistriesTest.java b/src/test/java/net/minecraftforge/debug/misc/DataPackRegistriesTest.java index 42a482d749..eb5d52492b 100644 --- a/src/test/java/net/minecraftforge/debug/misc/DataPackRegistriesTest.java +++ b/src/test/java/net/minecraftforge/debug/misc/DataPackRegistriesTest.java @@ -34,6 +34,7 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.event.TagsUpdatedEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.util.thread.EffectiveSide; @@ -53,7 +54,7 @@ import org.slf4j.Logger; *
  • data/data_pack_registries_test/tags/data_pack_registries_test/syncable/test.json
  • * */ -//@Mod(DataPackRegistriesTest.MODID) +@Mod(DataPackRegistriesTest.MODID) public class DataPackRegistriesTest { private static final boolean ENABLED = true; diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index 71dd1e7a86..e9a8eb5155 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -269,6 +269,8 @@ modId="ambient_occlusion_elements_test" [[mods]] modId="grindstone_event_test" [[mods]] +modId="data_pack_registries_test" +[[mods]] modId="creative_mode_tab_test"