chore(update): update to 24w39a

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
SpongePowered · Oct 3, 2024 · dac0c11 · dac0c11
1 parent 42a6077
commit dac0c11
Show file tree

Hide file tree

Showing 84 changed files with 421 additions and 432 deletions.
diff --git a/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java b/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java
@@ -246,13 +246,6 @@ private static List<Generator> generators(final Context context) {
                  "getSerializedName",
                  "sponge"
             ),
-            new EnumEntriesValidator<>(
-                 "data.type",
-                 "BoatTypes",
-                 Boat.Type.class,
-                 "getSerializedName",
-                 "sponge"
-            ),
             new RegistryEntriesGenerator<>(
                  "map.decoration",
                  "MapDecorationTypes",

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json
 superClassChanges=common.superclasschange
 
-minecraftVersion=24w38a
+minecraftVersion=24w39a
 recommendedVersion=0-SNAPSHOT
 
 org.gradle.dependency.verification.console=verbose

diff --git a/src/accessors/java/org/spongepowered/common/accessor/world/entity/EntityAccessor.java b/src/accessors/java/org/spongepowered/common/accessor/world/entity/EntityAccessor.java
@@ -87,8 +87,6 @@ public interface EntityAccessor {
 
     @Invoker("getFireImmuneTicks") int invoker$getFireImmuneTicks();
 
-    @Invoker("getPermissionLevel") int invoker$getPermissionLevel();
-
     @Invoker("unsetRemoved") void invoker$unsetRemoved();
 
 }
diff --git a/.../spongepowered/common/accessor/world/entity/ai/targeting/TargetingConditionsAccessor.java b/.../spongepowered/common/accessor/world/entity/ai/targeting/TargetingConditionsAccessor.java
@@ -34,6 +34,6 @@
 @Mixin(TargetingConditions.class)
 public interface TargetingConditionsAccessor {
 
-    @Accessor("selector") Predicate<LivingEntity> accessor$selector();
+    @Accessor("selector") TargetingConditions.Selector accessor$selector();
 
 }
diff --git a/...ors/java/org/spongepowered/common/accessor/world/entity/decoration/ItemFrameAccessor.java b/...ors/java/org/spongepowered/common/accessor/world/entity/decoration/ItemFrameAccessor.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.common.accessor.world.entity.decoration;
 
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.decoration.ItemFrame;
 import org.spongepowered.asm.mixin.Mixin;
@@ -32,6 +33,6 @@
 @Mixin(ItemFrame.class)
 public interface ItemFrameAccessor {
 
-    @Invoker("dropItem") void invoker$dropItem(final Entity entity, final boolean drop);
+    @Invoker("dropItem") void invoker$dropItem(final ServerLevel level, final Entity entity, final boolean drop);
 
 }
diff --git a/src/accessors/java/org/spongepowered/common/accessor/world/entity/player/PlayerAccessor.java b/src/accessors/java/org/spongepowered/common/accessor/world/entity/player/PlayerAccessor.java
@@ -29,6 +29,7 @@
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.common.UntransformedAccessorError;
 
 @Mixin(Player.class)
@@ -57,6 +58,7 @@ public interface PlayerAccessor {
     @Accessor("DATA_SHOULDER_RIGHT") static EntityDataAccessor<CompoundTag> accessor$DATA_SHOULDER_RIGHT() {
         throw new UntransformedAccessorError();
     }
+    @Invoker("getPermissionLevel") int invoker$getPermissionLevel();
 
     @Accessor("sleepCounter") void accessor$sleepCounter(final int sleepCounter);
 

diff --git a/...or/world/entity/vehicle/BoatAccessor.java → .../entity/vehicle/AbstractBoatAccessor.java b/...or/world/entity/vehicle/BoatAccessor.java → .../entity/vehicle/AbstractBoatAccessor.java
@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.accessor.world.entity.vehicle;
 
-import net.minecraft.world.entity.vehicle.Boat;
+import net.minecraft.world.entity.vehicle.AbstractBoat;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(Boat.class)
-public interface BoatAccessor {
+@Mixin(AbstractBoat.class)
+public interface AbstractBoatAccessor {
 
-    @Accessor("status") Boat.Status accessor$status();
+    @Accessor("status") AbstractBoat.Status accessor$status();
 
 }
diff --git a/src/accessors/java/org/spongepowered/common/accessor/world/food/FoodDataAccessor.java b/src/accessors/java/org/spongepowered/common/accessor/world/food/FoodDataAccessor.java
@@ -37,4 +37,6 @@ public interface FoodDataAccessor {
 
     @Accessor("exhaustionLevel") void accessor$exhaustionLevel(final float exhaustionLevel);
 
+    @Accessor("exhaustionLevel") float accessor$exhaustionLevel();
+
 }
diff --git a/src/accessors/resources/mixins.sponge.accessors.json b/src/accessors/resources/mixins.sponge.accessors.json
@@ -118,7 +118,7 @@
         "world.entity.raid.RaidAccessor",
         "world.entity.raid.RaiderAccessor",
         "world.entity.raid.RaidsAccessor",
-        "world.entity.vehicle.BoatAccessor",
+      "world.entity.vehicle.AbstractBoatAccessor",
         "world.entity.vehicle.MinecartFurnaceAccessor",
         "world.food.FoodDataAccessor",
         "world.inventory.AbstractContainerMenuAccessor",

diff --git a/...idge/world/entity/vehicle/BoatBridge.java → ...ld/entity/vehicle/AbstractBoatBridge.java b/...idge/world/entity/vehicle/BoatBridge.java → ...ld/entity/vehicle/AbstractBoatBridge.java
@@ -24,7 +24,7 @@
  */
 package org.spongepowered.common.bridge.world.entity.vehicle;
 
-public interface BoatBridge {
+public interface AbstractBoatBridge {
 
     double bridge$getMaxSpeed();
 

diff --git a/src/main/java/org/spongepowered/common/data/provider/block/entity/LockableData.java b/src/main/java/org/spongepowered/common/data/provider/block/entity/LockableData.java
@@ -38,9 +38,9 @@ private LockableData() {
     public static void register(final DataProviderRegistrator registrator) {
         registrator
                 .asMutable(BaseContainerBlockEntityAccessor.class)
-                    .create(Keys.LOCK_TOKEN)
-                        .get(h -> h.accessor$lockKey().key())
-                        .set((h, v) -> h.accessor$lockKey(v.isEmpty() ? LockCode.NO_LOCK : new LockCode(v)));
+                    .create(Keys.LOCK_TOKEN);// TODO - Implement Item Predicates
+//                        .get(h -> h.accessor$lockKey().key())
+//                        .set((h, v) -> h.accessor$lockKey(v.isEmpty() ? LockCode.NO_LOCK : new LockCode(v)));
     }
     // @formatter:on
 }
diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/BoatData.java b/src/main/java/org/spongepowered/common/data/provider/entity/BoatData.java
@@ -24,13 +24,13 @@
  */
 package org.spongepowered.common.data.provider.entity;
 
+import net.minecraft.world.entity.vehicle.AbstractBoat;
 import net.minecraft.world.entity.vehicle.Boat;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.persistence.DataContentUpdater;
-import org.spongepowered.api.data.type.BoatType;
-import org.spongepowered.common.accessor.world.entity.vehicle.BoatAccessor;
-import org.spongepowered.common.bridge.world.entity.vehicle.BoatBridge;
+import org.spongepowered.common.accessor.world.entity.vehicle.AbstractBoatAccessor;
+import org.spongepowered.common.bridge.world.entity.vehicle.AbstractBoatBridge;
 import org.spongepowered.common.data.ByteToBooleanContentUpdater;
 import org.spongepowered.common.data.SpongeDataManager;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
@@ -46,32 +46,29 @@ private BoatData() {
     // @formatter:off
     public static void register(final DataProviderRegistrator registrator) {
         registrator
-                .asMutable(Boat.class)
-                    .create(Keys.BOAT_TYPE)
-                        .get(h -> ((BoatType) (Object) h.getVariant()))
-                        .set((h, v) -> h.setVariant((Boat.Type) (Object) v))
-                .asMutable(BoatAccessor.class)
+                .asMutable(AbstractBoat.class)
+                .asMutable(AbstractBoatAccessor.class)
                     .create(Keys.IS_IN_WATER)
                         .get(h -> h.accessor$status() == Boat.Status.IN_WATER)
-                .asMutable(BoatBridge.class)
+                .asMutable(AbstractBoatBridge.class)
                     .create(Keys.CAN_MOVE_ON_LAND)
-                        .get(BoatBridge::bridge$getMoveOnLand)
-                        .set(BoatBridge::bridge$setMoveOnLand)
-                .asMutable(BoatBridge.class)
+                        .get(AbstractBoatBridge::bridge$getMoveOnLand)
+                        .set(AbstractBoatBridge::bridge$setMoveOnLand)
+                .asMutable(AbstractBoatBridge.class)
                     .create(Keys.OCCUPIED_DECELERATION)
-                        .get(BoatBridge::bridge$getOccupiedDecelerationSpeed)
-                        .set(BoatBridge::bridge$setOccupiedDecelerationSpeed)
-                .asMutable(BoatBridge.class)
+                        .get(AbstractBoatBridge::bridge$getOccupiedDecelerationSpeed)
+                        .set(AbstractBoatBridge::bridge$setOccupiedDecelerationSpeed)
+                .asMutable(AbstractBoatBridge.class)
                     .create(Keys.MAX_SPEED)
-                        .get(BoatBridge::bridge$getMaxSpeed)
-                        .set(BoatBridge::bridge$setMaxSpeed)
-                .asMutable(BoatBridge.class)
+                        .get(AbstractBoatBridge::bridge$getMaxSpeed)
+                        .set(AbstractBoatBridge::bridge$setMaxSpeed)
+                .asMutable(AbstractBoatBridge.class)
                     .create(Keys.UNOCCUPIED_DECELERATION)
-                        .get(BoatBridge::bridge$getUnoccupiedDecelerationSpeed)
-                        .set(BoatBridge::bridge$setUnoccupiedDecelerationSpeed)
+                        .get(AbstractBoatBridge::bridge$getUnoccupiedDecelerationSpeed)
+                        .set(AbstractBoatBridge::bridge$setUnoccupiedDecelerationSpeed)
         ;
         final ResourceKey boatDataStoreKey = ResourceKey.sponge("boat");
-        registrator.spongeDataStore(boatDataStoreKey, 2, new DataContentUpdater[]{BoatData.BOAT_UPDATER_BYTE_TO_BOOL_FIX}, BoatBridge.class,
+        registrator.spongeDataStore(boatDataStoreKey, 2, new DataContentUpdater[]{BoatData.BOAT_UPDATER_BYTE_TO_BOOL_FIX}, AbstractBoatBridge.class,
                 Keys.MAX_SPEED, Keys.CAN_MOVE_ON_LAND, Keys.OCCUPIED_DECELERATION, Keys.UNOCCUPIED_DECELERATION);
         SpongeDataManager.INSTANCE.registerLegacySpongeData(Constants.Entity.Boat.BOAT_MAX_SPEED, boatDataStoreKey, Keys.MAX_SPEED);
         SpongeDataManager.INSTANCE.registerLegacySpongeData(Constants.Entity.Boat.BOAT_MOVE_ON_LAND, boatDataStoreKey, Keys.CAN_MOVE_ON_LAND);

diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/PlayerData.java b/src/main/java/org/spongepowered/common/data/provider/entity/PlayerData.java
@@ -60,7 +60,7 @@ public static void register(final DataProviderRegistrator registrator) {
                         .get(h -> (HandPreference) (Object) h.getMainArm())
                         .set((h, v) -> h.setMainArm((HumanoidArm) (Object) v))
                     .create(Keys.EXHAUSTION)
-                        .get(h -> (double) h.getFoodData().getExhaustionLevel())
+                        .get(h -> (double) ((FoodDataAccessor) h.getFoodData()).accessor$exhaustionLevel())
                         .set((h, v) -> ((FoodDataAccessor) h.getFoodData()).accessor$exhaustionLevel(v.floatValue()))
                     .create(Keys.EXPERIENCE)
                         .get(h -> h.totalExperience)

diff --git a/src/main/java/org/spongepowered/common/data/provider/item/stack/BlockItemStackData.java b/src/main/java/org/spongepowered/common/data/provider/item/stack/BlockItemStackData.java
@@ -52,18 +52,18 @@ public static void register(final DataProviderRegistrator registrator) {
                             return ((DyeColorBlockBridge) block).bridge$getDyeColor().orElse(null);
                         })
                         .supports(h -> h.getItem() instanceof BlockItem && !(h.getItem() instanceof BannerItem))
-                    .create(Keys.LOCK_TOKEN)
-                        .get(h -> {
-                            var component = h.getOrDefault(DataComponents.LOCK, LockCode.NO_LOCK);
-                            return component.key().isEmpty() ? null : component.key();
-                        })
-                        .set((h, v) -> {
-                            if (v.isEmpty()) {
-                                h.remove(DataComponents.LOCK);
-                                return;
-                            }
-                            h.set(DataComponents.LOCK, new LockCode(v));
-                        })
+                    .create(Keys.LOCK_TOKEN) // TODO - Implement Item Predicates
+//                        .get(h -> {
+//                            var component = h.getOrDefault(DataComponents.LOCK, LockCode.NO_LOCK);
+//                            return component.key().isEmpty() ? null : component.key();
+//                        })
+//                        .set((h, v) -> {
+//                            if (v.isEmpty()) {
+//                                h.remove(DataComponents.LOCK);
+//                                return;
+//                            }
+//                            h.set(DataComponents.LOCK, new LockCode(v));
+//                        })
                         .delete(h -> h.remove(DataComponents.LOCK))
                         .supports(h -> {
                             if (!(h.getItem() instanceof BlockItem)) {

diff --git a/...rg/spongepowered/common/entity/ai/goal/builtin/creature/SpongeAvoidLivingGoalBuilder.java b/...rg/spongepowered/common/entity/ai/goal/builtin/creature/SpongeAvoidLivingGoalBuilder.java
@@ -29,8 +29,10 @@
 import org.spongepowered.api.entity.ai.goal.builtin.creature.AvoidLivingGoal;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.PathfinderAgent;
+import org.spongepowered.api.world.server.ServerWorld;
 
 import java.util.Objects;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 public final class SpongeAvoidLivingGoalBuilder implements AvoidLivingGoal.Builder {
@@ -69,7 +71,7 @@ public AvoidLivingGoal.Builder farRangeSpeed(double speed) {
 
     @Override
     public AvoidLivingGoal.Builder from(AvoidLivingGoal value) {
-        return this.targetSelector(value.targetSelector())
+        return this.targetSelector((e) -> value.targetSelector().test(e, (ServerWorld) e.world()))
             .searchDistance(value.searchDistance())
             .closeRangeSpeed(value.closeRangeSpeed())
             .farRangeSpeed(value.farRangeSpeed());

diff --git a/.../entity/ai/goal/builtin/creature/target/SpongeFindNearestAttackableTargetGoalBuilder.java b/.../entity/ai/goal/builtin/creature/target/SpongeFindNearestAttackableTargetGoalBuilder.java
@@ -28,6 +28,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.ai.goal.builtin.creature.target.FindNearestAttackableTargetGoal;
 import org.spongepowered.api.entity.living.Living;
@@ -40,7 +41,7 @@
 public final class SpongeFindNearestAttackableTargetGoalBuilder extends SpongeTargetGoalBuilder<FindNearestAttackableTargetGoal, FindNearestAttackableTargetGoal.Builder>
         implements FindNearestAttackableTargetGoal.Builder {
 
-    private static final Predicate<LivingEntity> ALWAYS_TRUE = e -> true;
+    private static final TargetingConditions.Selector ALWAYS_TRUE = (e, l) -> true;
 
     private Class<? extends Living> targetClass;
     private int chance;
@@ -94,6 +95,6 @@ public FindNearestAttackableTargetGoal build(PathfinderAgent owner) {
         Objects.requireNonNull(this.targetClass);
 
         return (FindNearestAttackableTargetGoal) new NearestAttackableTargetGoal((PathfinderMob) owner, this.targetClass, this.chance,
-            this.checkSight, this.checkOnlyNearby, this.predicate == null ? SpongeFindNearestAttackableTargetGoalBuilder.ALWAYS_TRUE : this.predicate);
+            this.checkSight, this.checkOnlyNearby, this.predicate == null ? SpongeFindNearestAttackableTargetGoalBuilder.ALWAYS_TRUE : (e, l) -> ((Predicate) this.predicate).test(l));
     }
 }
diff --git a/src/main/java/org/spongepowered/common/event/SpongeCommonEventFactory.java b/src/main/java/org/spongepowered/common/event/SpongeCommonEventFactory.java
@@ -503,7 +503,7 @@ public static DestructEntityEvent.Death callDestructEntityEventDeath(final Livin
 
             final DestructEntityEvent.Death event = SpongeEventFactory.createDestructEntityEventDeath(frame.currentCause(),
                     originalChannel, Optional.of(originalChannel), originalMessage, originalMessage, (Living) entity,
-                    entity.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY), messageCancelled);
+                ((ServerLevel) entity.level()).getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY), messageCancelled);
             SpongeCommon.post(event);
 
             return event;

diff --git a/src/main/java/org/spongepowered/common/event/tracking/IPhaseState.java b/src/main/java/org/spongepowered/common/event/tracking/IPhaseState.java
@@ -61,6 +61,7 @@
 import org.spongepowered.api.util.Tuple;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.common.block.SpongeBlockSnapshot;
 import org.spongepowered.common.bridge.server.TickTaskBridge;
 import org.spongepowered.common.bridge.server.level.ServerLevelBridge;
@@ -160,12 +161,14 @@ default boolean isInteraction() {
     /**
      * Performs any necessary custom logic after the provided {@link BlockSnapshot}
      * {@link Transaction} has taken place.
-     * @param context The context for information
+     *
+     * @param context     The context for information
+     * @param serverWorld
      * @param blockChange The block change performed
-     * @param receipt The transaction of the old and new snapshots
+     * @param receipt     The transaction of the old and new snapshots
      */
     default void postBlockTransactionApplication(
-        final C context, final BlockChange blockChange,
+        final C context, ServerWorld serverWorld, final BlockChange blockChange,
         final BlockTransactionReceipt receipt
     ) { }
 

diff --git a/src/main/java/org/spongepowered/common/event/tracking/PhaseStateProxy.java b/src/main/java/org/spongepowered/common/event/tracking/PhaseStateProxy.java
@@ -53,6 +53,7 @@
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
 import org.spongepowered.api.util.Tuple;
 import org.spongepowered.api.world.BlockChangeFlag;
+import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.common.block.SpongeBlockSnapshot;
 import org.spongepowered.common.bridge.server.TickTaskBridge;
 import org.spongepowered.common.bridge.world.TrackedWorldBridge;
@@ -102,11 +103,13 @@ default boolean isInteraction() {
     /**
      * Performs any necessary custom logic after the provided {@link BlockSnapshot}
      * {@link Transaction} has taken place.
-     *  @param blockChange The block change performed
-     * @param receipt The transaction of the old and new snapshots
+     *
+     * @param serverWorld
+     * @param blockChange The block change performed
+     * @param receipt     The transaction of the old and new snapshots
      */
-    default void postBlockTransactionApplication(final BlockChange blockChange, final BlockTransactionReceipt receipt) {
-        this.getState().postBlockTransactionApplication(this.asContext(), blockChange, receipt);
+    default void postBlockTransactionApplication(ServerWorld serverWorld, final BlockChange blockChange, final BlockTransactionReceipt receipt) {
+        this.getState().postBlockTransactionApplication(this.asContext(), serverWorld, blockChange, receipt);
     }
 
     /**

diff --git a/...rg/spongepowered/common/event/tracking/context/transaction/type/BlockTransactionType.java b/...rg/spongepowered/common/event/tracking/context/transaction/type/BlockTransactionType.java
@@ -63,7 +63,7 @@ protected void consumeEventsAndMarker(
 
         eventsByWorld.asMap().forEach((key, events) -> {
             final Optional<ServerWorld> serverWorld = ((SpongeServer) SpongeCommon.server()).worldManager().world(key);
-            if (!serverWorld.isPresent()) {
+            if (serverWorld.isEmpty()) {
                 return;
             }
 
@@ -85,7 +85,7 @@ protected void consumeEventsAndMarker(
                     final Operation operation = context.getBlockOperation(original, result);
                     final BlockTransactionReceipt eventTransaction = new BlockTransactionReceipt(original, result, operation);
                     transactions.add(eventTransaction);
-                    context.postBlockTransactionApplication(original.blockChange, eventTransaction);
+                    context.postBlockTransactionApplication(serverWorld.get(), original.blockChange, eventTransaction);
                 }
             }
 

diff --git a/src/main/java/org/spongepowered/common/event/tracking/phase/general/CommandState.java b/src/main/java/org/spongepowered/common/event/tracking/phase/general/CommandState.java
@@ -35,6 +35,7 @@
 import org.spongepowered.api.event.CauseStackManager;
 import org.spongepowered.api.event.cause.entity.SpawnType;
 import org.spongepowered.api.event.cause.entity.SpawnTypes;
+import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.common.bridge.world.level.chunk.LevelChunkBridge;
 import org.spongepowered.common.entity.PlayerTracker;
 import org.spongepowered.common.event.tracking.PhaseTracker;
@@ -66,7 +67,7 @@ public BiConsumer<CauseStackManager.StackFrame, CommandPhaseContext> getFrameMod
 
     @Override
     public void postBlockTransactionApplication(
-        final CommandPhaseContext context, final BlockChange blockChange,
+        final CommandPhaseContext context, ServerWorld serverWorld, final BlockChange blockChange,
         final BlockTransactionReceipt transaction
     ) {
         // We want to investigate if there is a user on the cause stack

diff --git a/.../java/org/spongepowered/common/event/tracking/phase/packet/player/PacketCommandState.java b/.../java/org/spongepowered/common/event/tracking/phase/packet/player/PacketCommandState.java
@@ -37,6 +37,7 @@
 import org.spongepowered.api.event.cause.entity.SpawnTypes;
 import org.spongepowered.api.event.entity.SpawnEntityEvent;
 import org.spongepowered.api.util.Tuple;
+import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.common.event.tracking.PhaseTracker;
 import org.spongepowered.common.event.tracking.TrackingUtil;
 import org.spongepowered.common.event.tracking.context.transaction.GameTransaction;
@@ -69,7 +70,7 @@ public BiConsumer<CauseStackManager.StackFrame, PlayerCommandPhaseContext> getFr
 
     @Override
     public void postBlockTransactionApplication(
-        final PlayerCommandPhaseContext context, final BlockChange blockChange,
+        final PlayerCommandPhaseContext context, ServerWorld serverWorld, final BlockChange blockChange,
         final BlockTransactionReceipt transaction
     ) {
         // We want to investigate if there is a user on the cause stack
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,6 @@ public interface FoodDataAccessor {

		@Accessor("exhaustionLevel") void accessor$exhaustionLevel(final float exhaustionLevel);

		@Accessor("exhaustionLevel") float accessor$exhaustionLevel();

		}