Don't call recalcBlockCounts on the client

src/main/java/ca/spottedleaf/moonrise/mixin/block_counting/LevelChunkSectionMixin.java

@@ -8,7 +8,9 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
+import net.minecraft.client.Minecraft;
 import net.minecraft.util.BitStorage;
+import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.Palette;
@@ -62,8 +64,8 @@ abstract class LevelChunkSectionMixin implements BlockCountingChunkSection {
     private final IntList tickingBlocks = new IntList();
 
     @Override
-    public final int moonrise$getSpecialCollidingBlocks() {
-        return this.specialCollidingBlocks;
+    public final boolean moonrise$maybeHasSpecialCollidingBlocks() {
+        return this.specialCollidingBlocks != 0;
     }
 
     @Override
@@ -184,7 +186,7 @@ public void recalcBlockCounts() {
     }
 
     /**
-     * @reason Call recalcBlockCounts on the client, as the client does not invoke it when deserializing chunk sections.
+     * @reason the client does not invoke recalcBlockCounts when deserializing chunk sections, but we need this info for collision optimizations
      * @author Spottedleaf
      */
     @Inject(
@@ -193,7 +195,13 @@ public void recalcBlockCounts() {
                     value = "RETURN"
             )
     )
-    private void callRecalcBlocksClient(final CallbackInfo ci) {
-        this.recalcBlockCounts();
+    private void checkForSpecialCollidingBlocksClient(final CallbackInfo ci) {
+        final ProfilerFiller profiler = Minecraft.getInstance().getProfiler();
+        profiler.push("checkForSpecialCollidingBlocksClient");
+        try {
+            this.specialCollidingBlocks = this.maybeHas(CollisionUtil::isSpecialCollidingBlock) ? 1 : 0;
+        } finally {
+            profiler.pop();
+        }
     }
 }

src/main/java/ca/spottedleaf/moonrise/patches/block_counting/BlockCountingChunkSection.java

@@ -4,7 +4,7 @@
 
 public interface BlockCountingChunkSection {
 
-    public int moonrise$getSpecialCollidingBlocks();
+    public boolean moonrise$maybeHasSpecialCollidingBlocks();
 
     public IntList moonrise$getTickingBlockList();
 

src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java

@@ -1994,7 +1994,7 @@ public static boolean getCollisionsForBlocksOrWorldBorder(final Level world, fin
                         continue;
                     }
 
-                    final boolean hasSpecial = ((BlockCountingChunkSection)section).moonrise$getSpecialCollidingBlocks() != 0;
+                    final boolean hasSpecial = ((BlockCountingChunkSection)section).moonrise$maybeHasSpecialCollidingBlocks();
                     final int sectionAdjust = !hasSpecial ? 1 : 0;
 
                     final PalettedContainer<BlockState> blocks = section.states;