fix: ghost mushroom attempt 1

Related to #336

Author: ishland

c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/Config.java

@@ -13,12 +13,6 @@ public class Config {
                     " Lower this for a better latency and higher this for a faster loading")
             .getLong(GlobalExecutors.GLOBAL_EXECUTOR_PARALLELISM * 2L, GlobalExecutors.GLOBAL_EXECUTOR_PARALLELISM * 2L, ConfigSystem.LongChecks.POSITIVE_VALUES_ONLY);
 
-    public static final boolean compatibilityMode = new ConfigSystem.ConfigAccessor()
-            .key("noTickViewDistance.compatibilityMode")
-            .comment("Whether to use compatibility mode to send chunks \n" +
-                    " This may fix some mod compatibility issues")
-            .getBoolean(true, true);
-
     public static final boolean enableExtRenderDistanceProtocol = new ConfigSystem.ConfigAccessor()
             .key("noTickViewDistance.enableExtRenderDistanceProtocol")
             .comment("""

c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinServerAccessible.java

@@ -27,14 +27,4 @@ private static boolean needSendChunks() {
         return true;
     }
 
-    @Dynamic
-    @WrapOperation(method = "lambda$upgradeToThis$0", at = @At(value = "INVOKE", target = "Lcom/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible;sendChunkToPlayer(Lnet/minecraft/server/world/ServerChunkLoadingManager;Lcom/ishland/flowsched/scheduler/ItemHolder;)V", remap = true), remap = false)
-    private static void wrapSendChunks(ServerChunkLoadingManager tacs, ItemHolder<?, ?, ?, ?> holder, Operation<Void> original) {
-        if (Config.compatibilityMode) {
-            ((IThreadedAnvilChunkStorage) tacs).getMainThreadExecutor().submit(() -> original.call(tacs, holder));
-        } else {
-            original.call(tacs, holder);
-        }
-    }
-
 }

c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinThreadedAnvilChunkStorage.java

@@ -53,11 +53,7 @@ private WorldChunk redirectSendWatchPacketsGetWorldChunk(ChunkHolder chunkHolder
     @Inject(method = "makeChunkAccessible", at = @At("RETURN"))
     private void onMakeChunkAccessible(ChunkHolder chunkHolder, CallbackInfoReturnable<CompletableFuture<OptionalChunk<WorldChunk>>> cir) {
         cir.getReturnValue().thenAccept(either -> either.ifPresent(worldChunk -> {
-            if (Config.compatibilityMode) {
-                this.mainThreadExecutor.send(() -> this.sendToPlayers(worldChunk));
-            } else {
-                this.sendToPlayers(worldChunk);
-            }
+            this.mainThreadExecutor.send(() -> this.sendToPlayers(worldChunk));
         }));
     }
 

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/ducks/IPartialPostProcessing.java

@@ -0,0 +1,7 @@
+package com.ishland.c2me.rewrites.chunksystem.common.ducks;
+
+public interface IPartialPostProcessing {
+
+    void c2me$runBorderPostProcessing();
+
+}

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible.java

@@ -9,6 +9,7 @@
 import com.ishland.c2me.rewrites.chunksystem.common.Config;
 import com.ishland.c2me.rewrites.chunksystem.common.NewChunkHolderVanillaInterface;
 import com.ishland.c2me.rewrites.chunksystem.common.NewChunkStatus;
+import com.ishland.c2me.rewrites.chunksystem.common.ducks.IPartialPostProcessing;
 import com.ishland.c2me.rewrites.chunksystem.common.fapi.LifecycleEventInvoker;
 import com.ishland.flowsched.scheduler.ItemHolder;
 import com.ishland.flowsched.scheduler.KeyStatusPair;
@@ -85,15 +86,13 @@ private static boolean needSendChunks() {
     }
 
     private static void sendChunkToPlayer(ServerChunkLoadingManager tacs, ItemHolder<ChunkPos, ChunkState, ChunkLoadingContext, NewChunkHolderVanillaInterface> holder) {
-        final Chunk chunk = holder.getItem().get().chunk();
-        if (chunk instanceof WorldChunk worldChunk) {
-            CompletableFuture<?> completableFuturexx = holder.getUserData().get().getPostProcessingFuture();
-            if (completableFuturexx.isDone()) {
+        holder.submitOp(CompletableFuture.runAsync(() -> {
+            final Chunk chunk = holder.getItem().get().chunk();
+            if (chunk instanceof WorldChunk worldChunk) {
+                ((IPartialPostProcessing) worldChunk).c2me$runBorderPostProcessing();
                 ((IThreadedAnvilChunkStorage) tacs).invokeSendToPlayers(worldChunk);
-            } else {
-                completableFuturexx.thenAcceptAsync(v -> ((IThreadedAnvilChunkStorage) tacs).invokeSendToPlayers(worldChunk), ((IThreadedAnvilChunkStorage) tacs).getMainThreadExecutor());
             }
-        }
+        }, ((IThreadedAnvilChunkStorage) tacs).getMainThreadExecutor()::submit));
     }
 
     private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverWorld) {

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinWorldChunk.java

@@ -0,0 +1,55 @@
+package com.ishland.c2me.rewrites.chunksystem.mixin;
+
+import com.ishland.c2me.rewrites.chunksystem.common.ducks.IPartialPostProcessing;
+import it.unimi.dsi.fastutil.shorts.ShortListIterator;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.HeightLimitView;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkSection;
+import net.minecraft.world.chunk.ProtoChunk;
+import net.minecraft.world.chunk.UpgradeData;
+import net.minecraft.world.chunk.WorldChunk;
+import net.minecraft.world.gen.chunk.BlendingData;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(WorldChunk.class)
+public abstract class MixinWorldChunk extends Chunk implements IPartialPostProcessing {
+
+    @Shadow @Final private World world;
+
+    public MixinWorldChunk(ChunkPos pos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry<Biome> biomeRegistry, long inhabitedTime, @Nullable ChunkSection[] sectionArray, @Nullable BlendingData blendingData) {
+        super(pos, upgradeData, heightLimitView, biomeRegistry, inhabitedTime, sectionArray, blendingData);
+    }
+
+    @Override
+    public void c2me$runBorderPostProcessing() {
+        ChunkPos chunkPos = this.getPos();
+
+        for (int i = 0; i < this.postProcessingLists.length; i++) {
+            if (this.postProcessingLists[i] != null) {
+                for (ShortListIterator iterator = this.postProcessingLists[i].iterator(); iterator.hasNext(); ) {
+                    short short_ = iterator.nextShort();
+                    BlockPos blockPos = ProtoChunk.joinBlockPos(short_, this.sectionIndexToCoord(i), chunkPos);
+                    BlockState blockState = this.getBlockState(blockPos);
+
+                    if (blockState.getBlock() == Blocks.BROWN_MUSHROOM || blockState.getBlock() == Blocks.RED_MUSHROOM) {
+                        if (!blockState.canPlaceAt(world, blockPos)) {
+                            this.world.setBlockState(blockPos, Blocks.AIR.getDefaultState(), Block.NO_REDRAW | Block.FORCE_STATE);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}

c2me-rewrites-chunk-system/src/main/resources/c2me-rewrites-chunk-system.mixins.json

@@ -12,6 +12,7 @@
     "MixinNoiseChunkGenerator",
     "MixinServerChunkManager",
     "MixinThreadedAnvilChunkStorage",
+    "MixinWorldChunk",
     "async_serialization.MixinBlender",
     "async_serialization.MixinChunkRegion",
     "async_serialization.MixinChunkSerializer",