feat(content): Update to Minecraft 1.21.5

build-logic/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation(libs.accessWidener)
 
     // arch-loom is used by SpongeNeo but must be declared here to avoid a classloader conflict with its transitive dependencies
-    api("dev.architectury:architectury-loom:1.7.423")
+    api("dev.architectury:architectury-loom:1.10.430")
 }
 
 indraSpotlessLicenser {

build.gradle.kts

@@ -150,10 +150,6 @@ dependencies {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "org.checkerframework", module = "checker-qual") // We use our own version
     }
-    applaunchConfig(libs.configurate.jackson) {
-        exclude(group = "org.spongepowered", module = "configurate-core")
-        exclude(group = "org.checkerframework", module = "checker-qual") // We use our own version
-    }
     applaunchConfig(libs.log4j.core)
     applaunchConfig(libs.log4j.jpl)
     applaunchConfig(apiLibs.pluginSpi) {

forge/build.gradle.kts

@@ -181,10 +181,6 @@ dependencies {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "org.checkerframework", module = "checker-qual")
     }
-    service(libs.configurate.jackson) {
-        exclude(group = "org.spongepowered", module = "configurate-core")
-        exclude(group = "org.checkerframework", module = "checker-qual")
-    }
 
     val game = gameLibrariesConfig.name
     game("org.spongepowered:spongeapi:$apiVersion")
