diff --git a/CHANGELOG.md b/CHANGELOG.md index 1549ced..2385df5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,14 @@ 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 — correction finale du Safe Block +## `26.2.0-alpha.204` -Module modifié : **Another World `0.0.0-alpha.52`**. Le pack distribué reste en **`26.2.0-alpha.203`**. +Module modifié : **Another World `0.0.0-alpha.52`**. Les neuf autres modules conservent leur version issue de l’alpha.203. - charge la texture 16×16 du Safe Block depuis l’atlas de blocs afin de supprimer la texture manquante avant formation ; - refuse explicitement les lignes horizontales ou verticales de 3 × 1 et n’active le CTM 48×48 qu’après validation des neuf blocs du mur 3 × 3 ; - décale le panneau d’inventaire étendu sous les trois lignes monétaires afin de rendre l’émeraude visible et laisse Sanctuary afficher un seul libellé d’inventaire ; +- actualise JEI de `30.27.0.187` à `30.27.0.188` dans Packwiz et le manifeste Prism/Modrinth ; - conserve les données v3, le protocole 1, les IDs et les soldes existants sans migration de sauvegarde. ## `26.2.0-alpha.203` diff --git a/README.md b/README.md index 743d0e1..ad10f48 100644 --- a/README.md +++ b/README.md @@ -22,7 +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.203`**. Dans le workspace, le correctif du Safe Block porte Another World en développement à **`0.0.0-alpha.52`** sans produire une nouvelle version du pack. +Version courante du pack distribué : **`26.2.0-alpha.204`**. Another World passe en **`0.0.0-alpha.52`** ; les neuf autres modules conservent leur version de l’alpha.203. + +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. L’alpha.203 porte Another World en **`0.0.0-alpha.51`** et JEI en **`30.27.0.187`**. Le Safe Block forme désormais un mur vertical exact de 3 × 3 : ses blocs restent des cubes individuels avant validation, puis les neuf segments composent les textures connectées 48×48. Son interface affiche trois soldes centrés — rubis, saphirs et émeraudes — avec les transferts serveur `− ×64`, `− ×1`, `+ ×1` et `+ ×64`. diff --git a/build.gradle b/build.gradle index ba34546..8da50ed 100644 --- a/build.gradle +++ b/build.gradle @@ -329,7 +329,7 @@ tasks.register("verifyWorkspace") { } def progressionJeiMigration = new JsonSlurper().parse(file( "pack/migrations/26.2.0-alpha.87-progression-jei-audio-to-alpha.88.json")) - def jeiFiles = prismIndex.files.findAll { it.path == "mods/jei-26.2-fabric-30.27.0.187.jar" } + def jeiFiles = prismIndex.files.findAll { it.path == "mods/jei-26.2-fabric-30.27.0.188.jar" } if (progressionJeiMigration.source?.pack_version != "26.2.0-alpha.87" || progressionJeiMigration.target?.pack_version != "26.2.0-alpha.88" || progressionJeiMigration.target?.modules?.sanctuary != "0.0.0-alpha.38" @@ -344,8 +344,8 @@ tasks.register("verifyWorkspace") { || progressionJeiMigration.compatibility?.network_protocol != 10 || progressionJeiMigration.compatibility?.network_protocol_changed != true || jeiFiles.size() != 1 - || jeiFiles[0].hashes?.sha1 != "cbd62af1f8e568cbe29c7892ae1b2917c0784a44" - || jeiFiles[0].hashes?.sha512 != "f8bf88c089c7fe3d56031d7629170ba01eb1d0c5cc4d33f2fd0ac9413369cdef84a0fde999528621426d3dca878c9cfaf7a790622e2cd1d54802e1086fb073f0" + || jeiFiles[0].hashes?.sha1 != "addab1f50da54ac55592c75022938522332f92e0" + || jeiFiles[0].hashes?.sha512 != "2d87e91f59fc617efaa27ab91145cabc371471ab1a709cd934186240c711f999dbce54cc8af1fcd6259a412f24191d3f6939fa43536911063468efd2952c558b" || jeiFiles[0].env?.client != "required" || jeiFiles[0].env?.server != "required") { throw new GradleException("The alpha.88 progression, JEI and Minecrafter audio contract is incomplete") } @@ -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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || rootProject.anotherworld_version != "0.0.0-alpha.52" || 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"')) { + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"')) { 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"')) { + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"')) { 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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"') + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"') || !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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"') + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"') || !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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"') + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"') || !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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"') + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"') || !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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || rootProject.anotherworld_version != "0.0.0-alpha.52" || 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.203" - || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.203.mrpack" - || prism.versionId != "26.2.0-alpha.203" - || !packwiz.contains('version = "26.2.0-alpha.203"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.51.jar"') + || release.pack_version != "26.2.0-alpha.204" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" + || prism.versionId != "26.2.0-alpha.204" + || !packwiz.contains('version = "26.2.0-alpha.204"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.52.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"')) { @@ -4681,7 +4681,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.203" + if (rootProject.pack_version != "26.2.0-alpha.204" || rootProject.anotherworld_version != "0.0.0-alpha.52" || rootProject.sanctuary_version != "0.0.0-alpha.117" || migration.schema_version != 1 @@ -4717,7 +4717,7 @@ tasks.register("verifySafeVaultFeature") { || interfaceMigration.compatibility?.pack_release_updated != true || fixMigration.source?.pack_version != "26.2.0-alpha.203" || fixMigration.source?.modules != [anotherworld: "0.0.0-alpha.51"] - || fixMigration.target?.pack_version != "26.2.0-alpha.203" + || fixMigration.target?.pack_version != "26.2.0-alpha.204" || fixMigration.target?.modules != [anotherworld: "0.0.0-alpha.52"] || fixMigration.safe_vault_structure_fix?.unformed_block_texture != "anotherworld:block/safe_block" || fixMigration.safe_vault_structure_fix?.horizontal_3x1_rejected != true @@ -4734,7 +4734,7 @@ tasks.register("verifySafeVaultFeature") { || fixMigration.compatibility?.save_migration_required != false || fixMigration.compatibility?.registry_ids_changed != false || fixMigration.compatibility?.saved_currency_balances_preserved != true - || fixMigration.compatibility?.pack_release_updated != false + || fixMigration.compatibility?.pack_release_updated != true || manifest.depends?.sanctuary != ">=0.0.0-alpha.117" || manifest.custom?.sanctuary26?.data_version != 3 || !file("build.gradle").text.contains('implementation project(":sanctuary")') @@ -4778,8 +4778,8 @@ tasks.register("verifySafeVaultInterfaceAlpha203Release") { 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.187.jar" } - if (rootProject.pack_version != "26.2.0-alpha.203" + def jeiFiles = prism.files.findAll { it.path == "mods/jei-26.2-fabric-30.27.0.188.jar" } + if (rootProject.pack_version != "26.2.0-alpha.204" || rootProject.anotherworld_version != "0.0.0-alpha.52" || migration.source?.pack_version != "26.2.0-alpha.202" || migration.source?.modules != [anotherworld: "0.0.0-alpha.50"] @@ -4797,23 +4797,78 @@ 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.203.mrpack" + || release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.204.mrpack" || prism.versionId != rootProject.pack_version - || !packwiz.contains('version = "26.2.0-alpha.203"') - || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.51.jar"') + || !packwiz.contains('version = "26.2.0-alpha.204"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.52.jar"') || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.50.jar"') || jeiFiles.size() != 1 - || jeiFiles[0].hashes?.sha1 != "cbd62af1f8e568cbe29c7892ae1b2917c0784a44" - || jeiFiles[0].hashes?.sha512 != "f8bf88c089c7fe3d56031d7629170ba01eb1d0c5cc4d33f2fd0ac9413369cdef84a0fde999528621426d3dca878c9cfaf7a790622e2cd1d54802e1086fb073f0") { + || jeiFiles[0].hashes?.sha1 != "addab1f50da54ac55592c75022938522332f92e0" + || jeiFiles[0].hashes?.sha512 != "2d87e91f59fc617efaa27ab91145cabc371471ab1a709cd934186240c711f999dbce54cc8af1fcd6259a412f24191d3f6939fa43536911063468efd2952c558b") { throw new GradleException("The alpha.203 upright safe-vault interface release is incomplete") } } } +tasks.register("verifySafeVaultFixAlpha204Release") { + group = "verification" + description = "Checks the complete Sanctuary 26.2.0-alpha.204 Safe Block finalization release." + inputs.file(file("pack/migrations/anotherworld-safe-vault-fix-alpha52.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-fix-alpha52.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.188.jar" } + if (rootProject.pack_version != "26.2.0-alpha.204" + || rootProject.anotherworld_version != "0.0.0-alpha.52" + || migration.source?.pack_version != "26.2.0-alpha.203" + || migration.source?.modules != [anotherworld: "0.0.0-alpha.51"] + || migration.target?.pack_version != "26.2.0-alpha.204" + || migration.target?.modules != [anotherworld: "0.0.0-alpha.52"] + || migration.safe_vault_structure_fix?.unformed_block_texture != "anotherworld:block/safe_block" + || migration.safe_vault_structure_fix?.horizontal_3x1_rejected != true + || migration.safe_vault_structure_fix?.vertical_3x1_rejected != true + || migration.safe_vault_structure_fix?.complete_3x3_mask_required != true + || migration.safe_vault_interface_fix?.emerald_row_visible != true + || migration.safe_vault_interface_fix?.extended_inventory_starts_below_currency_controls != true + || migration.safe_vault_interface_fix?.native_inventory_label_suppressed != true + || migration.compatibility?.anotherworld_data_version != 3 + || migration.compatibility?.vault_data_version != 2 + || migration.compatibility?.anotherworld_network_protocol != 1 + || 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 + || migration.distribution?.jei?.source != "30.27.0.187" + || migration.distribution?.jei?.target != "30.27.0.188" + || 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.204.mrpack" + || prism.versionId != rootProject.pack_version + || !packwiz.contains('version = "26.2.0-alpha.204"') + || !packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.52.jar"') + || packwizIndex.contains('file = "mods/anotherworld-0.0.0-alpha.51.jar"') + || jeiFiles.size() != 1 + || jeiFiles[0].hashes?.sha1 != "addab1f50da54ac55592c75022938522332f92e0" + || jeiFiles[0].hashes?.sha512 != "2d87e91f59fc617efaa27ab91145cabc371471ab1a709cd934186240c711f999dbce54cc8af1fcd6259a412f24191d3f6939fa43536911063468efd2952c558b") { + throw new GradleException("The alpha.204 Safe Block finalization release is incomplete") + } + } +} + tasks.named("verifyWorkspace") { dependsOn tasks.named("verifyWaystoneShopCulinaryAlpha202Release") dependsOn tasks.named("verifySafeVaultFeature") dependsOn tasks.named("verifySafeVaultInterfaceAlpha203Release") + dependsOn tasks.named("verifySafeVaultFixAlpha204Release") } tasks.named("check") { diff --git a/gradle.properties b/gradle.properties index 402d4cb..73795ab 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.203 +pack_version=26.2.0-alpha.204 maven_group=fr.koka99cab.sanctuary26 diff --git a/pack/migrations/anotherworld-safe-vault-fix-alpha52.json b/pack/migrations/anotherworld-safe-vault-fix-alpha52.json index 8f27174..881953b 100644 --- a/pack/migrations/anotherworld-safe-vault-fix-alpha52.json +++ b/pack/migrations/anotherworld-safe-vault-fix-alpha52.json @@ -7,7 +7,7 @@ } }, "target": { - "pack_version": "26.2.0-alpha.203", + "pack_version": "26.2.0-alpha.204", "modules": { "anotherworld": "0.0.0-alpha.52" } @@ -25,6 +25,15 @@ "extended_inventory_starts_below_currency_controls": true, "native_inventory_label_suppressed": true }, + "distribution": { + "packwiz_index_refreshed": true, + "jei": { + "source": "30.27.0.187", + "target": "30.27.0.188", + "modrinth_version_id": "OcMayhUH", + "prism_manifest_updated": true + } + }, "compatibility": { "anotherworld_data_version": 3, "vault_data_version": 2, @@ -32,6 +41,6 @@ "save_migration_required": false, "registry_ids_changed": false, "saved_currency_balances_preserved": true, - "pack_release_updated": false + "pack_release_updated": true } } diff --git a/pack/packwiz/index.toml b/pack/packwiz/index.toml index 83111c3..52b30e1 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 = "40de39da187fa42f3b947f83872286ef6f049ff8bac0ac1a66d46d18ee14f911" +hash = "cac30d3110409be8075c52e858fe8482de224e2b4e0c45c868b4afc58b90b61a" [[files]] -file = "mods/anotherworld-0.0.0-alpha.51.jar" -hash = "caa4d8b29af65dd0a43e9aa2a7b897255ae10869595f1ca706f579b15d37c5a2" +file = "mods/anotherworld-0.0.0-alpha.52.jar" +hash = "97f76444ed283d32c582fa34430ab233ea4d76381cfd5a9be59481354171951a" [[files]] file = "mods/events-0.0.0-alpha.0.jar" -hash = "09047070e419df4bbd510c114e6c23c609757e03ef1142ba4d38f6b99ecb0a7c" +hash = "59b1c398f326dbfe5c845667c67f3b1a230b4d4a68957e00c4bd96fc2ed3b7c2" [[files]] file = "mods/fabric-api.pw.toml" @@ -31,7 +31,7 @@ metafile = true [[files]] file = "mods/iliketomoveit-0.0.0-alpha.14.jar" -hash = "e8027e82ebcb214c94e028d7c2780057d745dcb810ca785ee35601bbbc1c3ec0" +hash = "24690732a65890c88c74fbb35a612c8eb34338cac94b55fcab5ae28815b659f4" [[files]] file = "mods/iris.pw.toml" @@ -40,32 +40,32 @@ metafile = true [[files]] file = "mods/itsalive-0.0.0-alpha.31.jar" -hash = "04fcdc3312c0bd4e4271602c2e9eb8eb419de10c7b61b6ab47182033de736452" +hash = "5a9675f36a1bfa1c4412e36e1614001cd6be755717b1d8b26c6d53542aa9228d" [[files]] file = "mods/jei.pw.toml" -hash = "7196839cc369a00ea9cffd0a85594f8fd46c0978f4f2fc708e61368a8b451270" +hash = "fa2de0af1ce83d1663defb67c085c2dd1b1c2509bf72acdaa34340e2fbf08c34" metafile = true [[files]] file = "mods/masterkey-0.0.0-alpha.8.jar" -hash = "1a14be8288a9eb2b93922e84cf14d701fb86bd67d6227adb16a534961dae5f87" +hash = "88b83bad9dca3aa320d7236e6de2014f3f2d7ca36fc1688ea61c9e654503e3ca" [[files]] file = "mods/onlyfun-0.0.0-alpha.19.jar" -hash = "c5b8bf67efd0a001c142172110f307ec2a59ac3d7457ed8e4f53f8e683033c1d" +hash = "b0987cc5035fabbc6ca299bf84e3ac7dc46e719c072d019532d38a22f5130e66" [[files]] file = "mods/ouch-0.0.0-alpha.9.jar" -hash = "781f89dd44e3277dd8fd51e60ff2da9677a6376faeafd4000e1c07cf6f818759" +hash = "1e769db4c2b6f020450c236a5ab696db0f71af0985349f9e7edc549338686463" [[files]] file = "mods/redstoner-0.0.0-alpha.10.jar" -hash = "2d6ea237771f7a75a6d0184a68e910a7513159c0259e3c2b06f0a411a0979cbe" +hash = "070aaf26d216fdaef69a30476ed45cf8388b2181dd48c28273a75e833e810ea0" [[files]] file = "mods/sanctuary-0.0.0-alpha.117.jar" -hash = "10a7403a4b10ef049a7e557fd00eed56178f6d5383a2b7f28ff60b951eb4e053" +hash = "0e1bbbd62c3e36a0a40ce0791405d01cfc6c96f42938eadc149be802b152c776" [[files]] file = "mods/simple-voice-chat.pw.toml" diff --git a/pack/packwiz/mods/jei.pw.toml b/pack/packwiz/mods/jei.pw.toml index 3c971f5..07bc673 100644 --- a/pack/packwiz/mods/jei.pw.toml +++ b/pack/packwiz/mods/jei.pw.toml @@ -1,14 +1,14 @@ name = "Just Enough Items (JEI)" -filename = "jei-26.2-fabric-30.27.0.187.jar" +filename = "jei-26.2-fabric-30.27.0.188.jar" side = "both" pin = true [download] -url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/XXTFqqwG/jei-26.2-fabric-30.27.0.187.jar" +url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/OcMayhUH/jei-26.2-fabric-30.27.0.188.jar" hash-format = "sha512" -hash = "f8bf88c089c7fe3d56031d7629170ba01eb1d0c5cc4d33f2fd0ac9413369cdef84a0fde999528621426d3dca878c9cfaf7a790622e2cd1d54802e1086fb073f0" +hash = "2d87e91f59fc617efaa27ab91145cabc371471ab1a709cd934186240c711f999dbce54cc8af1fcd6259a412f24191d3f6939fa43536911063468efd2952c558b" [update] [update.modrinth] mod-id = "u6dRKJwZ" -version = "XXTFqqwG" +version = "OcMayhUH" diff --git a/pack/packwiz/pack.toml b/pack/packwiz/pack.toml index a3665e8..e7ca0a5 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.203" +version = "26.2.0-alpha.204" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "0cb034db4939949917ee7d06d1eb205268b1453c2fb78a3fe57d64d090b54a87" +hash = "3f65e7bb698b644815b0712ed249e55006a32b6b6b201e446fb1d6ac29eecc04" [versions] fabric = "0.19.3" diff --git a/pack/prism/modrinth.index.json b/pack/prism/modrinth.index.json index 91421ed..969dc24 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.203", + "versionId": "26.2.0-alpha.204", "files": [ { "path": "mods/fabric-api-0.158.0+26.2.jar", @@ -21,19 +21,19 @@ "fileSize": 2535765 }, { - "path": "mods/jei-26.2-fabric-30.27.0.187.jar", + "path": "mods/jei-26.2-fabric-30.27.0.188.jar", "hashes": { - "sha1": "cbd62af1f8e568cbe29c7892ae1b2917c0784a44", - "sha512": "f8bf88c089c7fe3d56031d7629170ba01eb1d0c5cc4d33f2fd0ac9413369cdef84a0fde999528621426d3dca878c9cfaf7a790622e2cd1d54802e1086fb073f0" + "sha1": "addab1f50da54ac55592c75022938522332f92e0", + "sha512": "2d87e91f59fc617efaa27ab91145cabc371471ab1a709cd934186240c711f999dbce54cc8af1fcd6259a412f24191d3f6939fa43536911063468efd2952c558b" }, "env": { "client": "required", "server": "required" }, "downloads": [ - "https://cdn.modrinth.com/data/u6dRKJwZ/versions/XXTFqqwG/jei-26.2-fabric-30.27.0.187.jar" + "https://cdn.modrinth.com/data/u6dRKJwZ/versions/OcMayhUH/jei-26.2-fabric-30.27.0.188.jar" ], - "fileSize": 1818136 + "fileSize": 1818142 }, { "path": "mods/voicechat-fabric-2.6.22+26.2.jar", diff --git a/pack/release.json b/pack/release.json index 0f75389..522d6d4 100644 --- a/pack/release.json +++ b/pack/release.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "pack_version": "26.2.0-alpha.203", + "pack_version": "26.2.0-alpha.204", "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.203.mrpack", + "primary_file": "sanctuary-26.2.0-alpha.204.mrpack", "shared_client_server_pack": true, "update_owner": "packwiz-installer", "check_on_launch": true,