Update to 1.20.3/4

This commit is contained in:
tibs 2024-01-07 21:45:35 -05:00
parent 37997cde7d
commit 166ef4a287
Signed by: tibs
GPG key ID: 047833989F50F88F
8 changed files with 28 additions and 25 deletions

View file

@ -1,6 +1,5 @@
plugins { plugins {
alias(libs.plugins.fabric.loom) alias(libs.plugins.fabric.loom)
alias(libs.plugins.loom.quiltflower)
alias(libs.plugins.grgit) alias(libs.plugins.grgit)
id "maven-publish" id "maven-publish"
} }

View file

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

View file

@ -1,9 +1,12 @@
[versions] [versions]
minecraft = "1.20.1" minecraft = "1.20.3"
quilt_mappings = "1.20.1+build.23" quilt_mappings = "1.20.3+build.3"
fabric_loader = "0.14.22" 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] [libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } 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" } fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
[plugins] [plugins]
fabric_loom = { id = "fabric-loom", version = "1.2.+" } fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
loom_quiltflower = { id = "io.github.juuxel.loom-vineflower", version = "1.11.+" } grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
grgit = { id = "org.ajoberstar.grgit", version = "5.2.+" }

Binary file not shown.

View file

@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

22
gradlew vendored
View file

@ -83,7 +83,8 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} 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. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -130,10 +131,13 @@ location of your Java installation."
fi fi
else else
JAVACMD=java 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 Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # 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 ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # 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" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac 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. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command; # Collect all arguments for the java command:
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# shell script including quotes and variable substitutions, so put them in # and any embedded shellness will be escaped.
# double quotes to make sure that they get re-expanded; and # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# * put everything else in single quotes, so that it's not re-expanded. # treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

View file

@ -43,7 +43,7 @@ public interface CauldronBehaviorMixin {
} }
@SuppressWarnings("target") @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) { 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); var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) { if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) {
@ -54,7 +54,7 @@ public interface CauldronBehaviorMixin {
@Inject(method = "registerBehavior", at = @At("TAIL")) @Inject(method = "registerBehavior", at = @At("TAIL"))
private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) { private static void cauldron_dyeing$injectRegisterBehavior(CallbackInfo ci) {
for (Map.Entry<DyeColor, DyeItem> dyeItem : DyeItem.DYES.entrySet()) { 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);
} }
} }
} }

View file

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