Merge branch 'api-15' into api-16

# Conflicts:
#	src/main/java/org/spongepowered/common/event/tracking/context/transaction/world/EntityPerformingDropsTransaction.java
#	src/main/java/org/spongepowered/common/event/tracking/context/transaction/world/SpawnEntityTransaction.java

Author: Yeregorix

.github/workflows/check-spotless.yaml

@@ -11,5 +11,5 @@ jobs:
     uses: SpongePowered/.github/.github/workflows/shared-check-spotless.yaml@master
     with:
       runtime_version: 21
-      extra_gradle_params: "-Pprojects=vanilla,neoforge,testplugins"
+      extra_gradle_params: "-Pprojects=vanilla,forge,neoforge,testplugins"
     secrets: inherit

neoforge/src/main/resource-templates/META-INF/neoforge.mods.toml

@@ -16,17 +16,15 @@ description = "{{ description }}"
 
 [[dependencies.spongeneo]]
 modId="neoforge"
-mandatory=true
+type="required"
 versionRange="[{{ neoForgeVersion }},)"
 ordering="AFTER"
-side="BOTH"
 
 [[dependencies.spongeneo]]
 modId="sponge"
-mandatory=true
+type="required"
 versionRange="[{{ version }}]"
 ordering="AFTER"
-side="BOTH"
 
 
 [[mods]]
@@ -40,10 +38,9 @@ description="The SpongeAPI implementation targeting vanilla Minecraft and 3rd pa
 
 [[dependencies.sponge]]
 modId="spongeapi"
-mandatory=true
+type="required"
 versionRange="[{{ apiVersion }},)"
 ordering="AFTER"
-side="BOTH"
 
 
 [[mods]]
@@ -55,6 +52,11 @@ credits="SpongePowered and Contributors"
 authors="SpongePowered"
 description="A Minecraft plugin API"
 
+
 ["lithium:options"]
 "mixin.world.tick_scheduler"=false
 "mixin.collections.entity_filtering"=false
+
+[[dependencies.spongeneo]]
+modId="adventure_platform_neoforge"
+type="incompatible"

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

