fix conflict with worldedit, update NeoForge version to 21.1.137

Author: TexBlock

CHANGELOG.md

@@ -1,2 +1,4 @@
 ## Changelog
-- rework `customSticky` mixin
+- rework `customSticky` mixin
+- fix conflict with worldedit
+- update NeoForge version to `21.1.137`

gradle.properties

@@ -4,7 +4,7 @@ loom.platform = neoforge
 
 # Mod Properties
 	minecraft_version=1.21.1
-	neoforge_version=21.1.115
+	neoforge_version=21.1.137
 	jsr305_version=3.0.2
 	parchment_mappings=2024.11.17
 

src/main/java/carpet/mixins/LevelChunk_fillUpdatesMixin.java

@@ -1,6 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
@@ -13,14 +15,17 @@
 public class LevelChunk_fillUpdatesMixin
 {
     // todo onStateReplaced needs a bit more love since it removes be which is needed
-    @Redirect(method = "setBlockState", at = @At(
+    @WrapOperation(method = "setBlockState", at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/world/level/block/state/BlockState;onPlace(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V"
     ))
-    private void onAdded(BlockState blockState, Level world_1, BlockPos blockPos_1, BlockState blockState_1, boolean boolean_1)
+    private void onAdded(BlockState blockState, Level world, BlockPos blockPos, BlockState state, boolean b, Operation<Void> original)
     {
-        if (!CarpetSettings.impendingFillSkipUpdates.get())
-            blockState.onPlace(world_1, blockPos_1, blockState_1, boolean_1);
+        if (!CarpetSettings.impendingFillSkipUpdates.get()) {
+            blockState.onPlace(world, blockPos, blockState, b);
+        } else {
+            original.call(blockState, world, blockPos, state, b);
+        }
     }
 
     @Redirect(method = "setBlockState", at = @At(