From b33876d4dbf7bf20932a69da5ebec6af411db158 Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Tue, 27 Jan 2026 03:17:11 +0000 Subject: [PATCH] Add mod back --- .gitignore | 12 ++++++------ export-pack.sh | 30 +++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4356769..b0d9b31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ release deps overrides/mods/mc_rebalance-*.jar -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_au.json -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_ca.json -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_gb.json -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_nz.json -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_pt.json -overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/en_ud.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_au.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_ca.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_gb.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_nz.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_pt.json +overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_ud.json diff --git a/export-pack.sh b/export-pack.sh index ddb473f..f9eb991 100755 --- a/export-pack.sh +++ b/export-pack.sh @@ -4,7 +4,35 @@ cd "$(dirname "$0")" basedir="$PWD" -(cd "$basedir/overrides/global_packs/required_data/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh) +# Location for downloading/updating the mc_rebalance mod +if [ ! -d deps ]; then + mkdir deps +fi; + +# Location for saving the mc_rebalance mod +if [ ! -d overrides/mods ]; then + mkdir -p overrides/mods +fi; + +# If the user provides input e.g. `./export-pack.sh 1`, clone the repository using https +if [ -n "$1" ]; then + repo_prefix="https://patience.nearmisses.xyz/" +else + repo_prefix="forgejo@patience.nearmisses.xyz:" +fi + +mod_repo="$repo_prefix/patience/mc_rebalance.git" + +# Clone the repos if they don't exist, otherwise, update them +git clone "$mod_repo" "$basedir/deps/mc_rebalance" --branch 1.21 || (cd "$basedir/deps/mc_rebalance"; git checkout 1.21; git pull) || exit 1 + +rm "$basedir/deps/mc_rebalance/build/libs/mc_rebalance-"*".jar" +(cd "$basedir"/deps/mc_rebalance/ && ./gradlew build) + +(cd "$basedir/overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/" && ./gen-langs.sh) + +rm "$basedir/overrides/mods/mc_rebalance-"*".jar" +cp "$(find $basedir/deps/mc_rebalance/build/libs -regex "$basedir/deps\/mc_rebalance\/build\/libs\/mc_rebalance-[0-9\.]+\.jar")" "$basedir/overrides/mods" # Final path for the modpack if [ ! -d release ]; then