@@ -122,6 +122,7 @@ public void callRegisterBuilderEvent() {
     public void establishEarlyGlobalRegistries() {
         final SpongeRegistryHolder holder = (SpongeRegistryHolder) this.game;
         holder.setRootMinecraftRegistry((Registry<Registry<?>>) BuiltInRegistries.REGISTRY);
+        holder.streamRegistries().forEach(r -> ((WritableRegistryBridge<?>) r).bridge$setRegistryHolder(this.game));
 
         SpongeRegistries.registerEarlyGlobalRegistries(holder);
     }
@@ -136,8 +137,12 @@ public void establishGlobalRegistries() {
         // Freeze Sponge Root - Registries are now available
         holder.registryHolder().freezeSpongeRootRegistry();
 
-        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()))));
+        final Map<RegistryType<?>, org.spongepowered.api.registry.Registry<?>> map =
+                holder.streamRegistries().collect(Collectors.toMap(org.spongepowered.api.registry.Registry::type, Function.identity()));
+
+        this.game.eventManager().post(new AbstractRegisterRegistryValueEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game, map));
+        map.values().forEach(r -> ((WritableRegistryBridge<?>) r).bridge$markEventCalled());
+        holder.registryHolder().freezeSpongeDynamicRegistries(false);
     }
 
     public void endEstablishGlobalRegistries() {

src/main/java/org/spongepowered/common/data/provider/item/stack/PotionItemStackData.java

@@ -30,6 +30,7 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.world.item.alchemy.PotionContents;
 import org.spongepowered.api.data.Keys;
@@ -57,6 +58,7 @@ public static void register(final DataProviderRegistrator registrator) {
                         .get(h -> Color.ofRgb(h.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).getColor()))
                         .set((h, v) -> h.update(DataComponents.POTION_CONTENTS, PotionContents.EMPTY, contents -> new PotionContents(contents.potion(), Optional.of(v.rgb()), contents.customEffects(), contents.customName())))
                         .delete(h -> h.update(DataComponents.POTION_CONTENTS, PotionContents.EMPTY, contents -> new PotionContents(contents.potion(), Optional.empty(), contents.customEffects(), contents.customName())))
+                        .supports(h -> h.getItem() == Items.POTION || h.getItem() == Items.SPLASH_POTION || h.getItem() == Items.LINGERING_POTION || h.getItem() == Items.TIPPED_ARROW)
                     .create(Keys.CUSTOM_POTION_EFFECTS)
                         .get(h -> {
                             final List<MobEffectInstance> effects = h.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).customEffects();

src/main/java/org/spongepowered/common/data/provider/item/stack/SignItemStackData.java

@@ -24,15 +24,16 @@
  */
 package org.spongepowered.common.data.provider.item.stack;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import com.mojang.serialization.DynamicOps;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.level.block.entity.SignText;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.data.Keys;
+import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.adventure.SpongeAdventure;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 import org.spongepowered.common.util.Constants;
@@ -66,16 +67,24 @@ public static void register(final DataProviderRegistrator registrator) {
                                 .toList();
                         })
                         .set((h, v) -> {
-                            final GsonComponentSerializer gcs = GsonComponentSerializer.gson();
                             final CompoundTag tag = new CompoundTag();
                             tag.putString(Constants.Item.BLOCK_ENTITY_ID, Constants.TileEntity.SIGN);
-                            for (int i = 0; i < 4; i++) {
-                                final @Nullable Component line = v.size() > i ? v.get(i) : Component.empty();
-                                if (line == null) {
-                                    throw new IllegalArgumentException("A null line was given at index " + i);
+                            DynamicOps<Tag> $$2 = SpongeCommon.vanillaRegistryAccess().createSerializationContext(NbtOps.INSTANCE);
+                            final var text = new SignText();
+                            for (int i = 0; i < v.size(); ++i) {
+                                if (i > 3) {
+                                    break;
                                 }
-                                tag.putString("Text" + (i + 1), gcs.serialize(line));
+                                final var translated = SpongeAdventure.asVanilla(v.get(i));
+                                if (translated == null) {
+                                    continue;
+                                }
+                                text.setMessage(i, translated);
                             }
+                            SignText.DIRECT_CODEC.encodeStart($$2, text)
+                                .resultOrPartial(SpongeCommon.logger()::error)
+                                .ifPresent($$1x -> tag.put("front_text", $$1x));
+
                             h.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(tag));
                         })
                         .delete(h -> h.remove(DataComponents.BLOCK_ENTITY_DATA));

src/main/java/org/spongepowered/common/event/lifecycle/AbstractRegisterRegistryEvent.java

@@ -36,6 +36,8 @@
 import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.registry.RegistryRoots;
 import org.spongepowered.api.registry.RegistryType;
+import org.spongepowered.common.SpongeCommon;
+import org.spongepowered.common.event.tracking.PhaseTracker;
 import org.spongepowered.common.registry.RegistryLoader;
 import org.spongepowered.common.registry.SpongeRegistryHolder;
 
@@ -68,7 +70,7 @@ public <T> RegistryType<T> register(final ResourceKey key, final boolean isDynam
 
         final SpongeRegistryHolder holder = this.getHolder();
         final RegistryType<T> type = RegistryType.of(RegistryRoots.SPONGE, key);
-        holder.createRegistry(type, defaultValues, isDynamic);
+        holder.createRegistry(type, () -> this.wrapWithScopedHolder(type, holder, defaultValues), isDynamic);
         return type;
     }
 
@@ -81,10 +83,20 @@ public <T> RegistryType<T> register(final ResourceKey key, final boolean isDynam
 
         final SpongeRegistryHolder holder = this.getHolder();
         final RegistryType<T> type = RegistryType.of(RegistryRoots.SPONGE, key);
-        holder.createRegistry(type, defaultValues, isDynamic, dependencies);
+        holder.createRegistry(type, actualHolder -> this.wrapWithScopedHolder(type, holder, () -> defaultValues.apply(actualHolder)), isDynamic, dependencies);
         return type;
     }
 
+    private <T> Map<ResourceKey, T> wrapWithScopedHolder(final RegistryType<T> registry, final SpongeRegistryHolder holder, final Supplier<Map<ResourceKey, T>> defaultValues) {
+        return PhaseTracker.getInstance().switchStartupRegistryHolder(
+            holder, defaultValues,
+            (exception) -> {
+                // If we don't catch it, vanilla will shut the server with "Failed to load datapacks"
+                SpongeCommon.logger().error("Could not supply default values for registry {}", registry.toString(), exception);
+                return Map.of();
+            });
+    }
+
     protected abstract SpongeRegistryHolder getHolder();
 
     public static final class GameScopedImpl extends AbstractRegisterRegistryEvent implements RegisterRegistryEvent.GameScoped {

src/main/java/org/spongepowered/common/event/tracking/IPhaseState.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.event.tracking;
 
-import com.google.common.collect.ImmutableList;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -57,7 +56,6 @@
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.item.inventory.Slot;
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
-import org.spongepowered.api.util.Tuple;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.server.ServerWorld;
@@ -70,7 +68,6 @@
 import org.spongepowered.common.entity.PlayerTracker;
 import org.spongepowered.common.event.tracking.context.transaction.GameTransaction;
 import org.spongepowered.common.event.tracking.context.transaction.block.ChangeBlock;
-import org.spongepowered.common.event.tracking.context.transaction.world.SpawnEntityTransaction;
 import org.spongepowered.common.event.tracking.phase.general.ExplosionContext;
 import org.spongepowered.common.event.tracking.phase.packet.PacketPhase;
 import org.spongepowered.common.event.tracking.phase.tick.LocationBasedTickContext;
@@ -81,7 +78,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
  * A literal phase state of which the {@link World} is currently running
@@ -378,14 +374,10 @@ default Supplier<SpawnType> getSpawnTypeForTransaction(final C context, final En
 
     default SpawnEntityEvent createSpawnEvent(final C context,
         final @Nullable GameTransaction<@NonNull ?> parent,
-        final ImmutableList<Tuple<Entity, SpawnEntityTransaction.DummySnapshot>> collect,
+        final List<Entity> collect,
         final Cause currentCause
     ) {
-        return SpongeEventFactory.createSpawnEntityEvent(currentCause,
-            collect.stream()
-                .map(t -> (org.spongepowered.api.entity.Entity) t.first())
-                .collect(Collectors.toList())
-        );
+        return SpongeEventFactory.createSpawnEntityEvent(currentCause, (List) collect);
     }
 
     default void populateLootContext(final C phaseContext, final LootParams.Builder lootBuilder) {

src/main/java/org/spongepowered/common/event/tracking/PhaseStateProxy.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.event.tracking;
 
-import com.google.common.collect.ImmutableList;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -51,7 +50,6 @@
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.item.inventory.Slot;
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
-import org.spongepowered.api.util.Tuple;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.common.block.SpongeBlockSnapshot;
@@ -61,7 +59,6 @@
 import org.spongepowered.common.entity.PlayerTracker;
 import org.spongepowered.common.event.tracking.context.transaction.GameTransaction;
 import org.spongepowered.common.event.tracking.context.transaction.block.ChangeBlock;
-import org.spongepowered.common.event.tracking.context.transaction.world.SpawnEntityTransaction;
 import org.spongepowered.common.event.tracking.phase.general.ExplosionContext;
 import org.spongepowered.common.event.tracking.phase.tick.LocationBasedTickContext;
 import org.spongepowered.common.world.BlockChange;
@@ -292,7 +289,7 @@ default Supplier<SpawnType> getSpawnTypeForTransaction(final Entity entityToSpaw
     }
 
     default SpawnEntityEvent createSpawnEvent(final @Nullable GameTransaction<@NonNull ?> parent,
-        final ImmutableList<Tuple<Entity, SpawnEntityTransaction.DummySnapshot>> collect,
+        final List<Entity> collect,
         final Cause currentCause
     ) {
         return this.getState().createSpawnEvent(this.asContext(), parent, collect, currentCause);

src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java

@@ -82,6 +82,8 @@
 import java.util.StringJoiner;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * The core state machine of Sponge. Acts a as proxy between various engine objects by processing actions through
@@ -873,7 +875,22 @@ public CauseStackManager apiAccess() {
         return this.api;
     }
 
-    public void startupRegistryHolder(final RegistryHolder holder) {
+    public <T> T switchStartupRegistryHolder(
+        final SpongeRegistryHolder holder, final Supplier<? extends T> valueSupplier,
+        final Function<? super RuntimeException, ? extends T> exceptionalValueSupplier
+    ) {
+        final @Nullable SpongeRegistryHolder previousHolder = this.startupRegistryHolder();
+        try {
+            this.startupRegistryHolder(holder);
+            return valueSupplier.get();
+        } catch (final RuntimeException e) {
+            return exceptionalValueSupplier.apply(e);
+        } finally {
+            this.startupRegistryHolder(previousHolder);
+        }
+    }
+
+    public void startupRegistryHolder(final @Nullable RegistryHolder holder) {
         if (holder instanceof SpongeRegistryHolder srh) {
             this.startupRegistryHolder = srh;
         } else {

src/main/java/org/spongepowered/common/event/tracking/context/transaction/world/EntityPerformingDropsTransaction.java

@@ -25,14 +25,10 @@
 package org.spongepowered.common.event.tracking.context.transaction.world;
 
 import com.google.common.collect.ImmutableList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.ProblemReporter;
 import net.minecraft.world.damagesource.CombatEntry;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.storage.TagValueOutput;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -46,7 +42,6 @@
 import org.spongepowered.common.event.tracking.context.transaction.GameTransaction;
 import org.spongepowered.common.event.tracking.context.transaction.type.TransactionTypes;
 import org.spongepowered.common.util.PrettyPrinter;
-import org.spongepowered.common.world.volume.VolumeStreamUtils;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -57,9 +52,7 @@
 
 public final class EntityPerformingDropsTransaction extends WorldBasedTransaction<HarvestEntityEvent> {
 
-    private @MonotonicNonNull Supplier<ServerLevel> worldSupplier;
     final Entity destroyingEntity;
-    private @MonotonicNonNull CompoundTag entityTag;
     private @MonotonicNonNull Supplier<Optional<DamageSource>> lastAttacker;
 
     public EntityPerformingDropsTransaction(final Entity destroyingEntity) {
@@ -70,16 +63,10 @@ public EntityPerformingDropsTransaction(final Entity destroyingEntity) {
     @Override
     protected void captureState() {
         super.captureState();
-        final Entity entity = this.destroyingEntity;
-        this.worldSupplier = VolumeStreamUtils.createWeaklyReferencedSupplier((ServerLevel) entity.level(), "ServerLevel");
-
-        final var output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, entity.level().registryAccess());
-        entity.saveWithoutId(output);
-        this.entityTag = output.buildResult();
 
         final @Nullable DamageSource lastAttacker;
-        if (entity instanceof LivingEntity) {
-            final List<CombatEntry> entries = ((CombatTrackerAccessor) ((LivingEntity) entity).getCombatTracker()).accessor$entries();
+        if (this.destroyingEntity instanceof LivingEntity living) {
+            final List<CombatEntry> entries = ((CombatTrackerAccessor) living.getCombatTracker()).accessor$entries();
             if (!entries.isEmpty()) {
                 final CombatEntry entry = entries.get(entries.size() - 1);
                 lastAttacker = entry.source();