diff --git a/CHANGELOG.md b/CHANGELOG.md index 371903a..cc658ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,13 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve - Depuis `26.2.0-alpha.6`, le pack et les modules ont des versions indépendantes. I Like To Move It et Only Fun deviennent les cinquième et sixième modules actifs dans l'alpha 46. - Les versions ci-dessous ont été reconstituées à partir des JAR archivés, des packs locaux et du code source actuel. Les dates n'étant pas enregistrées de manière fiable, elles ne sont pas inventées. -## En développement — orientation CTM du Safe Block +## `26.2.0-alpha.206` -Module modifié : **Another World `0.0.0-alpha.54`**. Le pack distribué reste en **`26.2.0-alpha.205`**. +Module modifié : **Another World `0.0.0-alpha.54`**. Les neuf autres modules conservent leur version issue de l’alpha.205. - remet les colonnes A et C dans le bon ordre sur la façade et le dos du coffre-fort 3 × 3 × 3 ; - conserve la colonne B, les côtés, le dessus, le dessous et les quatre orientations du coffre-fort ; +- régénère Packwiz avec le JAR Another World `0.0.0-alpha.54` et synchronise les métadonnées Prism/Modrinth sur l’alpha.206 ; - ne modifie ni les blockstates formés, ni les données v4, ni `safe_vaults` v3, ni le protocole 1. ## `26.2.0-alpha.205` diff --git a/README.md b/README.md index 65e038d..95ba7d3 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ 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.205`**. Dans le workspace, la correction des colonnes CTM du Safe Block porte Another World en développement à **`0.0.0-alpha.54`** sans produire une nouvelle version du pack. +Version courante du pack distribué : **`26.2.0-alpha.206`**. Cette release distribue Another World **`0.0.0-alpha.54`** avec les colonnes A et C corrigées sur la façade et le dos du coffre-fort. -L’alpha.205 exige une coque creuse de **3 × 3 × 3**, soit 26 Safe Blocks appartenant au même joueur, et actualise JEI en **`30.27.0.189`**. Le centre est libre et peut contenir un bloc caché. Les quatre images 48×48 se répartissent sur les faces extérieures du cube : façade, dessus, dessous et côtés/arrière. Un ancien mur 3 × 3 ne s’active plus et doit être démonté puis reconstruit ; les comptes et soldes existants restent conservés. +L’alpha.206 exige une coque creuse de **3 × 3 × 3**, soit 26 Safe Blocks appartenant au même joueur, et conserve JEI en **`30.27.0.189`**. Le centre est libre et peut contenir un bloc caché. Les quatre images 48×48 se répartissent sur les faces extérieures du cube : façade, dessus, dessous et côtés/arrière. Les colonnes extrêmes de la façade et du dos sont désormais orientées correctement. Un ancien mur 3 × 3 ne s’active plus et doit être démonté puis reconstruit ; les comptes et soldes existants restent conservés. L’alpha.204 finalise le Safe Block vertical et actualise JEI en **`30.27.0.188`** : sa texture individuelle 16×16 est chargée avant formation, les structures incomplètes 3 × 1 sont refusées et le CTM 48×48 exige les neuf blocs. L’interface monétaire affiche désormais correctement l’émeraude et place l’inventaire étendu sous les trois lignes de monnaie. diff --git a/build.gradle b/build.gradle index 91beed4..3392c98 100644 --- a/build.gradle +++ b/build.gradle @@ -3427,7 +3427,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.sanctuary_version != "0.0.0-alpha.117" || rootProject.onlyfun_version != "0.0.0-alpha.19" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -3477,7 +3477,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || rootProject.redstoner_version != "0.0.0-alpha.10" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4123,7 +4123,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.onlyfun_version != "0.0.0-alpha.19" || rootProject.sanctuary_version != "0.0.0-alpha.117" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4168,7 +4168,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.itsalive_version != "0.0.0-alpha.31" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version || migration.source?.pack_version != "26.2.0-alpha.193" @@ -4217,7 +4217,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.onlyfun_version != "0.0.0-alpha.19" || rootProject.sanctuary_version != "0.0.0-alpha.117" || release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version @@ -4263,7 +4263,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || migration.source?.pack_version != "26.2.0-alpha.195" || migration.target?.pack_version != "26.2.0-alpha.196" || migration.target?.modules != [ @@ -4281,10 +4281,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.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"')) { + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"')) { throw new GradleException("The alpha.196 culinary, mailbox and grapple release contract is incomplete") } } @@ -4309,7 +4309,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.itsalive_version != "0.0.0-alpha.31" || rootProject.sanctuary_version != "0.0.0-alpha.117" || migration.source?.pack_version != "26.2.0-alpha.196" @@ -4329,10 +4329,10 @@ tasks.register("verifyQuestRequestsCauldronBatchesRelease") { || migration.distribution?.jei?.target != "30.26.0.186" || migration.compatibility?.sanctuary_target_network_protocol != 19 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21 - || release.pack_version != "26.2.0-alpha.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"')) { + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"')) { throw new GradleException("The alpha.197 quest-request and cauldron-batch release contract is incomplete") } } @@ -4359,7 +4359,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.itsalive_version != "0.0.0-alpha.31" || migration.source?.pack_version != "26.2.0-alpha.197" || migration.target?.pack_version != "26.2.0-alpha.198" @@ -4378,10 +4378,10 @@ tasks.register("verifyFermentationBarrelAutomationRelease") { || migration.distribution?.packwiz_index_refreshed != true || itsAliveManifest.custom?.sanctuary26?.data_version != 1 || itsAliveManifest.custom?.sanctuary26?.network_protocol != 3 - || release.pack_version != "26.2.0-alpha.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"') + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.31.jar"')) { throw new GradleException("The alpha.198 fermentation barrel release contract is incomplete") } @@ -4409,7 +4409,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.itsalive_version != "0.0.0-alpha.31" || rootProject.sanctuary_version != "0.0.0-alpha.117" || migration.source?.pack_version != "26.2.0-alpha.198" @@ -4423,10 +4423,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 != 21 - || release.pack_version != "26.2.0-alpha.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"') + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.31.jar"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.117.jar"')) { throw new GradleException("The alpha.199 quest-request contract release is incomplete") @@ -4464,7 +4464,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.ambiance_version != "0.0.0-alpha.12" || rootProject.ouch_version != "0.0.0-alpha.9" || migration.source?.pack_version != "26.2.0-alpha.199" @@ -4498,10 +4498,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.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"') + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"') || !packwizIndex.contains('file = "mods/ambiance-0.0.0-alpha.12.jar"') || !packwizIndex.contains('file = "mods/ouch-0.0.0-alpha.9.jar"')) { throw new GradleException("The alpha.200 Weather TNT and Ambiance release is incomplete") @@ -4530,7 +4530,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.sanctuary_version != "0.0.0-alpha.117" || migration.source?.pack_version != "26.2.0-alpha.200" || migration.source?.modules?.sanctuary != "0.0.0-alpha.115" @@ -4545,10 +4545,10 @@ tasks.register("verifyQuestRequestEscrowRelease") { || migration.compatibility?.sanctuary_target_network_protocol != 21 || sanctuaryManifest.custom?.sanctuary26?.data_version != 11 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21 - || release.pack_version != "26.2.0-alpha.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"') + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.117.jar"')) { throw new GradleException("The alpha.201 quest-request escrow release is incomplete") } @@ -4584,7 +4584,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || rootProject.itsalive_version != "0.0.0-alpha.31" || rootProject.iliketomoveit_version != "0.0.0-alpha.14" @@ -4624,11 +4624,11 @@ tasks.register("verifyWaystoneShopCulinaryAlpha202Release") { || moveItManifest.custom?.sanctuary26?.network_protocol != 5 || sanctuaryManifest.custom?.sanctuary26?.data_version != 11 || sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21 - || release.pack_version != "26.2.0-alpha.205" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.205.mrpack" - || prism.versionId != "26.2.0-alpha.205" - || !packwiz.contains('version = "26.2.0-alpha.205"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') + || release.pack_version != "26.2.0-alpha.206" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" + || prism.versionId != "26.2.0-alpha.206" + || !packwiz.contains('version = "26.2.0-alpha.206"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') || !packwizIndex.contains('file = "mods/itsalive-0.0.0-alpha.31.jar"') || !packwizIndex.contains('file = "mods/iliketomoveit-0.0.0-alpha.14.jar"') || !packwizIndex.contains('file = "mods/sanctuary-0.0.0-alpha.117.jar"')) { @@ -4740,7 +4740,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.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || rootProject.sanctuary_version != "0.0.0-alpha.117" || migration.schema_version != 1 @@ -4817,7 +4817,7 @@ tasks.register("verifySafeVaultFeature") { || cubeMigration.compatibility?.pack_release_updated != true || ctmMigration.source?.pack_version != "26.2.0-alpha.205" || ctmMigration.source?.modules != [anotherworld: "0.0.0-alpha.53"] - || ctmMigration.target?.pack_version != "26.2.0-alpha.205" + || ctmMigration.target?.pack_version != "26.2.0-alpha.206" || ctmMigration.target?.modules != [anotherworld: "0.0.0-alpha.54"] || ctmMigration.safe_vault_texture_fix?.front_column_mapping != "2-column" || ctmMigration.safe_vault_texture_fix?.back_column_mapping != "column" @@ -4833,7 +4833,8 @@ tasks.register("verifySafeVaultFeature") { || ctmMigration.compatibility?.save_migration_required != false || ctmMigration.compatibility?.registry_ids_changed != false || ctmMigration.compatibility?.saved_currency_balances_preserved != true - || ctmMigration.compatibility?.pack_release_updated != false + || ctmMigration.compatibility?.pack_release_updated != true + || ctmMigration.distribution?.packwiz_index_refreshed != true || manifest.depends?.sanctuary != ">=0.0.0-alpha.117" || manifest.custom?.sanctuary26?.data_version != 4 || !file("build.gradle").text.contains('implementation project(":sanctuary")') @@ -4890,7 +4891,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.27.0.189.jar" } - if (rootProject.pack_version != "26.2.0-alpha.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || migration.source?.pack_version != "26.2.0-alpha.202" || migration.source?.modules != [anotherworld: "0.0.0-alpha.50"] @@ -4908,10 +4909,10 @@ 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.205.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.205"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') + || !packwiz.contains('version = "26.2.0-alpha.206"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.50.jar"') || jeiFiles.size() != 1 || jeiFiles[0].hashes?.sha1 != "821b8b69e67226539328de77e4445d0dec791231" @@ -4936,7 +4937,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.27.0.189.jar" } - if (rootProject.pack_version != "26.2.0-alpha.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || migration.source?.pack_version != "26.2.0-alpha.203" || migration.source?.modules != [anotherworld: "0.0.0-alpha.51"] @@ -4962,10 +4963,10 @@ 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.205.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.205"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') + || !packwiz.contains('version = "26.2.0-alpha.206"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.51.jar"') || jeiFiles.size() != 1 || jeiFiles[0].hashes?.sha1 != "821b8b69e67226539328de77e4445d0dec791231" @@ -4990,7 +4991,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.27.0.189.jar" } - if (rootProject.pack_version != "26.2.0-alpha.205" + if (rootProject.pack_version != "26.2.0-alpha.206" || rootProject.anotherworld_version != "0.0.0-alpha.54" || migration.source?.pack_version != "26.2.0-alpha.204" || migration.source?.modules != [anotherworld: "0.0.0-alpha.52"] @@ -5019,10 +5020,10 @@ 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.205.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.206.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.205"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') + || !packwiz.contains('version = "26.2.0-alpha.206"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.52.jar"') || jeiFiles.size() != 1 || jeiFiles[0].hashes?.sha1 != "821b8b69e67226539328de77e4445d0dec791231" @@ -5032,12 +5033,65 @@ tasks.register("verifySafeVaultCubeAlpha205Release") { } } +tasks.register("verifySafeVaultCtmAlpha206Release") { + group = "verification" + description = "Checks the complete Sanctuary 26.2.0-alpha.206 Safe Block CTM column release." + inputs.file(file("pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.json")) + inputs.file(file("pack/release.json")) + inputs.file(file("pack/prism/modrinth.index.json")) + inputs.file(file("pack/packwiz/pack.toml")) + inputs.file(file("pack/packwiz/index.toml")) + doLast { + def migration = new JsonSlurper().parse(file( + "pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.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 + def packwizIndex = file("pack/packwiz/index.toml").text + def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.27.0.189.jar" } + if (rootProject.pack_version != "26.2.0-alpha.206" + || rootProject.anotherworld_version != "0.0.0-alpha.54" + || migration.source?.pack_version != "26.2.0-alpha.205" + || migration.source?.modules != [anotherworld: "0.0.0-alpha.53"] + || migration.target?.pack_version != "26.2.0-alpha.206" + || migration.target?.modules != [anotherworld: "0.0.0-alpha.54"] + || migration.safe_vault_texture_fix?.front_column_mapping != "2-column" + || migration.safe_vault_texture_fix?.back_column_mapping != "column" + || migration.safe_vault_texture_fix?.corrected_columns != ["A", "C"] + || migration.safe_vault_texture_fix?.corrected_rows != [1, 2, 3] + || migration.safe_vault_texture_fix?.middle_column_unchanged != true + || migration.safe_vault_texture_fix?.side_top_bottom_unchanged != true + || migration.safe_vault_texture_fix?.horizontal_facings_preserved != ["north", "east", "south", "west"] + || migration.compatibility?.anotherworld_data_version != 4 + || migration.compatibility?.vault_data_version != 3 + || migration.compatibility?.anotherworld_network_protocol != 1 + || migration.compatibility?.formed_blockstates_preserved != true + || migration.compatibility?.save_migration_required != false + || migration.compatibility?.registry_ids_changed != false + || migration.compatibility?.saved_currency_balances_preserved != true + || 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.206.mrpack" + || prism.versionId != rootProject.pack_version + || !packwiz.contains('version = "26.2.0-alpha.206"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.54.jar"') + || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.53.jar"') + || jeiFiles.size() != 1 + || jeiFiles[0].hashes?.sha1 != "821b8b69e67226539328de77e4445d0dec791231" + || jeiFiles[0].hashes?.sha512 != "1227f2b24e0f8745140b35b34de0ade146babe3b85ea57c49b08b05d2ef6a1ee5f9358f5795505904ddbbd1e359bc478e0c67b2115ce697996b95f9516f9ebbb") { + throw new GradleException("The alpha.206 Safe Block CTM column release is incomplete") + } + } +} + tasks.named("verifyWorkspace") { dependsOn tasks.named("verifyWaystoneShopCulinaryAlpha202Release") dependsOn tasks.named("verifySafeVaultFeature") dependsOn tasks.named("verifySafeVaultInterfaceAlpha203Release") dependsOn tasks.named("verifySafeVaultFixAlpha204Release") dependsOn tasks.named("verifySafeVaultCubeAlpha205Release") + dependsOn tasks.named("verifySafeVaultCtmAlpha206Release") } tasks.named("check") { diff --git a/gradle.properties b/gradle.properties index 740bd14..c9ac966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,5 +30,5 @@ onlyfun_version=0.0.0-alpha.19 onlyfun_lifecycle=active sanctuary_version=0.0.0-alpha.117 sanctuary_lifecycle=active -pack_version=26.2.0-alpha.205 +pack_version=26.2.0-alpha.206 maven_group=fr.koka99cab.sanctuary26 diff --git a/pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.json b/pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.json index 8d38e62..f115dfc 100644 --- a/pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.json +++ b/pack/migrations/anotherworld-safe-vault-ctm-columns-alpha54.json @@ -7,7 +7,7 @@ } }, "target": { - "pack_version": "26.2.0-alpha.205", + "pack_version": "26.2.0-alpha.206", "modules": { "anotherworld": "0.0.0-alpha.54" } @@ -29,6 +29,9 @@ "save_migration_required": false, "registry_ids_changed": false, "saved_currency_balances_preserved": true, - "pack_release_updated": false + "pack_release_updated": true + }, + "distribution": { + "packwiz_index_refreshed": true } } diff --git a/pack/packwiz/index.toml b/pack/packwiz/index.toml index 9ff8653..9572c46 100644 --- a/pack/packwiz/index.toml +++ b/pack/packwiz/index.toml @@ -14,15 +14,15 @@ hash = "41f4f4c88c71d0a23446d5014f7407d55ad477441847099cad24492b032335a0" [[files]] file = "mods/ambiance-0.0.0-alpha.12.jar" -hash = "704d286b70b21b342e7b7e9813495f9f6943b2d58dee917f9c1c60554af0ea17" +hash = "84002beec8c3d60401919fbef933a0de6e57daafcbedfa6c9b21ca0db8ae2759" [[files]] -file = "mods/anotherworld-0.0.0-alpha.53.jar" -hash = "96388bfbda7d22477691cc2c78bd37b12156523571e490b7dc9bd3610c44b653" +file = "mods/anotherworld-0.0.0-alpha.54.jar" +hash = "5447d75f9627832e3ef7bdcca6b2d113623b864af6e2b222866facfee2727e8b" [[files]] file = "mods/events-0.0.0-alpha.0.jar" -hash = "ecbb243945c1c5f9a358b1dd2d79cef5b2b8edfb8a7a487aab55c54e77ba6de3" +hash = "e3bb33d5d0bfe93480d54a4a6ceedc03f2aefd884bd23d21942908c95bd9a89e" [[files]] file = "mods/fabric-api.pw.toml" @@ -31,7 +31,7 @@ metafile = true [[files]] file = "mods/iliketomoveit-0.0.0-alpha.14.jar" -hash = "51ea797a63decd3c25595af7894f9eaace0bf4450f8ab91c6ba8b208fa1c6b73" +hash = "20cdbf5171c27556f15ef18f2ec91bdd177182dae8e74daea3d2968996856bfa" [[files]] file = "mods/iris.pw.toml" @@ -40,7 +40,7 @@ metafile = true [[files]] file = "mods/itsalive-0.0.0-alpha.31.jar" -hash = "d5490086a8da27ba628c556b39276e2d1a7c1e578331499fbe165966e58fe53d" +hash = "7ebdd4e30740f202f527da557d3b9b074cb5a7503111a13aabdee42acf34f1ca" [[files]] file = "mods/jei.pw.toml" @@ -49,23 +49,23 @@ metafile = true [[files]] file = "mods/masterkey-0.0.0-alpha.8.jar" -hash = "966c1c77307e3109d2b9e0bc08affd36e88604d8644a164785d503c8c5698ce3" +hash = "9e3f8bece89fdd790f02605df1d4babc31210292d8eb2497a27af563fe58ec7c" [[files]] file = "mods/onlyfun-0.0.0-alpha.19.jar" -hash = "6045603415fe1e13a8b09afc8926e793473fcbb399b37394129573656ced44fe" +hash = "61e930adde348d6acfa429f5143f22f8cc55cac372dc450b2eceebaaae2720ba" [[files]] file = "mods/ouch-0.0.0-alpha.9.jar" -hash = "34693682c3a30974c169db0fc851ee8dac5af51eb7741fadade16b053d85b0a5" +hash = "f23ba8cb013de30294bda6666f5852a37ecf8c4f1827f5c0e00e12c6d6f7a581" [[files]] file = "mods/redstoner-0.0.0-alpha.10.jar" -hash = "6c9256d065108744891be4518d6e087244ccc126f925bf7e75c7ef7369bcdb51" +hash = "4c6007d6f0f9b0466d04f3f79787eb746add9488ace5c654a635788593cff8e9" [[files]] file = "mods/sanctuary-0.0.0-alpha.117.jar" -hash = "50a531daaa683034ecca2e6d6ef4970283242a32aab910aba067e7c602e4e4de" +hash = "1f35bd6e77b7afc38293ee7db20523bb573f1122ff555be5bb852524628e30e9" [[files]] file = "mods/simple-voice-chat.pw.toml" diff --git a/pack/packwiz/pack.toml b/pack/packwiz/pack.toml index 1cb22ae..3d65f9e 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.205" +version = "26.2.0-alpha.206" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "fc8480fbc884514c45360660eda46d32b4f963af4e839ec7861b35c187415daa" +hash = "19d9f5bf2eb9ea4de6bc32a99899bd53738a81c46c916858a82ac72146094268" [versions] fabric = "0.19.3" diff --git a/pack/prism/modrinth.index.json b/pack/prism/modrinth.index.json index 33f9f78..f24bd0f 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.205", + "versionId": "26.2.0-alpha.206", "files": [ { "path": "mods/fabric-api-0.158.0+26.2.jar", diff --git a/pack/release.json b/pack/release.json index e630e3b..1f2faea 100644 --- a/pack/release.json +++ b/pack/release.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "pack_version": "26.2.0-alpha.205", + "pack_version": "26.2.0-alpha.206", "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.205.mrpack", + "primary_file": "sanctuary-26.2.0-alpha.206.mrpack", "shared_client_server_pack": true, "update_owner": "packwiz-installer", "check_on_launch": true,