release: integrate merged PRs in alpha.243

CHANGELOG.md

@@ -8,12 +8,19 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve
 
 ## Non publié
 
-Issue [#169](https://git.botsu.net/koka/sanctuary/issues/169) — catalogue du Shop.
+Aucun changement non publié.
+
+## `26.2.0-alpha.243`
+
+Pull requests intégrées : [#172](https://git.botsu.net/koka/sanctuary/pulls/172), [#173](https://git.botsu.net/koka/sanctuary/pulls/173) et [#174](https://git.botsu.net/koka/sanctuary/pulls/174).
 
 - ajoute une barre de recherche dans l’onglet catalogue, avec repli des accents et filtrage local ;
 - permet de choisir la grille du catalogue : **3×3**, **4×4** ou **5×5** maximum, mémorisée entre les sessions ;
 - affiche le numéro de page du catalogue (`2/5`) à côté de la navigation ;
-- conserve la grille 3×3 et les neuf emplacements des ventes flash.
+- conserve la grille 3×3 et les neuf emplacements des ventes flash ;
+- resynchronise le texte des panneaux de quêtes après une rotation survenue hors chunk et garantit qu’un rafraîchissement opérateur génère un nouveau contrat ;
+- ajoute le feu d’artifice Nourra, dont l’explosion dessine le visage et la capuche du skin en particules, en taille normale ou agrandie ;
+- conserve les sauvegardes et les protocoles réseau existants ; Sanctuary passe à `0.0.0-alpha.140` et OnlyFun à `0.0.0-alpha.28`.
 
 ## `26.2.0-alpha.242`
 

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.242`**. 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 quatrième build fourni, avec WaterMedia **`3.0.0.23`** et WaterMedia Binaries **`3.0.0.6`**.
+Version courante du pack distribué : **`26.2.0-alpha.243`**. Cette release conserve les dix modules Sanctuary, notamment Another World **`0.0.0-alpha.58`**, Sanctuary **`0.0.0-alpha.140`**, OnlyFun **`0.0.0-alpha.28`** et Red-Stoner **`0.0.0-alpha.20`**, garde ZEVENT entièrement retiré et met à jour MyDisplay **`1.0.0`** vers le quatrième build fourni, avec WaterMedia **`3.0.0.23`** et WaterMedia Binaries **`3.0.0.6`**.
+
+L’alpha.243 intègre les PR #172, #173 et #174. Le catalogue du Shop gagne une recherche tolérante aux accents, des grilles 3×3, 4×4 et 5×5 mémorisées ainsi qu’un compteur de pages, sans modifier les ventes flash. Les panneaux de quêtes resynchronisent leur texte après une rotation hors chunk et les rafraîchissements opérateur produisent bien un nouveau contrat. OnlyFun ajoute enfin le feu d’artifice Nourra, dont l’explosion dessine le visage et la capuche du skin en particules. Les sauvegardes et protocoles restent compatibles.
 
 L’alpha.242 remplace le troisième JAR MyDisplay par `mydisplay-1.0.0-sanctuary-4.jar`. Cette révision actualise exclusivement le pipeline client de performance, de session et de lecture WaterMedia, sans changer les blocs, les données ni le protocole réseau. Le manifeste reste compatible avec le serveur dédié, les traductions EN/FR/RU sont alignées, les écrans déjà placés restent compatibles et le nom distinct force Packwiz à retirer le build précédent.
 

gradle.properties

@@ -26,9 +26,9 @@ masterkey_version=0.0.0-alpha.9
 masterkey_lifecycle=active
 iliketomoveit_version=0.0.0-alpha.18
 iliketomoveit_lifecycle=active
-onlyfun_version=0.0.0-alpha.27
+onlyfun_version=0.0.0-alpha.28
 onlyfun_lifecycle=active
-sanctuary_version=0.0.0-alpha.139
+sanctuary_version=0.0.0-alpha.140
 sanctuary_lifecycle=active
-pack_version=26.2.0-alpha.242
+pack_version=26.2.0-alpha.243
 maven_group=fr.koka99cab.sanctuary26

pack/migrations/26.2.0-alpha.242-merged-prs-to-alpha.243.json

@@ -0,0 +1,58 @@
+{
+  "schema_version": 1,
+  "status": "released",
+  "source": {
+    "pack_version": "26.2.0-alpha.242",
+    "modules": {
+      "sanctuary": "0.0.0-alpha.139",
+      "onlyfun": "0.0.0-alpha.27"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.243",
+    "modules": {
+      "sanctuary": "0.0.0-alpha.140",
+      "onlyfun": "0.0.0-alpha.28"
+    }
+  },
+  "integrated_pull_requests": [172, 173, 174],
+  "shop_catalog": {
+    "local_search": true,
+    "accent_folding": true,
+    "grid_sizes": [3, 4, 5],
+    "grid_preference_persisted": true,
+    "page_counter": true,
+    "flash_sales_unchanged": true
+  },
+  "quest_board": {
+    "stale_sign_resynchronized_after_unloaded_rotation": true,
+    "operator_refresh_rerolls_contract": true,
+    "displayed_contract_matches_claimed_contract": true
+  },
+  "nourra_firework": {
+    "registry_id": "onlyfun:nourra_firework",
+    "skin_face_and_hood_particles": true,
+    "normal_and_large_bursts": true,
+    "vanilla_colored_burst_suppressed": true,
+    "languages": ["en_us", "fr_fr", "ru_ru"]
+  },
+  "compatibility": {
+    "existing_saves_supported": true,
+    "world_reset_required": false,
+    "save_migration_required": false,
+    "persistent_data_formats_changed": false,
+    "network_protocols_changed": false,
+    "sanctuary_data_version": 15,
+    "sanctuary_network_protocol": 24,
+    "onlyfun_data_version": 2,
+    "onlyfun_network_protocol": 3,
+    "client_server_update_required": true
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true,
+    "distributed_module_count": 10
+  }
+}

pack/packwiz/index.toml

@@ -57,8 +57,8 @@ hash = "a5538de6d9c38cf37ff0882451fd025c8a24c7cb250482baa4ca5918d1129b06"
 metafile = true
 
 [[files]]
-file = "mods/onlyfun-0.0.0-alpha.27.jar"
-hash = "dcd5003390c132f3421c12550f851846548b4d1cc541d3ada0deb35c65bb3f54"
+file = "mods/onlyfun-0.0.0-alpha.28.jar"
+hash = "1f6816b78e735c0ccbe8ee518407c5dd8c1b39fedb8b74fe275869c4926699eb"
 
 [[files]]
 file = "mods/ouch-0.0.0-alpha.11.jar"
@@ -69,8 +69,8 @@ file = "mods/redstoner-0.0.0-alpha.20.jar"
 hash = "39f0cba6213e4efcd40b8b72cf7812b56315e1d637803a87a2672b00bc4ee4a0"
 
 [[files]]
-file = "mods/sanctuary-0.0.0-alpha.139.jar"
-hash = "22a37980bd7b121cbfe65e853a6c6a9f8549bbf4af9b4fdd5f22dbd04df273b0"
+file = "mods/sanctuary-0.0.0-alpha.140.jar"
+hash = "f13f793dea9300543280eb761862c45e9ad86a299c4d1efa11eb7af83d2b7891"
 
 [[files]]
 file = "mods/simple-voice-chat.pw.toml"

pack/packwiz/pack.toml

@@ -1,12 +1,12 @@
 name = "Sanctuary 26.2"
 author = "KOKA99CAB"
-version = "26.2.0-alpha.242"
+version = "26.2.0-alpha.243"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "0a55cea4e39c4df93a2d52133295afdf55798e23516f1209cab56d50e5339051"
+hash = "41ec6d85ef927e5f5a85084237cd4a16f8c746b72f21e44fde383d93f65957d3"
 
 [versions]
 fabric = "0.19.3"

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.242",
+	"versionId": "26.2.0-alpha.243",
 	"files": [
 		{
       "path": "mods/fabric-api-0.159.0+26.2.jar",

pack/release.json

@@ -1,6 +1,6 @@
 {
 	"schema_version": 1,
-	"pack_version": "26.2.0-alpha.242",
+	"pack_version": "26.2.0-alpha.243",
 	"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.242.mrpack",
+		"primary_file": "sanctuary-26.2.0-alpha.243.mrpack",
 		"shared_client_server_pack": true,
 		"update_owner": "packwiz-installer",
 		"check_on_launch": true,

sanctuary/build.gradle

@@ -223,7 +223,7 @@ tasks.register("verifyBlackMarket") {
 		def questData = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardData.java").text
 		def quests = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardService.java").text
 		def inventoryView = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/inventory/SanctuaryPlayerInventoryView.java").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| !data.contains('SAVE_KEY = "black_market"') || !data.contains("DATA_VERSION = 2")
 			|| !data.contains("ItemStack.CODEC.fieldOf(\"item\")") || !data.contains("replaceListing")
 			|| !service.contains("LISTING_FEE_RUBIES = 1") || !service.contains("COMMISSION_PERCENT = 5")
@@ -2942,7 +2942,7 @@ tasks.register("verifyShopCurrencyRowsRelease") {
 			"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketService.java").text
 		def shop = file(
 			"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopService.java").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.117"
 			|| migration.shop_currency_inventory?.all_unlocked_rows_counted != true
 			|| migration.shop_currency_inventory?.overflow_rows_counted != true
@@ -3108,7 +3108,7 @@ tasks.register("verifyProgressivePauseMenu") {
 			"pack/migrations/26.2.0-alpha.190-progressive-pause-menu-to-alpha.191.json"))
 		def pauseMenu = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/PauseScreenMixin.java").text
 		def costs = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/progression/SanctuaryProgressionCosts.java").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.pack_version != "26.2.0-alpha.191"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.109"
 			|| migration.pause_menu?.progression_full_width != true
@@ -3146,7 +3146,7 @@ tasks.register("verifyShopPricingLayout") {
 			"pack/migrations/26.2.0-alpha.192-shop-pricing-layout-to-alpha.193.json"))
 		def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryShopScreen.java").text
 		def progression = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopProgression.java").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.110"
 			|| migration.shop_layout?.locked_offer_buttons != 6
 			|| migration.shop_layout?.button_slots != [4, 5, 6, 7, 8, 9]
@@ -3177,7 +3177,7 @@ tasks.register("verifyShopCsvBossGates") {
 			"pack/migrations/26.2.0-alpha.194-shop-csv-boss-gates-to-alpha.195.json"))
 		def provider = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopCatalogProvider.java").text
 		def catalog = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopOfferCatalog.java").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.pack_version != "26.2.0-alpha.195"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
 			|| migration.compatibility?.sanctuary_data_version != 11
@@ -3208,7 +3208,7 @@ tasks.register("verifyDeliveryBoxOrientation") {
 		def blockstate = new JsonSlurper().parse(
 			file("src/main/resources/assets/sanctuary/blockstates/delivery_box.json"))
 		def expectedVariants = ["facing=north", "facing=east", "facing=south", "facing=west"].toSet()
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
 			|| migration.mailbox?.id != "sanctuary:delivery_box"
 			|| migration.mailbox?.horizontal_facing != true
@@ -3236,7 +3236,7 @@ tasks.register("verifyInventoryShiftClick") {
 		def mixin = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/AbstractContainerMenuMixin.java").text
 		def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/AbstractContainerScreenMixin.java").text
 		def gui = file("INVENTORY_GUI.md").text
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| !transfer.contains("shouldAppendOverflow")
 			|| !transfer.contains("isVanillaStorageRange")
 			|| !transfer.contains("hotbarStart")
@@ -3282,7 +3282,7 @@ tasks.register("verifyQuestRequests") {
 			new JsonSlurper().parse(file("src/main/resources/data/sanctuary/loot_table/blocks/${path}.json"))
 				.pools[0].entries[0].name
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
 			|| migration.quest_requests?.save_key != "quest_requests"
 			|| migration.quest_requests?.data_version != 1
@@ -3344,7 +3344,7 @@ tasks.register("verifyQuestRequestContracts") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
 			[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.source?.pack_version != "26.2.0-alpha.198"
 			|| migration.source?.modules?.sanctuary != "0.0.0-alpha.114"
 			|| migration.target?.pack_version != "26.2.0-alpha.199"
@@ -3413,7 +3413,7 @@ tasks.register("verifyQuestRequestEscrow") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
 			[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.source?.pack_version != "26.2.0-alpha.200"
 			|| migration.source?.modules?.sanctuary != "0.0.0-alpha.115"
 			|| migration.target?.pack_version != "26.2.0-alpha.201"
@@ -3492,7 +3492,7 @@ tasks.register("verifyCraftableBannerCape") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collect {
 			new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.130"
 			|| migration.white_cape?.crafting_material_count != 6
 			|| migration.white_cape?.maximum_pattern_layers != 6
@@ -3544,7 +3544,7 @@ tasks.register("verifyFinalSanctuaryTickets") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collect {
 			new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| !capeRenderer.contains("SHIELD_FACE_WIDTH = 12.0F")
 			|| !capeRenderer.contains("SHIELD_FACE_HEIGHT = 22.0F")
 			|| !capeRenderer.contains("CAPE_WIDTH / SHIELD_FACE_WIDTH")
@@ -3598,7 +3598,7 @@ tasks.register("verifyAlphaIndev") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collect {
 			new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.122"
 			|| migration.alpha_world?.dimension != "sanctuary:alpha"
 			|| migration.alpha_world?.legacy_dimension != "portals:alpha"
@@ -3658,7 +3658,7 @@ tasks.register("verifyBackroom") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collect {
 			new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
 		}
-		if (project.version.toString() != "0.0.0-alpha.139"
+		if (project.version.toString() != "0.0.0-alpha.140"
 			|| migration.source_data_version != 13 || migration.target_data_version != 14
 			|| migration.integration_modules?.anotherworld?.source != "0.0.0-alpha.56"
 			|| migration.integration_modules?.anotherworld?.target != "0.0.0-alpha.57"