Merge 1.20 into 1.21.1

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/ModernFix.java

@@ -63,14 +63,19 @@ public void onServerStarted() {
         ClassInfoManager.clear();
     }
 
+    @SuppressWarnings("ConstantValue")
     public void onServerDead(MinecraftServer server) {
         /* Clear as much data from the integrated server as possible, in case a mod holds on to it */
         try {
             for(ServerLevel level : server.getAllLevels()) {
                 ChunkMap chunkMap = level.getChunkSource().chunkMap;
-                chunkMap.updatingChunkMap.clear();
-                chunkMap.visibleChunkMap.clear();
-                chunkMap.pendingUnloads.clear();
+                // Null check for mods that replace chunk system
+                if(chunkMap.updatingChunkMap != null)
+                    chunkMap.updatingChunkMap.clear();
+                if(chunkMap.visibleChunkMap != null)
+                    chunkMap.visibleChunkMap.clear();
+                if(chunkMap.pendingUnloads != null)
+                    chunkMap.pendingUnloads.clear();
             }
         } catch(RuntimeException e) {
             ModernFix.LOGGER.error("Couldn't clear chunk data", e);

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/chunk_meshing/RebuildTaskMixin.java

@@ -3,13 +3,15 @@
 import net.minecraft.client.renderer.chunk.SectionCompiler;
 import net.minecraft.core.BlockPos;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.embeddedt.modernfix.annotation.RequiresMod;
 import org.embeddedt.modernfix.util.blockpos.SectionBlockPosIterator;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = SectionCompiler.class, priority = 2000)
 @ClientOnlyMixin
+@RequiresMod("!fluidlogged")
 public class RebuildTaskMixin {
     /**
      * @author embeddedt