feat(neoforge): update to 1.21.11

See https://minecraft.wiki/w/Java_Edition_1.21.11
See https://neoforged.net/changelog/

Author: gabizou

neoforge/gradle.properties

@@ -2,5 +2,5 @@ name=SpongeNeo
 implementation=NeoForge
 description=The SpongeAPI implementation for NeoForge
 
-neoForgeVersion=21.10.16-beta
+neoForgeVersion=21.11.0-beta
 mixinConfigs=mixins.spongeneo.accessors.json,mixins.spongeneo.api.json,mixins.spongeneo.inventory.json,mixins.spongeneo.core.json,mixins.spongeneo.tracker.json

neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/NeoForgePluginPlatform.java

@@ -26,7 +26,7 @@
 
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.FMLPaths;
-import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
+import net.neoforged.neoforge.common.NeoForgeVersion;
 import org.spongepowered.common.applaunch.AppLaunch;
 import org.spongepowered.common.applaunch.config.LaunchConfig;
 import org.spongepowered.common.applaunch.config.TokenReplacement;

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

@@ -33,6 +33,7 @@
 import net.minecraft.server.RegistryLayer;
 import net.minecraft.server.ReloadableServerResources;
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.world.flag.FeatureFlagSet;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -44,9 +45,12 @@
 @Mixin(ReloadableServerResources.class)
 public abstract class ReloadableServerResourcesMixin_Neo {
 
-    @WrapOperation(method = "lambda$loadResources$3", at = @At(value = "NEW", target = "(Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;Ljava/util/List;I)Lnet/minecraft/server/ReloadableServerResources;"))
-    private static ReloadableServerResources impl$onCreateResources(final LayeredRegistryAccess<RegistryLayer> $$0, final HolderLookup.Provider $$1, final FeatureFlagSet $$2,
-            final Commands.CommandSelection $$3, final List<?> $$4, final int $$5, final Operation<ReloadableServerResources> original, final @Local(argsOnly = true) ResourceManager resourceManager) {
+    @WrapOperation(method = "lambda$loadResources$3", at = @At(value = "NEW",
+        target = "(Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;Ljava/util/List;Lnet/minecraft/server/permissions/PermissionSet;)Lnet/minecraft/server/ReloadableServerResources;"))
+    private static ReloadableServerResources impl$onCreateResources(
+        final LayeredRegistryAccess<RegistryLayer> $$0, final HolderLookup.Provider $$1, final FeatureFlagSet $$2,
+        final Commands.CommandSelection $$3, final List<?> $$4, final PermissionSet $$5,
+        final Operation<ReloadableServerResources> original, final @Local(argsOnly = true) ResourceManager resourceManager) {
         final ReloadableServerResources instance = original.call($$0, $$1, $$2, $$3, $$4, $$5);
         if (instance.getCommands().getDispatcher() instanceof final DelegatingCommandDispatcher delegatingCommandDispatcher) {
             delegatingCommandDispatcher.permissionService(((ResourceManagerBridge) resourceManager).bridge$services().permissionService());

…ld/entity/animal/SnowGolemMixin_Neo.java …ity/animal/golem/SnowGolemMixin_Neo.javaneoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/animal/SnowGolemMixin_Neo.java renamed to neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/animal/golem/SnowGolemMixin_Neo.java neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/animal/SnowGolemMixin_Neo.java renamed to neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/animal/golem/SnowGolemMixin_Neo.java

@@ -22,11 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.neoforge.mixin.core.world.entity.animal;
+package org.spongepowered.neoforge.mixin.core.world.entity.animal.golem;
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.animal.SnowGolem;
+import net.minecraft.world.entity.animal.golem.SnowGolem;
 import net.neoforged.neoforge.event.EventHooks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

…ntity/vehicle/AbstractBoatMixin_Neo.java …/vehicle/boat/AbstractBoatMixin_Neo.javaneoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/vehicle/AbstractBoatMixin_Neo.java renamed to neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/vehicle/boat/AbstractBoatMixin_Neo.java neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/vehicle/AbstractBoatMixin_Neo.java renamed to neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/entity/vehicle/boat/AbstractBoatMixin_Neo.java

@@ -22,11 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.neoforge.mixin.core.world.entity.vehicle;
+package org.spongepowered.neoforge.mixin.core.world.entity.vehicle.boat;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.vehicle.AbstractBoat;
+import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;

neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin_Neo.java

@@ -96,13 +96,13 @@ public abstract class AbstractFurnaceBlockEntityMixin_Neo extends BaseContainerB
         final Cause cause = PhaseTracker.getInstance().currentCause();
         if (entity.cookingTimer == 0) { // Start
             final CookingEvent.Start event = SpongeEventFactory.createCookingEventStart(cause, (FurnaceBlockEntity) entityIn, Optional.of(fuel),
-                Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().location()));
+                Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().identifier()));
             SpongeCommon.post(event);
             return !event.isCancelled();
         } else { // Tick up
             final ItemStackSnapshot cooking = ItemStackUtil.snapshotOf(entity.items.getFirst());
             final CookingEvent.Tick event = SpongeEventFactory.createCookingEventTick(cause, (FurnaceBlockEntity) entityIn, cooking, Optional.of(fuel),
-                Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().location()));
+                Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().identifier()));
             SpongeCommon.post(event);
             return !event.isCancelled();
         }
