diff --git a/build.gradle b/build.gradle index ce3cb9f..bf22eb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.fabric.loom) - alias(libs.plugins.loom.quiltflower) alias(libs.plugins.grgit) id "maven-publish" } diff --git a/gradle.properties b/gradle.properties index e9817aa..aa96e3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod Properties -mod_version=1.0.11 +mod_version=1.0.12 maven_group=me.tibinonest.mods archives_base_name=cauldron-dyeing diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0024ec..455bab0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,12 @@ [versions] -minecraft = "1.20.1" -quilt_mappings = "1.20.1+build.23" -fabric_loader = "0.14.22" +minecraft = "1.20.3" +quilt_mappings = "1.20.3+build.3" +fabric_loader = "0.15.3" -fabric_api = "0.88.1+1.20.1" +fabric_api = "0.91.1+1.20.3" + +fabric_loom = "1.4.+" +grgit = "5.2.+" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -13,6 +16,5 @@ fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_l fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } [plugins] -fabric_loom = { id = "fabric-loom", version = "1.2.+" } -loom_quiltflower = { id = "io.github.juuxel.loom-vineflower", version = "1.11.+" } -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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index aeb74cb..1aa94a4 100755 --- a/gradlew +++ b/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,10 +131,13 @@ 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. @@ -141,7 +145,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=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" \ diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java index 5851d01..aff0684 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java @@ -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 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 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); } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 710516e..2f7e512 100644 --- a/src/main/resources/fabric.mod.json +++ b/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.5.2" } }