feat(minecraft): update towards 25w41a

Introduced updates to reflect changes in Minecraft's
codebase, particularly around permissions, world
rules, and API adaptations. Adjusted permission
levels to integrate with new PermissionLevel and
PermissionSet systems while incorporating various
minor fixes and deprecations.

See: https://minecraft.wiki/w/Java_Edition_25w41a

Author: gabizou

SpongeAPI

@@ -42,6 +42,7 @@
 import net.minecraft.server.packs.repository.ServerPacksSource;
 import net.minecraft.server.packs.resources.CloseableResourceManager;
 import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import net.minecraft.server.permissions.LevelBasedPermissionSet;
 import net.minecraft.tags.TagLoader;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.spongepowered.vanilla.generator.item.ItemRegistries;
@@ -151,7 +152,7 @@ private static Pair<RegistryAccess.Frozen, ReloadableServerResources> loadVanill
             pendingTags,
             packRepository.getRequestedFeatureFlags(),
             CommandSelection.ALL,
-            2, // functionPermissionLevel
+            LevelBasedPermissionSet.ALL_PERMISSIONS, // functionPermissionLevel
             Util.backgroundExecutor(), // prepareExecutor
             Runnable::run // applyExecutor
         ).whenComplete((result, ex) -> {

generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java

@@ -11,7 +11,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.entityactivation.json,mixins.sponge.exploit.json,mixins.sponge.inventory.json,mixins.sponge.movementcheck.json,\
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.test.json
 
-minecraftVersion=1.21.10
+minecraftVersion=25w41a
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

gradle.properties

@@ -32,6 +32,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.util.TaskChainer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.Vec2;
@@ -50,7 +51,7 @@ public interface CommandSourceStackAccessor {
             final Vec3 $$1,
             final Vec2 $$2,
             final ServerLevel $$3,
-            final int $$4,
+            final PermissionSet $$4,
             final String $$5,
             final Component $$6, final MinecraftServer $$7,
             @Nullable final Entity $$8,

src/accessors/java/org/spongepowered/common/accessor/commands/CommandSourceStackAccessor.java

@@ -61,8 +61,6 @@ public interface MinecraftServerAccessor {
 
     @Accessor("nextTickTimeNanos") void accessor$nextTickTimeNanos(final long nextTickTime);
 
-    @Invoker("isSpawningMonsters") boolean invoker$isSpawningMonsters();
-
     @Invoker("setupDebugLevel") void invoker$setupDebugLevel(final WorldData serverConfiguration);
 
     @Invoker("forceDifficulty") void invoker$forceDifficulty();

src/accessors/java/org/spongepowered/common/accessor/server/MinecraftServerAccessor.java

@@ -31,7 +31,7 @@
 @Mixin(ZombifiedPiglin.class)
 public interface ZombifiedPiglinAccessor {
 
-    @Accessor("remainingPersistentAngerTime") int accessor$remainingPersistentAngerTime();
+    @Accessor("persistentAngerEndTime") long accessor$remainingPersistentAngerTime();
 
-    @Accessor("remainingPersistentAngerTime") void accessor$remainingPersistentAngerTime(final int remainingPersistentAngerTime);
+    @Accessor("persistentAngerEndTime") void accessor$remainingPersistentAngerTime(final long remainingPersistentAngerTime);
 }

src/accessors/java/org/spongepowered/common/accessor/world/entity/monster/ZombifiedPiglinAccessor.java

@@ -25,6 +25,7 @@
 package org.spongepowered.common.accessor.world.entity.player;
 
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -51,7 +52,7 @@ public interface PlayerAccessor {
     @Accessor("DATA_SHOULDER_PARROT_RIGHT") static EntityDataAccessor<OptionalInt> accessor$DATA_SHOULDER_RIGHT() {
         throw new UntransformedAccessorError();
     }
-    @Invoker("getPermissionLevel") int invoker$getPermissionLevel();
+    @Invoker("permissions") PermissionSet invoker$permissions();
 
     @Accessor("sleepCounter") void accessor$sleepCounter(final int sleepCounter);
 

src/accessors/java/org/spongepowered/common/accessor/world/entity/player/PlayerAccessor.java

@@ -25,6 +25,7 @@
 package org.spongepowered.common.accessor.world.level;
 
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.BaseCommandBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -41,6 +42,6 @@ public interface BaseCommandBlockAccessor {
 
     @Accessor("command") void accessor$command(final String command);
 
-    @Invoker("createSource") BaseCommandBlock.CloseableCommandBlockSource invoker$createSource();
+    @Invoker("createSource") BaseCommandBlock.CloseableCommandBlockSource invoker$createSource(ServerLevel level);
 
 }

src/accessors/java/org/spongepowered/common/accessor/world/level/BaseCommandBlockAccessor.java

@@ -26,6 +26,7 @@
 
 import com.google.inject.Injector;
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.spongepowered.api.Client;
 import org.spongepowered.api.Engine;
@@ -66,7 +67,7 @@ public interface Lifecycle {
 
     void establishGameServices();
 
-    void establishServerServices(ResourceManager resourceManager, int functionsPermissionLevel);
+    void establishServerServices(ResourceManager resourceManager, PermissionLevel functionsPermissionLevel);
 
     void establishServerFeatures();
 

src/launch/java/org/spongepowered/common/launch/Lifecycle.java

@@ -31,6 +31,7 @@
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.level.WorldDataConfiguration;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -174,7 +175,7 @@ public void establishGameServices() {
     }
 
     @Override
-    public void establishServerServices(final ResourceManager resourceManager, final int functionsPermissionLevel) {
+    public void establishServerServices(final ResourceManager resourceManager, final PermissionLevel functionsPermissionLevel) {
         final SpongeServerScopedServiceProvider serviceProvider = new SpongeServerScopedServiceProvider(this.game, this.injector, functionsPermissionLevel);
         serviceProvider.init();
         ((ResourceManagerBridge) resourceManager).bridge$services(serviceProvider);