fix broadcasting block changes to client

Author: CursedFlames

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java

@@ -15,6 +15,7 @@
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
+import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.utils.Coords;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.exception.DasmFailedToApply;
@@ -29,6 +30,7 @@
 import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube;
 import it.unimi.dsi.fastutil.shorts.ShortSet;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.FullChunkStatus;
@@ -120,8 +122,24 @@ public void cc_onSectionLightChanged(LightLayer lightLayer, int sectionY, Callba
 
     @Shadow public abstract void broadcastChanges(LevelChunk chunk);
 
+    // region [cc_broadcastCubeChanges dasm + mixin]
     @AddTransformToSets(ChunkToCubeSet.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("broadcastChanges(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     public native void cc_broadcastCubeChanges(LevelCube cube);
+    // TODO (P2) lighting - ClientboundLightUpdatePacket branch is currently never reached; once we have lighting it will have to be a CC packet, and this.broadcast will need to redirect to a CC method
+
+    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionYFromSectionIndex(I)I"))
+    private int cc_onBroadcastCubeChanges_indexToSectionY(LevelHeightAccessor instance, int sectionIndex) {
+        // The vanilla method uses SectionPos.of(ChunkPos, sectionY), but we want SectionPos.of(CubePos, sectionIndex).
+        // The easiest way to accomplish this is to turn `getSectionYFromSectionIndex` into a no-op so that we get sectionIndex instead of sectionY.
+        // (We could do local captures, but it'd be more brittle)
+        return sectionIndex;
+    }
+
+    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;of(Lio/github/opencubicchunks/cc_core/api/CubePos;I)Lnet/minecraft/core/SectionPos;"))
+    private SectionPos cc_onBroadcastCubeChanges_sectionPos(CubePos cubePos, int sectionIndex) {
+        return Coords.sectionPosByIndex(cubePos, sectionIndex);
+    }
+    // endregion
 
     @AddMethodToSets(sets = ChunkToCloSet.class, owner = @Ref(ChunkHolder.class), method = @MethodSig("broadcastChanges(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     public void cc_broadcastCloChanges(LevelClo clo) {

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java

@@ -39,9 +39,11 @@
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.GlobalSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.SectionPosToCubeSet;
 import io.github.opencubicchunks.cubicchunks.network.CCClientboundSetCubeCacheCenterPacket;
+import io.github.opencubicchunks.cubicchunks.server.level.CCServerPlayer;
 import io.github.opencubicchunks.cubicchunks.server.level.CloGenerationTask;
 import io.github.opencubicchunks.cubicchunks.server.level.CloHolder;
 import io.github.opencubicchunks.cubicchunks.server.level.CloTrackingView;
+import io.github.opencubicchunks.cubicchunks.server.level.CubeHolder;
 import io.github.opencubicchunks.cubicchunks.server.level.CubicChunkMap;
 import io.github.opencubicchunks.cubicchunks.server.level.GeneratingCubeMap;
 import io.github.opencubicchunks.cubicchunks.server.level.progress.CloProgressListener;
@@ -94,7 +96,7 @@
  */
 @Dasm(ChunkToCloSet.class)
 @Mixin(ChunkMap.class)
-public abstract class MixinChunkMap extends MixinChunkStorage implements GeneratingCubeMap, CubicChunkMap {
+public abstract class MixinChunkMap extends MixinChunkStorage implements GeneratingCubeMap, CubicChunkMap, CubeHolder.PlayerProvider {
     @Shadow public abstract ReportedException debugFuturesAndCreateReportedException(IllegalStateException exception, String details);
 
     @Shadow protected abstract ChunkHolder getUpdatingChunkIfPresent(long aLong);
@@ -155,7 +157,7 @@ private static double cc_euclideanDistanceSquared(CloPos cloPos, Vec3 vec3) {
     // These methods are not copied due to taking 3 ints instead of 2
     @Override
     public boolean cc_isChunkTracked(ServerPlayer player, int x, int y, int z) {
-        return ((CloTrackingView) player.getChunkTrackingView()).cc_contains(x, y, z)
+        return ((CCServerPlayer) player).cc_getCloTrackingView().cc_contains(x, y, z)
             // TODO this requires PlayerChunkSender to accept Clo longs
             && !player.connection.chunkSender.isPending(CloPos.cubeAsLong(x, y, z));
     }
@@ -496,6 +498,11 @@ private boolean cc_getPlayers_isChunkTracked(ChunkMap instance, ServerPlayer pla
     }
     //endregion
 
+    @AddMethodToSets(sets = ChunkToCubeSet.class, owner = @Ref(ChunkMap.class), method = @MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
+    @Override public List<ServerPlayer> cc_getPlayers(CubePos pos, boolean boundaryOnly) {
+        return cc_getPlayers(CloPos.cube(pos), boundaryOnly);
+    }
+
     // Replace `SectionPos.chunk()` with `SectionPos.cc_cube()` unconditionally here
     @AddTransformToSets(GlobalSet.class) @TransformFromMethod(value = @MethodSig("tick(Ljava/util/function/BooleanSupplier;)V"), useRedirectSets = { ChunkToCloSet.class, SectionPosToCubeSet.class })
     protected native void cc_tick(BooleanSupplier hasMoreTime);

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java

@@ -1,6 +1,7 @@
 package io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level;
 
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.BooleanSupplier;
@@ -105,6 +106,8 @@ public abstract class MixinServerChunkCache extends MixinChunkSource implements
 
     @Shadow protected abstract void getFullChunk(long p_8371_, Consumer<LevelChunk> p_8372_);
 
+    @Shadow @Final private Set<ChunkHolder> chunkHoldersToBroadcast;
+
     @Inject(method = "<init>", at = @At("CTOR_HEAD"))
     private void cc_onInit(ServerLevel level, LevelStorageSource.LevelStorageAccess levelStorageAccess, DataFixer fixerUpper, StructureTemplateManager structureManager, Executor dispatcher,
                         ChunkGenerator generator, int viewDistance, int simulationDistance, boolean sync, ChunkProgressListener progressListener,
@@ -243,17 +246,18 @@ private void cc_tickSpawningClo(LevelClo levelClo, long timeInhabited, List<MobC
         // TODO (P2)
     }
 
-    // TODO just inject and do this in vanilla method?
-    // needs manual impl because needs to use cube rather than chunk
-    @Override
-    @AddMethodToSets(sets = GlobalSet.class, owner = @Ref(ServerChunkCache.class), method = @MethodSig("blockChanged(Lnet/minecraft/core/BlockPos;)V"))
-    public void cc_blockChanged(BlockPos pos) {
+    @Inject(method = "blockChanged", at = @At("HEAD"), cancellable = true)
+    public void cc_onBlockChanged(BlockPos pos, CallbackInfo ci) {
+        if (!this.cc_isCubic) {
+            return;
+        }
+        ci.cancel();
         int x = Coords.blockToCube(pos.getX());
         int y = Coords.blockToCube(pos.getY());
         int z = Coords.blockToCube(pos.getZ());
         ChunkHolder chunkholder = this.getVisibleChunkIfPresent(CloPos.cubeAsLong(x, y, z));
-        if (chunkholder != null) {
-            chunkholder.blockChanged(pos);
+        if (chunkholder != null && chunkholder.blockChanged(pos)) {
+            this.chunkHoldersToBroadcast.add(chunkholder);
         }
     }
 

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerPlayer.java

@@ -16,6 +16,7 @@
 import io.github.opencubicchunks.cubicchunks.mixin.core.common.world.entity.MixinEntity;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCloSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCubeSet;
+import io.github.opencubicchunks.cubicchunks.server.level.CCServerPlayer;
 import io.github.opencubicchunks.cubicchunks.server.level.CloTrackingView;
 import io.github.opencubicchunks.cubicchunks.server.level.ServerCubeCache;
 import net.minecraft.core.BlockPos;
@@ -29,7 +30,7 @@
 
 @Dasm(ChunkToCloSet.class)
 @Mixin(ServerPlayer.class)
-public abstract class MixinServerPlayer extends MixinEntity {
+public abstract class MixinServerPlayer extends MixinEntity implements CCServerPlayer {
     @AddFieldToSets(sets = ChunkToCloSet.class, owner = @Ref(ServerPlayer.class), field = @FieldSig(type = @Ref(ChunkTrackingView.class), name = "chunkTrackingView"))
     private CloTrackingView cc_cloTrackingView = CloTrackingView.EMPTY;
 

src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCubeSet.java

@@ -1,5 +1,6 @@
 package io.github.opencubicchunks.cubicchunks.mixin.dasmsets;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.ConstructorToFactoryRedirect;
@@ -36,6 +37,7 @@
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.GeneratingChunkMap;
 import net.minecraft.server.level.GenerationChunkHolder;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.StaticCache2D;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -156,7 +158,10 @@ abstract class ChunkPyramid$Builder_to_CubePyramid$Builder_redirects { }
     interface ChunkHolder$LevelChangeListener_to_CubeHolder$LevelChangeListener_redirects { }
 
     @TypeRedirect(from = @Ref(ChunkHolder.PlayerProvider.class), to = @Ref(CubeHolder.PlayerProvider.class))
-    interface ChunkHolder$PlayerProvider_to_CubeHolder$PlayerProvider_redirects { }
+    interface ChunkHolder$PlayerProvider_to_CubeHolder$PlayerProvider_redirects {
+        @MethodRedirect(@MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
+        List<ServerPlayer> cc_getPlayers(CubePos pos, boolean boundaryOnly);
+    }
 
     @TypeRedirect(from = @Ref(GeneratingChunkMap.class), to = @Ref(GeneratingCubeMap.class))
     interface GeneratingChunkMap_to_GeneratingCubeMap_redirects {
@@ -176,6 +181,13 @@ abstract class ChunkGenerationTask_redirects {
     @TypeRedirect(from = @Ref(LevelChunk.UnsavedListener.class), to = @Ref(LevelCube.UnsavedListener.class))
     interface LevelChunk$UnsavedListener_to_LevelCube$UnsavedListener_redirects { }
 
+    @IntraOwnerContainer(owner = @Ref(ChunkHolder.class))
+    abstract class ChunkHolder_redirects {
+        // TODO dasm inheritance
+        @FieldRedirect(@FieldSig(name = "pos", type = @Ref(ChunkPos.class)))
+        protected CubePos cc_cubePos;
+    }
+
     // Forge stuff
     // TODO move to a forge-specific sourceset
     @TypeRedirect(from = @Ref(ChunkEvent.Load.class), to = @Ref(Event.class))

src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CCServerPlayer.java

@@ -0,0 +1,5 @@
+package io.github.opencubicchunks.cubicchunks.server.level;
+
+public interface CCServerPlayer {
+    CloTrackingView cc_getCloTrackingView();
+}

src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeHolder.java

@@ -18,6 +18,6 @@ interface PlayerProvider {
         /**
          * Returns the players tracking the given cube.
          */
-        List<ServerPlayer> getPlayers(CubePos pos, boolean boundaryOnly);
+        List<ServerPlayer> cc_getPlayers(CubePos pos, boolean boundaryOnly);
     }
 }