Registry rework (#4179)

forge/src/main/java/org/spongepowered/forge/SpongeForgeMod.java

@@ -114,7 +114,6 @@ public void onServerAboutToStart(final ServerAboutToStartEvent event) {
 
         lifecycle.establishServerFeatures();
 
-        lifecycle.establishServerRegistries((Server) event.getServer());
         lifecycle.callStartingEngineEvent((Server) event.getServer());
     }
 

forge/src/mixins/java/org/spongepowered/forge/mixin/core/server/MinecraftServerMixin_Forge.java

@@ -24,14 +24,19 @@
  */
 package org.spongepowered.forge.mixin.core.server;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import net.minecraft.world.level.Level;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.common.bridge.server.MinecraftServerBridge;
 import org.spongepowered.common.bridge.server.level.ServerLevelBridge;
 import org.spongepowered.forge.ForgeServer;
 
@@ -50,4 +55,10 @@ public abstract class MinecraftServerMixin_Forge implements ForgeServer {
     public long[] getTickTime(ResourceKey<Level> dim) {
         return ((ServerLevelBridge) this.shadow$getLevel(dim)).bridge$recentTickTimes();
     }
+
+    @ModifyExpressionValue(method = "lambda$reloadResources$29", at = @At(value = "NEW", target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;"))
+    private MultiPackResourceManager impl$onReloadResources(final MultiPackResourceManager original) {
+        ((MinecraftServerBridge) this).bridge$reloadServerRegistries((RegistryHolder) original);
+        return original;
+    }
 }

generator/src/main/java/org/spongepowered/vanilla/generator/world/level/LevelDataRegistries.java

@@ -70,7 +70,9 @@ public static List<Generator> levelDataRegistries(final Context context) {
                 "Biomes",
                 "BIOME",
                 context.relativeClass("world.biome", "Biome"),
-                Registries.BIOME
+                Registries.BIOME,
+                a -> true,
+                RegistryScope.SERVER
             ),
             new RegistryEntriesGenerator<>(
                 "world.generation.carver",
@@ -219,6 +221,15 @@ public static List<Generator> levelDataRegistries(final Context context) {
                 "FLUID_TYPE",
                 context.relativeClass("fluid", "FluidType"),
                 Registries.FLUID
+            ),
+            new RegistryEntriesGenerator<>(
+                "world.server",
+                "WorldArchetypeTypes",
+                "WORLD_ARCHETYPE_TYPE",
+                context.relativeClass("world.server", "WorldArchetypeType"),
+                Registries.LEVEL_STEM,
+                $ -> true,
+                RegistryScope.SERVER
             )
         );
     }

neoforge/src/main/java/org/spongepowered/neoforge/SpongeNeoMod.java

@@ -109,7 +109,6 @@ public void onServerAboutToStart(final ServerAboutToStartEvent event) {
 
         lifecycle.establishServerFeatures();
 
-        lifecycle.establishServerRegistries((Server) event.getServer());
         lifecycle.callStartingEngineEvent((Server) event.getServer());
     }
 

neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/server/MinecraftServerMixin_Neo.java

@@ -24,14 +24,19 @@
  */
 package org.spongepowered.neoforge.mixin.core.server;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import net.minecraft.world.level.Level;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.common.bridge.server.MinecraftServerBridge;
 import org.spongepowered.common.bridge.server.level.ServerLevelBridge;
 import org.spongepowered.neoforge.NeoServer;
 
@@ -50,4 +55,10 @@ public abstract class MinecraftServerMixin_Neo implements NeoServer {
     public long[] getTickTime(ResourceKey<Level> dim) {
         return ((ServerLevelBridge) this.shadow$getLevel(dim)).bridge$recentTickTimes();
     }
+
+    @ModifyExpressionValue(method = "lambda$reloadResources$29", at = @At(value = "NEW", target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;"))
+    private MultiPackResourceManager impl$onReloadResources(final MultiPackResourceManager original) {
+        ((MinecraftServerBridge) this).bridge$reloadServerRegistries((RegistryHolder) original);
+        return original;
+    }
 }

src/main/java/org/spongepowered/common/datapack/DataPackEncoder.java → src/accessors/java/org/spongepowered/common/accessor/resources/RegistryDataLoader_LoaderAccessor.java

@@ -22,13 +22,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.datapack;
+package org.spongepowered.common.accessor.resources;
 
-import net.minecraft.core.RegistryAccess;
-import org.spongepowered.api.datapack.DataPackEntry;
+import net.minecraft.core.WritableRegistry;
+import net.minecraft.resources.RegistryDataLoader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
 
-public interface DataPackEncoder<E, T extends DataPackEntry<T>> {
+@Mixin(targets = "net/minecraft/resources/RegistryDataLoader$Loader")
+public interface RegistryDataLoader_LoaderAccessor<T> {
 
-    E encode(T serializable, RegistryAccess registryAccess);
+    @Accessor("data") RegistryDataLoader.RegistryData<T> accessor$data();
 
+    @Accessor("registry") WritableRegistry<T> accessor$registry();
 }

src/accessors/resources/mixins.sponge.accessors.json

@@ -31,6 +31,7 @@
     "network.protocol.game.ServerboundMovePlayerPacketAccessor",
     "network.protocol.game.ServerboundMoveVehiclePacketAccessor",
     "network.protocol.handshake.ClientIntentionPacketAccessor",
+    "resources.RegistryDataLoader_LoaderAccessor",
     "resources.ResourceKeyAccessor",
     "server.MinecraftServerAccessor",
     "server.level.ChunkMap_TrackedEntityAccessor",

src/launch/java/org/spongepowered/common/launch/Lifecycle.java

@@ -25,13 +25,14 @@
 package org.spongepowered.common.launch;
 
 import com.google.inject.Injector;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.spongepowered.api.Client;
 import org.spongepowered.api.Engine;
-import org.spongepowered.api.Server;
+import org.spongepowered.api.registry.Registry;
+import org.spongepowered.api.registry.RegistryHolder;
+
+import java.util.stream.Stream;
 
 
 /**
@@ -50,9 +51,6 @@ public interface Lifecycle {
     void callRegisterBuilderEvent();
 
     void establishEarlyGlobalRegistries();
-    void finalizeEarlyGlobalRegistries();
-
-    void establishGlobalRegistries(RegistryAccess.Frozen registryAccess, final RegistryLayer layer);
 
     void establishDataProviders();
 
@@ -70,7 +68,11 @@ public interface Lifecycle {
 
     void callConstructEvent();
 
-    void establishServerRegistries(Server server);
+    void beginEstablishServerRegistries(RegistryHolder server);
+
+    void processServerRegistries(RegistryHolder server, Stream<? extends Registry<?>> registries);
+
+    void endEstablishServerRegistries(RegistryHolder server);
 
     void establishClientRegistries(Client client);
 

src/main/java/org/spongepowered/common/SpongeLifecycle.java

@@ -29,23 +29,24 @@
 import com.google.inject.Singleton;
 import io.leangen.geantyref.TypeToken;
 import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Client;
 import org.spongepowered.api.Engine;
 import org.spongepowered.api.Game;
-import org.spongepowered.api.Server;
 import org.spongepowered.api.Sponge;
-import org.spongepowered.api.advancement.criteria.trigger.Trigger;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.EventContext;
 import org.spongepowered.api.event.SpongeEventFactory;
+import org.spongepowered.api.registry.RegistryHolder;
+import org.spongepowered.api.registry.RegistryRoots;
+import org.spongepowered.api.registry.RegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.common.applaunch.plugin.DummyPluginContainer;
+import org.spongepowered.common.bridge.core.WritableRegistryBridge;
 import org.spongepowered.common.bridge.server.MinecraftServerBridge;
 import org.spongepowered.common.bridge.server.packs.resources.ResourceManagerBridge;
 import org.spongepowered.common.data.SpongeDataManager;
@@ -71,15 +72,17 @@
 import org.spongepowered.plugin.PluginContainer;
 
 import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Singleton
 public final class SpongeLifecycle implements Lifecycle {
 
     private final Game game;
     private final Injector injector;
     private FeatureFlagSet featureFlags;
-    public boolean establishedPluginRegistries = false;
 
     @Inject
     public SpongeLifecycle(final Game game, final Injector injector) {
@@ -113,50 +116,25 @@ public void callRegisterBuilderEvent() {
         this.game.eventManager().post(new RegisterBuilderEventImpl(Cause.of(EventContext.empty(), this.game), this.game));
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void establishEarlyGlobalRegistries() {
         final SpongeRegistryHolder holder = (SpongeRegistryHolder) this.game;
         holder.setRootMinecraftRegistry((Registry<Registry<?>>) BuiltInRegistries.REGISTRY);
 
         SpongeRegistries.registerEarlyGlobalRegistries(holder);
-    }
 
-    @Override
-    public void finalizeEarlyGlobalRegistries() {
+        // Plugin registries
+        this.game.eventManager().post(new AbstractRegisterRegistryEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game));
 
-        // Vanilla registries we want plugins to be able to modify:
-        // TODO marker for this in API?
-        this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.BuiltInImpl<>(Cause.of(EventContext.empty(), this.game), this.game,
-                (org.spongepowered.api.registry.Registry<Trigger<?>>) BuiltInRegistries.TRIGGER_TYPES));
-    }
+        // Freeze Sponge Root - Registries are now available
+        holder.registryHolder().freezeSpongeRootRegistry();
 
-    @Override
-    public void establishGlobalRegistries(final RegistryAccess.Frozen registryAccess, final RegistryLayer layer) {
-        final SpongeRegistryHolder holder = (SpongeRegistryHolder) this.game;
-        SpongeCommon.logger().info("Layer {}", layer);
-        switch (layer)
-        {
-            // WORLDGEN ->
-            case DIMENSIONS -> {
-                SpongeRegistries.registerGlobalRegistriesDimensionLayer((SpongeRegistryHolder) this.game, registryAccess, this.featureFlags);
-
-                // Plugin registries
-                this.game.eventManager().post(new AbstractRegisterRegistryEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game));
-
-                // Freeze Sponge Root - Registries are now available
-                holder.registryHolder().freezeSpongeRootRegistry();
-            }
-            case RELOADABLE -> {
-                if (!this.establishedPluginRegistries) {
-                    // Plugin registry values
-                    this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game));
-                    // Freeze Dynamic Registries - Values are now available
-                    holder.registryHolder().freezeSpongeDynamicRegistries();
-
-                    this.establishedPluginRegistries = true;
-                }
-            }
-        }
+        this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game,
+            holder.streamRegistries().collect(Collectors.toMap(org.spongepowered.api.registry.Registry::type, Function.identity()))));
+
+        // Freeze Dynamic Registries - Values are now available
+        holder.registryHolder().freezeSpongeDynamicRegistries(true);
     }
 
     @Override
@@ -209,31 +187,48 @@ public void callConstructEvent() {
     }
 
     @Override
-    public void establishServerRegistries(final Server server) {
-        SpongeRegistries.registerServerRegistries(server);
+    public void beginEstablishServerRegistries(final RegistryHolder server) {
+        SpongeRegistries.registerServerRegistries((SpongeRegistryHolder) server, this.featureFlags);
+
+        ((SpongeRegistryHolder) server).registryHolder().featureFlagSet(this.featureFlags);
 
-        this.game.eventManager().post(new AbstractRegisterRegistryEvent.EngineScopedImpl<>(Cause.of(EventContext.empty(), this.game), this.game,
-         server));
+        this.game.eventManager().post(
+            AbstractRegisterRegistryEvent.EngineScopedImpl.server(Cause.of(EventContext.empty(), this.game), this.game, server));
 
         ((SpongeRegistryHolder) server).registryHolder().freezeSpongeRootRegistry();
 
-        this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.EngineScopedImpl<>(Cause.of(EventContext.empty(), this.game),
-                this.game, server));
+        this.processServerRegistries(server, server.streamRegistries(RegistryRoots.SPONGE)
+            .filter(r -> !r.type().equals(RegistryTypes.ADVANCEMENT) && !r.type().equals(RegistryTypes.RECIPE)));
+    }
+
+    @Override
+    public void processServerRegistries(final RegistryHolder server, final Stream<? extends org.spongepowered.api.registry.Registry<?>> registries) {
+        final Map<RegistryType<?>, org.spongepowered.api.registry.Registry<?>> map =
+            registries.collect(Collectors.toMap(org.spongepowered.api.registry.Registry::type, Function.identity()));
+        if (!map.isEmpty()) {
+            map.values().forEach(r -> ((WritableRegistryBridge<?>) r).bridge$setRegistryHolder(server));
+            this.game.eventManager().post(AbstractRegisterRegistryValueEvent.EngineScopedImpl.server(Cause.of(EventContext.empty(), this.game), this.game, server, map));
+            map.values().forEach(r -> ((WritableRegistryBridge<?>) r).bridge$markEventCalled());
+            ((SpongeRegistryHolder) server).registryHolder().freezeSpongeDynamicRegistries(false);
+        }
+    }
 
-        ((SpongeRegistryHolder) server).registryHolder().freezeSpongeDynamicRegistries();
+    @Override
+    public void endEstablishServerRegistries(final RegistryHolder server) {
+        ((SpongeRegistryHolder) server).registryHolder().freezeSpongeDynamicRegistries(true);
     }
 
     @Override
     public void establishClientRegistries(final Client client) {
-        this.game.eventManager().post(new AbstractRegisterRegistryEvent.EngineScopedImpl<>(Cause.of(EventContext.empty(), this.game), this.game,
-                client));
+        this.game.eventManager().post(
+            AbstractRegisterRegistryEvent.EngineScopedImpl.client(Cause.of(EventContext.empty(), this.game), this.game, client));
 
         ((SpongeRegistryHolder) client).registryHolder().freezeSpongeRootRegistry();
 
-        this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.EngineScopedImpl<>(Cause.of(EventContext.empty(), this.game),
-                this.game, client));
+        this.game.eventManager().post(AbstractRegisterRegistryValueEvent.EngineScopedImpl.client(Cause.of(EventContext.empty(), this.game),
+                this.game, client, client.streamRegistries(RegistryRoots.SPONGE).collect(Collectors.toMap(org.spongepowered.api.registry.Registry::type, Function.identity()))));
 
-        ((SpongeRegistryHolder) client).registryHolder().freezeSpongeDynamicRegistries();
+        ((SpongeRegistryHolder) client).registryHolder().freezeSpongeDynamicRegistries(true);
     }
 
     @Override