7 files changed, 47 insertions, 34 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 8e44eea..78d680e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -200,7 +200,7 @@ val configuredSourceSet = createIsolatedSourceSet(
 	"configured",
 	isEnabled = false
 ) // Wait for update (also low prio, because configured sucks)
-val sodiumSourceSet = createIsolatedSourceSet("sodium", isEnabled = false)
+val sodiumSourceSet = createIsolatedSourceSet("sodium")
 val citResewnSourceSet = createIsolatedSourceSet("citresewn", isEnabled = false) // TODO: Wait for update
 val yaclSourceSet = createIsolatedSourceSet("yacl")
 val explosiveEnhancementSourceSet =
@@ -254,6 +254,7 @@ dependencies {
 	(wildfireGenderSourceSet.implementationConfigurationName)(customTexturesSourceSet.output)
 	(configuredSourceSet.modImplementationConfigurationName)(libs.configured)
 	(sodiumSourceSet.modImplementationConfigurationName)(libs.sodium)
+	(sodiumSourceSet.implementationConfigurationName)(customTexturesSourceSet.output)
 	(jadeSourceSet.modImplementationConfigurationName)(libs.jade)
 
 	(citResewnSourceSet.modImplementationConfigurationName)(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2465f3e..d914e66 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,13 +23,13 @@ rei = "19.0.805"
 reidev = "33d8900cd6621816680634fcbae2dd07f1cffbd3"
 
 # Update from https://maven.architectury.dev/dev/architectury/loom/dev.architectury.loom.gradle.plugin/
-loom = "1.10.433" # TODO: port back to architectury (and) 1.9.424
+loom = "1.11.454" # TODO: port back to architectury (and) 1.9.424
 
 # Update from https://modrinth.com/mod/qolify/versions?l=fabric
 qolify = "1.6.0-1.21.1"
 
 # Update from https://modrinth.com/mod/sodium/versions?l=fabric
-sodium = "mc1.21.6-0.6.13-fabric"
+sodium = "mc1.21.8-0.7.2-fabric"
 
 # Update from https://modrinth.com/mod/freecam/versions?l=fabric
 freecammod = "1.3.4+mc1.21.6"
diff --git a/src/compat/sodium/java/moe/nea/firmament/compat/sodium/Compat.kt b/src/compat/sodium/java/moe/nea/firmament/compat/sodium/Compat.kt
new file mode 100644
index 0000000..97ae1fc
--- /dev/null
+++ b/src/compat/sodium/java/moe/nea/firmament/compat/sodium/Compat.kt
@@ -0,0 +1,12 @@
+package moe.nea.firmament.compat.sodium
+
+import moe.nea.firmament.util.compatloader.CompatMeta
+import moe.nea.firmament.util.compatloader.ICompatMeta
+import net.fabricmc.loader.api.FabricLoader
+
+@CompatMeta
+object Compat : ICompatMeta {
+	override fun shouldLoad(): Boolean {
+		return FabricLoader.getInstance().isModLoaded("sodium")
+	}
+}
diff --git a/src/compat/sodium/java/SodiumChunkReloader.kt b/src/compat/sodium/java/moe/nea/firmament/compat/sodium/SodiumChunkReloader.kt
index 0256b88..e5d0fd9 100644
--- a/src/compat/sodium/java/SodiumChunkReloader.kt
+++ b/src/compat/sodium/java/moe/nea/firmament/compat/sodium/SodiumChunkReloader.kt
@@ -1,7 +1,7 @@
 package moe.nea.firmament.compat.sodium
 
+import moe.nea.firmament.mixins.sodium.accessor.AccessorSodiumWorldRenderer
 import net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer
-import moe.nea.firmament.mixins.accessor.sodium.AccessorSodiumWorldRenderer
 
 class SodiumChunkReloader : Runnable {
     override fun run() {
diff --git a/src/compat/sodium/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java b/src/compat/sodium/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java
deleted file mode 100644
index fe87310..0000000
--- a/src/compat/sodium/java/moe/nea/firmament/mixins/custommodels/PatchBlockModelInSodiumChunkGenerator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package moe.nea.firmament.mixins.custommodels;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import moe.nea.firmament.features.texturepack.CustomBlockTextures;
-import net.caffeinemc.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderMeshingTask;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.render.block.BlockModels;
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(ChunkBuilderMeshingTask.class)
-public class PatchBlockModelInSodiumChunkGenerator {
-    @WrapOperation(
-        method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BakedModel;"))
-    private BakedModel replaceBlockModel(BlockModels instance, BlockState state, Operation<BakedModel> original,
-                                         @Local(name = "blockPos") BlockPos.Mutable pos) {
-        var replacement = CustomBlockTextures.getReplacementModel(state, pos);
-        if (replacement != null) return replacement;
-        CustomBlockTextures.enterFallbackCall();
-        var fallback = original.call(instance, state);
-        CustomBlockTextures.exitFallbackCall();
-        return fallback;
-    }
-}
diff --git a/src/compat/sodium/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/accessor/AccessorSodiumWorldRenderer.java
index f75874d..bc2210a 100644
--- a/src/compat/sodium/java/moe/nea/firmament/mixins/accessor/sodium/AccessorSodiumWorldRenderer.java
+++ b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/accessor/AccessorSodiumWorldRenderer.java
@@ -1,4 +1,4 @@
-package moe.nea.firmament.mixins.accessor.sodium;
+package moe.nea.firmament.mixins.sodium.accessor;
 
 import net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer;
 import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionManager;
diff --git a/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java
new file mode 100644
index 0000000..50a545a
--- /dev/null
+++ b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java
@@ -0,0 +1,29 @@
+package moe.nea.firmament.mixins.sodium.custommodels;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import moe.nea.firmament.features.texturepack.CustomBlockTextures;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderMeshingTask;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.block.BlockModels;
+import net.minecraft.client.render.model.BlockStateModel;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ChunkBuilderMeshingTask.class)
+public class PatchBlockModelInSodiumChunkGenerator {
+	@WrapOperation(
+		method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;",
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BlockStateModel;"))
+	private BlockStateModel replaceBlockModel(BlockModels instance, BlockState state, Operation<BlockStateModel> original,
+											  @Local(name = "blockPos") BlockPos.Mutable pos) {
+		var replacement = CustomBlockTextures.getReplacementModel(state, pos);
+		if (replacement != null) return replacement;
+		CustomBlockTextures.enterFallbackCall();
+		var fallback = original.call(instance, state);
+		CustomBlockTextures.exitFallbackCall();
+		return fallback;
+	}
+}