sodium 0.5 support; bump version to 2.3.0-beta.5 (#778)

common/gradle.properties

@@ -6,4 +6,4 @@ port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_
 cloth_config_version = 11.1.106
 
 # https://modrinth.com/mod/sodium/versions
-sodium_version = mc1.20-0.4.10
+sodium_version = mc1.20.1-0.5.8

common/src/main/java/org/valkyrienskies/mod/compat/SodiumCompat.java

@@ -1,19 +1,21 @@
 package org.valkyrienskies.mod.compat;
 
-import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkStatus;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
+import net.minecraft.client.multiplayer.ClientLevel;
 import org.valkyrienskies.mod.mixin.ValkyrienCommonMixinConfigPlugin;
 
 public class SodiumCompat {
 
-    public static void onChunkAdded(final int x, final int z) {
+    public static void onChunkAdded(final ClientLevel level, final int x, final int z) {
         if (ValkyrienCommonMixinConfigPlugin.getVSRenderer() == VSRenderer.SODIUM) {
-            SodiumWorldRenderer.instance().onChunkAdded(x, z);
+            ChunkTrackerHolder.get(level).onChunkStatusAdded(x, z, ChunkStatus.FLAG_HAS_BLOCK_DATA);
         }
     }
 
-    public static void onChunkRemoved(final int x, final int z) {
+    public static void onChunkRemoved(final ClientLevel level, final int x, final int z) {
         if (ValkyrienCommonMixinConfigPlugin.getVSRenderer() == VSRenderer.SODIUM) {
-            SodiumWorldRenderer.instance().onChunkRemoved(x, z);
+            ChunkTrackerHolder.get(level).onChunkStatusRemoved(x, z, ChunkStatus.FLAG_HAS_BLOCK_DATA);
         }
     }
 

common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java

@@ -58,17 +58,18 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(final String s, final String mixinClassName) {
+        final VSRenderer renderer = getVSRenderer();
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.sodium")) {
-            return getVSRenderer() == VSRenderer.SODIUM;
+            return renderer == VSRenderer.SODIUM;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.optifine_vanilla")) {
-            return getVSRenderer() != VSRenderer.SODIUM;
+            return renderer == VSRenderer.VANILLA || renderer == VSRenderer.OPTIFINE;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.vanilla_renderer")) {
-            return getVSRenderer() == VSRenderer.VANILLA;
+            return renderer == VSRenderer.VANILLA;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.mod_compat.optifine")) {
-            return getVSRenderer() == VSRenderer.OPTIFINE;
+            return renderer == VSRenderer.OPTIFINE;
         }
         if (mixinClassName.contains("org.valkyrienskies.mod.mixin.feature.render_pathfinding")) {
             return PATH_FINDING_DEBUG;

common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientChunkCache.java

@@ -71,7 +71,7 @@ private void preLoadChunkFromPacket(final int x, final int z,
                 }
 
                 this.level.onChunkLoaded(new ChunkPos(x, z));
-                SodiumCompat.onChunkAdded(x, z);
+                SodiumCompat.onChunkAdded(this.level, x, z);
                 cir.setReturnValue(worldChunk);
             }
         }
@@ -84,7 +84,7 @@ public void preUnload(final int chunkX, final int chunkZ, final CallbackInfo ci)
             ((IVSViewAreaMethods) ((LevelRendererAccessor) ((ClientLevelAccessor) level).getLevelRenderer()).getViewArea())
                 .unloadChunk(chunkX, chunkZ);
         }
-        SodiumCompat.onChunkRemoved(chunkX, chunkZ);
+        SodiumCompat.onChunkRemoved(this.level, chunkX, chunkZ);
         ci.cancel();
     }
 

common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/sodium/MixinChunkTracker.java

@@ -1,27 +1,62 @@
 package org.valkyrienskies.mod.mixin.mod_compat.sodium;
 
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import me.jellysquid.mods.sodium.client.render.chunk.ChunkTracker;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import it.unimi.dsi.fastutil.longs.LongSet;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkStatus;
+import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTracker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
-@Mixin(value = ChunkTracker.class, remap = false)
+@Mixin(ChunkTracker.class)
 public class MixinChunkTracker {
+
+    @Shadow
+    @Final
+    private Long2IntOpenHashMap chunkStatus;
+
+    @Shadow
+    @Final
+    private LongOpenHashSet chunkReady;
+
+    @Shadow
+    @Final
+    private LongSet unloadQueue;
+
     @Shadow
     @Final
-    private Long2IntOpenHashMap single;
+    private LongSet loadQueue;
+
+    @Inject(method = "updateMerged", at = @At("HEAD"), cancellable = true, remap = false)
+    public void beforeUpdateMerged(final int x, final int z, final CallbackInfo ci) {
+        final Level level = Minecraft.getInstance().level;
+        if (level == null || !VSGameUtilsKt.isChunkInShipyard(level, x, z)) {
+            return;
+        }
 
-    @Inject(method = "onLightDataAdded", at = @At("HEAD"), cancellable = true)
-    private void cancelDataLight(final int x, final int z, final CallbackInfo ci) {
         final long key = ChunkPos.asLong(x, z);
-        final int existingFlags = this.single.get(key);
-        if ((existingFlags & 1) == 0) {
-            ci.cancel(); // Cancel instead of throwing an error for now
+
+        final int flags = this.chunkStatus.get(key);
+
+        if (flags == ChunkStatus.FLAG_ALL) {
+            if (this.chunkReady.add(key) && !this.unloadQueue.remove(key)) {
+                this.loadQueue.add(key);
+            }
+        } else {
+            if (this.chunkReady.remove(key) && !this.loadQueue.remove(key)) {
+                this.unloadQueue.add(key);
+            }
         }
+
+        ci.cancel();
     }
+
 }