feat(forge): update MinecraftForge to 1.21.5

- Updated MinecraftForge version to 1.21.5-55.0.6
- Introduced a mixin for NamespacedWrapper to address registry hierarchy
  changes from MinecraftForge
- Refined scope of damage steps in LivingEntity for Forge

Author: gabizou

forge/build.gradle.kts

@@ -220,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/mixins/java/org/spongepowered/forge/mixin/core/minecraftforge/registries/NamespacedWrapperMixin_Forge.java

@@ -0,0 +1,49 @@
+/*
+ * 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.minecraftforge.registries;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.common.accessor.core.MappedRegistryAccessor;
+
+/**
+ * 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> {
+
+    @Shadow private boolean frozen;
+
+    @Override
+    public boolean accessor$frozen() {
+        return this.frozen;
+    }
+}

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

@@ -26,11 +26,14 @@
 
 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;
@@ -44,28 +47,55 @@
 @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/minecraftforge/event/ForgeEventFactory;onShieldBlock(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)Lnet/minecraftforge/event/entity/living/ShieldBlockEvent;"))
-    private ShieldBlockEvent damage$modifyBeforeAndAfterShield(final LivingEntity self, final DamageSource source, final float originalDamage, final Operation<ShieldBlockEvent> operation) {
+    @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 operation.call(self, source, originalDamage);
+            return original.call(self, level, source, originalDamage);
         }
 
-        final SpongeDamageStep step = tracker.newStep(DamageStepTypes.SHIELD, ItemStackUtil.snapshotOf(self.getUseItem()));
+        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);
+            event = new ShieldBlockEvent(self, source, damage, stack);
             event.setCanceled(true);
         } else {
-            event = operation.call(self, source, damage);
+            event = operation.call(self, source, damage, stack);
             if (!event.isCanceled()) {
                 damage -= event.getBlockedDamage();
             }

forge/src/mixins/resources/mixins.spongeforge.core.json

@@ -18,6 +18,7 @@
     "minecraftforge.internal.BrandingControlMixin_Forge",
     "minecraftforge.registries.ForgeRegistryMixin_Forge",
     "minecraftforge.registries.GameDataMixin_Forge",
+    "minecraftforge.registries.NamespacedWrapperMixin_Forge",
     "minecraftforge.registries.RegistryManagerMixin_Forge",
     "network.ConnectionMixin_Forge",
     "network.protocol.common.ClientboundCustomPayloadPacketMixin_Forge",