@@ -122,7 +122,7 @@ public abstract class AbstractFurnaceBlockEntityMixin_Neo extends BaseContainerB
         final var recipe = entity.bridge$getCurrentRecipe();
         final ItemStackSnapshot cooking = ItemStackUtil.snapshotOf(entity.items.get(0));
         final CookingEvent.Tick event = SpongeEventFactory.createCookingEventTick(cause, (FurnaceBlockEntity) entityIn, cooking, Optional.of(fuel),
-            recipe.map(r -> (CookingRecipe) r.value()), recipe.map(r -> (ResourceKey) (Object) r.id().location()));
+            recipe.map(r -> (CookingRecipe) r.value()), recipe.map(r -> (ResourceKey) (Object) r.id().identifier()));
         SpongeCommon.post(event);
         if (event.isCancelled()) {
             return entity.cookingTimer; // dont tick down
@@ -182,7 +182,7 @@ public abstract class AbstractFurnaceBlockEntityMixin_Neo extends BaseContainerB
         }
         final Optional<ItemStackSnapshot> fuel = hasFuel && !slots.get(1).isEmpty() ? Optional.of(ItemStackUtil.snapshotOf(slots.get(1))) : Optional.empty();
         final CookingEvent.Finish event = SpongeEventFactory.createCookingEventFinish(cause, entity,
-            fuel, Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().location()), Collections.unmodifiableList(transactions));
+            fuel, Optional.of((CookingRecipe) recipe.value()), Optional.of((ResourceKey) (Object) recipe.id().identifier()), Collections.unmodifiableList(transactions));
         SpongeCommon.post(event);
 
         for (final SlotTransaction transaction : transactions) {

neoforge/src/mixins/resources/mixins.spongeneo.core.json

@@ -31,11 +31,11 @@
     "world.entity.EntityMixin_Neo",
     "world.entity.LivingEntityMixin_Neo",
     "world.entity.LivingEntityMixin_Neo_Damage",
-    "world.entity.animal.SnowGolemMixin_Neo",
+    "world.entity.animal.golem.SnowGolemMixin_Neo",
     "world.entity.item.ItemEntityMixin_Neo",
     "world.entity.player.PlayerMixin_Neo_Damage",
     "world.entity.projectile.FishingHookMixin_Neo",
-    "world.entity.vehicle.AbstractBoatMixin_Neo",
+    "world.entity.vehicle.boat.AbstractBoatMixin_Neo",
     "world.level.ServerExplosionMixin_NeoForge",
     "world.level.block.FireBlockMixin_Neo",
     "world.level.block.entity.AbstractFurnaceBlockEntityMixin_Neo"