Merge branch 'master' of https://github.com/gnembon/fabric-carpet

src/main/java/carpet/mixins/BlockStateArgument_fillUpdatesMixin.java

@@ -0,0 +1,30 @@
+package carpet.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import carpet.CarpetSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.command.argument.BlockStateArgument;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.WorldAccess;
+
+@Mixin(BlockStateArgument.class)
+public class BlockStateArgument_fillUpdatesMixin
+{
+    @Redirect(method = "setBlockState", at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/block/Block;postProcessState(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"
+    ))
+    private BlockState postProcessStateProxy(BlockState state, WorldAccess serverWorld, BlockPos blockPos)
+    {
+        if (CarpetSettings.impendingFillSkipUpdates)
+        {
+            return state;
+        }
+        
+        return Block.postProcessState(state, serverWorld, blockPos);
+    }
+}

src/main/java/carpet/mixins/ServerWorld_tickMixin.java

@@ -38,7 +38,7 @@ public abstract class ServerWorld_tickMixin extends World
 
     @Inject(method = "tick", at = @At(
             value = "CONSTANT",
-            args = "stringValue=world border"
+            args = "stringValue=weather"
     ))
     private void startWeatherSection(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
@@ -46,7 +46,7 @@ public abstract class ServerWorld_tickMixin extends World
     }
     @Inject(method = "tick", at = @At(
             value = "CONSTANT",
-            args = "stringValue=world border"
+            args = "stringValue=chunkSource"
     ))
     private void stopWeatherStartChunkSection(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
@@ -84,7 +84,7 @@ public abstract class ServerWorld_tickMixin extends World
 
     @Inject(method = "tick", at = @At(
             value = "CONSTANT",
-            args = "stringValue=tickPending"
+            args = "stringValue=blockEvents"
     ))
     private void stopVillageStartBlockAgainSection(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {