diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de797be --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# packwiz n'a presque rien à ignorer : TOUT le pack (pack.toml, index.toml, +# mods/*.pw.toml, config/, etc.) doit être commité — c'est ça le manifeste. + +# Manifeste LOCAL de l'installeur côté joueur (ne fait pas partie du pack source) +packwiz.json +packwiz.exe +.packwiz-installer/ +packwiz-installer.jar +packwiz-installer-bootstrap.jar + +# Le zip ATM10 d'origine (sert juste à l'import, pas besoin de le versionner) +*.zip + +# Dossier de staging pour les jars "exclus" (les jars utiles sont copiés dans mods/) +excluded-jars/ + +# OS +.DS_Store +Thumbs.db diff --git a/add-excluded-mods.ps1 b/add-excluded-mods.ps1 new file mode 100644 index 0000000..fc65b45 --- /dev/null +++ b/add-excluded-mods.ps1 @@ -0,0 +1,70 @@ +# Integrates the CurseForge "third-party distribution disabled" mods that ATM10 +# ships. packwiz cannot download them automatically, so we embed them as direct +# files in the pack (then served by your Gitea). +# +# Steps: +# 1. Download the 7 .jar files listed below (open each URL, click Download). +# 2. Put them in a .\excluded-jars\ folder at the pack root. +# 3. Run: .\add-excluded-mods.ps1 +# 4. Then: .\update-pack.ps1 "ajout mods exclus" +# +# License note: these authors disabled automatic redistribution. For a private +# pack between friends the risk is low, but keep it in mind (ideally a non-public +# repo/host). +# +# ASCII-only on purpose: avoids PowerShell 5.1 encoding issues with accents. + +$ErrorActionPreference = "Stop" + +# packwiz slug (metafile mods/.pw.toml) ; expected jar name ; CF page +$mods = @( + @{ slug = "bad-wither-no-cookie-reloaded"; jar = "bwncr-neoforge-1.21.1-3.20.3.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/bad-wither-no-cookie-reloaded/files/6172735" } + @{ slug = "create-aeronautics"; jar = "create-aeronautics-bundled-1.21.1-1.2.1.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/create-aeronautics/files/8003941" } + @{ slug = "im-fast"; jar = "imfast-NEOFORGE-1.0.2.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/im-fast/files/5991453" } + @{ slug = "more-overlays-updated"; jar = "moreoverlays-1.24.2-mc1.21.1-neoforge.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/more-overlays-updated/files/6981252" } + @{ slug = "not-enough-animations"; jar = "notenoughanimations-neoforge-1.12.0-mc1.21.1.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/not-enough-animations/files/7818966" } + @{ slug = "structory"; jar = "Structory_26.1_v1.3.16.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/structory/files/7850172" } + @{ slug = "structory-towers"; jar = "Structory_Towers_26.1_v1.0.16.jar"; url = "https://www.curseforge.com/minecraft/mc-mods/structory-towers/files/7842394" } +) + +# Use local packwiz.exe if present, else the one on PATH +$packwiz = if (Test-Path (Join-Path $PSScriptRoot "packwiz.exe")) { Join-Path $PSScriptRoot "packwiz.exe" } else { "packwiz" } + +$srcDir = Join-Path $PSScriptRoot "excluded-jars" +New-Item -ItemType Directory -Force -Path (Join-Path $PSScriptRoot "mods") | Out-Null + +$missing = @() +foreach ($m in $mods) { + $src = Join-Path $srcDir $m.jar + if (-not (Test-Path $src)) { + $missing += $m + continue + } + + # Remove the CurseForge metafile if present (else packwiz refresh keeps failing on it) + $meta = Join-Path $PSScriptRoot ("mods/" + $m.slug + ".pw.toml") + if (Test-Path $meta) { + Write-Host ("==> packwiz remove " + $m.slug) -ForegroundColor Cyan + & $packwiz remove $m.slug + } + + # Copy the jar straight into mods/ (will be indexed as a normal file) + Copy-Item $src (Join-Path $PSScriptRoot ("mods/" + $m.jar)) -Force + Write-Host (" + mods/" + $m.jar) -ForegroundColor Green +} + +if ($missing.Count -gt 0) { + Write-Host "" + Write-Host "Missing jars in .\excluded-jars\ - download them:" -ForegroundColor Yellow + foreach ($m in $missing) { + Write-Host (" - " + $m.jar) + Write-Host (" " + $m.url) + } + Write-Host "" + Write-Error "Drop the missing jars then run the script again." + exit 1 +} + +Write-Host "==> packwiz refresh" -ForegroundColor Cyan +& $packwiz refresh +Write-Host 'OK. Now run: .\update-pack.ps1 "ajout mods exclus"' -ForegroundColor Green diff --git a/index.toml b/index.toml index 38e42c6..bd4e6b2 100644 --- a/index.toml +++ b/index.toml @@ -4,6 +4,10 @@ hash-format = "sha256" file = "README.md" hash = "06848344b9e82a8c763b4c4423be65f10077e11044aa70f8bcd148301c1370a2" +[[files]] +file = "add-excluded-mods.ps1" +hash = "8be6f41a7cd425b16253ffc5b9f0c9986ff175d9f347030f735fcc72d6eca54e" + [[files]] file = "bsl-shaders.pw.toml" hash = "4a5ea44fb3e87c430dbb19df9587ec93bd189ea1a12a15ed190dde3cf5a5cf13" @@ -8151,6 +8155,34 @@ hash = "121b93764159be6fb7dab523b29a844e2bb78400ce8c48f52135a097e9b0006e" file = "datapacks/sawmill.zip" hash = "a393ff2854dfe4891300b7737707ebd94bf9a74a03bb725caf27c5ebeb501fa3" +[[files]] +file = "excluded-jars/Structory_26.1_v1.3.16.jar" +hash = "2591265c9899bbb7305b4d6992e2a5fa1aff1bc691c724d3da34761b806251b7" + +[[files]] +file = "excluded-jars/Structory_Towers_26.1_v1.0.16.jar" +hash = "a9c1715219642c87d105bd944a0316c9a22cd3caf83836e21bcaaee3fd4f04e2" + +[[files]] +file = "excluded-jars/bwncr-neoforge-1.21.1-3.20.3.jar" +hash = "2d506ec61d802feef2a03279f73a9528372af6ae5d0ec04ea8677cebaabfe6af" + +[[files]] +file = "excluded-jars/create-aeronautics-bundled-1.21.1-1.2.1.jar" +hash = "5a8c6d168ec1b47ecee7f2e83a93accbca71544d2b14ca1ca1b1271855f26248" + +[[files]] +file = "excluded-jars/imfast-NEOFORGE-1.0.2.jar" +hash = "b435fc21651883ede376ada684d196a1c93aae8f240bcd4d551fb0d8384db7fa" + +[[files]] +file = "excluded-jars/moreoverlays-1.24.2-mc1.21.1-neoforge.jar" +hash = "1ab0d1a49e31bbe5cf0cdfe5ba29fd923eca5ac60cdb51164780aa3db317c4b1" + +[[files]] +file = "excluded-jars/notenoughanimations-neoforge-1.12.0-mc1.21.1.jar" +hash = "1c9fc96bc22c094ab3f0f9c009913a3b95064ad36f285113d205cf2004afd499" + [[files]] file = "kubejs/README.md" hash = "23b45d6c3c70309c53e50044884f9de0b6538a8e442f4be97c6654db7b6f67a9" @@ -16936,6 +16968,14 @@ file = "makeup-ultra-fast-shader.pw.toml" hash = "cb5b785108ae4f64238e5cc4c838823749257bf26095ed1103f38c5e5f8e2cb9" metafile = true +[[files]] +file = "mods/Structory_26.1_v1.3.16.jar" +hash = "2591265c9899bbb7305b4d6992e2a5fa1aff1bc691c724d3da34761b806251b7" + +[[files]] +file = "mods/Structory_Towers_26.1_v1.0.16.jar" +hash = "a9c1715219642c87d105bd944a0316c9a22cd3caf83836e21bcaaee3fd4f04e2" + [[files]] file = "mods/accelerated-decay.pw.toml" hash = "0c31f109b6c4dca94a153fbdd827bbd5f96149fd5c7863ba0ba41fcab801afe0" @@ -17186,11 +17226,6 @@ file = "mods/auroras.pw.toml" hash = "22523481b7a5b3be8e086462d6598a209d5ccdd3fea0c6a2c6384e9aa92b40ec" metafile = true -[[files]] -file = "mods/bad-wither-no-cookie-reloaded.pw.toml" -hash = "c3233ab72a796b7a0fcea7fa22b88ef5ee0512daf3c767be4f88e6e4f30881b0" -metafile = true - [[files]] file = "mods/balm.pw.toml" hash = "a0f52f47c27d6ccdbee89735e459ff955ba09cdf499ef42bc901f8426be75253" @@ -17276,6 +17311,10 @@ file = "mods/building-gadgets.pw.toml" hash = "88908286eebea979713b5626891f634317fcc4c5a5bd4ec0c9444a33863a4518" metafile = true +[[files]] +file = "mods/bwncr-neoforge-1.21.1-3.20.3.jar" +hash = "2d506ec61d802feef2a03279f73a9528372af6ae5d0ec04ea8677cebaabfe6af" + [[files]] file = "mods/byzantine-styles-pack-for-minecolonies.pw.toml" hash = "a0d264d5e6561842a9f3ea2b0975553be7768c8e372c629cbc2dbcd93483408a" @@ -17461,9 +17500,8 @@ hash = "6457e8702c7c3d603e1e35252bf2388db4ec44c875209af3c4364a79f4c1709c" metafile = true [[files]] -file = "mods/create-aeronautics.pw.toml" -hash = "6cabae8686cf85c826d1280f00e00d67bb7672d353f669bea9f3775de39dd378" -metafile = true +file = "mods/create-aeronautics-bundled-1.21.1-1.2.1.jar" +hash = "5a8c6d168ec1b47ecee7f2e83a93accbca71544d2b14ca1ca1b1271855f26248" [[files]] file = "mods/create-aquatic-ambitions.pw.toml" @@ -17956,9 +17994,8 @@ hash = "9c29704cb4b162b8dc6a0fa8bdeddcb250a5029d7ab85467445dffb9156c484c" metafile = true [[files]] -file = "mods/im-fast.pw.toml" -hash = "a7b43a5e9c934e22bebe3298ae5ec54bbf098f3506703a1581f901e6896797ff" -metafile = true +file = "mods/imfast-NEOFORGE-1.0.2.jar" +hash = "b435fc21651883ede376ada684d196a1c93aae8f240bcd4d551fb0d8384db7fa" [[files]] file = "mods/immediatelyfast.pw.toml" @@ -18440,11 +18477,6 @@ file = "mods/more-dragon-eggs.pw.toml" hash = "6526d0de1fe5acd6a4fa0135b8b7bcd7fc09bd481f85e7f8221db633ff58e676" metafile = true -[[files]] -file = "mods/more-overlays-updated.pw.toml" -hash = "c315824dfe979035e9943c2d6c051cb865e5501c8e48ac96860289a8fb81a28d" -metafile = true - [[files]] file = "mods/more-red-x-cc-tweaked-compat.pw.toml" hash = "5015a605e131526b60fc305cba3f94aa69f076c5ee681db53a50d94bfb07cda5" @@ -18455,6 +18487,10 @@ file = "mods/more-red.pw.toml" hash = "f978224776c543bba4eda79ab3352f00b9eafd72e24167474775e2c130527313" metafile = true +[[files]] +file = "mods/moreoverlays-1.24.2-mc1.21.1-neoforge.jar" +hash = "1ab0d1a49e31bbe5cf0cdfe5ba29fd923eca5ac60cdb51164780aa3db317c4b1" + [[files]] file = "mods/mouse-tweaks.pw.toml" hash = "2bdee19bd39b4bd411d7c858a7978ca9d2bdda41c1cf15920ea6be0014663f79" @@ -18520,16 +18556,15 @@ file = "mods/nolijium.pw.toml" hash = "f448b2d9937031e57277bb9dee0425c9be9e3af552078d316d023f7af9a38b38" metafile = true -[[files]] -file = "mods/not-enough-animations.pw.toml" -hash = "6b78f9db27625d67d253d0e7bf9b355f757362ea56b440a6d759d1149138c6f2" -metafile = true - [[files]] file = "mods/not-enough-glyphs.pw.toml" hash = "547e98090d9f9b7742880cecc10ac6d9e1cbc9211e2513e5fe58759784d14ad5" metafile = true +[[files]] +file = "mods/notenoughanimations-neoforge-1.12.0-mc1.21.1.jar" +hash = "1c9fc96bc22c094ab3f0f9c009913a3b95064ad36f285113d205cf2004afd499" + [[files]] file = "mods/nullscape.pw.toml" hash = "c183fb8843a6c04da0417e5d51c62b2def40b994f0e9f1176243877b104d88a8" @@ -19020,16 +19055,6 @@ file = "mods/storage-delight-forge.pw.toml" hash = "523366aa4b7b286765a88684034a2390f7caec157fb362e6df7f01711777a337" metafile = true -[[files]] -file = "mods/structory-towers.pw.toml" -hash = "e74548b0dc0bb3633e122f1c36fc8a7978128f15d11cea1a9b54da4991bc1e6f" -metafile = true - -[[files]] -file = "mods/structory.pw.toml" -hash = "2232bcc24b4b597dfd19deb3618bf8e0431d7437e978f7503f32ec59f6dd16cd" -metafile = true - [[files]] file = "mods/structurize.pw.toml" hash = "0f403c213ec9ab08588d619ac516be1b615077ed5603083b0b1bb837739e309f" @@ -23736,4 +23761,4 @@ hash = "1ff2a3529f60f4cdf66e2e8ac09d90813ce479ef340c18440deeccf845141ff3" [[files]] file = "update-pack.ps1" -hash = "c04a8ce3aad4d33e98417537bcc98575c7d3e5807260fdd23cb1479c48ab262b" +hash = "866a6e80b935667105865ddbe348d00bfefaa80bc63c9fb44133f48f06058836" diff --git a/mods/Structory_26.1_v1.3.16.jar b/mods/Structory_26.1_v1.3.16.jar new file mode 100644 index 0000000..9d21681 Binary files /dev/null and b/mods/Structory_26.1_v1.3.16.jar differ diff --git a/mods/Structory_Towers_26.1_v1.0.16.jar b/mods/Structory_Towers_26.1_v1.0.16.jar new file mode 100644 index 0000000..f547cb1 Binary files /dev/null and b/mods/Structory_Towers_26.1_v1.0.16.jar differ diff --git a/mods/bad-wither-no-cookie-reloaded.pw.toml b/mods/bad-wither-no-cookie-reloaded.pw.toml deleted file mode 100644 index 85d653f..0000000 --- a/mods/bad-wither-no-cookie-reloaded.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Bad Wither No Cookie - Reloaded" -filename = "bwncr-neoforge-1.21.1-3.20.3.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "ece7a31501bc3080e1c4263689c26e9154809b2d" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 6172735 -project-id = 261251 diff --git a/mods/bwncr-neoforge-1.21.1-3.20.3.jar b/mods/bwncr-neoforge-1.21.1-3.20.3.jar new file mode 100644 index 0000000..da5d313 Binary files /dev/null and b/mods/bwncr-neoforge-1.21.1-3.20.3.jar differ diff --git a/mods/create-aeronautics-bundled-1.21.1-1.2.1.jar b/mods/create-aeronautics-bundled-1.21.1-1.2.1.jar new file mode 100644 index 0000000..7f5637c Binary files /dev/null and b/mods/create-aeronautics-bundled-1.21.1-1.2.1.jar differ diff --git a/mods/create-aeronautics.pw.toml b/mods/create-aeronautics.pw.toml deleted file mode 100644 index 7fcdd2e..0000000 --- a/mods/create-aeronautics.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Create Aeronautics" -filename = "create-aeronautics-bundled-1.21.1-1.2.1.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "fdf1ae69e8b6437e0196b3a35dd2325aa904aba9" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 8003941 -project-id = 676721 diff --git a/mods/im-fast.pw.toml b/mods/im-fast.pw.toml deleted file mode 100644 index 32f52f7..0000000 --- a/mods/im-fast.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "I'm Fast" -filename = "imfast-NEOFORGE-1.0.2.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "2a62ae984777ef81d63adfb358608b72fedfcaf9" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 5991453 -project-id = 1111501 diff --git a/mods/imfast-NEOFORGE-1.0.2.jar b/mods/imfast-NEOFORGE-1.0.2.jar new file mode 100644 index 0000000..45a8def Binary files /dev/null and b/mods/imfast-NEOFORGE-1.0.2.jar differ diff --git a/mods/more-overlays-updated.pw.toml b/mods/more-overlays-updated.pw.toml deleted file mode 100644 index 4034acf..0000000 --- a/mods/more-overlays-updated.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "More Overlays Updated" -filename = "moreoverlays-1.24.2-mc1.21.1-neoforge.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "21e8bd61c5e146a9574266015d3f64621c2d9e18" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 6981252 -project-id = 391382 diff --git a/mods/moreoverlays-1.24.2-mc1.21.1-neoforge.jar b/mods/moreoverlays-1.24.2-mc1.21.1-neoforge.jar new file mode 100644 index 0000000..d1433b0 Binary files /dev/null and b/mods/moreoverlays-1.24.2-mc1.21.1-neoforge.jar differ diff --git a/mods/not-enough-animations.pw.toml b/mods/not-enough-animations.pw.toml deleted file mode 100644 index ee35275..0000000 --- a/mods/not-enough-animations.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Not Enough Animations" -filename = "notenoughanimations-neoforge-1.12.0-mc1.21.1.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "98ad737aae797120f88e92824cc6e91b9e6215a4" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 7818966 -project-id = 433760 diff --git a/mods/notenoughanimations-neoforge-1.12.0-mc1.21.1.jar b/mods/notenoughanimations-neoforge-1.12.0-mc1.21.1.jar new file mode 100644 index 0000000..e5e3a8d Binary files /dev/null and b/mods/notenoughanimations-neoforge-1.12.0-mc1.21.1.jar differ diff --git a/mods/structory-towers.pw.toml b/mods/structory-towers.pw.toml deleted file mode 100644 index 1d39511..0000000 --- a/mods/structory-towers.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Structory: Towers" -filename = "Structory_Towers_26.1_v1.0.16.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "ed22fe659cb3020f2e86b7619ce721714b9546be" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 7842394 -project-id = 783522 diff --git a/mods/structory.pw.toml b/mods/structory.pw.toml deleted file mode 100644 index 282760a..0000000 --- a/mods/structory.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Structory" -filename = "Structory_26.1_v1.3.16.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "ee48f145a3a09fdb3f492576cbc21ed26abc74bb" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 7850172 -project-id = 636540 diff --git a/pack.toml b/pack.toml index 44b695b..5189686 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "1974ec224ca50a7a036faeb91f06ad7151dacef6c2d136074686a86f610e15c9" +hash = "04c78ec0eeac0768d6414d23fa7d965d818d01ecab90b7434b097edea91bd172" [versions] minecraft = "1.21.1" diff --git a/update-pack.ps1 b/update-pack.ps1 index 1502171..70102c9 100644 --- a/update-pack.ps1 +++ b/update-pack.ps1 @@ -10,14 +10,8 @@ param( $ErrorActionPreference = "Stop" -# Vérifie packwiz -if (-not (Get-Command packwiz -ErrorAction SilentlyContinue)) { - Write-Error "packwiz introuvable dans le PATH. Voir README §1." - exit 1 -} - Write-Host "==> packwiz refresh (recalcul des hash / index.toml)" -ForegroundColor Cyan -packwiz refresh +.\packwiz refresh Write-Host "==> git commit + push" -ForegroundColor Cyan git add -A