From 4d8de7eb3d7fedfd87e3cd344e1c0c5d8a5f3e91 Mon Sep 17 00:00:00 2001
From: MCRcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Mon, 10 Nov 2025 11:27:39 +1000
Subject: [PATCH] remove lighting synchronizer + version bump

---
 build.gradle                                     |  1 +
 gradle.properties                                |  2 +-
 .../minecraft/MixinLayerLightSectionStorage.java | 16 ++++++++++++++++
 src/main/resources/client.voxy.mixins.json       | 13 +++++++------
 src/main/resources/fabric.mod.json               |  5 ++++-
 5 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinLayerLightSectionStorage.java

diff --git a/build.gradle b/build.gradle
index 5ab53405..d67c12d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,7 @@ def gitCommitHash = { ->
 }
 
 def buildtime = {System.currentTimeSeconds()}
+
 processResources {
     def time = buildtime()
     def hash = gitCommitHash()
diff --git a/gradle.properties b/gradle.properties
index 7530cea8..8b98d13e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@ fabric_version=0.134.1+1.21.10
 
 
 # Mod Properties
-mod_version = 0.2.6-alpha
+mod_version = 0.2.7-alpha
 maven_group = me.cortex
 archives_base_name = voxy
\ No newline at end of file
diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinLayerLightSectionStorage.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinLayerLightSectionStorage.java
new file mode 100644
index 00000000..eaf264a4
--- /dev/null
+++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinLayerLightSectionStorage.java
@@ -0,0 +1,16 @@
+package me.cortex.voxy.client.mixin.minecraft;
+
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import net.minecraft.world.level.chunk.DataLayer;
+import net.minecraft.world.level.lighting.LayerLightSectionStorage;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(LayerLightSectionStorage.class)
+public class MixinLayerLightSectionStorage {
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/longs/Long2ObjectMaps;synchronize(Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;)Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;"), remap = false)
+    private static Long2ObjectMap<DataLayer> voxy$removeSynchronized(Long2ObjectMap<DataLayer> map) {
+        return map;
+    }
+}
diff --git a/src/main/resources/client.voxy.mixins.json b/src/main/resources/client.voxy.mixins.json
index c66ee66e..662108fe 100644
--- a/src/main/resources/client.voxy.mixins.json
+++ b/src/main/resources/client.voxy.mixins.json
@@ -5,28 +5,28 @@
   "client": [
     "flashback.MixinFlashbackMeta",
     "flashback.MixinFlashbackRecorder",
-    "iris.MixinLevelRenderer",
-    "iris.MixinPackRenderTargetDirectives",
     "iris.CustomUniformsAccessor",
     "iris.IrisRenderingPipelineAccessor",
     "iris.MixinIris",
     "iris.MixinIrisRenderingPipeline",
     "iris.MixinIrisSamplers",
+    "iris.MixinLevelRenderer",
     "iris.MixinMatrixUniforms",
+    "iris.MixinPackRenderTargetDirectives",
     "iris.MixinProgramSet",
     "iris.MixinShaderPackSourceNames",
     "iris.MixinStandardMacros",
-    "minecraft.MixinClientLevel",
+    "minecraft.MixinBlockableEventLoop",
     "minecraft.MixinClientChunkCache",
     "minecraft.MixinClientCommonPacketListenerImpl",
+    "minecraft.MixinClientLevel",
     "minecraft.MixinClientPacketListener",
     "minecraft.MixinFogRenderer",
     "minecraft.MixinGlDebug",
+    "minecraft.MixinLevelRenderer",
     "minecraft.MixinMinecraft",
     "minecraft.MixinRenderSystem",
-    "minecraft.MixinBlockableEventLoop",
     "minecraft.MixinWindow",
-    "minecraft.MixinLevelRenderer",
     "nvidium.MixinRenderPipeline",
     "sodium.AccessorChunkTracker",
     "sodium.AccessorSodiumWorldRenderer",
@@ -34,7 +34,8 @@
     "sodium.MixinDefaultChunkRenderer",
     "sodium.MixinRenderSectionManager",
     "sodium.MixinSodiumOptionsGUI",
-    "sodium.MixinSodiumWorldRenderer"
+    "sodium.MixinSodiumWorldRenderer",
+    "minecraft.MixinLayerLightSectionStorage"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index bb87b0bb..7a5c4db4 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -28,7 +28,10 @@
     ]
   },
   "mixins": [
-    "client.voxy.mixins.json",
+    {
+      "config": "client.voxy.mixins.json",
+      "environment": "client"
+    },
     "common.voxy.mixins.json"
   ],
   "depends": {