From 9b432f2ecc8e8953908a92b03bedf0d6f5df4a7a Mon Sep 17 00:00:00 2001 From: koka Date: Fri, 4 Sep 2026 17:42:34 +0200 Subject: [PATCH] release: update MyDisplay build 2 --- CHANGELOG.md | 11 + README.md | 8 +- build.gradle | 473 +++++++++--------- gradle.properties | 2 +- ...ha.239-mydisplay-build-2-to-alpha.240.json | 38 ++ pack/packwiz/README.md | 2 +- pack/packwiz/index.toml | 2 +- pack/packwiz/mods/mydisplay.pw.toml | 6 +- pack/packwiz/pack.toml | 4 +- pack/prism/modrinth.index.json | 12 +- pack/release.json | 4 +- pack/update_packwiz_dependencies.py | 6 + 12 files changed, 311 insertions(+), 257 deletions(-) create mode 100644 pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 756012f..4111a9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,17 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve Aucun changement non publié. +## `26.2.0-alpha.240` + +Dépendance mise à jour : **MyDisplay `1.0.0` (second build fourni)**. + +- remplace le premier JAR MyDisplay par une nouvelle révision sous un nom distinct pour contourner les caches Packwiz ; +- ajoute la sélection côté client de l’écran MyDisplay actuellement visé et met à jour la gestion multimédia associée ; +- conserve WaterMedia `3.0.0.23` et WaterMedia Binaries `3.0.0.6` côté client ; +- conserve l’adaptation du manifeste pour le serveur dédié et complète toujours EN/FR avec le russe ; +- rend le résolveur des dépendances Packwiz compatible avec les téléchargements directs privés épinglés ; +- conserve les écrans MyDisplay existants, les dix modules Sanctuary, leurs sauvegardes et leurs protocoles. + ## `26.2.0-alpha.239` Dépendances remplacées : **MyDisplay `1.0.0`**, **WaterMedia `3.0.0.23`** et **WaterMedia Binaries `3.0.0.6`**. diff --git a/README.md b/README.md index 34adf93..fab23ca 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,11 @@ Licence : **GNU GPL 3.0 or Later** (`GPL-3.0-or-later`) Les descriptions FR/EN/RU sont déclarées dans chaque `fabric.mod.json` et dans les fichiers de langue. Les images fournies servent d'icônes Fabric de leur module. -Version courante du pack distribué : **`26.2.0-alpha.239`**. Cette release conserve les dix modules Sanctuary, notamment Another World **`0.0.0-alpha.58`**, Sanctuary **`0.0.0-alpha.139`** et Red-Stoner **`0.0.0-alpha.20`**, garde ZEVENT entièrement retiré et remplace Dream Displays par MyDisplay **`1.0.0`**, WaterMedia **`3.0.0.23`** et WaterMedia Binaries **`3.0.0.6`**. +Version courante du pack distribué : **`26.2.0-alpha.240`**. Cette release conserve les dix modules Sanctuary, notamment Another World **`0.0.0-alpha.58`**, Sanctuary **`0.0.0-alpha.139`** et Red-Stoner **`0.0.0-alpha.20`**, garde ZEVENT entièrement retiré et met à jour MyDisplay **`1.0.0`** vers le second build fourni, avec WaterMedia **`3.0.0.23`** et WaterMedia Binaries **`3.0.0.6`**. -L’alpha.239 distribue MyDisplay côté client et serveur, et réserve WaterMedia ainsi que ses binaires natifs au client. Le manifeste de MyDisplay est adapté sans modifier son code afin que ses dépendances de lecture client ne bloquent pas le démarrage d’un serveur dédié ; sa traduction russe complète les langues EN/FR déjà fournies. Packwiz retire automatiquement `dreamdisplays-fabric-26.2-audio-buffer-test-2.jar`. Les écrans Dream Displays déjà posés ne sont pas convertis et doivent être remplacés par des écrans MyDisplay. +L’alpha.240 remplace le premier JAR MyDisplay par `mydisplay-1.0.0-sanctuary-2.jar`, dont le nom distinct force Packwiz à télécharger le nouveau build et à supprimer le précédent. Cette révision ajoute notamment la sélection côté client d’un écran MyDisplay visé. Le manifeste conserve l’adaptation serveur dédié et les traductions EN/FR/RU restent alignées. Les écrans MyDisplay déjà placés restent compatibles. + +L’alpha.239 distribue MyDisplay côté client et serveur, et réserve WaterMedia ainsi que ses binaires natifs au client. Packwiz retire automatiquement Dream Displays ; ses anciens écrans déjà posés ne sont pas convertis et doivent être remplacés par des écrans MyDisplay. L’alpha.238 distribue la seconde révision `dreamdisplays-fabric-26.2-audio-buffer-test-2.jar` côté client et serveur. @@ -430,7 +432,7 @@ Le menu pause est lui aussi possédé par Sanctuary. Il ne conserve que Retour a ## Versions du modpack et mises à jour Modrinth -`pack_version` dans `gradle.properties` est la version du pack complet. `mod_version=0.0.0-alpha.0` et `module_lifecycle=standby` sont les valeurs par défaut des modules en veille ; les propriétés `_version` et `_lifecycle` n’activent et ne font avancer que le module concerné. Le contrat de distribution est dans `pack/release.json`. Depuis l’alpha.236, le module temporaire `zevent` n’est plus construit ni distribué ; l’alpha.239 utilise MyDisplay et son moteur client WaterMedia à la place de Dream Displays. +`pack_version` dans `gradle.properties` est la version du pack complet. `mod_version=0.0.0-alpha.0` et `module_lifecycle=standby` sont les valeurs par défaut des modules en veille ; les propriétés `_version` et `_lifecycle` n’activent et ne font avancer que le module concerné. Le contrat de distribution est dans `pack/release.json`. Depuis l’alpha.236, le module temporaire `zevent` n’est plus construit ni distribué ; l’alpha.240 utilise le second build MyDisplay fourni et son moteur client WaterMedia à la place de Dream Displays. La version globale du pack n’est pas injectée dans les JAR inchangés : leur contenu et leur numéro restent immuables. Le lanceur possède la composition exacte du pack, tandis que chaque manifest conserve la version effective de son module. diff --git a/build.gradle b/build.gradle index e26ace4..548b425 100644 --- a/build.gradle +++ b/build.gradle @@ -2921,7 +2921,7 @@ tasks.register("verifyNotchEncounter") { || rootProject.ouch_version != "0.0.0-alpha.11" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.masterkey_version != "0.0.0-alpha.9" - || rootProject.pack_version != "26.2.0-alpha.239" + || rootProject.pack_version != "26.2.0-alpha.240" || manifests.itsalive.custom?.sanctuary26?.data_version != 4 || manifests.sanctuary.custom?.sanctuary26?.data_version != 15 || manifests.ouch.depends?.itsalive != ">=0.0.0-alpha.37" @@ -3010,7 +3010,7 @@ tasks.register("verifyMagicCarpet") { "iliketomoveit/src/main/resources/assets/iliketomoveit/models/item/magic_carpet.json")) def carpetTexture = file( "iliketomoveit/src/main/resources/assets/iliketomoveit/textures/item/magic_carpet.png") - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.iliketomoveit_version != "0.0.0-alpha.18" || rootProject.onlyfun_version != "0.0.0-alpha.27" || rootProject.sanctuary_version != "0.0.0-alpha.139" @@ -3643,7 +3643,7 @@ tasks.register("verifyProgressivePauseMenuRelease") { [(locale): new JsonSlurper().parse(file( "sanctuary/src/main/resources/assets/sanctuary/lang/${locale}.json"))] } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.onlyfun_version != "0.0.0-alpha.27" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -3693,7 +3693,7 @@ tasks.register("verifyMirrorLavenderDrawerRelease") { def redStonerRegistry = file( "redstoner/src/main/java/fr/koka99cab/sanctuary26/redstoner/registry/RedStonerRegistries.java").text def drawerRecipe = file("redstoner/src/main/resources/data/redstoner/recipe/drawer.json") - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || rootProject.redstoner_version != "0.0.0-alpha.20" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4675,7 +4675,7 @@ tasks.register("verifyShopPricingLayoutRelease") { "pack/migrations/26.2.0-alpha.192-shop-pricing-layout-to-alpha.193.json")) def release = new JsonSlurper().parse(file("pack/release.json")) def index = new JsonSlurper().parse(file("pack/prism/modrinth.index.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.onlyfun_version != "0.0.0-alpha.27" || rootProject.sanctuary_version != "0.0.0-alpha.139" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4720,7 +4720,7 @@ tasks.register("verifyCuisineCropsRelease") { def climate = file("itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/ClimateCropForaging.java").text def rice = file("itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/RiceCropBlock.java").text def bean = file("itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/BeanCropBlock.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.itsalive_version != "0.0.0-alpha.38" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version || migration.source?.pack_version != "26.2.0-alpha.193" @@ -4769,7 +4769,7 @@ tasks.register("verifyShopCsvBossGatesRelease") { def bossGate = file("onlyfun/src/main/java/fr/koka99cab/sanctuary26/onlyfun/shop/OnlyFunBossShopGate.java").text def catalog = file("onlyfun/src/main/java/fr/koka99cab/sanctuary26/onlyfun/shop/OnlyFunShopCatalog.java").text def offerCatalog = file("sanctuary/src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopOfferCatalog.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.onlyfun_version != "0.0.0-alpha.27" || rootProject.sanctuary_version != "0.0.0-alpha.139" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4816,7 +4816,7 @@ tasks.register("verifyCulinaryMailboxGrappleFixesRelease") { def release = new JsonSlurper().parse(file("pack/release.json")) def prism = new JsonSlurper().parse(file("pack/prism/modrinth.index.json")) def packwiz = file("pack/packwiz/pack.toml").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || migration.source?.pack_version != "26.2.0-alpha.195" || migration.target?.pack_version != "26.2.0-alpha.196" || migration.target?.modules != [ @@ -4834,10 +4834,10 @@ tasks.register("verifyCulinaryMailboxGrappleFixesRelease") { || migration.distribution?.jei?.target != "30.26.0.182" || migration.compatibility?.save_migration_required != false || migration.compatibility?.registry_ids_changed != false - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"')) { + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"')) { throw new GradleException("The alpha.196 culinary, mailbox and grapple release contract is incomplete") } } @@ -4862,7 +4862,7 @@ tasks.register("verifyQuestRequestsCauldronBatchesRelease") { def prism = new JsonSlurper().parse(file("pack/prism/modrinth.index.json")) def packwiz = file("pack/packwiz/pack.toml").text def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.itsalive_version != "0.0.0-alpha.38" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.196" @@ -4882,10 +4882,10 @@ tasks.register("verifyQuestRequestsCauldronBatchesRelease") { || migration.distribution?.jei?.target != "30.26.0.186" || migration.compatibility?.sanctuary_target_network_protocol != 19 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 24 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"')) { + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"')) { throw new GradleException("The alpha.197 quest-request and cauldron-batch release contract is incomplete") } } @@ -4912,7 +4912,7 @@ tasks.register("verifyFermentationBarrelAutomationRelease") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def itsAliveManifest = new JsonSlurper().parse(file("itsalive/src/main/resources/fabric.mod.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.itsalive_version != "0.0.0-alpha.38" || migration.source?.pack_version != "26.2.0-alpha.197" || migration.target?.pack_version != "26.2.0-alpha.198" @@ -4931,10 +4931,10 @@ tasks.register("verifyFermentationBarrelAutomationRelease") { || migration.distribution?.packwiz_index_refreshed != true || itsAliveManifest.custom?.sanctuary26?.data_version != 4 || itsAliveManifest.custom?.sanctuary26?.network_protocol != 4 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.38.jar"')) { throw new GradleException("The alpha.198 fermentation barrel release contract is incomplete") } @@ -4962,7 +4962,7 @@ tasks.register("verifyQuestRequestContractsRelease") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.itsalive_version != "0.0.0-alpha.38" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.198" @@ -4976,10 +4976,10 @@ tasks.register("verifyQuestRequestContractsRelease") { || migration.quest_request_contracts?.chat_accept_revalidates_distance_owner_sign_and_claim != true || migration.compatibility?.sanctuary_target_network_protocol != 20 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 24 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.38.jar"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"')) { throw new GradleException("The alpha.199 quest-request contract release is incomplete") @@ -5017,7 +5017,7 @@ tasks.register("verifyWeatherTntAmbianceRelease") { def ambianceManifest = new JsonSlurper().parse(file("ambiance/src/main/resources/fabric.mod.json")) def ouchManifest = new JsonSlurper().parse(file("ouch/src/main/resources/fabric.mod.json")) def rootBuild = file("build.gradle").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || rootProject.ouch_version != "0.0.0-alpha.11" || migration.source?.pack_version != "26.2.0-alpha.199" @@ -5051,10 +5051,10 @@ tasks.register("verifyWeatherTntAmbianceRelease") { || !weatherTnt.contains("AmbianceDailyWeather.CLEAR") || !weatherTnt.contains("CLEAR_WEATHER_TICKS = 864_000") || weatherTnt.contains("setWeatherParameters") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || !packwizIndex.contains('file = "mods/ouch-0.0.0-alpha.11.jar"')) { throw new GradleException("The alpha.200 Weather TNT and Ambiance release is incomplete") @@ -5083,7 +5083,7 @@ tasks.register("verifyQuestRequestEscrowRelease") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.200" || migration.source?.modules?.sanctuary != "0.0.0-alpha.115" @@ -5098,10 +5098,10 @@ tasks.register("verifyQuestRequestEscrowRelease") { || migration.compatibility?.sanctuary_target_network_protocol != 21 || sanctuaryManifest.custom?.sanctuary26?.data_version != 15 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 24 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"')) { throw new GradleException("The alpha.201 quest-request escrow release is incomplete") } @@ -5137,7 +5137,7 @@ tasks.register("verifyWaystoneShopCulinaryAlpha202Release") { "iliketomoveit/src/main/resources/fabric.mod.json")) def sanctuaryManifest = new JsonSlurper().parse(file( "sanctuary/src/main/resources/fabric.mod.json")) - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || rootProject.itsalive_version != "0.0.0-alpha.38" || rootProject.iliketomoveit_version != "0.0.0-alpha.18" @@ -5177,10 +5177,10 @@ tasks.register("verifyWaystoneShopCulinaryAlpha202Release") { || moveItManifest.custom?.sanctuary26?.network_protocol != 5 || sanctuaryManifest.custom?.sanctuary26?.data_version != 15 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 24 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.38.jar"') || !packwizIndex.contains('file = "mods/iliketomoveit-0.0.0-alpha.18.jar"') @@ -5297,7 +5297,7 @@ tasks.register("verifySafeVaultFeature") { def image = javax.imageio.ImageIO.read(file("anotherworld/src/main/resources/assets/anotherworld/textures/${path}")) image == null || image.width != size[0] || image.height != size[1] }.keySet() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.schema_version != 1 @@ -5489,7 +5489,7 @@ tasks.register("verifySafeVaultInterfaceAlpha203Release") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || migration.source?.pack_version != "26.2.0-alpha.202" || migration.source?.modules != [anotherworld: "0.0.0-alpha.50"] @@ -5507,9 +5507,9 @@ tasks.register("verifySafeVaultInterfaceAlpha203Release") { || migration.distribution?.jei?.modrinth_version_id != "XXTFqqwG" || migration.distribution?.jei?.prism_manifest_updated != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.50.jar"') || jeiFiles.size() != 1 @@ -5535,7 +5535,7 @@ tasks.register("verifySafeVaultFixAlpha204Release") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || migration.source?.pack_version != "26.2.0-alpha.203" || migration.source?.modules != [anotherworld: "0.0.0-alpha.51"] @@ -5561,9 +5561,9 @@ tasks.register("verifySafeVaultFixAlpha204Release") { || migration.distribution?.jei?.modrinth_version_id != "OcMayhUH" || migration.distribution?.jei?.prism_manifest_updated != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.51.jar"') || jeiFiles.size() != 1 @@ -5589,7 +5589,7 @@ tasks.register("verifySafeVaultCubeAlpha205Release") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || migration.source?.pack_version != "26.2.0-alpha.204" || migration.source?.modules != [anotherworld: "0.0.0-alpha.52"] @@ -5618,9 +5618,9 @@ tasks.register("verifySafeVaultCubeAlpha205Release") { || migration.distribution?.jei?.modrinth_version_id != "NtfJDMhk" || migration.distribution?.jei?.prism_manifest_updated != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.52.jar"') || jeiFiles.size() != 1 @@ -5647,7 +5647,7 @@ tasks.register("verifySafeVaultCtmAlpha206Release") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || migration.source?.pack_version != "26.2.0-alpha.205" || migration.source?.modules != [anotherworld: "0.0.0-alpha.53"] @@ -5670,9 +5670,9 @@ tasks.register("verifySafeVaultCtmAlpha206Release") { || migration.compatibility?.pack_release_updated != true || migration.distribution?.packwiz_index_refreshed != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') || jeiFiles.size() != 1 @@ -5699,7 +5699,7 @@ tasks.register("verifySafeVaultUnlimitedAlpha207Release") { def packwiz = file("pack/packwiz/pack.toml").text def packwizIndex = file("pack/packwiz/index.toml").text def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || migration.source?.pack_version != "26.2.0-alpha.206" || migration.source?.modules != [anotherworld: "0.0.0-alpha.54"] @@ -5729,9 +5729,9 @@ tasks.register("verifySafeVaultUnlimitedAlpha207Release") { || migration.compatibility?.pack_release_updated != true || migration.distribution?.packwiz_index_refreshed != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') || jeiFiles.size() != 1 @@ -5787,7 +5787,7 @@ tasks.register("verifyCanapliaFoundation") { "itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/ItsAliveMod.java").text def visualApiSource = file( "ambiance/src/main/java/fr/koka99cab/sanctuary26/ambiance/api/visual/AmbianceVisualEffectApi.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.itsalive_version != "0.0.0-alpha.38" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.issue != 35 @@ -6039,7 +6039,7 @@ tasks.register("verifyCanapliaAlpha209Release") { ambiance: "0.0.0-alpha.14", itsalive: "0.0.0-alpha.33", onlyfun: "0.0.0-alpha.20"] - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || rootProject.itsalive_version != "0.0.0-alpha.38" || rootProject.onlyfun_version != "0.0.0-alpha.27" @@ -6087,9 +6087,9 @@ tasks.register("verifyCanapliaAlpha209Release") { || fixMigration.compatibility?.network_protocol_changed != false || fixMigration.distribution?.pack_release_updated != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.38.jar"') || !packwizIndex.contains('file = "mods/onlyfun-0.0.0-alpha.27.jar"') @@ -6158,7 +6158,7 @@ tasks.register("verifyAlpha210Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.onlyfun_version != "0.0.0-alpha.27" || rootProject.iliketomoveit_version != "0.0.0-alpha.18" @@ -6204,10 +6204,10 @@ tasks.register("verifyAlpha210Release") { || manifests.iliketomoveit.custom?.sanctuary26?.network_protocol != 5 || manifests.itsalive.custom?.sanctuary26?.data_version != 4 || manifests.itsalive.custom?.sanctuary26?.network_protocol != 4 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || jeiFiles.size() != 1 @@ -6288,7 +6288,7 @@ tasks.register("verifyAlpha211Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || workspaceModules.any { id, version -> rootProject.property("${id}_version") != version } || migration.source?.pack_version != "26.2.0-alpha.210" || migration.source?.modules != expectedSource @@ -6316,9 +6316,9 @@ tasks.register("verifyAlpha211Release") { || migration.distribution?.prism_modrinth_index_updated != true || migration.distribution?.shared_client_server_mrpack != true || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || prism.files?.size() != 8 @@ -6326,7 +6326,7 @@ tasks.register("verifyAlpha211Release") { || jeiFiles[0].hashes?.sha1 != "e82447aff07e87a372cf817bc9c28b0d77b6f55c" || jeiFiles[0].hashes?.sha512 != "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a" || !changelog.contains("## `26.2.0-alpha.211`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.211 Abjection and gameplay-polish release is incomplete") } } @@ -6360,7 +6360,7 @@ tasks.register("verifyAlpha212Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.211" || migration.source?.modules != [sanctuary: "0.0.0-alpha.119"] @@ -6382,16 +6382,16 @@ tasks.register("verifyAlpha212Release") { || manifest.custom?.sanctuary26?.data_version != 15 || manifest.custom?.sanctuary26?.network_protocol != 24 || !minecraftMixin.contains('method = "pickBlockOrEntity"') - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 || jeiFiles.size() != 1 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"') || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.119.jar"') || !changelog.contains("## `26.2.0-alpha.212`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.212 Black Market startup-fix release is incomplete") } } @@ -6425,7 +6425,7 @@ tasks.register("verifyAlpha213Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.212" || migration.source?.modules != [ambiance: "0.0.0-alpha.15"] @@ -6449,16 +6449,16 @@ tasks.register("verifyAlpha213Release") { || manifest.custom?.sanctuary26?.network_protocol != 6 || !levelEventMixin.contains('@Mixin(LevelEventHandler.class)') || !levelEventMixin.contains('@Inject(method = "levelEvent"') - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 || jeiFiles.size() != 1 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.15.jar"') || !changelog.contains("## `26.2.0-alpha.213`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.213 Ambiance startup-fix release is incomplete") } } @@ -6493,7 +6493,7 @@ tasks.register("verifyAlpha214Release") { "ambiance/src/main/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscAudioPlayer.java").text def urlSmoke = file( "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/white_disc/WhiteDiscUrlSmoke.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.213" || migration.source?.modules != [ambiance: "0.0.0-alpha.16"] @@ -6522,16 +6522,16 @@ tasks.register("verifyAlpha214Release") { || !audioPlayer.contains('message.ambiance.white_disc.loading') || !audioPlayer.contains('message.ambiance.white_disc.failed') || !urlSmoke.contains("https://youtu.be/Ue5ZBe-GzSM?si=78LSbtBQzUYzhA2Y") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.16.jar"') || !changelog.contains("## `26.2.0-alpha.214`") || changelog.contains("## Modifications non distribuées") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.214 white-disc solo synchronization release is incomplete") } } @@ -6572,7 +6572,7 @@ tasks.register("verifyAlpha215Release") { "ambiance/src/main/java/fr/koka99cab/sanctuary26/ambiance/client/audio/LavaplayerAudioStream.java").text def playbackSmoke = file( "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.214" || migration.source?.modules != [ambiance: "0.0.0-alpha.17"] @@ -6612,16 +6612,16 @@ tasks.register("verifyAlpha215Release") { || !playbackSmoke.contains("https://www.youtube.com/watch?v=Ue5ZBe-GzSM") || !playbackSmoke.contains("stream.paddedSilenceBytes() != 0L") || !playbackSmoke.contains("stream.decodedTimelineMillis() != 4_000L") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.17.jar"') || !changelog.contains("## `26.2.0-alpha.215`") || changelog.contains("## Modifications non distribuées") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.215 resilient white-disc playback release is incomplete") } } @@ -6666,7 +6666,7 @@ tasks.register("verifyAlpha216Release") { "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/LavaplayerAudioStreamSmoke.java").text def playbackSmoke = file( "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.215" || migration.source?.modules != [ambiance: "0.0.0-alpha.18"] @@ -6710,16 +6710,16 @@ tasks.register("verifyAlpha216Release") { || !playbackSmoke.contains("stream.paddedSilenceBytes() != 0L") || !playbackSmoke.contains("stream.decodedTimelineMillis() != 4_000L") || !playbackSmoke.contains("LavaplayerAudioStream.SAMPLE_RATE * 2 * 4") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.18.jar"') || !changelog.contains("## `26.2.0-alpha.216`") || changelog.contains("## Modifications non distribuées") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.216 white-disc audio-quality release is incomplete") } } @@ -6754,7 +6754,7 @@ tasks.register("verifyAlpha217Release") { "ambiance/src/main/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscAudioPlayer.java").text def streamSmoke = file( "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/LavaplayerAudioStreamSmoke.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.216" || migration.source?.modules != [ambiance: "0.0.0-alpha.19"] @@ -6785,16 +6785,16 @@ tasks.register("verifyAlpha217Release") { || !audioPlayer.contains("PLAYBACK_PITCH = 1.0F") || audioPlayer.count("channel.setPitch(PLAYBACK_PITCH)") != 2 || !streamSmoke.contains("WhiteDiscAudioPlayer.PLAYBACK_PITCH - 1.0F") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" || prism.files?.size() != 8 - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.19.jar"') || !changelog.contains("## `26.2.0-alpha.217`") || changelog.contains("## Modifications non distribuées") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.217 white-disc pitch release is incomplete") } } @@ -6851,7 +6851,7 @@ tasks.register("verifyAlpha218Release") { def obsoleteJars = sourceModules.collect { id, version -> "file = \"mods/${id}-${version}.jar\"" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.redstoner_version != "0.0.0-alpha.20" || currentModules.findAll { id, version -> id != "redstoner" && id != "sanctuary" && id != "onlyfun" && id != "iliketomoveit" @@ -6892,13 +6892,13 @@ tasks.register("verifyAlpha218Release") { || !onlyFunPolicy.contains('namespace.equals("redstoner") && path.equals("storage_terminal")') || !blackMarketPolicy.contains('namespace.equals("redstoner") && path.equals("storage_terminal")') || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || !changelog.contains("## `26.2.0-alpha.218`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.218 Storage Terminal release is incomplete") } } @@ -6961,7 +6961,7 @@ tasks.register("verifyAlpha219Release") { include "**/*golden*days*.zip", "**/*golden*days*.jar" exclude "**/build/**", "**/.gradle/**", "**/.git/**" }.files - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || workspaceModules.any { id, version -> rootProject.property("${id}_version") != version } || migration.source?.pack_version != "26.2.0-alpha.218" || migration.source?.modules != sourceModules @@ -6993,15 +6993,15 @@ tasks.register("verifyAlpha219Release") { || manifests.ambiance.custom?.sanctuary26?.data_version != 2 || manifests.ambiance.custom?.sanctuary26?.network_protocol != 6 || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version || prism.files.any { it.path.toLowerCase().contains("golden-days") } - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || !forbiddenGoldenArchives.isEmpty() || !changelog.contains("## `26.2.0-alpha.219`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.219 finite Alpha/Indev release is incomplete") } } @@ -7040,7 +7040,7 @@ tasks.register("verifyAlpha220Release") { "redstoner/src/main/java/fr/koka99cab/sanctuary26/redstoner/client/gui/StorageTerminalScreen.java").text def networking = file( "redstoner/src/main/java/fr/koka99cab/sanctuary26/redstoner/network/RedStonerNetworking.java").text - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.redstoner_version != "0.0.0-alpha.20" || migration.source?.pack_version != "26.2.0-alpha.219" || migration.source?.modules != [redstoner: "0.0.0-alpha.11"] @@ -7081,13 +7081,13 @@ tasks.register("verifyAlpha220Release") { || networking.contains("storage_terminal_snapshot") || networking.contains("storage_terminal_action") || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.20.jar"') || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.11.jar"') || !changelog.contains("## `26.2.0-alpha.220`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.220 Storage Terminal menu release is incomplete") } } @@ -7135,7 +7135,7 @@ tasks.register("verifyAlpha221Release") { def playbackSmoke = file( "ambiance/src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java").text def contract = migration.white_disc_native_rate - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.ambiance_version != "0.0.0-alpha.22" || migration.source?.pack_version != "26.2.0-alpha.220" || migration.source?.modules != [ambiance: "0.0.0-alpha.21"] @@ -7184,13 +7184,13 @@ tasks.register("verifyAlpha221Release") { || !playbackSmoke.contains("PCM cadence: 100%% speed") || !whiteDiscDocumentation.contains("48 000 Hz") || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.22.jar"') || packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.21.jar"') || !changelog.contains("## `26.2.0-alpha.221`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.221 native-rate white-disc release is incomplete") } } @@ -7269,7 +7269,7 @@ tasks.register("verifyAlpha222Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.redstoner_version != "0.0.0-alpha.20" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.221" @@ -7343,10 +7343,10 @@ tasks.register("verifyAlpha222Release") { || !questEditor.contains("QuestIdSuggestions.suggest") || !suggestions.contains("Normalizer.Form.NFD") || !suggestions.contains("public static final int LIMIT = 5") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.20.jar"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"') || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.12.jar"') @@ -7357,7 +7357,7 @@ tasks.register("verifyAlpha222Release") { || jeiFiles[0].hashes?.sha1 != "e82447aff07e87a372cf817bc9c28b0d77b6f55c" || jeiFiles[0].hashes?.sha512 != "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a" || !changelog.contains("## `26.2.0-alpha.222`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.222 terminal-search and quest-tracker release is incomplete") } } @@ -7488,7 +7488,7 @@ tasks.register("verifyAlpha223Release") { def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.29.0.201.jar" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.source?.pack_version != "26.2.0-alpha.222" || migration.source?.modules != [sanctuary: "0.0.0-alpha.124"] @@ -7553,10 +7553,10 @@ tasks.register("verifyAlpha223Release") { || !questSync.contains("case EMERALD -> 2") || !inventorySmoke.contains("Hotbar snapshot must remain untouched") || !displaySmoke.contains("QuestTrackerDisplayMode.PANEL.next()") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"') || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.124.jar"') || !packwizJei.contains('filename = "jei-26.2-fabric-30.29.0.201.jar"') @@ -7565,7 +7565,7 @@ tasks.register("verifyAlpha223Release") { || jeiFiles[0].hashes?.sha1 != "e82447aff07e87a372cf817bc9c28b0d77b6f55c" || jeiFiles[0].hashes?.sha512 != "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a" || !changelog.contains("## `26.2.0-alpha.223`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.223 inventory-sort and quest-tracker display release is incomplete") } } @@ -7629,7 +7629,7 @@ tasks.register("verifyAlpha224Release") { }.collect { id, version -> "file = \"mods/${id}-${version}.jar\"" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || workspaceModules.any { id, version -> rootProject.property("${id}_version") != version } || migration.status != "released" || migration.source?.pack_version != "26.2.0-alpha.223" @@ -7672,14 +7672,14 @@ tasks.register("verifyAlpha224Release") { || !sortPayload.contains("buffer.writeBoolean(container)") || !sortPayload.contains("buffer.readBoolean()") || !networking.contains("PROTOCOL_VERSION = 24") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || !changelog.contains("## `26.2.0-alpha.224`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.224 Notch, Magic Carpet and container-sort release is incomplete") } } @@ -7774,7 +7774,7 @@ tasks.register("verifyAlpha225Release") { "iliketomoveit/src/main/resources/assets/iliketomoveit/textures/item/magic_carpet.png") def carpetTextureHash = MessageDigest.getInstance("SHA-256") .digest(carpetTexture.bytes).encodeHex().toString() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || currentWorkspaceModules.any { id, version -> rootProject.property("${id}_version") != version } || migration.status != "released" || migration.source?.pack_version != "26.2.0-alpha.224" @@ -7827,14 +7827,14 @@ tasks.register("verifyAlpha225Release") { || !lootboxes.contains("SanctuaryEntityPolicy.isTemporaryCompanion") || carpetModel.textures?.layer0 != "iliketomoveit:item/magic_carpet" || carpetTextureHash != "3e4527d24a37f0632b27d2c857b047c581db07eaa41befaffbf28043a8ed86cc" - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || obsoleteJars.any { packwizIndex.contains(it) } || !changelog.contains("## `26.2.0-alpha.225`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.225 four-ticket bug-fix release is incomplete") } } @@ -7900,7 +7900,7 @@ tasks.register("verifyAlpha226Release") { def requiredJars = releasedModules.collect { id, version -> "file = \"mods/${id}-${version}.jar\"" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.status != "released" || migration.source?.pack_version != "26.2.0-alpha.225" @@ -7943,14 +7943,14 @@ tasks.register("verifyAlpha226Release") { || !renderer.contains("LivingEntityRenderLayerRegistrationCallback") || !avatarMixin.contains("appearance.bannerCape()") || onlyFun.contains('"white_cape"') - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.129.jar"') || !changelog.contains("## `26.2.0-alpha.226`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.226 craftable banner cape release is incomplete") } } @@ -7991,7 +7991,7 @@ tasks.register("verifyAlpha227Release") { def requiredJars = releasedModules.collect { id, version -> "file = \"mods/${id}-${version}.jar\"" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.status != "released" @@ -8031,15 +8031,15 @@ tasks.register("verifyAlpha227Release") { || anotherWorldManifest.custom?.sanctuary26?.network_protocol != 2 || sanctuaryManifest.custom?.sanctuary26?.data_version != 15 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 24 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.56.jar"') || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.130.jar"') || !changelog.contains("## `26.2.0-alpha.227`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.227 persistent Backroom release is incomplete") } } @@ -8089,7 +8089,7 @@ tasks.register("verifyAlpha228Release") { def requiredJars = releasedModules.collect { id, version -> "file = \"mods/${id}-${version}.jar\"" } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.redstoner_version != "0.0.0-alpha.20" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.status != "released" @@ -8136,15 +8136,15 @@ tasks.register("verifyAlpha228Release") { || !backroomLayout.contains("WORLD_MAX_Y_EXCLUSIVE = 384") || !backroomLayout.contains("LEVEL_4(-64, 27)") || !backroomLayout.contains("mazeConnected") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.13.jar"') || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.131.jar"') || !changelog.contains("## `26.2.0-alpha.228`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.228 five-level Backroom and terminal release is incomplete") } } @@ -8199,7 +8199,7 @@ tasks.register("verifyAlpha229Release") { "screen.redstoner.storage_terminal.sort.alphabetical", "screen.redstoner.storage_terminal.sort.count_ascending", "screen.redstoner.storage_terminal.sort.count_descending"] - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.redstoner_version != "0.0.0-alpha.20" || rootProject.sanctuary_version != "0.0.0-alpha.139" || migration.status != "released" @@ -8237,14 +8237,14 @@ tasks.register("verifyAlpha229Release") { || !screen.contains("sortMode = sortMode.next()") || !smoke.contains("verifySorting()") || !smoke.contains("periodic quantity refresh") - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || requiredJars.any { !packwizIndex.contains(it) } || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.15.jar"') || !changelog.contains("## `26.2.0-alpha.229`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.229 storage-terminal sorting release is incomplete") } } @@ -8284,7 +8284,7 @@ tasks.register("verifyAlpha230Release") { } def indexHash = java.security.MessageDigest.getInstance("SHA-256") .digest(packwizIndexFile.bytes).encodeHex().toString() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.redstoner_version != "0.0.0-alpha.20" || migration.schema_version != 1 @@ -8319,10 +8319,10 @@ tasks.register("verifyAlpha230Release") { || manifests.sanctuary.custom?.sanctuary26?.network_protocol != 24 || manifests.redstoner.custom?.sanctuary26?.data_version != 5 || manifests.redstoner.custom?.sanctuary26?.network_protocol != 9 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwiz.contains("hash = \"${indexHash}\"") || requiredJars.any { !packwizIndex.contains(it) } || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"\nhash = "22a37980bd7b121cbfe65e853a6c6a9f8549bbf4af9b4fdd5f22dbd04df273b0"') @@ -8330,7 +8330,7 @@ tasks.register("verifyAlpha230Release") { || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.132.jar"') || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.16.jar"') || !changelog.contains("## `26.2.0-alpha.230`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.230 Sanctuary polish release is incomplete") } } @@ -8390,7 +8390,7 @@ tasks.register("verifyAlpha231Release") { } def indexHash = java.security.MessageDigest.getInstance("SHA-256") .digest(packwizIndexFile.bytes).encodeHex().toString() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.redstoner_version != "0.0.0-alpha.20" || migration.schema_version != 1 @@ -8454,10 +8454,10 @@ tasks.register("verifyAlpha231Release") { || jeiFiles[0].hashes?.sha512 != "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a" || jeiFiles[0].fileSize != 1_860_103 || !packwizJei.contains('filename = "jei-26.2-fabric-30.29.0.201.jar"') - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwiz.contains("hash = \"${indexHash}\"") || requiredJars.any { !packwizIndex.contains(it) } || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.139.jar"\nhash = "22a37980bd7b121cbfe65e853a6c6a9f8549bbf4af9b4fdd5f22dbd04df273b0"') @@ -8466,7 +8466,7 @@ tasks.register("verifyAlpha231Release") { || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.17.jar"') || !changelog.contains("## `26.2.0-alpha.231`") || !readme.contains("Red-Stoner **`0.0.0-alpha.20`**") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**")) { + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**")) { throw new GradleException("The alpha.231 Backroom and trophy-panel release is incomplete") } } @@ -8534,7 +8534,7 @@ tasks.register("verifyAlpha232Release") { } def indexHash = MessageDigest.getInstance("SHA-256") .digest(packwizIndexFile.bytes).encodeHex().toString() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.anotherworld_version != "0.0.0-alpha.58" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.redstoner_version != "0.0.0-alpha.20" @@ -8593,10 +8593,10 @@ tasks.register("verifyAlpha232Release") { !lang.containsKey("message.canon.camera.screenshot_saved") || !lang.containsKey("message.canon.camera.screenshot_failed") } - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwiz.contains("hash = \"${indexHash}\"") || requiredJars.any { !packwizIndex.contains(it) } || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"\nhash = "8936b0a5bf3f122afc752cba5e8d96ac92cfb1458785c3fac13d25f51cb4814c"') @@ -8607,7 +8607,7 @@ tasks.register("verifyAlpha232Release") { || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.18.jar"') || !changelog.contains("## `26.2.0-alpha.232`") || !changelog.contains("ticket #146") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**") + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**") || !readme.contains("Another World **`0.0.0-alpha.58`**")) { throw new GradleException("The alpha.232 Canon screenshot and alpha.231 follow-up release is incomplete") } @@ -8648,7 +8648,7 @@ tasks.register("verifyAlpha233Release") { } def indexHash = MessageDigest.getInstance("SHA-256") .digest(packwizIndexFile.bytes).encodeHex().toString() - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.sanctuary_version != "0.0.0-alpha.139" || rootProject.redstoner_version != "0.0.0-alpha.20" || migration.schema_version != 1 @@ -8680,10 +8680,10 @@ tasks.register("verifyAlpha233Release") { || manifests.sanctuary.custom?.sanctuary26?.network_protocol != 24 || manifests.redstoner.custom?.sanctuary26?.data_version != 5 || manifests.redstoner.custom?.sanctuary26?.network_protocol != 9 - || release.pack_version != "26.2.0-alpha.239" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" - || prism.versionId != "26.2.0-alpha.239" - || !packwiz.contains('version = "26.2.0-alpha.239"') + || release.pack_version != "26.2.0-alpha.240" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" + || prism.versionId != "26.2.0-alpha.240" + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwiz.contains("hash = \"${indexHash}\"") || requiredJars.any { !packwizIndex.contains(it) } || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.58.jar"\nhash = "8936b0a5bf3f122afc752cba5e8d96ac92cfb1458785c3fac13d25f51cb4814c"') @@ -8692,17 +8692,17 @@ tasks.register("verifyAlpha233Release") { || packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.138.jar"') || packwizIndex.contains('file = "mods/redstoner-0.0.0-alpha.19.jar"') || !changelog.contains("## `26.2.0-alpha.233`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**") + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**") || !readme.contains("véritable panneau Vanilla en chêne pâle")) { throw new GradleException("The alpha.233 vanilla trophy-sign release is incomplete") } } } -tasks.register("verifyAlpha239Release") { +tasks.register("verifyAlpha240Release") { group = "verification" - description = "Checks the Sanctuary 26.2.0-alpha.239 MyDisplay and WaterMedia release." - inputs.file(file("pack/migrations/26.2.0-alpha.238-dreamdisplays-to-mydisplay-alpha.239.json")) + description = "Checks the Sanctuary 26.2.0-alpha.240 MyDisplay build 2 release." + inputs.file(file("pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json")) inputs.file(file("pack/release.json")) inputs.file(file("pack/prism/modrinth.index.json")) inputs.file(file("pack/packwiz/pack.toml")) @@ -8710,11 +8710,12 @@ tasks.register("verifyAlpha239Release") { inputs.file(file("pack/packwiz/mods/mydisplay.pw.toml")) inputs.file(file("pack/packwiz/mods/watermedia.pw.toml")) inputs.file(file("pack/packwiz/mods/watermedia-binaries.pw.toml")) + inputs.file(file("pack/update_packwiz_dependencies.py")) inputs.file(file("CHANGELOG.md")) inputs.file(file("README.md")) doLast { def migration = new JsonSlurper().parse(file( - "pack/migrations/26.2.0-alpha.238-dreamdisplays-to-mydisplay-alpha.239.json")) + "pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json")) def release = new JsonSlurper().parse(file("pack/release.json")) def prism = new JsonSlurper().parse(file("pack/prism/modrinth.index.json")) def packwiz = file("pack/packwiz/pack.toml").text @@ -8723,6 +8724,7 @@ tasks.register("verifyAlpha239Release") { def myDisplayMetafile = file("pack/packwiz/mods/mydisplay.pw.toml").text def waterMediaMetafile = file("pack/packwiz/mods/watermedia.pw.toml").text def waterMediaBinariesMetafile = file("pack/packwiz/mods/watermedia-binaries.pw.toml").text + def dependencyUpdater = file("pack/update_packwiz_dependencies.py").text def changelog = file("CHANGELOG.md").text def readme = file("README.md").text def requiredJars = distributedModuleIds.collect { id -> @@ -8730,10 +8732,9 @@ tasks.register("verifyAlpha239Release") { } def indexHash = MessageDigest.getInstance("SHA-256") .digest(packwizIndexFile.bytes).encodeHex().toString() - def myDisplayFiles = prism.files.findAll { it.path == "mods/mydisplay-1.0.0-sanctuary.jar" } + def myDisplayFiles = prism.files.findAll { it.path == "mods/mydisplay-1.0.0-sanctuary-2.jar" } def waterMediaFiles = prism.files.findAll { it.path == "mods/watermedia-3.0.0.23.jar" } def waterMediaBinariesFiles = prism.files.findAll { it.path == "mods/watermedia-binaries-3.0.0.6.jar" } - def addedDependencies = migration.added_dependencies.collectEntries { [(it.id): it] } def metafileIsPinned = { text, filename, side, url, sha256 -> text.contains("filename = \"${filename}\"") && text.contains("side = \"${side}\"") @@ -8743,57 +8744,51 @@ tasks.register("verifyAlpha239Release") { && text.contains("hash = \"${sha256}\"") && !text.contains('[update.modrinth]') } - if (rootProject.pack_version != "26.2.0-alpha.239" + if (rootProject.pack_version != "26.2.0-alpha.240" || rootProject.findProperty("zevent_version") != null || rootProject.findProperty("zevent_lifecycle") != null || file("zevent/build.gradle").exists() || file("settings.gradle").text.contains('"zevent"') || migration.schema_version != 1 || migration.status != "released" - || migration.released_in != "26.2.0-alpha.239" - || migration.pack?.source_version != "26.2.0-alpha.238" - || migration.pack?.target_version != "26.2.0-alpha.239" - || migration.removed_dependencies?.size() != 1 - || migration.removed_dependencies[0]?.id != "dreamdisplays" - || migration.removed_dependencies[0]?.version != "1.10.0-dev" - || migration.removed_dependencies[0]?.filename != "dreamdisplays-fabric-26.2-audio-buffer-test-2.jar" - || addedDependencies.keySet() != (["mydisplay", "watermedia", "watermedia_binaries"] as Set) - || addedDependencies.mydisplay?.version != "1.0.0" - || addedDependencies.mydisplay?.filename != "mydisplay-1.0.0-sanctuary.jar" - || addedDependencies.mydisplay?.sha256 != "22cd63386bc7ba6961f586949f65b4a2a6cb335d75aa155bcdf0a633f1f9d907" - || addedDependencies.mydisplay?.side != "both" - || addedDependencies.mydisplay?.manifest_client_dependencies_optional != true - || addedDependencies.mydisplay?.languages != ["en_us", "fr_fr", "ru_ru"] - || addedDependencies.watermedia?.version != "3.0.0.23" - || addedDependencies.watermedia?.sha256 != "c3baefc8fbb005e349b3424f7df8f9d89b18524d5f7a358c6df73ca5e1d98b38" - || addedDependencies.watermedia?.side != "client" - || addedDependencies.watermedia_binaries?.version != "3.0.0.6" - || addedDependencies.watermedia_binaries?.sha256 != "2d9333061c3d2330033fe68837a31f546dbf58984455b0cfec0deeff6b1f121e" - || addedDependencies.watermedia_binaries?.side != "client" + || migration.released_in != "26.2.0-alpha.240" + || migration.pack?.source_version != "26.2.0-alpha.239" + || migration.pack?.target_version != "26.2.0-alpha.240" + || migration.dependency?.id != "mydisplay" + || migration.dependency?.version != "1.0.0" + || migration.dependency?.source_filename != "mydisplay-1.0.0-sanctuary.jar" + || migration.dependency?.target_filename != "mydisplay-1.0.0-sanctuary-2.jar" + || migration.dependency?.source_sha256 != "22cd63386bc7ba6961f586949f65b4a2a6cb335d75aa155bcdf0a633f1f9d907" + || migration.dependency?.target_sha256 != "9ff1645731dc2dfdc248e3c07ac923aba9dfe001a1580a981767f948d4f7427f" + || migration.dependency?.side != "both" + || migration.dependency?.manifest_client_dependencies_optional != true + || migration.dependency?.languages != ["en_us", "fr_fr", "ru_ru"] + || migration.dependency?.screen_picker_added != true || migration.compatibility?.world_reset_required != false || migration.compatibility?.save_migration_required != false || migration.compatibility?.sanctuary_module_versions_changed != false || migration.compatibility?.network_protocols_changed != false || migration.compatibility?.client_and_server_must_update != true - || migration.compatibility?.existing_dreamdisplays_blocks_converted != false + || migration.compatibility?.existing_mydisplay_blocks_compatible != true || migration.distribution?.packwiz_index_refreshed != true || migration.distribution?.prism_modrinth_index_updated != true - || migration.distribution?.old_dreamdisplays_jar_removed != true + || migration.distribution?.old_mydisplay_jar_removed != true + || migration.distribution?.direct_download_dependencies_skipped_by_modrinth_updater != true || migration.distribution?.watermedia_client_only != true || migration.distribution?.zevent_jar_absent != true || migration.distribution?.distributed_module_count != 10 || distributedModuleIds.size() != 10 || release.pack_version != rootProject.pack_version - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.239.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.240.mrpack" || prism.versionId != rootProject.pack_version || prism.files?.size() != 8 || prism.files.any { it.path.contains("dreamdisplays") || it.path.contains("zevent") } || myDisplayFiles.size() != 1 - || myDisplayFiles[0].hashes?.sha1 != "68479e5daf79a04207d82bccabb03625a1ae53cf" - || myDisplayFiles[0].hashes?.sha512 != "b3b5616a29d106fd2375b7ec10774cb146d23c18f7e0c59b72826d3798b387b0ea48d3798729b700bffd8e0c6ce4a95b51553f5aef0a9d32b3b0c5cd006e69a4" + || myDisplayFiles[0].hashes?.sha1 != "6d39e5965229b4312eeea28d3ec12fe111a8200f" + || myDisplayFiles[0].hashes?.sha512 != "da91c8784e2e48b060b71f6d340ae7e6a5dc741318d279db44753e8a1de7d96abd66c17e45d559bc33444e6350a65e61b4d1ea1eb737403bc7197bf34cc3b06d" || myDisplayFiles[0].env != [client: "required", server: "required"] - || myDisplayFiles[0].downloads != ["https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary.jar"] - || myDisplayFiles[0].fileSize != 103_141 + || myDisplayFiles[0].downloads != ["https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary-2.jar"] + || myDisplayFiles[0].fileSize != 106_377 || waterMediaFiles.size() != 1 || waterMediaFiles[0].hashes?.sha1 != "a644ab079cc9ed19a62b181e0252be5a9a422166" || waterMediaFiles[0].hashes?.sha512 != "b2f9c31828285bf7cb039b91e8756b35c2a9e425d614d9c767bdcd752475a7abf4f025d6f6005d74f5c610c298fdadf01e53b29124d1d9fd03554fff71b1993b" @@ -8806,10 +8801,10 @@ tasks.register("verifyAlpha239Release") { || waterMediaBinariesFiles[0].env != [client: "required", server: "unsupported"] || waterMediaBinariesFiles[0].downloads != ["https://download.botsu.cloud/sanctuary/artifacts/watermedia-binaries-3.0.0.6.jar"] || waterMediaBinariesFiles[0].fileSize != 143_725_808 - || !metafileIsPinned(myDisplayMetafile, "mydisplay-1.0.0-sanctuary.jar", "both", "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary.jar", "22cd63386bc7ba6961f586949f65b4a2a6cb335d75aa155bcdf0a633f1f9d907") + || !metafileIsPinned(myDisplayMetafile, "mydisplay-1.0.0-sanctuary-2.jar", "both", "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary-2.jar", "9ff1645731dc2dfdc248e3c07ac923aba9dfe001a1580a981767f948d4f7427f") || !metafileIsPinned(waterMediaMetafile, "watermedia-3.0.0.23.jar", "client", "https://download.botsu.cloud/sanctuary/artifacts/watermedia-3.0.0.23.jar", "c3baefc8fbb005e349b3424f7df8f9d89b18524d5f7a358c6df73ca5e1d98b38") || !metafileIsPinned(waterMediaBinariesMetafile, "watermedia-binaries-3.0.0.6.jar", "client", "https://download.botsu.cloud/sanctuary/artifacts/watermedia-binaries-3.0.0.6.jar", "2d9333061c3d2330033fe68837a31f546dbf58984455b0cfec0deeff6b1f121e") - || !packwiz.contains('version = "26.2.0-alpha.239"') + || !packwiz.contains('version = "26.2.0-alpha.240"') || !packwiz.contains("hash = \"${indexHash}\"") || requiredJars.any { !packwizIndex.contains(it) } || packwizIndex.contains('file = "mods/mcef-modern.pw.toml"') @@ -8818,11 +8813,13 @@ tasks.register("verifyAlpha239Release") { || !packwizIndex.contains('file = "mods/watermedia.pw.toml"') || !packwizIndex.contains('file = "mods/watermedia-binaries.pw.toml"') || packwizIndex.contains("zevent-") - || !changelog.contains("## `26.2.0-alpha.239`") - || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.239`**") - || !readme.contains("remplace Dream Displays par MyDisplay **`1.0.0`**, WaterMedia **`3.0.0.23`**") + || !dependencyUpdater.contains('if "[update.modrinth]" not in text:') + || !dependencyUpdater.contains('pinned direct download, skipped') + || !changelog.contains("## `26.2.0-alpha.240`") + || !readme.contains("Version courante du pack distribué : **`26.2.0-alpha.240`**") + || !readme.contains("met à jour MyDisplay **`1.0.0`** vers le second build fourni") || !readme.contains("garde ZEVENT entièrement retiré")) { - throw new GradleException("The alpha.239 MyDisplay and WaterMedia release is incomplete") + throw new GradleException("The alpha.240 MyDisplay build 2 release is incomplete") } } } @@ -8851,7 +8848,7 @@ tasks.named("verifyWorkspace") { dependsOn tasks.named("verifyAlpha231Release") dependsOn tasks.named("verifyAlpha232Release") dependsOn tasks.named("verifyAlpha233Release") - dependsOn tasks.named("verifyAlpha239Release") + dependsOn tasks.named("verifyAlpha240Release") } tasks.named("check") { @@ -9097,8 +9094,8 @@ tasks.register("verifyPackwizRelease") { throw new GradleException("Packwiz is missing custom modules: ${missingJars*.name}") } def metafiles = fileTree("pack/packwiz/mods") { include "*.pw.toml" }.files - if (metafiles.size() != 6) { - throw new GradleException("Expected six Packwiz Modrinth metafiles, found ${metafiles.size()}") + if (metafiles.size() != 8) { + throw new GradleException("Expected eight pinned Packwiz dependency metafiles, found ${metafiles.size()}") } def unpinned = metafiles.findAll { !it.getText("UTF-8").contains("pin = true") } if (!unpinned.isEmpty()) { diff --git a/gradle.properties b/gradle.properties index f21a5c9..18309a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,5 +30,5 @@ onlyfun_version=0.0.0-alpha.27 onlyfun_lifecycle=active sanctuary_version=0.0.0-alpha.139 sanctuary_lifecycle=active -pack_version=26.2.0-alpha.239 +pack_version=26.2.0-alpha.240 maven_group=fr.koka99cab.sanctuary26 diff --git a/pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json b/pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json new file mode 100644 index 0000000..c6b9aa5 --- /dev/null +++ b/pack/migrations/26.2.0-alpha.239-mydisplay-build-2-to-alpha.240.json @@ -0,0 +1,38 @@ +{ + "schema_version": 1, + "status": "released", + "released_in": "26.2.0-alpha.240", + "pack": { + "source_version": "26.2.0-alpha.239", + "target_version": "26.2.0-alpha.240" + }, + "dependency": { + "id": "mydisplay", + "version": "1.0.0", + "source_filename": "mydisplay-1.0.0-sanctuary.jar", + "target_filename": "mydisplay-1.0.0-sanctuary-2.jar", + "source_sha256": "22cd63386bc7ba6961f586949f65b4a2a6cb335d75aa155bcdf0a633f1f9d907", + "target_sha256": "9ff1645731dc2dfdc248e3c07ac923aba9dfe001a1580a981767f948d4f7427f", + "side": "both", + "manifest_client_dependencies_optional": true, + "languages": ["en_us", "fr_fr", "ru_ru"], + "screen_picker_added": true + }, + "compatibility": { + "world_reset_required": false, + "save_migration_required": false, + "sanctuary_module_versions_changed": false, + "network_protocols_changed": false, + "client_and_server_must_update": true, + "existing_mydisplay_blocks_compatible": true + }, + "distribution": { + "packwiz_index_refreshed": true, + "prism_modrinth_index_updated": true, + "old_mydisplay_jar_removed": true, + "direct_download_dependencies_skipped_by_modrinth_updater": true, + "watermedia_client_only": true, + "zevent_jar_absent": true, + "distributed_module_count": 10 + } +} diff --git a/pack/packwiz/README.md b/pack/packwiz/README.md index 13c183d..5cbb6df 100644 --- a/pack/packwiz/README.md +++ b/pack/packwiz/README.md @@ -10,7 +10,7 @@ Cette commande : 1. reconstruit les dix modules Sanctuary ; 2. remplace leurs anciens JAR dans ce pack ; -3. sélectionne la dernière version Modrinth marquée `release` de Fabric API, Simple Voice Chat, Sodium et Iris, ou `beta` pour JEI qui ne publie pas de release 26.2 ; aucune alpha n'est acceptée ; +3. sélectionne la dernière version Modrinth marquée `release` de Fabric API, Simple Voice Chat, Sodium et Iris, ou `beta` pour JEI qui ne publie pas de release 26.2 ; aucune alpha n'est acceptée et les dépendances privées en téléchargement direct restent épinglées sans interrogation Modrinth ; 4. rafraîchit `index.toml` ; 5. exporte `build/distributions/sanctuary--packwiz.mrpack` ; 6. produit `build/distributions/sanctuary--packwiz-site.zip`, à extraire sur un hébergement HTTPS statique. diff --git a/pack/packwiz/index.toml b/pack/packwiz/index.toml index b14fc5f..0a9be5c 100644 --- a/pack/packwiz/index.toml +++ b/pack/packwiz/index.toml @@ -53,7 +53,7 @@ hash = "95265c4aa4ebb89d5e89e3245917f47a4044db192f88995cfee2bdf63f348b79" [[files]] file = "mods/mydisplay.pw.toml" -hash = "cb52c60ff64f4d2b17217f87ebfef956ae5663252da808451d6b7f68e35fccca" +hash = "f789edabe714484b1034982ba937f3a01b9799938a352988a4006b88c96f631c" metafile = true [[files]] diff --git a/pack/packwiz/mods/mydisplay.pw.toml b/pack/packwiz/mods/mydisplay.pw.toml index af33ed8..57ffe56 100644 --- a/pack/packwiz/mods/mydisplay.pw.toml +++ b/pack/packwiz/mods/mydisplay.pw.toml @@ -1,9 +1,9 @@ name = "MyDisplay" -filename = "mydisplay-1.0.0-sanctuary.jar" +filename = "mydisplay-1.0.0-sanctuary-2.jar" side = "both" pin = true [download] -url = "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary.jar" +url = "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary-2.jar" hash-format = "sha256" -hash = "22cd63386bc7ba6961f586949f65b4a2a6cb335d75aa155bcdf0a633f1f9d907" +hash = "9ff1645731dc2dfdc248e3c07ac923aba9dfe001a1580a981767f948d4f7427f" diff --git a/pack/packwiz/pack.toml b/pack/packwiz/pack.toml index 6e50045..fe91157 100644 --- a/pack/packwiz/pack.toml +++ b/pack/packwiz/pack.toml @@ -1,12 +1,12 @@ name = "Sanctuary 26.2" author = "KOKA99CAB" -version = "26.2.0-alpha.239" +version = "26.2.0-alpha.240" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "0d69bf1d5aa9a87c76236f50d15b5a9fdcf1d1b8874dfe1ae9f3aa664717c2c4" +hash = "517502f8a1948cc965d145fbfd20bc9be876ec13f51cb3f46d84eca74031f5cd" [versions] fabric = "0.19.3" diff --git a/pack/prism/modrinth.index.json b/pack/prism/modrinth.index.json index a155206..0898bf5 100644 --- a/pack/prism/modrinth.index.json +++ b/pack/prism/modrinth.index.json @@ -3,7 +3,7 @@ "game": "minecraft", "name": "Sanctuary 26.2", "summary": "Sanctuary 26.2 — progression, exploration, worldgen and multiplayer systems by KOKA99CAB.", - "versionId": "26.2.0-alpha.239", + "versionId": "26.2.0-alpha.240", "files": [ { "path": "mods/fabric-api-0.159.0+26.2.jar", @@ -81,19 +81,19 @@ "fileSize": 2820763 }, { - "path": "mods/mydisplay-1.0.0-sanctuary.jar", + "path": "mods/mydisplay-1.0.0-sanctuary-2.jar", "hashes": { - "sha1": "68479e5daf79a04207d82bccabb03625a1ae53cf", - "sha512": "b3b5616a29d106fd2375b7ec10774cb146d23c18f7e0c59b72826d3798b387b0ea48d3798729b700bffd8e0c6ce4a95b51553f5aef0a9d32b3b0c5cd006e69a4" + "sha1": "6d39e5965229b4312eeea28d3ec12fe111a8200f", + "sha512": "da91c8784e2e48b060b71f6d340ae7e6a5dc741318d279db44753e8a1de7d96abd66c17e45d559bc33444e6350a65e61b4d1ea1eb737403bc7197bf34cc3b06d" }, "env": { "client": "required", "server": "required" }, "downloads": [ - "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary.jar" + "https://download.botsu.cloud/sanctuary/artifacts/mydisplay-1.0.0-sanctuary-2.jar" ], - "fileSize": 103141 + "fileSize": 106377 }, { "path": "mods/watermedia-3.0.0.23.jar", diff --git a/pack/release.json b/pack/release.json index bd1cdec..137e576 100644 --- a/pack/release.json +++ b/pack/release.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "pack_version": "26.2.0-alpha.239", + "pack_version": "26.2.0-alpha.240", "release_channel": "alpha", "minecraft_version": "26.2", "fabric_loader_version": "0.19.3", @@ -9,7 +9,7 @@ "project_id": "FgOqyAXd", "project_slug": "sanctuary-koka99", "project_url": "https://modrinth.com/modpack/sanctuary-koka99", - "primary_file": "sanctuary-26.2.0-alpha.239.mrpack", + "primary_file": "sanctuary-26.2.0-alpha.240.mrpack", "shared_client_server_pack": true, "update_owner": "packwiz-installer", "check_on_launch": true, diff --git a/pack/update_packwiz_dependencies.py b/pack/update_packwiz_dependencies.py index b1cbafd..f5a68b0 100755 --- a/pack/update_packwiz_dependencies.py +++ b/pack/update_packwiz_dependencies.py @@ -58,6 +58,12 @@ def main() -> int: for metafile in metafiles: text = metafile.read_text(encoding="utf-8") + if "[update.modrinth]" not in text: + label = field(text, "name") + if not re.search(r"^\s*pin\s*=\s*true\s*$", text, re.MULTILINE): + raise RuntimeError(f"Direct-download dependency {label!r} must stay pinned") + print(f"{label}: pinned direct download, skipped", flush=True) + continue project_id = field(text, "mod-id") current_version = field(text, "version") release, channel = latest_supported(project_id) -- 2.54.0