release: prepare Sanctuary 26.2.0-alpha.225

CHANGELOG.md

@@ -6,6 +6,16 @@ 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.
 
+## `26.2.0-alpha.225`
+
+Modules modifiés : **Another World `0.0.0-alpha.56`**, **It's Alive `0.0.0-alpha.38`**, **I Like To Move It `0.0.0-alpha.18`**, **Only Fun `0.0.0-alpha.27`** et **Sanctuary `0.0.0-alpha.129`**. Les cinq autres modules conservent leur version issue de l'alpha.224.
+
+- exige que l’attaquant possède son propre coffre-fort actif avant de commencer un braquage, revalide cette condition pendant le forage et refuse défensivement tout transfert si le coffre disparaît entre-temps ;
+- empêche les familiers temporaires Sanctuary de produire du butin vanilla, de l’expérience ou une lootbox Only Fun, et les exclut des contrats de panneau comme des demandes communautaires ;
+- conserve la variante Canaplia des seize graines historiques pendant le placement, la croissance naturelle, la poudre d’os, la création de la partie haute, le rechargement et la récolte, ce qui réactive notamment l’hybridation Tendre + Olive vers Dorée ;
+- remplace la laine violette du Magic Carpet par la texture historique 16 × 16 du Totem de Notch, utilisée par l’objet canonique et son alias hérité sans modifier la plateforme 3 × 3 ;
+- conserve tous les IDs, sauvegardes et formats de données ; les protocoles réseau restent Another World 2, It's Alive 4, I Like To Move It 5, Only Fun 3 et Sanctuary 23, sans nouveau monde ni réinitialisation.
+
 ## `26.2.0-alpha.224`
 
 Modules modifiés : **It's Alive `0.0.0-alpha.37`**, **Ouch `0.0.0-alpha.11`**, **I Like To Move It `0.0.0-alpha.17`**, **Only Fun `0.0.0-alpha.26`**, **Sanctuary `0.0.0-alpha.128`** et **MasterKey `0.0.0-alpha.9`**.

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.224`**. Cette release distribue It's Alive **`0.0.0-alpha.37`**, Ouch **`0.0.0-alpha.11`**, I Like To Move It **`0.0.0-alpha.17`**, Only Fun **`0.0.0-alpha.26`**, Sanctuary **`0.0.0-alpha.128`** et MasterKey **`0.0.0-alpha.9`** ; les quatre autres modules conservent leur version issue de l'alpha.223.
+Version courante du pack distribué : **`26.2.0-alpha.225`**. Cette release distribue Another World **`0.0.0-alpha.56`**, It's Alive **`0.0.0-alpha.38`**, I Like To Move It **`0.0.0-alpha.18`**, Only Fun **`0.0.0-alpha.27`** et Sanctuary **`0.0.0-alpha.129`** ; les cinq autres modules conservent leur version issue de l'alpha.224.
+
+L’alpha.225 corrige quatre tickets : posséder un coffre-fort devient obligatoire pour en braquer un autre, les familiers temporaires ne donnent plus de butin, d’expérience, de lootbox ni de progression de quête, les seize variantes Canaplia survivent à tout leur cycle de culture, et le Magic Carpet retrouve la texture historique du Totem de Notch à la place de la laine violette. Les IDs, sauvegardes, formats de données et protocoles restent compatibles.
 
 La migration [CANA-01 à CANA-09](CANAPLIA.md) porte Canaplia vers Minecraft 26.2. It's Alive **`0.0.0-alpha.35`** enregistre les seize familles, les découvertes, hybridations, résines, effets serveur et le Livre interdit personnel, partageable temporairement sur un pupitre. Ambiance **`0.0.0-alpha.14`** compose les profils visuels bornés avec ses réglages d'accessibilité, et Only Fun **`0.0.0-alpha.21`** exclut explicitement Canaplia et les raccourcis de progression du Shop.
 

anotherworld/build.gradle

@@ -1647,6 +1647,7 @@ tasks.register("generateAnotherWorldResources") {
 				"message.anotherworld.safe_vault.empty_before_break": "Videz le coffre-fort et attendez la fin du forage avant de le démonter.",
 				"message.anotherworld.safe_vault.drill_own": "Vous ne pouvez pas forer votre propre coffre-fort.",
 				"message.anotherworld.safe_vault.inactive": "Ce coffre-fort n’est pas actif.",
+				"message.anotherworld.safe_vault.raid_requires_vault": "Vous devez posséder un coffre-fort actif avant d’en braquer un autre.",
 				"message.anotherworld.safe_vault.empty": "Ce coffre-fort est vide.",
 				"message.anotherworld.safe_vault.owner_offline": "Le propriétaire doit être connecté pour que le coffre-fort soit attaquable.",
 				"message.anotherworld.safe_vault.protected": "Ce coffre-fort reste protégé pendant environ %s minute(s).",
@@ -1671,6 +1672,7 @@ tasks.register("generateAnotherWorldResources") {
 				"message.anotherworld.safe_vault.empty_before_break": "Опустошите сейф и дождитесь окончания сверления перед разборкой.",
 				"message.anotherworld.safe_vault.drill_own": "Нельзя сверлить собственный сейф.",
 				"message.anotherworld.safe_vault.inactive": "Этот сейф не активен.",
+				"message.anotherworld.safe_vault.raid_requires_vault": "Для ограбления чужого сейфа нужен собственный активный сейф.",
 				"message.anotherworld.safe_vault.empty": "Этот сейф пуст.",
 				"message.anotherworld.safe_vault.owner_offline": "Владелец должен быть в сети, чтобы атаковать сейф.",
 				"message.anotherworld.safe_vault.protected": "Сейф защищён ещё примерно %s минут(ы).",
@@ -1695,6 +1697,7 @@ tasks.register("generateAnotherWorldResources") {
 				"message.anotherworld.safe_vault.empty_before_break": "Empty the safe and wait for drilling to end before dismantling it.",
 				"message.anotherworld.safe_vault.drill_own": "You cannot drill your own safe.",
 				"message.anotherworld.safe_vault.inactive": "This safe is not active.",
+				"message.anotherworld.safe_vault.raid_requires_vault": "You need an active safe of your own before raiding another one.",
 				"message.anotherworld.safe_vault.empty": "This safe is empty.",
 				"message.anotherworld.safe_vault.owner_offline": "The owner must be online before the safe can be raided.",
 				"message.anotherworld.safe_vault.protected": "This safe remains protected for about %s minute(s).",
@@ -1953,7 +1956,7 @@ tasks.register("verifyAnotherWorldCatalog") {
 			"src/main/resources/assets/redstoner/textures/item/weather_gauge.png",
 			"src/main/resources/data/redstoner/recipe/weather_gauge.json"
 		]
-		if (project.version.toString() != "0.0.0-alpha.55"
+		if (project.version.toString() != "0.0.0-alpha.56"
 			|| sulfurMigration.target?.modules?.anotherworld != "0.0.0-alpha.44"
 			|| sulfurMigration.sulfur_caves?.sanctuary?.dripstone_cell_period != 2
 			|| !javaText.contains('Identifier.parse("sanctuary:sulfur_caves")')
@@ -3270,7 +3273,7 @@ tasks.register("verifyClimateBiomeMixer") {
 			"pack/migrations/26.2.0-alpha.188-beta-climate-provinces-to-alpha.189.json"))
 		def mixer = file(
 			"src/main/java/fr/koka99cab/sanctuary26/anotherworld/mixin/MultiNoiseBiomeSourceParameterListPresetMixin.java").text
-		if (project.version.toString() != "0.0.0-alpha.55"
+		if (project.version.toString() != "0.0.0-alpha.56"
 			|| migration.source?.pack_version != "26.2.0-alpha.188"
 			|| migration.target?.pack_version != "26.2.0-alpha.189"
 			|| migration.target?.modules?.anotherworld != "0.0.0-alpha.48"

gradle.properties

@@ -16,19 +16,19 @@ ambiance_version=0.0.0-alpha.22
 ambiance_lifecycle=active
 redstoner_version=0.0.0-alpha.13
 redstoner_lifecycle=active
-anotherworld_version=0.0.0-alpha.55
+anotherworld_version=0.0.0-alpha.56
 anotherworld_lifecycle=active
-itsalive_version=0.0.0-alpha.37
+itsalive_version=0.0.0-alpha.38
 itsalive_lifecycle=active
 ouch_version=0.0.0-alpha.11
 ouch_lifecycle=active
 masterkey_version=0.0.0-alpha.9
 masterkey_lifecycle=active
-iliketomoveit_version=0.0.0-alpha.17
+iliketomoveit_version=0.0.0-alpha.18
 iliketomoveit_lifecycle=active
-onlyfun_version=0.0.0-alpha.26
+onlyfun_version=0.0.0-alpha.27
 onlyfun_lifecycle=active
-sanctuary_version=0.0.0-alpha.128
+sanctuary_version=0.0.0-alpha.129
 sanctuary_lifecycle=active
-pack_version=26.2.0-alpha.224
+pack_version=26.2.0-alpha.225
 maven_group=fr.koka99cab.sanctuary26

iliketomoveit/build.gradle

@@ -321,7 +321,7 @@ tasks.register("verifyPortals") {
 		}
 		def atlasCavernsMigration = new JsonSlurper().parse(rootProject.file(
 			"pack/migrations/26.2.0-alpha.149-atlas-caverns-to-alpha.150.json"))
-		if (project.version.toString() != "0.0.0-alpha.17"
+		if (project.version.toString() != "0.0.0-alpha.18"
 			|| atlasCavernsMigration.target?.pack_version != "26.2.0-alpha.150"
 			|| atlasCavernsMigration.target?.modules?.iliketomoveit != "0.0.0-alpha.9"
 			|| atlasCavernsMigration.portals?.active_routes != [
@@ -357,7 +357,7 @@ tasks.register("verifySilverAircraft") {
 		def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
 		def migration = new JsonSlurper().parse(rootProject.file(
 			"pack/migrations/26.2.0-alpha.184-silver-engineering-to-alpha.185.json"))
-		if (project.version.toString() != "0.0.0-alpha.17"
+		if (project.version.toString() != "0.0.0-alpha.18"
 			|| recipe.pattern != ["PGP", "GCG", "PBP"]
 			|| recipe.key != [B: "anotherworld:silver_block", C: "anotherworld:aircraft_cockpit",
 				G: "anotherworld:silver_gear", P: "anotherworld:silver_plate"]
@@ -386,7 +386,7 @@ tasks.register("verifyGrapplePrediction") {
 		def payload = file("src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/network/GrappleStatePayload.java").text
 		def controller = file("src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/grapple/GrappleController.java").text
 		def prediction = file("src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/client/grapple/ClientGrapplePrediction.java").text
-		if (project.version.toString() != "0.0.0-alpha.17"
+		if (project.version.toString() != "0.0.0-alpha.18"
 			|| migration.target?.modules?.iliketomoveit != "0.0.0-alpha.13"
 			|| migration.grappling?.owner_prediction_payload != "iliketomoveit:s2c/grapple_state"
 			|| migration.compatibility?.iliketomoveit_source_network_protocol != 4
@@ -418,7 +418,7 @@ tasks.register("verifyWaystoneDescendingRelease") {
 			"src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/waystone/WaystoneElevatorRules.java").text
 		def teleportation = file(
 			"src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/network/WaystoneTeleportation.java").text
-		if (project.version.toString() != "0.0.0-alpha.17"
+		if (project.version.toString() != "0.0.0-alpha.18"
 			|| migration.target?.modules?.iliketomoveit != "0.0.0-alpha.14"
 			|| migration.waystone_elevator?.undiscovered_downward_destination_allowed != true
 			|| migration.waystone_elevator?.destination_discovered_after_arrival != true
@@ -452,7 +452,7 @@ tasks.register("verifyAlphaPortal") {
 		def locales = ["fr_fr", "en_us", "ru_ru"].collect {
 			new JsonSlurper().parse(file("src/main/resources/assets/iliketomoveit/lang/${it}.json"))
 		}
-		if (project.version.toString() != "0.0.0-alpha.17"
+		if (project.version.toString() != "0.0.0-alpha.18"
 			|| route.schema_version != 2 || route.source_dimension != "minecraft:overworld"
 			|| route.destination_dimension != "sanctuary:alpha"
 			|| route.destination_resolver != "fixed"

itsalive/build.gradle

@@ -565,7 +565,7 @@ tasks.register("verifyItsAlive") {
 		def climateSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/ClimateCropForaging.java").text
 		def pineappleSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/PineappleItem.java").text
 		def worldgenSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/ItsAliveAgricultureWorldGeneration.java").text
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| climateMigration.target?.pack_version != "26.2.0-alpha.157"
 			|| climateMigration.target?.modules?.itsalive != "0.0.0-alpha.24"
 			|| !climateSource.contains("PlayerBlockBreakEvents.AFTER.register")
@@ -1322,7 +1322,7 @@ tasks.register("verifyCulinaryReliability") {
 				}
 			}
 		}
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| migration.target?.modules?.itsalive != "0.0.0-alpha.28"
 			|| migration.culinary_fixes?.food_press_contents_destroyed_on_break != true
 			|| migration.culinary_fixes?.comparator_contract?.blocks?.size() != 6
@@ -1360,7 +1360,7 @@ tasks.register("verifyCauldronBatching") {
 		def recipe = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/recipe/CulinaryProcessRecipe.java").text
 		def cauldron = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/block/entity/CookingCauldronBlockEntity.java").text
 		def timed = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/block/entity/AbstractTimedCulinaryBlockEntity.java").text
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| migration.target?.modules?.itsalive != "0.0.0-alpha.29"
 			|| migration.cauldron_batches?.logical_stack_limit != 64
 			|| migration.cauldron_batches?.identity != "same_item_same_components"
@@ -1398,7 +1398,7 @@ tasks.register("verifyFermentationBarrelAutomation") {
 		def partialMatching = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/recipe/CulinaryPartialMatching.java").text
 		def blockstate = new JsonSlurper().parse(
 			file("src/main/resources/assets/itsalive/blockstates/fermentation_barrel.json"))
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| migration.source?.modules?.itsalive != "0.0.0-alpha.29"
 			|| migration.target?.modules?.itsalive != "0.0.0-alpha.30"
 			|| migration.fermentation_barrel?.maximum_units_per_input_slot != 1
@@ -1446,7 +1446,7 @@ tasks.register("verifyCulinaryLecternRelease") {
 			[(locale): new JsonSlurper().parse(file(
 				"src/main/resources/assets/itsalive/lang/${locale}.json"))]
 		}
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| migration.target?.modules?.itsalive != "0.0.0-alpha.31"
 			|| migration.culinary_lectern?.book_tag != "minecraft:lectern_books"
 			|| migration.culinary_lectern?.owner_catalog_shared_while_placed != true
@@ -1509,7 +1509,7 @@ tasks.register("verifyCanapliaForbiddenBook") {
 			fr_fr: "Livre interdit",
 			en_us: "Forbidden Book",
 			ru_ru: "Запретная книга"]
-		if (project.version.toString() != "0.0.0-alpha.37"
+		if (project.version.toString() != "0.0.0-alpha.38"
 			|| !pageItem.contains("CanapliaKnowledge.learnRandomUnknown(serverPlayer)")
 			|| !knowledge.contains("unknownVariants(data.personal(player.getUUID()))")
 			|| !knowledge.contains("data.personal(inscription.ownerId())")

onlyfun/src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 		"java": ">=25",
 		"fabric-api": ">=0.154.2+26.2",
 		"iliketomoveit": ">=0.0.0-alpha.17",
-		"sanctuary": ">=0.0.0-alpha.127"
+		"sanctuary": ">=0.0.0-alpha.129"
 	},
 	"custom": {
 		"sanctuary26": {

pack/migrations/26.2.0-alpha.224-four-bug-fixes-to-alpha.225.json

@@ -0,0 +1,87 @@
+{
+  "schema_version": 1,
+  "status": "released",
+  "source": {
+    "pack_version": "26.2.0-alpha.224",
+    "modules": {
+      "anotherworld": "0.0.0-alpha.55",
+      "itsalive": "0.0.0-alpha.37",
+      "iliketomoveit": "0.0.0-alpha.17",
+      "onlyfun": "0.0.0-alpha.26",
+      "sanctuary": "0.0.0-alpha.128"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.225",
+    "modules": {
+      "anotherworld": "0.0.0-alpha.56",
+      "itsalive": "0.0.0-alpha.38",
+      "iliketomoveit": "0.0.0-alpha.18",
+      "onlyfun": "0.0.0-alpha.27",
+      "sanctuary": "0.0.0-alpha.129"
+    }
+  },
+  "fixed_issues": [105, 116, 123, 124],
+  "safe_vault_raid": {
+    "owner": "anotherworld",
+    "attacker_requires_registered_vault": true,
+    "validated_when_drilling_starts": true,
+    "revalidated_during_drilling": true,
+    "revalidated_before_balance_transfer": true
+  },
+  "temporary_companions": {
+    "owner": "sanctuary",
+    "public_policy_api": "SanctuaryEntityPolicy",
+    "vanilla_loot_suppressed": true,
+    "experience_suppressed": true,
+    "quest_board_progress_suppressed": true,
+    "community_request_progress_suppressed": true,
+    "onlyfun_lootboxes_suppressed": true
+  },
+  "canaplia_variants": {
+    "owner": "itsalive",
+    "historical_seed_ids_preserved": 16,
+    "placement_preserves_variant": true,
+    "natural_growth_preserves_variant": true,
+    "bonemeal_preserves_variant": true,
+    "upper_crop_preserves_variant": true,
+    "block_state_persistence_preserves_variant": true,
+    "harvest_and_break_drops_preserve_variant": true,
+    "mature_neighbors_preserve_variant": true,
+    "tender_plus_olive_can_produce_gold": true
+  },
+  "magic_carpet_texture": {
+    "owner": "iliketomoveit",
+    "canonical_item": "iliketomoveit:magic_carpet",
+    "legacy_item": "portals:notch_totem",
+    "texture": "iliketomoveit:item/magic_carpet",
+    "historical_totem_art_restored": true,
+    "purple_wool_reference_removed": true,
+    "platform_behavior_changed": false
+  },
+  "compatibility": {
+    "existing_saves_supported": true,
+    "new_world_required": false,
+    "save_reset_required": false,
+    "registry_ids_changed": false,
+    "persistent_data_formats_changed": false,
+    "network_protocols_changed": false,
+    "client_server_update_required": true,
+    "anotherworld_data_version": 5,
+    "anotherworld_network_protocol": 2,
+    "itsalive_data_version": 4,
+    "itsalive_network_protocol": 4,
+    "iliketomoveit_data_version": 4,
+    "iliketomoveit_network_protocol": 5,
+    "onlyfun_data_version": 2,
+    "onlyfun_network_protocol": 3,
+    "sanctuary_data_version": 13,
+    "sanctuary_network_protocol": 23
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true
+  }
+}

pack/packwiz/index.toml

@@ -14,15 +14,15 @@ hash = "41f4f4c88c71d0a23446d5014f7407d55ad477441847099cad24492b032335a0"
 
 [[files]]
 file = "mods/ambiance-0.0.0-alpha.22.jar"
-hash = "20f1b31b773c7cea9c5cbe01161c2c7e541eaca714213752a8d6227bae85c9b9"
+hash = "d6c44f09ddc455ae0cec02a1568e07036f11a3b2d105659e9aa14289357ddb47"
 
 [[files]]
-file = "mods/anotherworld-0.0.0-alpha.55.jar"
-hash = "2c01fb018cce49b8ef5ff6de1f2c4d0218243c23581333675c60dfe4ab48dfde"
+file = "mods/anotherworld-0.0.0-alpha.56.jar"
+hash = "ede131b654d26110af8c7e64238c1b5f99634c3e1307346953ad6ab622ccfedc"
 
 [[files]]
 file = "mods/events-0.0.0-alpha.0.jar"
-hash = "5bc52d22c93203c6c3881cd9086db5a1166feb6b31a67af8e761c9c0d0b87f37"
+hash = "9ccc30733117ab9984df3d69b98ab82d731578a6c35116595c96f2362ea22b76"
 
 [[files]]
 file = "mods/fabric-api.pw.toml"
@@ -30,8 +30,8 @@ hash = "df032a6b051d0262cf24945c43e0e6b915e8cc1d62af62fe933932e7f35960c4"
 metafile = true
 
 [[files]]
-file = "mods/iliketomoveit-0.0.0-alpha.17.jar"
-hash = "4aa2f5394f4e12301d13026c7b542660334f7c4e4f8057ea3d36dd04dfe461b6"
+file = "mods/iliketomoveit-0.0.0-alpha.18.jar"
+hash = "f0ccb5a3f411cb01bcf328a139a1f90e8357587c549778f98354d910d69b2616"
 
 [[files]]
 file = "mods/iris.pw.toml"
@@ -39,8 +39,8 @@ hash = "84a3cef87679c0d21dceb4641167dc0368b9a3593698f6a3632485e9b3a8d5da"
 metafile = true
 
 [[files]]
-file = "mods/itsalive-0.0.0-alpha.37.jar"
-hash = "926803c09b2247f42363d1042346bff9798b982aaeafa96800711e259c48039d"
+file = "mods/itsalive-0.0.0-alpha.38.jar"
+hash = "6dab7b2dca11cc1cd9789ed66cc8403b849cb73227d965d979eeebcf5c201309"
 
 [[files]]
 file = "mods/jei.pw.toml"
@@ -49,23 +49,23 @@ metafile = true
 
 [[files]]
 file = "mods/masterkey-0.0.0-alpha.9.jar"
-hash = "3069c9e784f425f59189c255638648ca51598c8626e340df9bf72a2c06f31753"
+hash = "ab0241386a0958505622487318c2e2e269e57e793ef873ed71dac8e0f420338b"
 
 [[files]]
-file = "mods/onlyfun-0.0.0-alpha.26.jar"
-hash = "5d2915c761e87cd94f4d4075c85ebb71f021b59b92ced5eba6b5da8bb1413519"
+file = "mods/onlyfun-0.0.0-alpha.27.jar"
+hash = "15dbc6a9c3d4fef699c1f62f989c1d47e366cc781747c76640f5de668ea00510"
 
 [[files]]
 file = "mods/ouch-0.0.0-alpha.11.jar"
-hash = "0e26e6e386781e2e258ef01eecad0129c00eec11783f182a34226213ea5f252e"
+hash = "5bc1e244309a8835ef1d7869225201179cbee12853fb2f2390bfd47f2fcc3c4a"
 
 [[files]]
 file = "mods/redstoner-0.0.0-alpha.13.jar"
-hash = "2e9519b8f8092883616fdce4e5b4ab427b7875565423ea18a90adb40df751878"
+hash = "d913aac62b6e7152c5751ea0ddc820a98a0b74c3864f4c0bdbfc3b44eeaa3417"
 
 [[files]]
-file = "mods/sanctuary-0.0.0-alpha.128.jar"
-hash = "9ac5e370509e0d0be77222aca227b698d449cfbcdde70ebc58fee2cec05e6a7e"
+file = "mods/sanctuary-0.0.0-alpha.129.jar"
+hash = "0b67c37680e5004b7f08ac9de32b501fc8f2025fe5a7649858948f14a5d8f5f5"
 
 [[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.224"
+version = "26.2.0-alpha.225"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "0073565d9342eae7a811696a273094f157b9a6ec113c8282c3e92714c8fe921a"
+hash = "19d66dcd7dbbc8e1a9471dcb259a9c9aad727acbc8428f114a48c05c2fd1d8de"
 
 [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.224",
+	"versionId": "26.2.0-alpha.225",
 	"files": [
 		{
       "path": "mods/fabric-api-0.158.0+26.2.jar",

pack/release.json

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

sanctuary/build.gradle

@@ -124,6 +124,14 @@ tasks.register("inventorySortSmoke", JavaExec) {
 	mainClass = "fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventorySortSmoke"
 }
 
+tasks.register("entityPolicySmoke", JavaExec) {
+	group = "verification"
+	description = "Checks that only tagged temporary companions are excluded from loot and quests."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.api.entity.SanctuaryEntityPolicySmoke"
+}
+
 tasks.register("alphaIndevGeneratorSmoke", JavaExec) {
 	group = "verification"
 	description = "Checks deterministic finite Indev islands, residences and safe portal arrivals."
@@ -175,7 +183,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| !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")
@@ -2891,7 +2899,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| 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
@@ -3057,7 +3065,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| 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
@@ -3095,7 +3103,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| 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]
@@ -3126,7 +3134,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| migration.target?.pack_version != "26.2.0-alpha.195"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
 			|| migration.compatibility?.sanctuary_data_version != 11
@@ -3157,7 +3165,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
 			|| migration.mailbox?.id != "sanctuary:delivery_box"
 			|| migration.mailbox?.horizontal_facing != true
@@ -3185,7 +3193,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| !transfer.contains("shouldAppendOverflow")
 			|| !transfer.contains("isVanillaStorageRange")
 			|| !transfer.contains("hotbarStart")
@@ -3231,7 +3239,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
 			|| migration.quest_requests?.save_key != "quest_requests"
 			|| migration.quest_requests?.data_version != 1
@@ -3289,7 +3297,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| 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"
@@ -3358,7 +3366,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| 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"
@@ -3430,7 +3438,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.128"
+		if (project.version.toString() != "0.0.0-alpha.129"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.122"
 			|| migration.alpha_world?.dimension != "sanctuary:alpha"
 			|| migration.alpha_world?.legacy_dimension != "portals:alpha"
@@ -3468,5 +3476,6 @@ tasks.named("check") {
 	dependsOn tasks.named("alphaIndevGeneratorSmoke")
 	dependsOn tasks.named("capeJoinSyncSmoke")
 	dependsOn tasks.named("inventorySortSmoke")
+	dependsOn tasks.named("entityPolicySmoke")
 	dependsOn tasks.named("verifyAlphaIndev")
 }