Update to 1.20.3/4

Fixes #9

build.gradle

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.fabric.loom)
-    alias(libs.plugins.loom.quiltflower)
     alias(libs.plugins.grgit)
     id "maven-publish"
 }
@@ -10,14 +9,6 @@ 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"
@@ -30,7 +21,6 @@ dependencies {
     modImplementation libs.fabric.loader
 
     modImplementation libs.fabric.api
-    modCompileOnly libs.sodium
 }
 
 loom {
@@ -106,7 +96,7 @@ def getMetadata() {
             id += "-dirty"
         }
 
-        metadata += "+${id}"
+        metadata += "+git.${id}"
     }
 
     return metadata

gradle.properties

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

gradle/libs.versions.toml

@@ -1,10 +1,12 @@
 [versions]
-minecraft = "1.20"
-quilt_mappings = "1.20+build.1"
-fabric_loader = "0.14.21"
+minecraft = "1.20.3"
+quilt_mappings = "1.20.3+build.3"
+fabric_loader = "0.15.3"
 
-fabric_api = "0.83.0+1.20"
-sodium = "mc1.20-0.4.10"
+fabric_api = "0.91.1+1.20.3"
+
+fabric_loom = "1.4.+"
+grgit = "5.2.+"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -12,9 +14,7 @@ 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 = "1.2.+" }
-loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.10.+" }
-grgit = { id = "org.ajoberstar.grgit", version = "5.2.+" }
+fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
+grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }

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.5-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,18 +131,21 @@ 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.
 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,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;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java

@@ -8,10 +8,12 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.color.world.BiomeColors;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockRenderView;
 
 public class CauldronDyeing implements ModInitializer {
     public static final String MOD_ID = "cauldron_dyeing";
@@ -23,6 +25,16 @@ public class CauldronDyeing implements ModInitializer {
         Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(MOD_ID, "water_cauldron_entity"), WATER_CAULDRON_BLOCK_ENTITY);
     }
 
+    @Environment(EnvType.CLIENT)
+    public static int getColor(BlockRenderView world, BlockPos pos) {
+        var blockEntity = world.getBlockEntity(pos);
+        if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron && waterCauldron.getColor() != -1) {
+            return waterCauldron.getColor();
+        }
+
+        return BiomeColors.getWaterColor(world, pos);
+    }
+
     @Environment(EnvType.CLIENT)
     public static void rebuildBlock(BlockPos pos) {
         MinecraftClient.getInstance().worldRenderer.scheduleBlockRenders(pos.getX(), pos.getY(), pos.getZ(), pos.getX(), pos.getY(), pos.getZ());

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.packet.Packet;
 import net.minecraft.network.listener.ClientPlayPacketListener;
+import net.minecraft.network.packet.Packet;
 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/BiomeColorsMixin.java

@@ -1,22 +0,0 @@
-package me.tibinonest.mods.cauldron_dyeing.mixin;
-
-import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
-import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockRenderView;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(BiomeColors.class)
-public class BiomeColorsMixin {
-    @Inject(method = "getWaterColor", at = @At("HEAD"), cancellable = true)
-    private static void cauldron_dyeing$modifyWaterColor(BlockRenderView world, BlockPos pos, CallbackInfoReturnable<Integer> cir) {
-        var blockEntity = world.getBlockEntity(pos);
-
-        if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron && waterCauldron.getColor() != -1) {
-            cir.setReturnValue(waterCauldron.getColor());
-        }
-    }
-}

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

@@ -0,0 +1,18 @@
+package me.tibinonest.mods.cauldron_dyeing.mixin;
+
+import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.color.block.BlockColors;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(BlockColors.class)
+public class BlockColorsMixin {
+    @Inject(method = "create", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
+    private static void cauldron_dyeing$modifyCreate(CallbackInfoReturnable<BlockColors> cir, BlockColors blockColors) {
+        blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? CauldronDyeing.getColor(world, pos) : -1, Blocks.WATER_CAULDRON);
+    }
+}

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(value = "TAIL"))
+    @Inject(method = "method_32217", at = @At("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.put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
+            CauldronBehavior.WATER_CAULDRON_BEHAVIOR.map().put(dyeItem.getValue(), CauldronBehaviorExtended.DYE_WATER);
         }
     }
 }

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

@@ -1,27 +0,0 @@
-package me.tibinonest.mods.cauldron_dyeing.mixin.sodium;
-
-import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
-import me.jellysquid.mods.sodium.client.model.quad.blender.ColorBlender;
-import me.jellysquid.mods.sodium.client.model.quad.blender.ColorSampler;
-import me.jellysquid.mods.sodium.client.model.quad.blender.FlatColorBlender;
-import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
-import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockRenderView;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(BlockRenderer.class)
-public class SodiumBlockRendererMixin {
-    @Redirect(method = "renderQuadList", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorBlender;getColors(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;Lme/jellysquid/mods/sodium/client/model/quad/ModelQuadView;Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorSampler;Ljava/lang/Object;)[I"))
-    private <T> int[] cauldron_dyeing$redirectGetColors(ColorBlender instance, BlockRenderView world, BlockPos pos, ModelQuadView quad, ColorSampler<T> sampler, T state) {
-        var blockEntity = world.getBlockEntity(pos);
-
-        if (blockEntity instanceof WaterCauldronBlockEntity) {
-            return new FlatColorBlender().getColors(world, pos, quad, sampler, state);
-        }
-
-        return instance.getColors(world, pos, quad, sampler, state);
-    }
-}

src/main/resources/cauldron-dyeing.accesswidener

@@ -1,5 +1,5 @@
 accessWidener v1 named
 
-accessible method net/minecraft/block/AbstractCauldronBlock canBeFilledByDripstone (Lnet/minecraft/fluid/Fluid;)Z
+accessible method net/minecraft/block/cauldron/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,8 +7,7 @@
     "CauldronBehaviorMixin"
   ],
   "client": [
-    "BiomeColorsMixin",
-    "sodium.SodiumBlockRendererMixin"
+    "BlockColorsMixin"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

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