Cleanup some of the section code

Author: octylFractal

worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/internal/SectionBufferingExtent.java

@@ -206,7 +206,7 @@ record SectionDataWithOld(
             Int2ObjectArrayMap<SectionDataWithOld> oldSections = new Int2ObjectArrayMap<>(entry.getValue().size());
             for (Int2ObjectArrayMap.Entry<SectionData> sectionEntry : entry.getValue().int2ObjectEntrySet()) {
                 SectionData data = sectionEntry.getValue();
-                NativeChunkSection old = chunk.setChunkSection(sectionEntry.getIntKey(), data.section);
+                NativeChunkSection old = chunk.setChunkSection(sectionEntry.getIntKey(), data.section, data.modified);
                 oldSections.put(sectionEntry.getIntKey(), new SectionDataWithOld(data.section, old, data.modified));
             }
             effectData.put(entry.getLongKey(), oldSections);

worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/NativeChunk.java

@@ -19,10 +19,6 @@ public interface NativeChunk {
     @Nullable
     NativeBlockState setBlockState(NativePosition blockPos, NativeBlockState newState);
 
-    void notifyBlockUpdate(NativePosition pos, NativeBlockState oldState, NativeBlockState newState);
-
-    void markBlockChanged(NativePosition pos);
-
     void markSectionChanged(int index, ChunkSectionMask changed);
 
     void updateHeightmaps();
@@ -45,11 +41,12 @@ public interface NativeChunk {
      * Replaces a chunk section in the given chunk. This method is also responsible for updating heightmaps
      * and creating block entities, to keep consistency with {@link #setBlockState(NativePosition, NativeBlockState)}
      * (the method we used to use). This is usually easily done by calling
-     * {@link WNASharedImpl#postChunkSectionReplacement(NativeChunk, int, NativeChunkSection, NativeChunkSection)}.
+     * {@link WNASharedImpl#postChunkSectionReplacement(NativeChunk, int, NativeChunkSection, NativeChunkSection, ChunkSectionMask)}.
      *
      * @param index the index, from 0 to the max height divided by 16
      * @param section the new chunk section
+     * @param modifiedBlocks the mask of modified blocks
      * @return the old chunk section
      */
-    NativeChunkSection setChunkSection(int index, NativeChunkSection section);
+    NativeChunkSection setChunkSection(int index, NativeChunkSection section, ChunkSectionMask modifiedBlocks);
 }

worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/NativeWorld.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldedit.internal.wna;
 
-import com.sk89q.worldedit.math.BlockVector3;
 import org.enginehub.linbus.tree.LinCompoundTag;
 
 /**
@@ -39,6 +38,10 @@ public interface NativeWorld {
 
     NativeChunk getChunk(int chunkX, int chunkZ);
 
+    void notifyBlockUpdate(NativePosition pos, NativeBlockState oldState, NativeBlockState newState);
+
+    void markBlockChanged(NativePosition pos);
+
     void updateLightingForBlock(NativePosition position);
 
     boolean updateTileEntity(NativePosition position, LinCompoundTag tag);

worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WNASharedImpl.java

@@ -20,6 +20,7 @@
 package com.sk89q.worldedit.internal.wna;
 
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.internal.util.collection.ChunkSectionMask;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.SideEffect;
 import com.sk89q.worldedit.util.SideEffectSet;
@@ -129,36 +130,36 @@ public static void applySideEffectsNoLookups(
      * This is a heavily modified function stripped from MC to apply WorldEdit-modifications.
      *
      * <p>
-     * See Forge's World.markAndNotifyBlock
+     * See NeoForge's Level.markAndNotifyBlock
      * </p>
      */
     public static void markAndNotifyBlock(
-        NativeWorld wna, NativePosition pos, NativeChunk chunk, NativeBlockState oldState, NativeBlockState newState,
+        NativeWorld nativeWorld, NativePosition pos, NativeChunk chunk, NativeBlockState oldState, NativeBlockState newState,
         SideEffectSet sideEffectSet
     ) {
         // Removed redundant branches
 
         if (chunk.isTicking()) {
             if (sideEffectSet.shouldApply(SideEffect.ENTITY_AI)) {
-                chunk.notifyBlockUpdate(pos, oldState, newState);
+                nativeWorld.notifyBlockUpdate(pos, oldState, newState);
             } else if (sideEffectSet.shouldApply(SideEffect.NETWORK)) {
                 // If we want to skip entity AI, just mark the block for sending
-                chunk.markBlockChanged(pos);
+                nativeWorld.markBlockChanged(pos);
             }
         }
 
         if (sideEffectSet.shouldApply(SideEffect.NEIGHBORS)) {
-            wna.notifyNeighbors(pos, oldState, newState);
+            nativeWorld.notifyNeighbors(pos, oldState, newState);
         }
 
         // Make connection updates optional
         if (sideEffectSet.shouldApply(SideEffect.NEIGHBORS)) {
-            wna.updateNeighbors(pos, oldState, newState, 512);
+            nativeWorld.updateNeighbors(pos, oldState, newState, 512);
         }
 
         // Seems used only for PoI updates
         if (sideEffectSet.shouldApply(SideEffect.POI_UPDATE)) {
-            wna.onBlockStateChange(pos, oldState, newState);
+            nativeWorld.onBlockStateChange(pos, oldState, newState);
         }
     }
 
@@ -171,35 +172,30 @@ public static void markAndNotifyBlock(
      * @param index the replaced section index
      * @param oldSection the old section
      * @param newSection the new section
+     * @param modifiedBlocks the mask of modified blocks
      */
     public static void postChunkSectionReplacement(
-        NativeChunk chunk, int index, NativeChunkSection oldSection, NativeChunkSection newSection
+        NativeChunk chunk, int index, NativeChunkSection oldSection, NativeChunkSection newSection,
+        ChunkSectionMask modifiedBlocks
     ) {
-        for (int secX = 0; secX < 16; secX++) {
-            for (int secY = 0; secY < 16; secY++) {
-                for (int secZ = 0; secZ < 16; secZ++) {
-                    NativeBlockState oldState = oldSection.getBlock(secX, secY, secZ);
-                    NativeBlockState newState = newSection.getBlock(secX, secY, secZ);
-                    if (oldState.isSame(newState)) {
-                        continue;
-                    }
-                    int chunkY = chunk.getWorld().getYForSectionIndex(index) + secY;
-                    // We skip heightmaps, they're optimized at a higher level to a single call.
-
-                    // We skip onRemove here, will call in UPDATE side effect if necessary.
-
-                    if (oldState.isSameBlockType(newState) && oldState.hasBlockEntity()) {
-                        chunk.removeSectionBlockEntity(secX, chunkY, secZ);
-                    }
-
-                    // We skip onPlace here, will call in UPDATE side effect if necessary.
-
-                    if (newState.hasBlockEntity()) {
-                        chunk.initializeBlockEntity(secX, chunkY, secZ, newState);
-                    }
-                }
+        modifiedBlocks.forEach((secX, secY, secZ) -> {
+            NativeBlockState oldState = oldSection.getBlock(secX, secY, secZ);
+            NativeBlockState newState = newSection.getBlock(secX, secY, secZ);
+            int chunkY = chunk.getWorld().getYForSectionIndex(index) + secY;
+            // We skip heightmaps, they're optimized at a higher level to a single call.
+
+            // We skip onRemove here, will call in UPDATE side effect if necessary.
+
+            if (oldState.isSameBlockType(newState) && oldState.hasBlockEntity()) {
+                chunk.removeSectionBlockEntity(secX, chunkY, secZ);
             }
-        }
+
+            // We skip onPlace here, will call in UPDATE side effect if necessary.
+
+            if (newState.hasBlockEntity()) {
+                chunk.initializeBlockEntity(secX, chunkY, secZ, newState);
+            }
+        });
 
         boolean wasOnlyAir = oldSection.isOnlyAir();
         boolean onlyAir = newSection.isOnlyAir();

worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinNativeChunk.java

@@ -19,7 +19,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -98,33 +97,16 @@ public MixinNativeChunk(ChunkPos chunkPos, UpgradeData upgradeData, LevelHeightA
         return (NativeBlockState) setBlockState((BlockPos) blockPos, (BlockState) newState, false);
     }
 
-    public void nc$notifyBlockUpdate(NativePosition pos, NativeBlockState oldState, NativeBlockState newState) {
-        if (getSections()[getLevel().getSectionIndex(pos.y())] != null) {
-            getLevel().sendBlockUpdated(
-                (BlockPos) pos, (BlockState) oldState, (BlockState) newState,
-                Block.UPDATE_NEIGHBORS | Block.UPDATE_CLIENTS
-            );
-        }
-    }
-
-    public void nc$markBlockChanged(NativePosition pos) {
-        if (getSections()[getLevel().getSectionIndex(pos.y())] != null) {
-            ((ServerChunkCache) getLevel().getChunkSource()).blockChanged((BlockPos) pos);
-        }
-    }
-
     public void nc$markSectionChanged(int index, ChunkSectionMask changed) {
         ChunkHolder holder = ((ServerChunkCache) getLevel().getChunkSource())
             .getVisibleChunkIfPresent(getPos().toLong());
         if (holder != null) {
             if (holder.changedBlocksPerSection[index] == null) {
                 holder.hasChangedSections = true;
-                holder.changedBlocksPerSection[index] = new ShortOpenHashSet(
-                    Math.max(ShortOpenHashSet.DEFAULT_INITIAL_SIZE, changed.cardinality())
-                );
+                holder.changedBlocksPerSection[index] = new ShortOpenHashSet(changed.asShortCollection());
+            } else {
+                holder.changedBlocksPerSection[index].addAll(changed.asShortCollection());
             }
-
-            holder.changedBlocksPerSection[index].addAll(changed.asShortCollection());
         }
     }
 
@@ -163,12 +145,12 @@ public MixinNativeChunk(ChunkPos chunkPos, UpgradeData upgradeData, LevelHeightA
         return (NativeChunkSection) getSection(index);
     }
 
-    public NativeChunkSection nc$setChunkSection(int index, NativeChunkSection section) {
+    public NativeChunkSection nc$setChunkSection(int index, NativeChunkSection section, ChunkSectionMask modifiedBlocks) {
         Preconditions.checkPositionIndex(index, getSectionsCount());
         LevelChunkSection[] chunkSections = getSections();
         var oldSection = (NativeChunkSection) chunkSections[index];
         chunkSections[index] = (LevelChunkSection) section;
-        WNASharedImpl.postChunkSectionReplacement((NativeChunk) this, index, oldSection, section);
+        WNASharedImpl.postChunkSectionReplacement((NativeChunk) this, index, oldSection, section, modifiedBlocks);
         this.unsaved = true;
         return oldSection;
     }

worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinNativeChunkSection.java

@@ -33,6 +33,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(LevelChunkSection.class)
 @Implements(@Interface(iface = NativeChunkSection.class, prefix = "ncs$"))
@@ -87,6 +88,7 @@ public abstract net.minecraft.world.level.block.state.BlockState getBlockState(
      * @param container the container to copy
      * @return the copied container
      */
+    @Unique
     private static <T> PalettedContainer<T> copyPalettedContainer(PalettedContainer<T> container) {
         // First init by directly moving the fields over
         PalettedContainer<T> copy = new PalettedContainer<>(container.registry, container.strategy, container.data);

worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinNativeWorld.java

@@ -13,6 +13,7 @@
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.Level;
@@ -51,6 +52,17 @@ protected MixinNativeWorld(WritableLevelData levelData, ResourceKey<Level> dimen
         return (NativeChunk) getChunk(chunkX, chunkZ);
     }
 
+    public void nw$notifyBlockUpdate(NativePosition pos, NativeBlockState oldState, NativeBlockState newState) {
+        sendBlockUpdated(
+            (BlockPos) pos, (BlockState) oldState, (BlockState) newState,
+            Block.UPDATE_NEIGHBORS | Block.UPDATE_CLIENTS
+        );
+    }
+
+    public void nw$markBlockChanged(NativePosition pos) {
+        ((ServerChunkCache) getChunkSource()).blockChanged((BlockPos) pos);
+    }
+
     public void nw$updateLightingForBlock(NativePosition position) {
         ProfilerFiller profilerFiller = getProfiler();
         profilerFiller.push("updateSkyLightSources");