Cleanup stuff for 2.3.2 release.

CHANGELOG.md

@@ -153,6 +153,13 @@
 
 ### 2.3.2
 
+- Fixed Fabric API (Indigo Renderer) compatibility
+  (by [#182](https://github.com/LambdAurora/LambDynamicLights/pull/182),
+  issue [#172](https://github.com/LambdAurora/LambDynamicLights/issues/172)).
+- Fixed Sodium compatibility
+  (by [#178](https://github.com/LambdAurora/LambDynamicLights/pull/178), 
+  issue [#175](https://github.com/LambdAurora/LambDynamicLights/issues/175)).
+- Fixed Minecraft version restriction.
 - Cleaned up some item light source code.
 
 [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page"

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '1.2.+'
+	id 'fabric-loom' version '1.3.+'
 	id 'io.github.juuxel.loom-quiltflower' version '1.8.+'
 	id 'org.quiltmc.gradle.licenser' version '2.0.+'
 	id 'java-library'
 	id 'maven-publish'
-	id 'com.github.johnrengelman.shadow' version '7.1.2'
+	id 'com.github.johnrengelman.shadow' version '8.1.1'
 	id 'com.modrinth.minotaur' version '2.+'
 	id 'com.matthewprenger.cursegradle' version '1.4.+'
 }
@@ -13,11 +13,16 @@ import com.modrinth.minotaur.dependencies.ModDependency
 
 group = project.maven_group
 version = "${project.mod_version}+${project.minecraft_version}"
-archivesBaseName = project.archives_base_name
+base.archivesName = project.archives_base_name
 
 // This field defines the Java version your mod target.
 def targetJavaVersion = 17
 
+if (!(System.getenv("CURSEFORGE_TOKEN") || System.getenv("MODRINTH_TOKEN"))) {
+	version += "-local"
+}
+logger.lifecycle("Preparing version ${version}...")
+
 boolean isMCVersionNonRelease() {
 	return project.minecraft_version.matches('^\\d\\dw\\d\\d[a-z]$')
 			|| project.minecraft_version.matches('\\d+\\.\\d+-(pre|rc)(\\d+)')
@@ -130,7 +135,7 @@ dependencies {
 		transitive = false
 	}
 
-	modImplementation "maven.modrinth:sodium:${project.sodium_version}"
+	modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}"
 
 	shadow 'com.electronwill.night-config:core:3.6.6'
 	shadow 'com.electronwill.night-config:toml:3.6.6'
@@ -159,7 +164,7 @@ processResources {
 
 jar {
 	from('LICENSE') {
-		rename { "${it}_${project.archivesBaseName}" }
+		rename { "${it}_${base.archivesName}" }
 	}
 }
 
@@ -171,7 +176,7 @@ license {
 shadowJar {
 	dependsOn jar
 	configurations = [project.configurations.shadow]
-	destinationDirectory.set(file("${project.buildDir}/devlibs"))
+	destinationDirectory.set(file("${project.layout.buildDirectory.get()}/devlibs"))
 	archiveClassifier.set('dev')
 
 	relocate 'com.electronwill.nightconfig', 'dev.lambdaurora.lambdynlights.shadow.nightconfig'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsMixinPlugin.java

@@ -22,7 +22,7 @@
  * LambDynamicLights mixin plugin for conditional mixins.
  *
  * @author LambdAurora
- * @version 2.1.1
+ * @version 2.3.2
  * @since 1.0.0
  */
 public class LambDynLightsMixinPlugin implements IMixinConfigPlugin {
@@ -34,7 +34,7 @@ public LambDynLightsMixinPlugin() {
 		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.ltr.LilTaterBlockEntityMixin", ltrInstalled);
 
 		boolean sodium05XInstalled = LambDynLightsCompat.isSodium05XInstalled();
-		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.ArrayLightDataCache", sodium05XInstalled);
+		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.ArrayLightDataCacheMixin", sodium05XInstalled);
 		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.FlatLightPipelineMixin", sodium05XInstalled);
 		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.LightDataAccessMixin", sodium05XInstalled);
 	}

src/main/java/dev/lambdaurora/lambdynlights/mixin/sodium/ArrayLightDataCacheMixin.java

@@ -11,7 +11,6 @@
 
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import dev.lambdaurora.lambdynlights.util.SodiumDynamicLightHandler;
-import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
 import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
@@ -21,16 +20,16 @@
 
 @Pseudo
 @Mixin(targets = "me.jellysquid.mods.sodium.client.model.light.data.ArrayLightDataCache", remap = false)
-public abstract class ArrayLightDataCacheMixin extends LightDataAccess {
-    @Dynamic
-    @Inject(method = "get(III)I", at = @At("HEAD"))
-    private void lambdynlights$storeLightPos(int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
-        if (!LambDynLights.get().config.getDynamicLightsMode().isEnabled())
-            return;
+public abstract class ArrayLightDataCacheMixin {
+	@Dynamic
+	@Inject(method = "get(III)I", at = @At("HEAD"), require = 0)
+	private void lambdynlights$storeLightPos(int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
+		if (!LambDynLights.get().config.getDynamicLightsMode().isEnabled())
+			return;
 
-        // Store the current light position.
-        // This is possible under smooth lighting scenarios, because AoFaceData in Sodium runs a get() call
-        // before getting the lightmap.
-        SodiumDynamicLightHandler.lambdynlights$pos.get().set(x, y, z);
-    }
+		// Store the current light position.
+		// This is possible under smooth lighting scenarios, because AoFaceData in Sodium runs a get() call
+		// before getting the lightmap.
+		SodiumDynamicLightHandler.pos.get().set(x, y, z);
+	}
 }

src/main/java/dev/lambdaurora/lambdynlights/mixin/sodium/FlatLightPipelineMixin.java

@@ -23,10 +23,20 @@
 @Pseudo
 @Mixin(targets = "me.jellysquid.mods.sodium.client.model.light.flat.FlatLightPipeline", remap = false)
 public abstract class FlatLightPipelineMixin {
-    @Dynamic
-    @Inject(method = "getOffsetLightmap", at = @At(value = "RETURN", ordinal = 1), remap = false, locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
-    private void lambdynlights$getLightmap(BlockPos pos, Direction face, CallbackInfoReturnable<Integer> cir, int word, int adjWord) {
-        int lightmap = SodiumDynamicLightHandler.lambdynlights$getLightmap(pos, adjWord, cir.getReturnValueI());
-        cir.setReturnValue(lightmap);
-    }
+	@Dynamic
+	@Inject(
+			method = "getOffsetLightmap",
+			at = @At(value = "RETURN", ordinal = 1),
+			require = 0,
+			remap = false,
+			locals = LocalCapture.CAPTURE_FAILHARD,
+			cancellable = true
+	)
+	private void lambdynlights$getLightmap(
+			BlockPos pos, Direction face, CallbackInfoReturnable<Integer> cir,
+			int word, int adjWord
+	) {
+		int lightmap = SodiumDynamicLightHandler.getLightmap(pos, adjWord, cir.getReturnValueI());
+		cir.setReturnValue(lightmap);
+	}
 }

src/main/java/dev/lambdaurora/lambdynlights/mixin/sodium/LightDataAccessMixin.java

@@ -20,10 +20,10 @@
 @Pseudo
 @Mixin(targets = "me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess", remap = false)
 public abstract class LightDataAccessMixin {
-    @Dynamic
-    @Inject(method = "getLightmap", at = @At("RETURN"), remap = false, cancellable = true)
-    private static void lambdynlights$getLightmap(int word, CallbackInfoReturnable<Integer> cir) {
-        int lightmap = SodiumDynamicLightHandler.lambdynlights$getLightmap(SodiumDynamicLightHandler.lambdynlights$pos.get(), word, cir.getReturnValueI());
-        cir.setReturnValue(lightmap);
-    }
+	@Dynamic
+	@Inject(method = "getLightmap", at = @At("RETURN"), remap = false, require = 0, cancellable = true)
+	private static void lambdynlights$getLightmap(int word, CallbackInfoReturnable<Integer> cir) {
+		int lightmap = SodiumDynamicLightHandler.getLightmap(SodiumDynamicLightHandler.pos.get(), word, cir.getReturnValueI());
+		cir.setReturnValue(lightmap);
+	}
 }

src/main/java/dev/lambdaurora/lambdynlights/util/SodiumDynamicLightHandler.java

@@ -10,26 +10,25 @@
 package dev.lambdaurora.lambdynlights.util;
 
 import dev.lambdaurora.lambdynlights.LambDynLights;
-import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
 import net.minecraft.util.math.BlockPos;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.Internal
 public interface SodiumDynamicLightHandler {
-    // Stores the current light position being used by ArrayLightDataCache#get
-    // We use ThreadLocal because Sodium's chunk builder is multithreaded, otherwise it will break
-    // catastrophically.
-    ThreadLocal<BlockPos.Mutable> lambdynlights$pos = ThreadLocal.withInitial(BlockPos.Mutable::new);
+	// Stores the current light position being used by ArrayLightDataCache#get
+	// We use ThreadLocal because Sodium's chunk builder is multithreaded, otherwise it will break
+	// catastrophically.
+	ThreadLocal<BlockPos.Mutable> pos = ThreadLocal.withInitial(BlockPos.Mutable::new);
 
-    static int lambdynlights$getLightmap(BlockPos pos, int word, int lightmap) {
-        if (!LambDynLights.get().config.getDynamicLightsMode().isEnabled())
-            return lightmap;
+	static int getLightmap(BlockPos pos, int word, int lightmap) {
+		if (!LambDynLights.get().config.getDynamicLightsMode().isEnabled())
+			return lightmap;
 
-        // Equivalent to world.getBlockState(pos).isOpaqueFullCube(world, pos)
-        if (LightDataAccess.unpackFO(word))
-            return lightmap;
+		// Equivalent to world.getBlockState(pos).isOpaqueFullCube(world, pos)
+		if (/*LightDataAccess.unpackFO(word)*/ (word >>> 30 & 1) != 0)
+			return lightmap;
 
-        double dynamic = LambDynLights.get().getDynamicLightLevel(pos);
-        return LambDynLights.get().getLightmapWithDynamicLight(dynamic, lightmap);
-    }
+		double dynamic = LambDynLights.get().getDynamicLightLevel(pos);
+		return LambDynLights.get().getLightmapWithDynamicLight(dynamic, lightmap);
+	}
 }

src/main/resources/fabric.mod.json

@@ -48,6 +48,15 @@
     "optifabric": "*"
   },
   "custom": {
+    "modmenu": {
+      "links": {
+        "modmenu.curseforge": "https://www.curseforge.com/minecraft/mc-mods/lambdynamiclights",
+        "modmenu.discord": "https://discord.lambdaurora.dev/",
+        "modmenu.github_releases": "https://github.com/LambdAurora/LambDynamicLights/releases",
+        "modmenu.modrinth": "https://modrinth.com/mod/lambdynamiclights",
+        "modmenu.twitter": "https://twitter.com/LambdAurora"
+      }
+    },
     "modupdater": {
       "strategy": "curseforge",
       "projectID": 393442