Update updateSuppressionBlock for 1.19

src/main/java/carpet/CarpetSettings.java

@@ -54,7 +54,6 @@ public class CarpetSettings
     public static boolean chainStoneStickToAll = false;
     public static Block structureBlockIgnoredBlock = Blocks.STRUCTURE_VOID;
     public static final int vanillaStructureBlockLimit = 48;
-    public static int updateSuppressionBlockSetting = -1;
 
     private static class LanguageValidator extends Validator<String> {
         @Override public String validate(CommandSourceStack source, ParsedRule<String> currentRule, String newValue, String string) {
@@ -1045,53 +1044,27 @@ public String validate(CommandSourceStack source, ParsedRule<String> currentRule
     public static boolean lightningKillsDropsFix = false;
 
     @Rule(
-            desc = "Placing an activator rail on top of a barrier block will update suppress when the rail turns off.",
-            extra = {"Entering an integer will make the update suppression block auto-reset","Integer entered is the delay in ticks for it to reset"},
-            category = {CREATIVE, "extras"},
-            options = {"false","true","1","6"},
+            desc = "Placing an activator rail on top of a barrier block will fill the neighbor updater stack when the rail turns off.",
+            extra = {"The integer entered is the amount of updates that should be left in the stack", "-1 turns it off"},
+            category = CREATIVE,
+            options = {"-1","0","10","50"},
             strict = false,
             validate = updateSuppressionBlockModes.class
     )
-    public static String updateSuppressionBlock = "false";
+    public static int updateSuppressionBlock = -1;
 
     @Rule(
             desc = "Fixes update suppression causing server crashes.",
             category = {BUGFIX}
     )
     public static boolean updateSuppressionCrashFix = false;
 
-    public static int getInteger(String s) {
-        try {
-            return Integer.parseInt(s);
-        } catch(NumberFormatException e) {
-            return -1;
-        }
-    }
-
-    private static class updateSuppressionBlockModes extends Validator<String> {
+    private static class updateSuppressionBlockModes extends Validator<Integer> {
         @Override
-        public String validate(CommandSourceStack source, ParsedRule<String> currentRule, String newValue, String string) {
-            if (!currentRule.get().equals(newValue)) {
-                if (newValue.equalsIgnoreCase("false")) {
-                    updateSuppressionBlockSetting = -1;
-                } else if (newValue.equalsIgnoreCase("true")) {
-                    updateSuppressionBlockSetting = 0;
-                } else {
-                    int parsedInt = getInteger(newValue);
-                    if (parsedInt <= 0) {
-                        updateSuppressionBlockSetting = -1;
-                        return "false";
-                    } else {
-                        updateSuppressionBlockSetting = parsedInt;
-                    }
-                }
-            }
+        public Integer validate(CommandSourceStack source, ParsedRule<Integer> currentRule, Integer newValue, String string) {
+            if (newValue < -1) newValue = -1;
             return newValue;
         }
-        @Override
-        public String description() {
-            return "Cannot be negative, can be true, false, or # > 0";
-        }
     }
 
     @Rule(

src/main/java/carpet/mixins/BarrierBlock_updateSuppressionBlockMixin.java

@@ -1,6 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import net.minecraft.world.level.redstone.CollectingNeighborUpdater;
+import net.minecraft.world.level.redstone.NeighborUpdater;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.util.Random;
@@ -22,33 +24,33 @@ public class BarrierBlock_updateSuppressionBlockMixin extends Block {
     public BarrierBlock_updateSuppressionBlockMixin(Properties settings) { super(settings); }
 
     @Override
-    public int getSignal(BlockState state, BlockGetter world, BlockPos pos, Direction direction) {
+    public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
         return (shouldPower && direction == Direction.DOWN) ? 15 : 0;
     }
 
     @Override
-    public void neighborChanged(BlockState state, Level world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) {
-        if (CarpetSettings.updateSuppressionBlockSetting != -1) {
+    public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean notify) {
+        if (CarpetSettings.updateSuppressionBlock != -1) {
             if (fromPos.equals(pos.above())) {
-                BlockState stateAbove = world.getBlockState(fromPos);
+                BlockState stateAbove = level.getBlockState(fromPos);
                 if (stateAbove.is(Blocks.ACTIVATOR_RAIL) && !stateAbove.getValue(PoweredRailBlock.POWERED)) {
-                    if (CarpetSettings.updateSuppressionBlockSetting > 0) {
-                        world.scheduleTick(pos, this, CarpetSettings.updateSuppressionBlockSetting);
-                    }
-                    throw new StackOverflowError("updateSuppressionBlock");
+                    level.scheduleTick(pos, this, 1);
+                    NeighborUpdater updater = ((LevelAccessor)level).getNeighborUpdater();
+                    if (updater instanceof CollectingNeighborUpdaterAccessor cnua)
+                        cnua.setCount(cnua.getMaxChainedNeighborUpdates()-CarpetSettings.updateSuppressionBlock);
                 }
             }
         }
-        super.neighborChanged(state, world, pos, block, fromPos, notify);
+        super.neighborChanged(state, level, pos, block, fromPos, notify);
     }
 
     @Override
-    public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
+    public void tick(BlockState state, ServerLevel level, BlockPos pos, Random random) {
         BlockPos posAbove = pos.above();
-        BlockState stateAbove = world.getBlockState(posAbove);
+        BlockState stateAbove = level.getBlockState(posAbove);
         if (stateAbove.is(Blocks.ACTIVATOR_RAIL) && !stateAbove.getValue(PoweredRailBlock.POWERED)) {
             shouldPower = true;
-            world.setBlock(posAbove, stateAbove.setValue(PoweredRailBlock.POWERED, true), 3);
+            level.setBlock(posAbove, stateAbove.setValue(PoweredRailBlock.POWERED, true), Block.UPDATE_CLIENTS | Block.UPDATE_NONE);
             shouldPower = false;
         }
     }

src/main/java/carpet/mixins/CollectingNeighborUpdaterAccessor.java

@@ -0,0 +1,13 @@
+package carpet.mixins;
+
+import net.minecraft.world.level.redstone.CollectingNeighborUpdater;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(CollectingNeighborUpdater.class)
+public interface CollectingNeighborUpdaterAccessor {
+    @Accessor("count")
+    void setCount(int count);
+    @Accessor("maxChainedNeighborUpdates")
+    int getMaxChainedNeighborUpdates();
+}

src/main/java/carpet/mixins/LevelAccessor.java

@@ -0,0 +1,12 @@
+package carpet.mixins;
+
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.redstone.NeighborUpdater;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Level.class)
+public interface LevelAccessor {
+    @Accessor("neighborUpdater")
+    NeighborUpdater getNeighborUpdater();
+}

src/main/resources/carpet.mixins.json

@@ -195,7 +195,9 @@
     "MinecraftServer_updateSuppressionCrashFixMixin",
     "ServerPlayer_updateSuppressionCrashFixMixin",
     "ChunkMap_creativePlayersLoadChunksMixin",
-    "SculkSensorBlock_rangeMixin"
+    "SculkSensorBlock_rangeMixin",
+    "LevelAccessor",
+    "CollectingNeighborUpdaterAccessor"
   ],
   "client": [
     "Timer_tickSpeedMixin",