Edit implementation of light update checking

CaffeineMC · Jul 17, 2023 · 7b7f629 · 7b7f629
1 parent 12ff40c
commit 7b7f629
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/.../jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinClientPlayNetworkHandler.java b/.../jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinClientPlayNetworkHandler.java
@@ -4,9 +4,14 @@
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
 import net.minecraft.network.packet.s2c.play.UnloadChunkS2CPacket;
+import net.minecraft.util.math.ChunkSectionPos;
+import net.minecraft.world.LightType;
+import net.minecraft.world.chunk.ChunkNibbleArray;
+import net.minecraft.world.chunk.light.LightingProvider;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
@@ -17,6 +22,15 @@ private void postLoadChunk(ChunkDataS2CPacket packet, CallbackInfo ci) {
                 .onChunkAdded(packet.getX(), packet.getZ());
     }
 
+    @Redirect(method = "updateLighting", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/light/LightingProvider;enqueueSectionData(Lnet/minecraft/world/LightType;Lnet/minecraft/util/math/ChunkSectionPos;Lnet/minecraft/world/chunk/ChunkNibbleArray;)V"))
+    private void postLightUpdate(LightingProvider instance, LightType lightType, ChunkSectionPos pos, ChunkNibbleArray nibbles) {
+        instance.enqueueSectionData(lightType, pos, nibbles);
+        if (nibbles != null) {
+            SodiumWorldRenderer.instance()
+                    .onChunkLightAdded(pos.getX(), pos.getZ());
+        }
+    }
+
     @Inject(method = "onUnloadChunk", at = @At("RETURN"))
     private void postUnloadChunk(UnloadChunkS2CPacket packet, CallbackInfo ci) {
         SodiumWorldRenderer.instance()

diff --git a/.../java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinLightingProvider.java b/.../java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinLightingProvider.java
diff --git a/src/main/resources/sodium.mixins.json b/src/main/resources/sodium.mixins.json
@@ -36,7 +36,6 @@
     "features.chunk_rendering.MixinClientChunkMap",
     "features.chunk_rendering.MixinClientPlayNetworkHandler",
     "features.chunk_rendering.MixinClientWorld",
-    "features.chunk_rendering.MixinLightingProvider",
     "features.chunk_rendering.MixinPackedIntegerArray",
     "features.chunk_rendering.MixinPalettedContainer",
     "features.chunk_rendering.MixinWorldRenderer",