build.gradle

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.fabric.loom)
+    alias(libs.plugins.loom.quiltflower)
     alias(libs.plugins.grgit)
     id "maven-publish"
 }
@@ -9,6 +10,14 @@ version = "${project.mod_version}${getMetadata()}"
 group = project.maven_group
 
 repositories {
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
+
     maven {
         name = "Quilt"
         url = "https://maven.quiltmc.org/repository/release"
@@ -21,6 +30,7 @@ dependencies {
     modImplementation libs.fabric.loader
 
     modImplementation libs.fabric.api
+    modCompileOnly libs.sodium
 }
 
 loom {

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=1.0.12
+mod_version=1.0.11
 maven_group=me.tibinonest.mods
 archives_base_name=cauldron-dyeing
 

gradle/libs.versions.toml

@@ -1,12 +1,10 @@
 [versions]
-minecraft = "1.20.3"
+minecraft = "1.20.1"
-quilt_mappings = "1.20.3+build.3"
+quilt_mappings = "1.20.1+build.14"
-fabric_loader = "0.15.3"
+fabric_loader = "0.14.22"
 
-fabric_api = "0.91.1+1.20.3"
+fabric_api = "0.87.0+1.20.1"
-
+sodium = "mc1.20.1-0.5.1"
-fabric_loom = "1.4.+"
-grgit = "5.2.+"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -14,7 +12,9 @@ quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_m
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
 
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
+sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
 
 [plugins]
-fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
+fabric_loom = { id = "fabric-loom", version = "1.2.+" }
-grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
+loom_quiltflower = { id = "io.github.juuxel.loom-vineflower", version = "1.11.+" }
+grgit = { id = "org.ajoberstar.grgit", version = "5.2.+" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-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
@@ -131,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    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.
@@ -145,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +198,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
+# Collect all arguments for the java command;
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     and any embedded shellness will be escaped.
+#     shell script including quotes and variable substitutions, so put them in
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     double quotes to make sure that they get re-expanded; and
-#     treated as '${Hostname}' itself on the command line.
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java

@@ -5,8 +5,8 @@ import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.network.listener.ClientPlayPacketListener;
 import net.minecraft.network.packet.Packet;
+import net.minecraft.network.listener.ClientPlayPacketListener;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.DyeColor;

src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/AbstractCauldronBlockMixin.java

@@ -1,9 +1,9 @@
 package me.tibinonest.mods.cauldron_dyeing.mixin;
 
 import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
+import net.minecraft.block.AbstractCauldronBlock;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.cauldron.AbstractCauldronBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.util.math.BlockPos;

src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java

@@ -3,8 +3,8 @@ package me.tibinonest.mods.cauldron_dyeing.mixin;
 import me.tibinonest.mods.cauldron_dyeing.block.CauldronBehaviorExtended;
 import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.LeveledCauldronBlock;
 import net.minecraft.block.cauldron.CauldronBehavior;
-import net.minecraft.block.cauldron.LeveledCauldronBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.DyeItem;
 import net.minecraft.item.DyeableItem;
@@ -43,7 +43,7 @@ public interface CauldronBehaviorMixin {
     }
 
     @SuppressWarnings("target")
-    @Inject(method = "method_32217", at = @At("TAIL"))
+    @Inject(method = "method_32217", at = @At(value = "TAIL"))
     private static void cauldron_dyeing$injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) {
         var blockEntity = world.getBlockEntity(pos);
         if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) {
@@ -54,7 +54,7 @@ public interface CauldronBehaviorMixin {
     @Inject(method = "registerBehavior", at = @At("TAIL"))
     private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) {
         for (Map.Entry<DyeColor, DyeItem> dyeItem : DyeItem.DYES.entrySet()) {
-            CauldronBehavior.WATER_CAULDRON_BEHAVIOR.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
+            CauldronBehavior.WATER_CAULDRON_BEHAVIOR.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
         }
     }
 }

src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/ColorProviderRegistryMixin.java

@@ -0,0 +1,22 @@
+package me.tibinonest.mods.cauldron_dyeing.mixin.sodium;
+
+import me.jellysquid.mods.sodium.client.model.color.ColorProvider;
+import me.jellysquid.mods.sodium.client.model.color.ColorProviderRegistry;
+import me.jellysquid.mods.sodium.client.model.color.DefaultColorProviders;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ColorProviderRegistry.class)
+public abstract class ColorProviderRegistryMixin {
+    @Shadow protected abstract void registerBlocks(ColorProvider<BlockState> resolver, Block... blocks);
+
+    @Redirect(method = "installOverrides", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/color/ColorProviderRegistry;registerBlocks(Lme/jellysquid/mods/sodium/client/model/color/ColorProvider;[Lnet/minecraft/block/Block;)V", ordinal = 2))
+    private void cauldron_dyeing$modifyOverrides(ColorProviderRegistry instance, ColorProvider<BlockState> resolver, Block... blocks) {
+        this.registerBlocks(DefaultColorProviders.WaterColorProvider.BLOCKS, Blocks.WATER, Blocks.BUBBLE_COLUMN);
+    }
+}

src/main/resources/cauldron-dyeing.accesswidener

@@ -1,5 +1,5 @@
 accessWidener v1 named
 
-accessible method net/minecraft/block/cauldron/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z
+accessible method net/minecraft/block/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z
 
 accessible field net/minecraft/item/DyeItem DYES Ljava/util/Map;

src/main/resources/cauldron-dyeing.mixins.json

@@ -7,7 +7,8 @@
     "CauldronBehaviorMixin"
   ],
   "client": [
-    "BlockColorsMixin"
+    "BlockColorsMixin",
+    "sodium.ColorProviderRegistryMixin"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

@@ -24,8 +24,11 @@
     "cauldron-dyeing.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.20.3",
+    "minecraft": ">=1.20",
     "fabricloader": ">=0.12.0",
     "fabric-object-builder-api-v1": ">=0.1"
+  },
+  "breaks": {
+    "sodium": "<0.5.0"
   }
 }