Threaded chunk changes broadcasting

Author: PureGero

patches_removed/0026-Run-unsupported-plugins-in-sync.patch

@@ -21,22 +21,6 @@
                  List<CloneCommands.CloneBlockInfo> list = Lists.newArrayList();
                  List<CloneCommands.CloneBlockInfo> list1 = Lists.newArrayList();
                  List<CloneCommands.CloneBlockInfo> list2 = Lists.newArrayList();
-@@ -329,6 +_,15 @@
-                     }
- 
-                     serverLevel1.getBlockTicks().copyAreaFrom(serverLevel.getBlockTicks(), boundingBox, blockPos4);
-+
-+                    // ShreddedPaper start - clear cached chunk packets for destination chunks
-+                    for (int chunkX = boundingBox1.minX() >> 4; chunkX <= boundingBox1.maxX() >> 4; chunkX++) {
-+                        for (int chunkZ = boundingBox1.minZ() >> 4; chunkZ <= boundingBox1.maxZ() >> 4; chunkZ++) {
-+                            net.minecraft.world.level.chunk.LevelChunk chunk = serverLevel1.getChunkIfLoaded(chunkX, chunkZ);
-+                            if (chunk != null) chunk.cachedChunkPacket = null;
-+                        }
-+                    }
-+                    // ShreddedPaper end - clear cached chunk packets for destination chunks
-                 } catch (Throwable var35) {
-                     try {
-                         scopedCollector.close();
 @@ -336,17 +_,19 @@
                          var35.addSuppressed(var34);
                      }

patches_removed/0028-Threaded-chunk-changes-broadcasting.patch

@@ -16,19 +16,9 @@
                  int i2 = 0;
 
                  for (BlockPos blockPos : BlockPos.betweenClosed(box.minX(), box.minY(), box.minZ(), box.maxX(), box.maxY(), box.maxZ())) {
-@@ -223,13 +_,24 @@
-                     level.updateNeighboursOnBlockSet(updatedPosition.pos, updatedPosition.oldState);
+@@ -224,12 +_,14 @@
                  }
 
-+                // ShreddedPaper start - clear cached chunk packets for affected chunks
-+                for (int chunkX = box.minX() >> 4; chunkX <= box.maxX() >> 4; chunkX++) {
-+                    for (int chunkZ = box.minZ() >> 4; chunkZ <= box.maxZ() >> 4; chunkZ++) {
-+                        net.minecraft.world.level.chunk.LevelChunk chunk = level.getChunkIfLoaded(chunkX, chunkZ);
-+                        if (chunk != null) chunk.cachedChunkPacket = null;
-+                    }
-+                }
-+                // ShreddedPaper end - clear cached chunk packets for affected chunks
-+
                  if (i2 == 0) {
 -                    throw ERROR_FAILED.create();
 +                    source.sendFailure(Component.translatable("commands.fill.failed")); // ShreddedPaper - run on correct region thread - send failure message instead of throwing

shreddedpaper-server/minecraft-patches/sources/net/minecraft/server/commands/CloneCommands.java.patch

@@ -16,7 +16,7 @@
              boolean flag;
              if (mode == SetBlockCommand.Mode.DESTROY) {
                  level.destroyBlock(pos, true);
-@@ -117,15 +_,21 @@
+@@ -117,15 +_,16 @@
              BlockState blockState = level.getBlockState(pos);
              if (flag
                  && !block.place(level, pos, Block.UPDATE_CLIENTS | (strict ? Block.UPDATE_SKIP_ALL_SIDEEFFECTS : Block.UPDATE_SKIP_BLOCK_ENTITY_SIDEEFFECTS))) {
@@ -27,11 +27,6 @@
                      level.updateNeighboursOnBlockSet(pos, blockState);
                  }
 
-+                // ShreddedPaper start - clear cached chunk packet
-+                net.minecraft.world.level.chunk.LevelChunk chunk = level.getChunkIfLoaded(pos.getX() >> 4, pos.getZ() >> 4);
-+                if (chunk != null) chunk.cachedChunkPacket = null;
-+                // ShreddedPaper end - clear cached chunk packet
-+
                  source.sendSuccess(() -> Component.translatable("commands.setblock.success", pos.getX(), pos.getY(), pos.getZ()), true);
 -                return 1;
              }

shreddedpaper-server/minecraft-patches/sources/net/minecraft/server/commands/FillCommand.java.patch

@@ -1,12 +1,13 @@
 --- a/net/minecraft/server/level/ChunkHolder.java
 +++ b/net/minecraft/server/level/ChunkHolder.java
-@@ -1,5 +_,10 @@
+@@ -1,5 +_,11 @@
  package net.minecraft.server.level;
 
 +import ca.spottedleaf.moonrise.common.util.TickThread;
 +import ca.spottedleaf.moonrise.common.util.WorldUtil;
 +import com.mojang.logging.LogUtils;
 +import io.multipaper.shreddedpaper.region.RegionPos;
++import io.multipaper.shreddedpaper.threading.ShreddedPaperChangesBroadcaster;
 +import io.multipaper.shreddedpaper.util.SimpleStampedLock;
  import it.unimi.dsi.fastutil.shorts.ShortOpenHashSet;
  import it.unimi.dsi.fastutil.shorts.ShortSet;