Merge pull request #31 from CommandGenius/1.21.x-architectury

Fix Indium incompatibility

common/src/main/java/org/thinkingstudio/ryoamiclights/RyoamicLightsCompat.java

@@ -45,6 +45,15 @@ public static boolean isSodiumInstalled() {
 		return ModPlatform.isModLoaded("sodium") != ModPlatform.isModLoaded("embeddium");
 	}
 
+	/**
+	 * Returns whether Indium is installed.
+	 *
+	 * @return {@code true} if Indium is installed, else {@code false}
+	 */
+	public static boolean isIndiumInstalled() {
+		return ModPlatform.isModLoaded("indium");
+	}
+
 	/**
 	 * Returns whether Fabric API or Forgified Fabric API is installed.
 	 *

fabric/build.gradle

@@ -21,6 +21,8 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     modImplementation "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric"
+    modImplementation "maven.modrinth:sodium:${project.sodium_version}"
+    modImplementation "maven.modrinth:indium:${project.indium_version}"
 
     modCompileOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { transitive false }
 

fabric/src/main/java/org/thinkingstudio/ryoamiclights/fabric/RyoamicLightsFabricMixinPlugin.java

@@ -33,6 +33,9 @@ public RyoamicLightsFabricMixinPlugin() {
         this.conditionalMixins.put("org.thinkingstudio.ryoamiclights.fabric.mixin.sodium.FlatLightPipelineMixin", sodiumInstalled);
         this.conditionalMixins.put("org.thinkingstudio.ryoamiclights.fabric.mixin.sodium.LightDataAccessMixin", sodiumInstalled);
 
+        boolean indiumInstalled = RyoamicLightsCompat.isIndiumInstalled();
+		this.conditionalMixins.put("org.thinkingstudio.ryoamiclights.fabric.mixin.indium.TerrainRenderContextMixin", indiumInstalled);
+
         boolean fabricApiInstalled = RyoamicLightsCompat.isFabricApiInstalled();
         this.conditionalMixins.put("org.thinkingstudio.ryoamiclights.fabric.mixin.fabricapi.AoCalculatorMixin", fabricApiInstalled);
     }

fabric/src/main/java/org/thinkingstudio/ryoamiclights/fabric/mixin/indium/TerrainRenderContextMixin.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2020~2024 LambdAurora <[email protected]>
+ * Copyright © 2024 ThinkingStudio
+ *
+ * This file is part of RyoamicLights.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package org.thinkingstudio.ryoamiclights.fabric.mixin.indium;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import org.thinkingstudio.ryoamiclights.RyoamicLights;
+import link.infra.indium.renderer.render.AbstractBlockRenderContext;
+import link.infra.indium.renderer.render.TerrainRenderContext;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Pseudo
+@Mixin(value = TerrainRenderContext.class, remap = false)
+public abstract class TerrainRenderContextMixin extends AbstractBlockRenderContext {
+	@Dynamic
+	@ModifyExpressionValue(method = "bufferQuad", at = @At(value = "INVOKE", target = "Llink/infra/indium/renderer/mesh/MutableQuadViewImpl;lightmap(I)I"), require = 0)
+	private int ryoamiclights$getLightmap(int original) {
+		return RyoamicLights.get().getLightmapWithDynamicLight(this.blockInfo.blockPos, original);
+	}
+}

fabric/src/main/resources/ryoamiclights.fabric.mixins.json

@@ -7,6 +7,7 @@
     "ScreenMixin",
     "VideoOptionsScreenMixin",
     "fabricapi.AoCalculatorMixin",
+    "indium.TerrainRenderContextMixin",
     "ltr.LilTaterBlockEntityMixin",
     "ltr.LilTaterBlocksMixin",
     "sodium.ArrayLightDataCacheMixin",

gradle.properties

@@ -18,5 +18,8 @@ neoforge_version=21.0.21-beta
 
 obsidianui_version=0.2.6+mc1.21
 
+sodium_version=mc1.21-0.5.9
+indium_version=1.0.33+mc1.21
+
 modrinth_id=reCfnRvJ
 curseforge_id=913587