feat(forge): update Forge for 1.21.9

Upgraded Forge dependencies and introduced MixinExtras for better injector
handling. Adjusted lambda mixin methods, improved client-side checks, and refined
explosion knockback logic with `WrapOperation`. Updated verification metadata for
new component versions.

Author: gabizou

.github/workflows/common-run-build.yaml

@@ -16,13 +16,13 @@ jobs:
       matrix:
         project:
           - vanilla
-#          - forge
+          - forge
 #          - neoforge
         include:
           - project: vanilla
             gradleProject: SpongeVanilla
-#          - project: forge
-#            gradleProject: SpongeForge
+          - project: forge
+            gradleProject: SpongeForge
 #          - project: neoforge
 #            gradleProject: SpongeNeo
     steps:

.github/workflows/deploy.yaml

@@ -42,9 +42,9 @@ jobs:
           - project: forge
             gradleProject: ':SpongeForge'
             skipUpdateBranch: true
-          - project: neoforge
-            gradleProject: ':SpongeNeo'
-            skipUpdateBranch: true
+#          - project: neoforge
+#            gradleProject: ':SpongeNeo'
+#            skipUpdateBranch: true
     steps:
       - name: setup
         if: "!(matrix.skipUpdateBranch && startsWith(github.ref, 'refs/heads/update/'))"

forge/gradle.properties

@@ -2,5 +2,5 @@ name=SpongeForge
 implementation=Forge
 description=The SpongeAPI implementation for MinecraftForge
 
-forgeVersion=58.0.5
+forgeVersion=59.0.0
 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/server/MinecraftServerMixin_Forge.java

@@ -63,13 +63,13 @@ 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;"))
+    @ModifyExpressionValue(method = "lambda$reloadResources$30", at = @At(value = "NEW", target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;"))
     private MultiPackResourceManager forge$onReloadResources(final MultiPackResourceManager original) {
         ((MinecraftServerBridge) this).bridge$reloadServerRegistries((RegistryHolder) original);
         return original;
     }
 
-    @Inject(method = "lambda$reloadResources$30", at = @At("TAIL"))
+    @Inject(method = "lambda$reloadResources$31", at = @At("TAIL"))
     public void forge$onReloadedResources(final Collection<?> $$0x, final @Coerce MinecraftServer_ReloadableResourcesAccessor $$1x, final CallbackInfo ci) {
         ((MinecraftServerBridge) this).bridge$reloadedServerRegistries(((SpongeRegistryHolder) $$1x.accessor$resourceManager()).registryHolder());
     }

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

@@ -46,7 +46,7 @@ public abstract class ItemEntityMixin_Forge {
         final CallbackInfo ci
     ) {
         // Check the level is not null to avoid an NPE
-        if (level != null && !level.isClientSide) {
+        if (level != null && !level.isClientSide()) {
             this.lifespan = SpongeGameConfigs.getForWorld(level).get().entity.item.despawnRate;
         }
     }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/world/level/ServerExplosionMixin_Forge.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.forge.mixin.core.world.level;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -104,12 +106,10 @@ public abstract class ServerExplosionMixin_Forge {
     }
 
 
-    @Redirect(method = "hurtEntities", at = @At(value = "NEW", target = "(DDD)Lnet/minecraft/world/phys/Vec3;"))
-    private Vec3 forge$useKnockbackMultiplier(final double $$0, final double $$1, final double $$2) {
+    @WrapOperation(method = "hurtEntities", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/Vec3;scale(D)Lnet/minecraft/world/phys/Vec3;"))
+    private Vec3 forge$useKnockbackMultiplier(Vec3 instance, double $$0, Operation<Vec3> original) {
         // Honor our knockback value from event
-        return new Vec3($$0 * this.impl$knockbackMultiplier,
-            $$1 * this.impl$knockbackMultiplier,
-            $$2 * this.impl$knockbackMultiplier);
+        return original.call(instance, $$0 * this.impl$knockbackMultiplier);
     }
 
 }

forge/src/mixins/java/org/spongepowered/forge/mixin/core/world/level/block/FireBlockMixin_Forge.java

@@ -49,7 +49,7 @@ public class FireBlockMixin_Forge {
             cancellable = true)
     private void impl$onCatchFirePreCheck(
             final Level world, final BlockPos pos, final int chance, final RandomSource random, final int age, final Direction dir, final CallbackInfo callbackInfo) {
-        if (!world.isClientSide) {
+        if (!world.isClientSide()) {
             if (ShouldFire.CHANGE_BLOCK_EVENT_PRE && SpongeCommonEventFactory.callChangeBlockEventPre((ServerLevelBridge) world, pos).isCancelled()) {
                 callbackInfo.cancel();
             }
@@ -65,7 +65,7 @@ public class FireBlockMixin_Forge {
             cancellable = true)
     private void impl$onCatchFirePreCheckOther(
         final Level world, final BlockPos pos, final int chance, final RandomSource random, final int age, final Direction dir, final CallbackInfo callbackInfo) {
-        if (!world.isClientSide) {
+        if (!world.isClientSide()) {
             if (ShouldFire.CHANGE_BLOCK_EVENT_PRE && SpongeCommonEventFactory.callChangeBlockEventPre((ServerLevelBridge) world, pos).isCancelled()) {
                 callbackInfo.cancel();
             }