@@ -224,7 +220,7 @@ AWToAT.convert(awFiles, atFile)
 val mixinConfigs: MutableSet<String> = spongeImpl.mixinConfigurations
 
 extensions.configure(UserDevExtension::class) {
-    mappings("official", "1.21.4")
+    mappings("official", "1.21.5")
     accessTransformers.from(atFile)
     reobf = false
 

forge/gradle.properties

@@ -2,7 +2,5 @@ name=SpongeForge
 implementation=Forge
 description=The SpongeAPI implementation for MinecraftForge
 
-forgeVersion=54.0.12
-loom.platform=forge
-fabric.loom.dontRemap=true
+forgeVersion=55.0.6
 mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.inventory.shared.json,mixins.spongeforge.core.json,mixins.spongeforge.core.shared.json,mixins.spongeforge.tracker.json

forge/src/main/resources/forge.superclasschange

@@ -1,3 +0,0 @@
-{
-    "org.spongepowered.api.entity.ai.goal.AbstractGoal": "net.minecraft.world.entity.ai.goal.Goal"
-}

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/biome/MobSpawnSettings_SpawnerDataMixin_API.java → forge/src/mixins/java/org/spongepowered/forge/mixin/core/minecraftforge/registries/NamespacedWrapperMixin_Forge.java

@@ -22,36 +22,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.mixin.api.minecraft.world.level.biome;
+package org.spongepowered.forge.mixin.core.minecraftforge.registries;
 
-import net.minecraft.world.level.biome.MobSpawnSettings;
-import org.spongepowered.api.entity.EntityType;
-import org.spongepowered.api.world.biome.spawner.NaturalSpawner;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.common.accessor.core.MappedRegistryAccessor;
 
-@Mixin(MobSpawnSettings.SpawnerData.class)
-public abstract class MobSpawnSettings_SpawnerDataMixin_API implements NaturalSpawner {
-
-    // @formatter:off
-    @Shadow @Final public net.minecraft.world.entity.EntityType<?> type;
-    @Shadow @Final public int minCount;
-    @Shadow @Final public int maxCount;
-    // @formatter:on
-
-    @Override
-    public EntityType<?> type() {
-        return (EntityType<?>) this.type;
-    }
+/**
+ * Due to the Accessor being intrinsically implemented on top of MappedRegistry, the
+ * extended NamespacedWrapper class redefines frozen as a private field, leaving the
+ * original accessor to be useless. To fix registry issues, we therefore re-implement
+ * our accessor interface explicitly for registry purposes.
+ *
+ * @author gabizou - Minecraft 1.21.5 MinecraftForge 55.0.6
+ * @param <T>
+ */
+@Mixin(targets = "net/minecraftforge/registries/NamespacedWrapper")
+public abstract class NamespacedWrapperMixin_Forge<T> implements MappedRegistryAccessor<T> {
 
-    @Override
-    public int min() {
-        return this.minCount;
-    }
+    @Shadow private boolean frozen;
 
     @Override
-    public int max() {
-        return this.maxCount;
+    public boolean accessor$frozen() {
+        return this.frozen;
     }
 }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/resources/RegistryDataLoaderMixin_Forge.java

@@ -0,0 +1,81 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.forge.mixin.core.resources;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.RegistryDataLoader;
+import net.minecraft.util.DependencySorter;
+import org.spongepowered.api.registry.Registry;
+import org.spongepowered.api.registry.RegistryRoots;
+import org.spongepowered.api.registry.RegistryType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.common.accessor.resources.RegistryDataLoader_LoaderAccessor;
+import org.spongepowered.common.bridge.core.WritableRegistryBridge;
+import org.spongepowered.common.bridge.resources.RegistryDataLoader_LoaderBridge;
+import org.spongepowered.common.launch.Launch;
+import org.spongepowered.common.launch.Lifecycle;
+import org.spongepowered.common.registry.SpongeRegistryDependencyEntry;
+import org.spongepowered.common.registry.SpongeRegistryHolder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Mixin(RegistryDataLoader.class)
+public class RegistryDataLoaderMixin_Forge {
+
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @WrapOperation(method = "load(Lnet/minecraft/resources/RegistryDataLoader$LoadingFunction;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen;",
+        at = @At(value = "INVOKE", target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V", ordinal = 1))
+    private static void impl$onLoad(final List<RegistryDataLoader_LoaderAccessor<?>> instance, final Consumer<?> consumer, final Operation<Void> original) {
+        // TODO: Remote layer
+        final DependencySorter<RegistryType<?>, SpongeRegistryDependencyEntry<RegistryDataLoader_LoaderAccessor<?>>> dependencies = new DependencySorter<>();
+        final Lifecycle lifecycle = Launch.instance().lifecycle();
+        instance.stream()
+            .filter(l -> ((RegistryDataLoader_LoaderBridge) l).bridge$registryHolder() != null)
+            .collect(Collectors.groupingBy(l -> ((RegistryDataLoader_LoaderBridge) l).bridge$registryHolder(), Collectors.toSet()))
+            .forEach((k, v) -> {
+                ((SpongeRegistryHolder) k).setRootMinecraftRegistry(new RegistryAccess.ImmutableRegistryAccess(
+                    (List) Stream.concat(k.streamRegistries(RegistryRoots.MINECRAFT), v.stream().map(RegistryDataLoader_LoaderAccessor::accessor$registry)).toList()));
+                lifecycle.processServerRegistries(k, v.stream()
+                    .filter(l -> !RegistryDataLoader.DIMENSION_REGISTRIES.contains(l.accessor$data())) // NOTE: DIMENSION_REGISTRIES are special!
+                    .map(l -> (Registry<?>) l.accessor$registry()));
+                v.forEach(l -> dependencies.addEntry(((Registry<?>) l.accessor$registry()).type(),
+                    new SpongeRegistryDependencyEntry<>(l, ((WritableRegistryBridge<?>) l.accessor$registry()).bridge$pendingDependencies().toList())));
+            });
+
+        List<RegistryDataLoader_LoaderAccessor<?>> loaders = new ArrayList<>(instance.size());
+        dependencies.orderByDependencies(($, v) -> loaders.add(v.cookie()));
+
+        original.call(Collections.unmodifiableList(loaders), consumer);
+    }
+}

forge/src/mixins/java/org/spongepowered/forge/mixin/core/world/entity/LivingEntityMixin_Forge_Damage.java

@@ -0,0 +1,111 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.forge.mixin.core.world.entity;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.event.entity.living.ShieldBlockEvent;
+import org.spongepowered.api.event.cause.entity.damage.DamageStepTypes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.Slice;
+import org.spongepowered.common.bridge.world.entity.TrackedDamageBridge;
+import org.spongepowered.common.event.cause.entity.damage.SpongeDamageStep;
+import org.spongepowered.common.event.cause.entity.damage.SpongeDamageTracker;
+import org.spongepowered.common.item.util.ItemStackUtil;
+
+@Mixin(LivingEntity.class)
+public abstract class LivingEntityMixin_Forge_Damage implements TrackedDamageBridge {
+
+    //@formatter:off
+    @Shadow public abstract ItemStack shadow$getUseItem();
+    //@formatter:on
+
+    @ModifyConstant(method = "actuallyHurt", constant = @Constant(floatValue = 0), slice = @Slice(
+        from = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/ForgeHooks;onLivingHurt(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)F"),
+        to = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getDamageAfterArmorAbsorb(Lnet/minecraft/world/damagesource/DamageSource;F)F")))
+    private float damage$doNotReturnEarly(final float constant) {
+        return Float.NaN;
+    }
+
+    @WrapOperation(method = "hurtServer",
+        at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/LivingEntity;applyItemBlocking(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;F)F"
+        ))
+    private float damage$initiateBlockingStep(
+        final LivingEntity self, final ServerLevel level, final DamageSource source, final float originalDamage,
+        final Operation<Float> original) {
+        final SpongeDamageTracker tracker = this.damage$tracker();
+        if (tracker == null) {
+            return original.call(self, level, source, originalDamage);
+        }
+
+        final SpongeDamageStep step = tracker.newStep(DamageStepTypes.SHIELD, ItemStackUtil.snapshotOf(this.shadow$getUseItem()));
+        float damage = (float) step.applyChildrenBefore(originalDamage);
+        return original.call(self, level, source, damage);
+    }
+
+
+    @WrapOperation(method = "applyItemBlocking", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/event/ForgeEventFactory;onShieldBlock(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;FLnet/minecraft/world/item/ItemStack;)Lnet/minecraftforge/event/entity/living/ShieldBlockEvent;"))
+    private ShieldBlockEvent damage$modifyBeforeAndAfterShield(
+        final LivingEntity self, final DamageSource source, final float originalDamage, final ItemStack stack,
+        final Operation<ShieldBlockEvent> operation
+    ) {
+        final SpongeDamageTracker tracker = this.damage$tracker();
+        if (tracker == null) {
+            return operation.call(self, source, originalDamage, stack);
+        }
+        final var step = tracker.currentStep(DamageStepTypes.SHIELD);
+        if (step == null) {
+            return operation.call(self, source, originalDamage, stack);
+        }
+        float damage = (float) step.damageBeforeSelf().getAsDouble();
+        final ShieldBlockEvent event;
+        if (step.isSkipped()) {
+            event = new ShieldBlockEvent(self, source, damage, stack);
+            event.setCanceled(true);
+        } else {
+            event = operation.call(self, source, damage, stack);
+            if (!event.isCanceled()) {
+                damage -= event.getBlockedDamage();
+            }
+        }
+        step.applyChildrenAfter(damage);
+        return event;
+    }
+
+    @ModifyArg(method = "actuallyHurt", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/ForgeHooks;onLivingDamage(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)F"))
+    private float damage$firePostEvent_Living(final float damage) {
+        return this.damage$firePostEvent(damage);
+    }
+}