vanilla-data.sh: clone the sounds into each preparation instead of linking them
Vanilla's resource packs refuse symbolic links inside a pack: with linked sounds the vanilla sound oracles found no sound files while Rust did (sound_event, sound_engine on #133's parity run). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -28,7 +28,7 @@ copy is: the Mac mini. Its runner runs as the maintainer's account and keeps its
|
||||
(its sources, the exporters in `mods/horizon/src/test/java` and `research-lock.json`). The game's sounds, which
|
||||
depend only on the Minecraft version, are kept once in `shared-local/sounds/<version>/` (copied from a folder
|
||||
`horizon-prepare sounds` made from the maintainer's own game; the Mac mini has no official launcher of its own)
|
||||
and linked into each preparation, for the audio harnesses.
|
||||
and cloned into each preparation (not linked: vanilla's packs refuse symbolic links), for the audio harnesses.
|
||||
3. `tools/parity.py --changed <base sha>` picks the harnesses whose traced dependencies (their script, Python
|
||||
modules, Java oracles and every Rust source their probes compile) changed since the merge base, plus any
|
||||
harness nothing is recorded about yet, and runs those that have no pass for their current inputs. A change to
|
||||
|
||||
@@ -74,10 +74,17 @@ while read -r name; do
|
||||
echo "::error::.local/$name is not a link to the prepared resources"; exit 1; fi
|
||||
done < "$prepared/.entries"
|
||||
# The game's sounds (horizon-prepare sounds copies them from the official launcher's asset store) depend only on the
|
||||
# Minecraft version: kept once in $shared/sounds/<version>/ (sounds.json and sounds/) and linked into each preparation.
|
||||
# Minecraft version: kept once in $shared/sounds/<version>/ (sounds.json and sounds/) and copied into each preparation
|
||||
# as clones (APFS, or reflinks on Linux: no second copy of the bytes). Not links: vanilla's resource packs refuse
|
||||
# symbolic links inside a pack, so its sound oracles would find no sound files.
|
||||
assets="$prepared/horizon-client/$version/assets/minecraft"
|
||||
if [ -f "$shared/sounds/$version/sounds.json" ] && [ -d "$assets" ]; then
|
||||
for entry in sounds.json sounds; do [ -e "$assets/$entry" ] || ln -sfn "$shared/sounds/$version/$entry" "$assets/$entry"; done
|
||||
for entry in sounds.json sounds; do
|
||||
[ -L "$assets/$entry" ] && rm "$assets/$entry"
|
||||
[ -e "$assets/$entry" ] && continue
|
||||
if [ "$(uname)" = Darwin ]; then cp -cR "$shared/sounds/$version/$entry" "$assets/"
|
||||
else cp -R --reflink=auto "$shared/sounds/$version/$entry" "$assets/"; fi
|
||||
done
|
||||
fi
|
||||
touch "$prepared"
|
||||
# The four newest preparations stay.
|
||||
|
||||
Reference in New Issue
Block a user