Colormatic Sodium/next (b98aca11) patch

colormatic.patch

Index: src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumBlockColorsMixin.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumBlockColorsMixin.java b/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumBlockColorsMixin.java
--- a/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumBlockColorsMixin.java	(revision d1441997f0977948a3c7d0649e0e597287b89fdb)
+++ b/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumBlockColorsMixin.java	(date 1655185701679)
@@ -22,20 +22,19 @@
 package io.github.kvverti.colormatic.mixinsodium.color;
 
 import io.github.kvverti.colormatic.colormap.BiomeColormaps;
-import me.jellysquid.mods.sodium.client.model.quad.blender.ColorSampler;
-import me.jellysquid.mods.sodium.client.world.biome.BlockColorsExtended;
+import net.caffeinemc.sodium.interop.vanilla.mixin.BlockColorProviderRegistry;
+import net.caffeinemc.sodium.render.terrain.color.ColorSampler;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.color.block.BlockColors;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.client.color.block.BlockColors;
-
 @Mixin(value = BlockColors.class, priority = 2000)
-@Implements(@Interface(iface = BlockColorsExtended.class, prefix = "i$", remap = Interface.Remap.NONE))
-public abstract class SodiumBlockColorsMixin implements BlockColorsExtended {
+@Implements(@Interface(iface = BlockColorProviderRegistry.class, prefix = "i$", remap = Interface.Remap.NONE))
+public abstract class SodiumBlockColorsMixin implements BlockColorProviderRegistry {
 
     @Unique
     private static final ColorSampler<BlockState> COLORMATIC_PROVIDER =
Index: src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumItemColorsMixin.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumItemColorsMixin.java b/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumItemColorsMixin.java
--- a/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumItemColorsMixin.java	(revision d1441997f0977948a3c7d0649e0e597287b89fdb)
+++ b/src/main/java/io/github/kvverti/colormatic/mixinsodium/color/SodiumItemColorsMixin.java	(date 1655185701684)
@@ -22,21 +22,20 @@
 package io.github.kvverti.colormatic.mixinsodium.color;
 
 import io.github.kvverti.colormatic.colormap.BiomeColormaps;
-import me.jellysquid.mods.sodium.client.world.biome.ItemColorsExtended;
+import net.caffeinemc.sodium.interop.vanilla.mixin.ItemColorProviderRegistry;
+import net.minecraft.client.color.item.ItemColorProvider;
+import net.minecraft.client.color.item.ItemColors;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
-import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.client.color.item.ItemColors;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.ItemStack;
-
 @Mixin(value = ItemColors.class, priority = 2000)
-@Implements(@Interface(iface = ItemColorsExtended.class, prefix = "i$", remap = Interface.Remap.NONE))
-public abstract class SodiumItemColorsMixin implements ItemColorsExtended {
+@Implements(@Interface(iface = ItemColorProviderRegistry.class, prefix = "i$", remap = Interface.Remap.NONE))
+public abstract class SodiumItemColorsMixin implements ItemColorProviderRegistry {
 
     @Unique
     private static final ItemColorProvider COLORMATIC_PROVIDER =
Index: src/main/java/io/github/kvverti/colormatic/mixinsodium/world/SodiumClientWorldMixin.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/io/github/kvverti/colormatic/mixinsodium/world/SodiumClientWorldMixin.java b/src/main/java/io/github/kvverti/colormatic/mixinsodium/world/SodiumClientWorldMixin.java
--- a/src/main/java/io/github/kvverti/colormatic/mixinsodium/world/SodiumClientWorldMixin.java	(revision d1441997f0977948a3c7d0649e0e597287b89fdb)
+++ b/src/main/java/io/github/kvverti/colormatic/mixinsodium/world/SodiumClientWorldMixin.java	(date 1655185701690)
@@ -21,11 +21,10 @@
  */
 package io.github.kvverti.colormatic.mixinsodium.world;
 
-import me.jellysquid.mods.sodium.client.world.BiomeSeedProvider;
-import org.spongepowered.asm.mixin.Mixin;
-
+import net.caffeinemc.sodium.interop.vanilla.mixin.BiomeSeedProvider;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
 
 /**
  * Sodium expects {@link BiomeSeedProvider} to be implemented on the target class, but the mixin that
Index: build.gradle
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/build.gradle b/build.gradle
--- a/build.gradle	(revision d1441997f0977948a3c7d0649e0e597287b89fdb)
+++ b/build.gradle	(date 1655185246547)
@@ -34,14 +34,14 @@
 	modCompileOnly("com.terraformersmc:modmenu:${project.mod_menu_version}") {
 		transitive = false
 	}
-	modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
+	modCompileOnly files("libs/sodium-fabric-0.5.0+mc1.19-unstable.jar")
 
 	// runtime only setups
 	 modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	 modRuntimeOnly("com.terraformersmc:modmenu:${project.mod_menu_version}") { transitive = false }
 	// modRuntimeOnly fabricApi.module("fabric-rendering-data-attachment-v1", project.fabric_version)
 	// modRuntimeOnly fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version)
-	 modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}"
+	 modRuntimeOnly files("libs/sodium-fabric-0.5.0+mc1.19-unstable.jar")
 
 	// because Loom doesn't load Sodium's included non-mod dependency
 	 runtimeOnly "org.joml:joml:1.10.2"