From 1a7915d562f24b3f5b357e562c7e84a69f48a212 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Sep 2023 09:27:03 -0700 Subject: [PATCH] Update hash file for previous step, fix check_datagen.sh to catch it --- .../.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 | 2 +- scripts/check_datagen.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 b/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 index 8a5d7ed3af..f5e43947ed 100644 --- a/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 +++ b/Xplat/src/generated/resources/.cache/bfa01a6ca2555c100103725bf5c9e6da285f29c3 @@ -18,7 +18,7 @@ c9a0fa2b480198219c3eaf0a6232213c6a8fed16 data/botania/tags/blocks/horn_of_the_ca bbb827430199d1a6f3b27fc25e2df941f22dc660 data/botania/tags/blocks/livingwood_logs.json 687fe87bd07caccd697ec50eee72fa5b48d3fd37 data/botania/tags/blocks/magnet_ring_blacklist.json 444e88940a9f3d04dab84f48217946488d34141a data/botania/tags/blocks/manasteel_blocks.json -36c20910bc9c89b7cc3e9a27802532349c7802d8 data/botania/tags/blocks/marimorphosis_convertable.json +fdccf413f94f9bc54ddb3cd8681d976fcba945d0 data/botania/tags/blocks/marimorphosis_convertable.json 67144be58a1b3c223dc44ca18a4e9894efa7cc34 data/botania/tags/blocks/mini_flowers.json 9d560acc5024d61903ea8afc12ab496a7fb0d708 data/botania/tags/blocks/misc_special_flowers.json 482e0e7e492741201a883a48ee6806b5a4d4e51f data/botania/tags/blocks/mundane_floating_flowers.json diff --git a/scripts/check_datagen.sh b/scripts/check_datagen.sh index 8dc23d5356..6e8aeb00cf 100755 --- a/scripts/check_datagen.sh +++ b/scripts/check_datagen.sh @@ -3,10 +3,7 @@ set -e ./gradlew :Fabric:runXplatDatagen :Forge:runData :Fabric:runFabricDatagen || exit 1 -# Only check status of the assets and data folders, -# because as of 1.19 rerunning datagen will -# always update the timestamp in the .cache files (Mojang why) -STATUS="$(git status --porcelain Xplat/src/generated/resources/* Fabric/src/generated/resources/* Forge/src/generated/resources/*)" +STATUS="$(git status --porcelain Xplat/src/generated/resources Fabric/src/generated/resources Forge/src/generated/resources)" if [ -z "$STATUS" ] then echo "Datagen ok"