Compare commits

...
Author SHA1 Message Date
koka b39c271c96 feat(backroom): add persistent lost-item dimension
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-01 14:30:42 +02:00
koka a16156b005 Merge pull request 'feat: ajouter une cape craftable décorée par bannière' (#126) from feature/craftable-banner-cape into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #126
2026-08-31 11:44:49 +00:00
koka 2518c20071 feat(sanctuary): add craftable banner cape
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 13:25:27 +02:00
koka b7497c81d1 Merge pull request 'release: publier Sanctuary 26.2.0-alpha.225' (#125) from release/26.2.0-alpha.225 into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #125
2026-08-31 09:50:25 +00:00
koka 97638e0fa2 release: prepare Sanctuary 26.2.0-alpha.225
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 11:46:39 +02:00
koka a071a0b746 fix(magic-carpet): restore the Notch Totem texture 2026-08-31 11:46:24 +02:00
koka 6fcc56552c fix(canaplia): preserve crop variants through growth 2026-08-31 11:46:17 +02:00
koka 66944ec492 fix(companions): suppress loot and quest progress 2026-08-31 11:46:02 +02:00
koka b513ab1262 fix(anotherworld): require a vault before raids 2026-08-31 11:45:46 +02:00
koka b2222c5d33 Merge pull request 'release: publier Sanctuary 26.2.0-alpha.224' (#122) from release/26.2.0-alpha.224 into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #122
2026-08-31 05:17:01 +00:00
koka 2d0be21c5b release: prepare Sanctuary 26.2.0-alpha.224
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 07:13:29 +02:00
koka a0b0788869 Merge pull request 'feat: livrer et migrer le Magic Carpet après Notch' (#121) from integration/magic-carpet-reward into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #121
2026-08-31 04:59:18 +00:00
koka 106d730dd8 feat: deliver and migrate the Magic Carpet
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 06:45:28 +02:00
koka 21dd089486 Merge pull request 'feat: ajouter Notch et son combat dans Alpha' (#119) from integration/notch-encounter into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #119
2026-08-31 04:15:54 +00:00
koka e3b6c6ed01 Merge pull request 'fix(sanctuary): trier coffres et barrels et garder la hotbar en bas' (#120) from fix/issue-118-container-sort into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #120
2026-08-31 04:15:42 +00:00
ChrisM-PekandCursor 7387096d98 chore(sanctuary): aligner la verif alpha.223 sur le tri des conteneurs
Verification 26.2 / check (pull_request) Canceled after 0s
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-31 05:54:43 +02:00
ChrisM-PekandCursor 457f91b92e fix(sanctuary): trier coffres et barrels et garder la hotbar en bas
Le clic molette range aussi les conteneurs de stockage, et la hotbar reste sur la derniere ligne a la connexion.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-31 05:52:17 +02:00
koka f283c1705b feat: add Notch Alpha encounter
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 05:42:19 +02:00
koka 6ee5cdc2fb Merge pull request 'release: tester les dernières PR dans Packwiz alpha.223' (#117) from release/26.2.0-alpha.223 into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #117
2026-08-31 03:15:43 +00:00
koka 87428c5f0d release: test latest PRs in Packwiz alpha.223
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 05:13:46 +02:00
koka 0599bf6885 Merge pull request 'feat(sanctuary): ajouter les modes du suivi de quêtes' (#107) from feature/quest-tracker-display-modes into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #107
2026-08-31 03:02:03 +00:00
koka 624f441578 Merge pull request 'feat(sanctuary): trier le stockage sans deplacer la hotbar' (#112) from feature/inventory-sorter into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #112
2026-08-31 03:01:13 +00:00
ChrisM-PekandCursor d6ca1140b5 feat(sanctuary): trier le stockage sans deplacer la hotbar
Verification 26.2 / check (pull_request) Canceled after 0s
Le clic molette range les rangées débloquées depuis le haut, fusionne les piles identiques et laisse la hotbar, l'armure et les slots spéciaux intacts.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-31 04:20:33 +02:00
koka 53fa32bbc5 feat(sanctuary): ajouter les modes du suivi de quetes
Verification 26.2 / check (pull_request) Canceled after 0s
2026-08-31 03:27:36 +02:00
170 changed files with 6955 additions and 495 deletions
+61
View File
@@ -6,6 +6,67 @@ 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.
## Non publié
Modules modifiés : **Sanctuary `0.0.0-alpha.131`** et **Another World `0.0.0-alpha.57`**.
- ajoute la dimension persistante `sanctuary:backroom`, accessible en saccroupissant devant un lit et quittée uniquement par un lit, avec arrivées variées dans une zone architecturale de 2 000 blocs ;
- transfère atomiquement vers la Mailbox tout l’équipement dentrée, y compris les rangées étendues, l’œuf compagnon et la cape, avec reprise idempotente après interruption ;
- conserve les objets perdus au dépop, dans le vide et lors des morts en Backroom dans un registre borné et non duplicable ;
- transforme tous les coffres de la dimension en butin renouvelable, pauvre la plupart du temps, qui privilégie les pertes personnelles dans les premiers coffres avant les pertes anciennes partagées ;
- génère des villes, bureaux, plaines, agrégats flottants et pièces visuellement retournées à partir de palettes composées, en réservant les matériaux dAnother World aux anomalies et les blocs précieux à de rares cachettes ;
- fait enregistrer la mousse turquoise par Another World via lAPI publique de matériaux Backroom, sans dépendance circulaire ;
- migre Sanctuary vers les données v14 sans changer le protocole réseau 24, sans réinitialiser les sauvegardes ni effacer les constructions.
## `26.2.0-alpha.226`
Module modifié : **Sanctuary `0.0.0-alpha.130`**. Les neuf autres modules conservent leur version issue de l'alpha.225.
- ajoute `sanctuary:white_cape`, une cape blanche craftable avec six laines blanches disposées comme une porte, en deux colonnes de trois ;
- permet d'associer simplement la cape et n'importe quelle bannière dans l'établi afin d'en conserver la couleur de fond et jusqu'à six motifs ;
- affiche les motifs dans l'inventaire et sur la cape équipée, avec la physique native des capes, y compris en multijoueur ;
- conserve les sauvegardes Sanctuary en data v13 ; le payload d'apparence transporte désormais la couleur et les motifs bornés, donc le protocole Sanctuary passe de 23 à 24 et client comme serveur doivent être mis à jour, sans nouveau monde ni réinitialisation.
## `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 lattaquant 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 lexpé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 dos, la création de la partie haute, le rechargement et la récolte, ce qui réactive notamment lhybridation 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 lobjet 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`**.
- étend le clic molette aux coffres, barils, boîtes de Shulker, entonnoirs et distributeurs, tout en excluant les fours, le Shop et le terminal Red-Stoner ;
- trie l'inventaire du joueur lorsque le curseur survole l'une de ses cases dans un conteneur, sans toucher à la hotbar, et replace la hotbar en bas après connexion ou achat d'une rangée ;
- ajoute Notch comme résident unique et persistant de la maison Indev, avec restauration automatique, déduplication et lecture des anciennes entités `portals:notch` ;
- transforme Notch en Titan au premier coup volontaire, avec santé bornée selon les participants, poursuite, attaques télégraphiées, boules de feu renvoyables et réinitialisation si le combat est abandonné ;
- limite la destruction de blocs à l'explosion initiale de transformation ; les attaques suivantes utilisent uniquement dégâts, poussée, particules et explosions non destructrices ;
- enregistre la première victoire comme jalon mondial monotone, crédite les participants, inscrit un marqueur de boss dans leur Atlas déjà découvert et réserve une récompense physique unique ;
- place le Magic Carpet de Notch dans un coffre déterministe signalé par feu d'artifice, avec réservation et livraison persistées séparément pour récupérer une interruption sans duplication ;
- conserve `portals:notch_totem` comme alias caché et convertit inventaires, conteneurs et items au sol vers `iliketomoveit:magic_carpet` en gardant quantité, composants et nom personnalisé ;
- maintient la plateforme temporaire 3 × 3 sous autorité serveur, sans écraser le terrain et avec un suivi par propriétaire qui protège les tapis superposés pendant les nettoyages ;
- rend l'offre Magic Carpet visible et achetable uniquement après `sanctuary:notch_defeated`, au prix exceptionnel existant, avec paiement normal, livraison Mailbox, provenance et journal de remplacement ;
- ajoute les diagnostics `/masterkey notch inspect` et `/masterkey notch restore`, les traductions FR/EN/RU et les contrats de test déterministes associés ;
- migre les données It's Alive de v3 à v4, I Like To Move It de v3 à v4 et Sanctuary de v11 à v13 ; le payload de tri ayant gagné un booléen borné, le protocole Sanctuary passe de 22 à 23 et client comme serveur doivent être mis à jour, sans nouveau monde ni réinitialisation.
## `26.2.0-alpha.223`
Module modifié : **Sanctuary `0.0.0-alpha.125`**. Les neuf autres modules conservent leur version issue de l'alpha.222.
- ajoute un tri natif de linventaire par clic molette configurable, uniquement sur les rangées de stockage débloquées ;
- fusionne et range les piles depuis le haut sans déplacer la hotbar, larmure, la main secondaire, le craft ni les emplacements spéciaux ;
- garde le tri sous autorité serveur, avec un délai de huit ticks, et lignore en créatif ou pendant la saisie dans un champ texte ;
- ajoute un style configurable au suivi des quêtes (`N` par défaut), entre le texte transparent et le panneau original de Chris ;
- place automatiquement le style texte sous la hauteur réelle de la colonne gauche du F3 permanent afin que les deux affichages ne se recouvrent pas ;
- nomme et ordonne les contrats suivis par niveau de récompense, rubis puis saphir puis émeraude/autres, au lieu du libellé générique « Contrat du jour » ;
- actualise JEI vers la bêta Fabric 26.2 `30.29.0.198` et synchronise ses empreintes entre Packwiz et Prism ;
- conserve les données Sanctuary v11, le protocole réseau 22, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation nest nécessaire.
## `26.2.0-alpha.222`
Modules modifiés : **Red-Stoner `0.0.0-alpha.13`** et **Sanctuary `0.0.0-alpha.124`**. Les huit autres modules conservent leur version issue de l'alpha.221.
+9 -1
View File
@@ -22,10 +22,16 @@ 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.222`**. Cette release distribue Red-Stoner **`0.0.0-alpha.13`** et Sanctuary **`0.0.0-alpha.124`** ; les huit autres modules conservent leur version issue de l'alpha.221.
Version courante du pack distribué : **`26.2.0-alpha.226`**. Cette release distribue Sanctuary **`0.0.0-alpha.130`** ; les neuf autres modules conservent leur version issue de l'alpha.225.
Lalpha.225 corrige quatre tickets : posséder un coffre-fort devient obligatoire pour en braquer un autre, les familiers temporaires ne donnent plus de butin, dexpé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.
Lalpha.224 ajoute Notch comme résident unique de la maison Indev et son combat de Titan. It's Alive possède l'entité persistante, Ouch les attaques et dégâts, Sanctuary le jalon mondial de victoire et l'Atlas, tandis que MasterKey fournit les commandes d'inspection et de restauration. Les anciennes entités `portals:notch` restent chargeables. La première victoire réserve maintenant un unique `iliketomoveit:magic_carpet` dans un coffre signalé par feu d'artifice. L'ancien `portals:notch_totem` est migré sans perte ; après Notch, Only Fun ouvre l'offre de remplacement au Shop avec paiement serveur et livraison par Mailbox. Le clic molette trie aussi les coffres, barils, boîtes de Shulker, entonnoirs et distributeurs, ou l'inventaire du joueur lorsqu'il est survolé, sans déplacer la hotbar. Le protocole Sanctuary passe à 23 : client et serveur doivent utiliser l'alpha.224.
Lalpha.223 ajoute le tri natif des rangées de stockage par clic molette sans déplacer la hotbar ni les emplacements spéciaux. Le suivi des quêtes propose désormais le texte transparent aligné sous la colonne gauche du F3 ou le panneau original de Chris, avec bascule configurable sur `N` et contrats ordonnés par récompense. JEI passe à la bêta Fabric 26.2 `30.29.0.198`.
Lalpha.222 améliore le terminal de stockage avec une recherche Unicode, des quantités compactes et des emplacements qui ne glissent plus lorsqu'une pile est vidée. Elle ajoute aussi le suivi textuel des quêtes actives en haut à gauche, masquable avec une touche configurable, ainsi que des suggestions dIDs ditems et de mobs dans l’éditeur de demandes. JEI passe à la bêta Fabric 26.2 `30.29.0.196`.
Lalpha.221 corrige la cause réelle du disque blanc ralenti et trop grave : Ambiance décode désormais la source AAC en stéréo native à 48 kHz, puis moyenne explicitement chaque paire gauche/droite vers le flux mono positionnel de Minecraft. OpenAL reste à sa hauteur normale `1.0`, sans compensation artificielle ni changement de durée.
@@ -110,6 +116,8 @@ Lalpha.173 centralise laudio du Miner : une seule boucle de frappe sur le
Lalpha.171 rassemble les **46 capes** dans un onglet créatif dédié « Capes ». Elles ne sont plus mélangées à longlet vanilla Tools & Utilities et ne sont donc affichées quune seule fois.
Lalpha.226 ajoute une 47e cape, `sanctuary:white_cape`, distincte de la collection Only Fun. Elle se fabrique avec six laines blanches en deux colonnes de trois, puis accepte une bannière dans une recette simple pour en conserver la couleur et jusqu’à six motifs ; les motifs saffichent dans linventaire comme une fois la cape équipée.
Lalpha.170 ajoute les pictogrammes fournis aux emplacements vides de la cape et du familier. Ils disparaissent dès quune cape ou un œuf est équipé, sans modifier les objets, la persistance ni le protocole.
Lalpha.169 agrandit la collection de 13 à **46 capes équipables**. Les 33 nouvelles textures 64×32 fournies sont conservées telles quelles, avec une icône dinventaire, un modèle et des traductions FR/EN/RU pour chaque cape. Elles utilisent le slot, la persistance et le rendu multijoueur déjà existants, restent sans recette et rejoignent toutes la lootbox de capes Only Fun. Les caméras Canon restent accessibles dans la lootbox normale et peuvent désormais aussi apparaître directement, très rarement, dans les coffres dexploration et du donjon de cobblestone.
+35 -2
View File
@@ -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 nest pas actif.",
"message.anotherworld.safe_vault.raid_requires_vault": "Vous devez posséder un coffre-fort actif avant den 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.57"
|| 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.57"
|| 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"
@@ -3297,3 +3300,33 @@ tasks.register("verifyClimateBiomeMixer") {
tasks.named("check") {
dependsOn tasks.named("verifyClimateBiomeMixer")
}
tasks.register("verifyBackroomMaterialIntegration") {
group = "verification"
description = "Checks the one-way Another World material integration with Sanctuary Backroom."
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/anotherworld/AnotherWorldMod.java"))
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/anotherworld/registry/AnotherWorldBlocks.java"))
inputs.file(rootProject.file(
"sanctuary/src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/backroom/BackroomMaterialApi.java"))
doLast {
def initializer = file("src/main/java/fr/koka99cab/sanctuary26/anotherworld/AnotherWorldMod.java").text
def blocks = file("src/main/java/fr/koka99cab/sanctuary26/anotherworld/registry/AnotherWorldBlocks.java").text
def api = rootProject.file(
"sanctuary/src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/backroom/BackroomMaterialApi.java").text
def rootBuild = rootProject.file("build.gradle").text
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
if (project.version.toString() != "0.0.0-alpha.57"
|| !initializer.contains("BackroomMaterialApi.registerAnomalyMaterial(AnotherWorldBlocks.TURQUOISE_MOSS)")
|| !blocks.contains('"turquoise_moss"')
|| !api.contains("public static void registerAnomalyMaterial")
|| manifest.depends?.sanctuary != ">=0.0.0-alpha.131"
|| !rootBuild.contains('project(":anotherworld")')
|| !rootBuild.contains('implementation project(":sanctuary")')) {
throw new GradleException("Another World alpha.57 Backroom material integration is incomplete")
}
}
}
tasks.named("check") {
dependsOn tasks.named("verifyBackroomMaterialIntegration")
}
@@ -4,7 +4,9 @@ import fr.koka99cab.canon.CanonMod;
import fr.koka99cab.sanctuary26.anotherworld.item.WeatherCompassItem;
import fr.koka99cab.sanctuary26.anotherworld.network.AnotherWorldNetworking;
import fr.koka99cab.sanctuary26.anotherworld.registry.AnotherWorldRegistries;
import fr.koka99cab.sanctuary26.anotherworld.registry.AnotherWorldBlocks;
import fr.koka99cab.sanctuary26.anotherworld.vault.VaultService;
import fr.koka99cab.sanctuary26.sanctuary.api.backroom.BackroomMaterialApi;
import net.fabricmc.api.ModInitializer;
import net.minecraft.resources.Identifier;
import org.slf4j.Logger;
@@ -26,6 +28,7 @@ public final class AnotherWorldMod implements ModInitializer {
@Override
public void onInitialize() {
AnotherWorldRegistries.initialize();
BackroomMaterialApi.registerAnomalyMaterial(AnotherWorldBlocks.TURQUOISE_MOSS);
VaultService.initialize();
WeatherCompassItem.registerFrameInteraction();
CanonMod.initialize();
@@ -113,6 +113,12 @@ public final class VaultData extends SavedData {
&& address.pos() == center.asLong() && address.owner().equals(ownerId));
}
public boolean hasRegisteredVault(UUID owner) {
if (owner == null) return false;
String ownerId = owner.toString();
return vaults.stream().anyMatch(address -> address.owner().equals(ownerId));
}
public void unregisterNear(ServerLevel level, BlockPos member) {
String dimension = dimension(level);
boolean changed = vaults.removeIf(address -> {
@@ -163,7 +169,7 @@ public final class VaultData extends SavedData {
/** Transfers the exact 20% raid share into the attacker's unlimited balances without item spam. */
public long transferRaid(UUID owner, UUID attacker) {
if (owner == null || attacker == null || owner.equals(attacker)) return 0L;
if (!canReceiveRaidLoot(owner, attacker, hasRegisteredVault(attacker))) return 0L;
Account source = accounts.get(owner);
if (source == null) return 0L;
Account target = accounts.computeIfAbsent(attacker, ignored -> new Account());
@@ -180,6 +186,10 @@ public final class VaultData extends SavedData {
return total;
}
static boolean canReceiveRaidLoot(UUID owner, UUID attacker, boolean attackerHasRegisteredVault) {
return owner != null && attacker != null && !owner.equals(attacker) && attackerHasRegisteredVault;
}
public long protectionRemaining(UUID owner, long gameTime) {
Account account = accounts.get(owner);
return account == null ? 0L : Math.max(0L, account.protectedUntil - gameTime);
@@ -48,6 +48,10 @@ public final class VaultDrillingService {
attacker.sendSystemMessage(Component.translatable("message.anotherworld.safe_vault.inactive"));
return false;
}
if (!data.hasRegisteredVault(attacker.getUUID())) {
attacker.sendSystemMessage(Component.translatable("message.anotherworld.safe_vault.raid_requires_vault"));
return false;
}
if (!data.hasContents(formed.owner())) {
attacker.sendSystemMessage(Component.translatable("message.anotherworld.safe_vault.empty"));
return false;
@@ -104,6 +108,13 @@ public final class VaultDrillingService {
attacker.stopUsingItem();
return;
}
if (!VaultData.get(level.getServer()).hasRegisteredVault(attacker.getUUID())) {
cancel(attacker, false);
attacker.sendOverlayMessage(Component.translatable(
"message.anotherworld.safe_vault.raid_requires_vault"));
attacker.stopUsingItem();
return;
}
int elapsed = session.elapsedTicks() + 1;
Session progressed = session.withElapsed(elapsed);
@@ -31,7 +31,7 @@
"java": ">=25",
"fabric-api": ">=0.154.2+26.2",
"ambiance": "*",
"sanctuary": ">=0.0.0-alpha.117"
"sanctuary": ">=0.0.0-alpha.131"
},
"custom": {
"sanctuary26": {
@@ -1,5 +1,7 @@
package fr.koka99cab.sanctuary26.anotherworld.vault;
import java.util.UUID;
public final class VaultRulesSmoke {
private VaultRulesSmoke() {
}
@@ -55,6 +57,14 @@ public final class VaultRulesSmoke {
require(VaultRules.raidLoot(Integer.MAX_VALUE) == 429_496_730L, "32-bit balance raid");
require(VaultRules.raidLoot(Long.MAX_VALUE) == 1_844_674_407_370_955_162L,
"64-bit balance raid without overflow");
UUID owner = UUID.fromString("00000000-0000-0000-0000-000000000001");
UUID attacker = UUID.fromString("00000000-0000-0000-0000-000000000002");
require(!VaultData.canReceiveRaidLoot(owner, attacker, false),
"an attacker without a registered vault cannot receive raid loot");
require(VaultData.canReceiveRaidLoot(owner, attacker, true),
"an attacker with a registered vault can receive raid loot");
require(!VaultData.canReceiveRaidLoot(owner, owner, true),
"a vault owner cannot receive loot from their own vault");
require(VaultRules.saturatingAdd(Long.MAX_VALUE - 2L, 10L) == Long.MAX_VALUE,
"balance saturation without overflow");
for (long balance : new long[] {0L, Integer.MAX_VALUE, (long) Integer.MAX_VALUE + 1L, Long.MAX_VALUE}) {
+1021 -262
View File
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -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.57
anotherworld_lifecycle=active
itsalive_version=0.0.0-alpha.36
itsalive_version=0.0.0-alpha.38
itsalive_lifecycle=active
ouch_version=0.0.0-alpha.10
ouch_version=0.0.0-alpha.11
ouch_lifecycle=active
masterkey_version=0.0.0-alpha.8
masterkey_version=0.0.0-alpha.9
masterkey_lifecycle=active
iliketomoveit_version=0.0.0-alpha.16
iliketomoveit_version=0.0.0-alpha.18
iliketomoveit_lifecycle=active
onlyfun_version=0.0.0-alpha.25
onlyfun_version=0.0.0-alpha.27
onlyfun_lifecycle=active
sanctuary_version=0.0.0-alpha.124
sanctuary_version=0.0.0-alpha.131
sanctuary_lifecycle=active
pack_version=26.2.0-alpha.222
pack_version=26.2.0-alpha.226
maven_group=fr.koka99cab.sanctuary26
+66
View File
@@ -0,0 +1,66 @@
# Magic Carpet et Totem de Notch
I Like To Move It possède l'objet, la plateforme temporaire, la remise physique
de la récompense et la compatibilité de l'ancien Totem. Sanctuary reste
propriétaire du jalon mondial et de la réservation unique ; Only Fun possède le
catalogue et applique le jalon avant d'exposer l'offre.
## Identités et provenance
| Rôle | ID | Statut |
|---|---|---|
| objet canonique | `iliketomoveit:magic_carpet` | distribué après Notch puis achetable au Shop |
| Totem historique | `portals:notch_totem` | alias caché, lisible et converti vers l'objet canonique |
| jalon mondial | `sanctuary:notch_defeated` | autorité serveur Sanctuary |
La conversion utilise `ItemStack.transmuteCopy` : quantité, composants et nom
personnalisé sont conservés. Les inventaires joueurs sont traités à la connexion,
les conteneurs vanilla lors de leur chargement et les entités d'item dès leur
tick serveur. Un Totem produit exactement un tapis et les nouveaux mondes ne
distribuent jamais l'ancien ID. La donnée I Like To Move It passe en v4 ; une
pile déjà convertie ne correspond plus à l'alias et ne peut donc pas être
convertie une seconde fois.
Chaque tapis porte une provenance Sanctuary sans autorité de gameplay :
`notch_reward`, `shop_purchase` ou `legacy_notch_totem`. Le serveur ne se fie
jamais à cette étiquette pour autoriser un achat ; elle sert à l'historique, au
diagnostic et à l'infobulle.
## Première récompense
Après la première victoire mondiale, Sanctuary réserve atomiquement la
récompense puis I Like To Move It crée un coffre déterministe près de la maison
de Notch. Le tapis unique est placé au centre et un feu d'artifice signale le
coffre. Sanctuary ne marque la livraison terminée qu'après avoir retrouvé ou
créé ce coffre.
Les états `initial_reward_claimed` et `initial_reward_delivered` sont distincts.
Une reprise entre les deux relance la création de façon idempotente ; un coffre
déjà créé et marqué est reconnu sans recevoir de second tapis. Les anciennes
sauvegardes v1 dont la récompense était déjà déclarée remise sont migrées vers
l'état livré afin de ne rien dupliquer.
## Plateforme temporaire
Tenir le tapis en main principale ou secondaire maintient neuf blocs de verre
sous le joueur. Seul l'air est remplacé : terrain, liquides, plantes et blocs
construits restent intacts. Le joueur conserve ses capacités normales ; seul le
dégât de chute est réinitialisé tant que la plateforme est active.
Chaque position possède un ensemble implicite de propriétaires. Deux tapis
peuvent se chevaucher et le verre ne disparaît qu'après le départ du dernier.
Le nettoyage est effectué côté serveur au relâchement, à la déconnexion, au
changement de dimension et pendant l'arrêt normal du serveur.
## Remplacement au Shop
Only Fun associe le Magic Carpet au resolver public
`SanctuaryWorldMilestones`. Avant `sanctuary:notch_defeated`, l'offre est
absente des snapshots et toute tentative réseau est rejetée par Sanctuary.
Après la victoire, elle rejoint la rotation normale au prix configuré de
1 536 rubis et 128 saphirs : les saphirs débloquent le catalogue, les rubis
paient chaque remplacement et la Mailbox effectue la livraison différée.
Un achat porte la provenance `shop_purchase`, est journalisé comme remplacement
et ne touche jamais aux états de réservation ou de coffre de la récompense
initiale.
+19 -10
View File
@@ -32,6 +32,14 @@ tasks.register("alphaPortalContractSmoke", JavaExec) {
dependsOn tasks.named("testClasses")
}
tasks.register("magicCarpetLedgerSmoke", JavaExec) {
group = "verification"
description = "Checks Magic Carpet overlap, dimension-change and shutdown cleanup ownership."
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.iliketomoveit.transport.MagicCarpetLedgerSmoke"
dependsOn tasks.named("testClasses")
}
tasks.named("test") {
// Runtime contracts are executable smoke tasks, not JUnit engine tests.
failOnNoDiscoveredTests = false
@@ -100,11 +108,11 @@ tasks.register("verifyWaystones") {
if (!missingResources.isEmpty()) throw new GradleException("Missing Waystone resources: ${missingResources}")
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
if (manifest.custom?.sanctuary26?.data_version != 3
if (manifest.custom?.sanctuary26?.data_version != 4
|| manifest.custom?.sanctuary26?.network_protocol != 5
|| manifest.depends?.anotherworld != ">=0.0.0-alpha.46"
|| manifest.depends?.sanctuary != ">=0.0.0-alpha.21") {
throw new GradleException("I Like To Move It must expose data v3, protocol 5 and its Another World alpha.46/Sanctuary alpha.21 dependencies")
|| manifest.depends?.sanctuary != ">=0.0.0-alpha.127") {
throw new GradleException("I Like To Move It must expose data v4, protocol 5 and its Another World alpha.46/Sanctuary alpha.127 dependencies")
}
["fr_fr", "en_us", "ru_ru"].each { language ->
def translations = new JsonSlurper().parse(file("src/main/resources/assets/iliketomoveit/lang/${language}.json"))
@@ -203,9 +211,9 @@ tasks.register("verifyGrappling") {
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
if (!manifest.mixins?.any { it.config == "iliketomoveit.mixins.json" }
|| !manifest.mixins?.any { it.config == "iliketomoveit.client.mixins.json" && it.environment == "client" }
|| manifest.custom?.sanctuary26?.data_version != 3
|| manifest.custom?.sanctuary26?.data_version != 4
|| manifest.custom?.sanctuary26?.network_protocol != 5) {
throw new GradleException("I Like To Move It must keep aggregate data v3/protocol 5 and register its common/client mixins")
throw new GradleException("I Like To Move It must expose aggregate data v4/protocol 5 and register its common/client mixins")
}
["fr_fr", "en_us", "ru_ru"].each { language ->
def translations = new JsonSlurper().parse(file("src/main/resources/assets/iliketomoveit/lang/${language}.json"))
@@ -313,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.16"
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 != [
@@ -349,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.16"
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"]
@@ -378,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.16"
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
@@ -410,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.16"
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
@@ -444,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.16"
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"
@@ -466,6 +474,7 @@ tasks.register("verifyAlphaPortal") {
tasks.named("check") {
dependsOn tasks.named("grapplePhysicsSmoke")
dependsOn tasks.named("magicCarpetLedgerSmoke")
dependsOn tasks.named("waystoneElevatorRulesSmoke")
dependsOn tasks.named("happyGhastCruiseSpeedSmoke")
dependsOn tasks.named("verifyWaystones")
@@ -8,6 +8,8 @@ import fr.koka99cab.sanctuary26.iliketomoveit.pulley.PulleyHeadController;
import fr.koka99cab.sanctuary26.iliketomoveit.registry.GrapplingLootTables;
import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItRegistries;
import fr.koka99cab.sanctuary26.iliketomoveit.transport.MagicCarpetController;
import fr.koka99cab.sanctuary26.iliketomoveit.transport.MagicCarpetMigrationService;
import fr.koka99cab.sanctuary26.iliketomoveit.transport.NotchCarpetRewardService;
import fr.koka99cab.sanctuary26.iliketomoveit.waystone.WaystoneElevatorController;
import net.fabricmc.api.ModInitializer;
import net.minecraft.resources.Identifier;
@@ -17,7 +19,7 @@ import org.slf4j.LoggerFactory;
public final class ILikeToMoveItMod implements ModInitializer {
public static final String MOD_ID = "iliketomoveit";
public static final String DISPLAY_NAME = "I Like To Move It";
public static final int CURRENT_DATA_VERSION = 3;
public static final int CURRENT_DATA_VERSION = 4;
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public ILikeToMoveItMod() {
@@ -37,6 +39,8 @@ public final class ILikeToMoveItMod implements ModInitializer {
GrappleController.register();
PulleyHeadController.register();
MagicCarpetController.register();
MagicCarpetMigrationService.register();
NotchCarpetRewardService.register();
WaystoneElevatorController.initialize();
LOGGER.info("[{}] Portals, vehicles, grappling, pulleys, Magic Carpet and dimension-local Waystones ready (data v{}, network v{}).",
DISPLAY_NAME, CURRENT_DATA_VERSION, ILikeToMoveItNetworking.PROTOCOL_VERSION);
@@ -0,0 +1,41 @@
package fr.koka99cab.sanctuary26.iliketomoveit.item;
import fr.koka99cab.sanctuary26.sanctuary.api.item.SanctuaryItemProvenance;
import java.util.function.Consumer;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.TooltipDisplay;
/** Epic carpet with explicit behaviour and provenance in its tooltip. */
public final class MagicCarpetItem extends Item {
public MagicCarpetItem(Properties properties) {
super(properties);
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay display,
Consumer<Component> tooltip, TooltipFlag flag) {
tooltip.accept(Component.translatable("item.iliketomoveit.magic_carpet.description")
.withStyle(ChatFormatting.GRAY));
var origin = SanctuaryItemProvenance.origin(stack);
if (SanctuaryItemProvenance.NOTCH_REWARD.equals(origin)) {
tooltip.accept(Component.translatable("item.iliketomoveit.magic_carpet.origin.notch")
.withStyle(ChatFormatting.GOLD));
} else if (SanctuaryItemProvenance.SHOP_PURCHASE.equals(origin)) {
tooltip.accept(Component.translatable("item.iliketomoveit.magic_carpet.origin.shop")
.withStyle(ChatFormatting.AQUA));
} else if (SanctuaryItemProvenance.LEGACY_NOTCH_TOTEM.equals(origin)) {
tooltip.accept(Component.translatable("item.iliketomoveit.magic_carpet.origin.legacy")
.withStyle(ChatFormatting.DARK_PURPLE));
}
}
@Override
public boolean isFoil(ItemStack stack) {
return SanctuaryItemProvenance.hasOrigin(stack, SanctuaryItemProvenance.NOTCH_REWARD)
|| super.isFoil(stack);
}
}
@@ -0,0 +1,19 @@
package fr.koka99cab.sanctuary26.iliketomoveit.mixin;
import fr.koka99cab.sanctuary26.iliketomoveit.transport.MagicCarpetMigration;
import net.minecraft.world.Container;
import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
import net.minecraft.world.level.storage.ValueInput;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Converts historical Totems as loaded chests and other vanilla containers are decoded. */
@Mixin(BaseContainerBlockEntity.class)
abstract class MagicCarpetContainerMixin {
@Inject(method = "loadAdditional", at = @At("TAIL"))
private void sanctuary26$migrateNotchTotem(ValueInput input, CallbackInfo ci) {
MagicCarpetMigration.migrateContainer((Container) (Object) this);
}
}
@@ -0,0 +1,21 @@
package fr.koka99cab.sanctuary26.iliketomoveit.mixin;
import fr.koka99cab.sanctuary26.iliketomoveit.transport.MagicCarpetMigration;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Converts historical Totems already present as loaded item entities. */
@Mixin(ItemEntity.class)
abstract class MagicCarpetItemEntityMixin {
@Inject(method = "tick", at = @At("HEAD"))
private void sanctuary26$migrateNotchTotem(CallbackInfo ci) {
ItemEntity self = (ItemEntity) (Object) this;
ItemStack current = self.getItem();
ItemStack replacement = MagicCarpetMigration.migrateStack(current);
if (replacement != current) self.setItem(replacement);
}
}
@@ -3,6 +3,7 @@ package fr.koka99cab.sanctuary26.iliketomoveit.registry;
import fr.koka99cab.sanctuary26.iliketomoveit.ILikeToMoveItMod;
import fr.koka99cab.sanctuary26.iliketomoveit.item.AircraftItem;
import fr.koka99cab.sanctuary26.iliketomoveit.item.GrapplingRodItem;
import fr.koka99cab.sanctuary26.iliketomoveit.item.MagicCarpetItem;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
@@ -25,7 +26,11 @@ public final class ILikeToMoveItItems {
key -> new BoatItem(ILikeToMoveItEntityTypes.MAGIC_CLOUD,
new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).setId(key)));
public static final Item MAGIC_CARPET = register("magic_carpet",
key -> new Item(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).setId(key)));
key -> new MagicCarpetItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).setId(key)));
/** Hidden read-preserving alias for inventories saved by the historical MagicCarpet mod. */
public static final Item LEGACY_NOTCH_TOTEM = register(
Identifier.fromNamespaceAndPath("portals", "notch_totem"),
key -> new MagicCarpetItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC).setId(key)));
public static final Item GRAPPLING_HAND = register("grappling_hand",
key -> new Item(new Item.Properties().setId(key)));
public static final Item GRAPPLING_ROD = register("grappling_rod",
@@ -1,10 +1,7 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import fr.koka99cab.sanctuary26.iliketomoveit.ILikeToMoveItMod;
import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItItems;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -27,7 +24,7 @@ public final class MagicCarpetController {
private static final int RADIUS = 1;
private static final Block CARPET_BLOCK = Blocks.GLASS;
private static final BlockState CARPET_STATE = CARPET_BLOCK.defaultBlockState();
private static final Map<UUID, CarpetState> ACTIVE_CARPETS = new HashMap<>();
private static final MagicCarpetLedger ACTIVE_CARPETS = new MagicCarpetLedger();
private MagicCarpetController() {
}
@@ -45,8 +42,8 @@ public final class MagicCarpetController {
connected.add(id);
boolean active = !player.isSpectator() && (isMagicCarpet(player.getMainHandItem()) || isMagicCarpet(player.getOffhandItem()));
if (active) {
if (!ACTIVE_CARPETS.containsKey(id)) {
ACTIVE_CARPETS.put(id, CarpetState.empty(player.level().dimension()));
if (!ACTIVE_CARPETS.contains(id)) {
ACTIVE_CARPETS.track(id, player.level().dimension(), Set.of());
player.sendOverlayMessage(Component.translatable("message.iliketomoveit.magic_carpet.enabled"));
}
updateCarpet(id, player);
@@ -54,27 +51,26 @@ public final class MagicCarpetController {
deactivate(server, id, true);
}
}
Iterator<Map.Entry<UUID, CarpetState>> iterator = ACTIVE_CARPETS.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<UUID, CarpetState> entry = iterator.next();
if (!connected.contains(entry.getKey())) {
removePositions(server, entry.getKey(), entry.getValue(), entry.getValue().positions());
iterator.remove();
for (UUID owner : ACTIVE_CARPETS.owners()) {
if (!connected.contains(owner)) {
MagicCarpetLedger.State state = ACTIVE_CARPETS.remove(owner);
if (state != null) removePositions(server, owner, state, state.positions());
}
}
}
private static boolean isMagicCarpet(ItemStack stack) {
return !stack.isEmpty() && stack.is(ILikeToMoveItItems.MAGIC_CARPET);
return MagicCarpetMigration.isAnyCarpet(stack);
}
private static void updateCarpet(UUID owner, ServerPlayer player) {
ServerLevel level = player.level();
CarpetState previous = ACTIVE_CARPETS.getOrDefault(owner, CarpetState.empty(level.dimension()));
MagicCarpetLedger.State previous = ACTIVE_CARPETS.state(owner, level.dimension());
Set<BlockPos> target = carpetPositions(player.blockPosition().below(player.isCrouching() ? 2 : 1));
if (!previous.dimension().equals(level.dimension())) {
removePositions(level.getServer(), owner, previous, previous.positions());
previous = CarpetState.empty(level.dimension());
ACTIVE_CARPETS.remove(owner);
previous = ACTIVE_CARPETS.state(owner, level.dimension());
} else {
Set<BlockPos> stale = new HashSet<>(previous.positions());
stale.removeAll(target);
@@ -91,7 +87,7 @@ public final class MagicCarpetController {
placed.add(pos);
}
}
ACTIVE_CARPETS.put(owner, new CarpetState(level.dimension(), Set.copyOf(placed)));
ACTIVE_CARPETS.track(owner, level.dimension(), placed);
player.resetFallDistance();
}
@@ -104,14 +100,14 @@ public final class MagicCarpetController {
}
private static void deactivate(MinecraftServer server, UUID owner, boolean notify) {
CarpetState state = ACTIVE_CARPETS.remove(owner);
MagicCarpetLedger.State state = ACTIVE_CARPETS.remove(owner);
if (state == null) return;
removePositions(server, owner, state, state.positions());
ServerPlayer player = server.getPlayerList().getPlayer(owner);
if (notify && player != null) player.sendOverlayMessage(Component.translatable("message.iliketomoveit.magic_carpet.disabled"));
}
private static void removePositions(MinecraftServer server, UUID owner, CarpetState state, Set<BlockPos> positions) {
private static void removePositions(MinecraftServer server, UUID owner, MagicCarpetLedger.State state, Set<BlockPos> positions) {
ServerLevel level = server.getLevel(state.dimension());
if (level == null) return;
for (BlockPos pos : positions) {
@@ -122,18 +118,13 @@ public final class MagicCarpetController {
}
private static boolean isTrackedByAnother(UUID owner, ResourceKey<Level> dimension, BlockPos pos) {
return ACTIVE_CARPETS.entrySet().stream().anyMatch(entry -> !entry.getKey().equals(owner)
&& entry.getValue().dimension().equals(dimension) && entry.getValue().positions().contains(pos));
return ACTIVE_CARPETS.trackedByAnother(owner, dimension, pos);
}
private static void reset(MinecraftServer server) {
Map<UUID, CarpetState> copy = new HashMap<>(ACTIVE_CARPETS);
ACTIVE_CARPETS.clear();
Map<UUID, MagicCarpetLedger.State> copy = ACTIVE_CARPETS.drain();
copy.forEach((owner, state) -> removePositions(server, owner, state, state.positions()));
ILikeToMoveItMod.LOGGER.debug("Magic Carpet temporary platforms cleaned.");
}
private record CarpetState(ResourceKey<Level> dimension, Set<BlockPos> positions) {
private static CarpetState empty(ResourceKey<Level> dimension) { return new CarpetState(dimension, Set.of()); }
}
}
@@ -0,0 +1,56 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
/** Pure ownership ledger preventing overlapping temporary platforms from deleting each other. */
public final class MagicCarpetLedger {
private final Map<UUID, State> carpets = new HashMap<>();
public boolean contains(UUID owner) {
return carpets.containsKey(owner);
}
public State state(UUID owner, ResourceKey<Level> dimension) {
return carpets.getOrDefault(owner, State.empty(dimension));
}
public void track(UUID owner, ResourceKey<Level> dimension, Set<BlockPos> positions) {
carpets.put(owner, new State(dimension, Set.copyOf(positions)));
}
public State remove(UUID owner) {
return carpets.remove(owner);
}
public Set<UUID> owners() {
return Set.copyOf(carpets.keySet());
}
public boolean trackedByAnother(UUID owner, ResourceKey<Level> dimension, BlockPos pos) {
return carpets.entrySet().stream().anyMatch(entry -> !entry.getKey().equals(owner)
&& entry.getValue().dimension().equals(dimension)
&& entry.getValue().positions().contains(pos));
}
public Map<UUID, State> drain() {
Map<UUID, State> copy = Map.copyOf(carpets);
carpets.clear();
return copy;
}
public record State(ResourceKey<Level> dimension, Set<BlockPos> positions) {
public State {
positions = Set.copyOf(positions);
}
private static State empty(ResourceKey<Level> dimension) {
return new State(dimension, Set.of());
}
}
}
@@ -0,0 +1,39 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItItems;
import fr.koka99cab.sanctuary26.sanctuary.api.item.SanctuaryItemProvenance;
import net.minecraft.world.Container;
import net.minecraft.world.item.ItemStack;
/** Read-preserving conversion from the historical Totem identity to the canonical carpet. */
public final class MagicCarpetMigration {
private MagicCarpetMigration() {
}
public static boolean isAnyCarpet(ItemStack stack) {
return stack != null && !stack.isEmpty()
&& (stack.is(ILikeToMoveItItems.MAGIC_CARPET)
|| stack.is(ILikeToMoveItItems.LEGACY_NOTCH_TOTEM));
}
public static ItemStack migrateStack(ItemStack stack) {
if (stack == null || stack.isEmpty() || !stack.is(ILikeToMoveItItems.LEGACY_NOTCH_TOTEM)) return stack;
ItemStack migrated = stack.transmuteCopy(ILikeToMoveItItems.MAGIC_CARPET, stack.getCount());
SanctuaryItemProvenance.stampIfAbsent(migrated, SanctuaryItemProvenance.LEGACY_NOTCH_TOTEM);
return migrated;
}
public static int migrateContainer(Container container) {
if (container == null) return 0;
int migrated = 0;
for (int slot = 0; slot < container.getContainerSize(); slot++) {
ItemStack current = container.getItem(slot);
ItemStack replacement = migrateStack(current);
if (replacement == current) continue;
container.setItem(slot, replacement);
migrated++;
}
if (migrated > 0) container.setChanged();
return migrated;
}
}
@@ -0,0 +1,34 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import fr.koka99cab.sanctuary26.iliketomoveit.ILikeToMoveItMod;
import fr.koka99cab.sanctuary26.iliketomoveit.data.ILikeToMoveItData;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
/** Converts online inventories once their historical alias has been decoded. */
public final class MagicCarpetMigrationService {
private MagicCarpetMigrationService() {
}
public static void register() {
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> migrate(handler.player));
ServerTickEvents.END_SERVER_TICK.register(MagicCarpetMigrationService::tick);
}
private static void tick(MinecraftServer server) {
ILikeToMoveItData.get(server);
if (server.overworld().getGameTime() % 20L != 0L) return;
for (ServerPlayer player : server.getPlayerList().getPlayers()) migrate(player);
}
private static void migrate(ServerPlayer player) {
int migrated = MagicCarpetMigration.migrateContainer(player.getInventory());
migrated += MagicCarpetMigration.migrateContainer(player.getEnderChestInventory());
if (migrated > 0) {
ILikeToMoveItMod.LOGGER.info("[Magic Carpet] Migrated {} historical Totem stack(s) for {}.",
migrated, player.getGameProfile().name());
}
}
}
@@ -0,0 +1,124 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import fr.koka99cab.sanctuary26.iliketomoveit.ILikeToMoveItMod;
import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItItems;
import fr.koka99cab.sanctuary26.sanctuary.api.item.SanctuaryItemProvenance;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import java.util.ArrayList;
import java.util.List;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.Container;
import net.minecraft.world.entity.projectile.FireworkRocketEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.FireworkExplosion;
import net.minecraft.world.item.component.Fireworks;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.ChestBlockEntity;
/** Idempotently materializes the globally reserved Magic Carpet in Alpha. */
public final class NotchCarpetRewardService {
private static final int REWARD_SLOT = 13;
private NotchCarpetRewardService() {
}
public static void register() {
ServerTickEvents.END_SERVER_TICK.register(NotchCarpetRewardService::tick);
}
private static void tick(MinecraftServer server) {
if (server.overworld().getGameTime() % 20L != 0L) return;
var state = SanctuaryNotchMilestone.snapshot(server);
if (!state.defeated() || state.initialRewardDelivered()) return;
if (!state.initialRewardClaimed() && !SanctuaryNotchMilestone.claimInitialReward(server)) return;
ServerLevel alpha = server.getLevel(SanctuaryDimensions.ALPHA);
if (alpha == null) return;
BlockPos home = SanctuaryAlphaWorld.residence(alpha.getSeed());
if (!alpha.isLoaded(home)) return;
RewardChest result = ensureRewardChest(alpha, home);
if (result == null || !SanctuaryNotchMilestone.completeInitialReward(server)) return;
if (result.created()) {
launchFirework(alpha, result.pos());
server.getPlayerList().broadcastSystemMessage(
Component.translatable("message.iliketomoveit.magic_carpet.reward_created"), false);
}
ILikeToMoveItMod.LOGGER.info(
"[Magic Carpet] Completed unique Notch reward at {} (origin=notch_reward, recovered={}).",
result.pos().toShortString(), !result.created());
}
private static RewardChest ensureRewardChest(ServerLevel level, BlockPos home) {
List<BlockPos> candidates = candidates(home);
for (BlockPos pos : candidates) {
if (containsInitialReward(level, pos)) return new RewardChest(pos, false);
}
for (BlockPos pos : candidates) {
if (!level.getBlockState(pos).isAir() || !level.getBlockState(pos.above()).isAir()
|| level.getBlockState(pos.below()).isAir()) continue;
if (!level.setBlock(pos, Blocks.CHEST.defaultBlockState(), Block.UPDATE_ALL)) continue;
if (level.getBlockEntity(pos) instanceof ChestBlockEntity chest) {
chest.setItem(REWARD_SLOT, rewardStack());
chest.setChanged();
level.sendBlockUpdated(pos, level.getBlockState(pos), level.getBlockState(pos), Block.UPDATE_ALL);
return new RewardChest(pos, true);
}
level.setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL);
}
return null;
}
private static boolean containsInitialReward(ServerLevel level, BlockPos pos) {
if (level.getBlockState(pos).getBlock() != Blocks.CHEST
|| !(level.getBlockEntity(pos) instanceof Container container)) return false;
for (ItemStack stack : container) {
if (stack.is(ILikeToMoveItItems.MAGIC_CARPET)
&& SanctuaryItemProvenance.hasOrigin(stack, SanctuaryItemProvenance.NOTCH_REWARD)) return true;
}
return false;
}
private static ItemStack rewardStack() {
ItemStack reward = new ItemStack(ILikeToMoveItItems.MAGIC_CARPET);
reward.set(DataComponents.CUSTOM_NAME,
Component.translatable("item.iliketomoveit.magic_carpet.notch_reward_name"));
SanctuaryItemProvenance.stamp(reward, SanctuaryItemProvenance.NOTCH_REWARD);
return reward;
}
private static List<BlockPos> candidates(BlockPos home) {
ArrayList<BlockPos> positions = new ArrayList<>();
for (int y : new int[] {0, 1, -1, 2}) {
for (int radius = 2; radius <= 7; radius++) {
for (int x = -radius; x <= radius; x++) for (int z = -radius; z <= radius; z++) {
if (Math.max(Math.abs(x), Math.abs(z)) != radius) continue;
BlockPos candidate = home.offset(x, y, z).immutable();
if (SanctuaryAlphaWorld.containsHorizontal(candidate)) positions.add(candidate);
}
}
}
return List.copyOf(positions);
}
private static void launchFirework(ServerLevel level, BlockPos pos) {
ItemStack rocket = new ItemStack(Items.FIREWORK_ROCKET);
FireworkExplosion explosion = new FireworkExplosion(FireworkExplosion.Shape.STAR,
new IntArrayList(new int[] {0xE8B923, 0xF1F1F1}),
new IntArrayList(new int[] {0x9B59B6}), true, true);
rocket.set(DataComponents.FIREWORKS, new Fireworks(1, List.of(explosion)));
level.addFreshEntity(new FireworkRocketEntity(level, pos.getX() + 0.5D,
pos.getY() + 1.2D, pos.getZ() + 0.5D, rocket));
}
private record RewardChest(BlockPos pos, boolean created) {
}
}
@@ -3,7 +3,13 @@
"itemGroup.iliketomoveit.transport": "I Like To Move It",
"item.iliketomoveit.aircraft": "Aircraft",
"item.iliketomoveit.magic_cloud": "Magic Cloud",
"item.iliketomoveit.magic_carpet": "Magic Carpet (laboratory)",
"item.iliketomoveit.magic_carpet": "Magic Carpet",
"item.portals.notch_totem": "Notch Totem (legacy)",
"item.iliketomoveit.magic_carpet.notch_reward_name": "Notch's Magic Carpet",
"item.iliketomoveit.magic_carpet.description": "Hold it to maintain a temporary 3 × 3 platform beneath your feet.",
"item.iliketomoveit.magic_carpet.origin.notch": "Unique world reward from Notch",
"item.iliketomoveit.magic_carpet.origin.shop": "Replacement purchased from the Shop",
"item.iliketomoveit.magic_carpet.origin.legacy": "Converted from the historical Notch Totem",
"block.iliketomoveit.waystone": "Waystone",
"block.waystone.waystone": "Waystone (legacy)",
"entity.iliketomoveit.aircraft": "Aircraft",
@@ -11,6 +17,7 @@
"container.iliketomoveit.aircraft_engine": "Aircraft Engine",
"message.iliketomoveit.magic_carpet.enabled": "Magic Carpet enabled",
"message.iliketomoveit.magic_carpet.disabled": "Magic Carpet disabled",
"message.iliketomoveit.magic_carpet.reward_created": "Notch's unique Magic Carpet appeared in a chest near his house.",
"subtitles.iliketomoveit.magic_cloud.fly": "Magic Cloud flies",
"screen.iliketomoveit.waystone.title": "Waystones",
"screen.iliketomoveit.waystone.empty": "No other waystone in this dimension",
@@ -3,7 +3,13 @@
"itemGroup.iliketomoveit.transport": "I Like To Move It",
"item.iliketomoveit.aircraft": "Avion",
"item.iliketomoveit.magic_cloud": "Nuage magique",
"item.iliketomoveit.magic_carpet": "Tapis magique (laboratoire)",
"item.iliketomoveit.magic_carpet": "Tapis magique",
"item.portals.notch_totem": "Totem de Notch (hérité)",
"item.iliketomoveit.magic_carpet.notch_reward_name": "Tapis magique de Notch",
"item.iliketomoveit.magic_carpet.description": "Tenu en main, il maintient une plateforme temporaire 3 × 3 sous vos pieds.",
"item.iliketomoveit.magic_carpet.origin.notch": "Récompense mondiale unique de Notch",
"item.iliketomoveit.magic_carpet.origin.shop": "Remplacement acheté au Shop",
"item.iliketomoveit.magic_carpet.origin.legacy": "Converti depuis le Totem de Notch historique",
"block.iliketomoveit.waystone": "Pierre de voyage",
"block.waystone.waystone": "Pierre de voyage (héritée)",
"entity.iliketomoveit.aircraft": "Avion",
@@ -11,6 +17,7 @@
"container.iliketomoveit.aircraft_engine": "Moteur de l'avion",
"message.iliketomoveit.magic_carpet.enabled": "Tapis magique activé",
"message.iliketomoveit.magic_carpet.disabled": "Tapis magique désactivé",
"message.iliketomoveit.magic_carpet.reward_created": "Le Tapis magique unique de Notch est apparu dans un coffre près de sa maison.",
"subtitles.iliketomoveit.magic_cloud.fly": "Le nuage magique vole",
"screen.iliketomoveit.waystone.title": "Pierres de voyage",
"screen.iliketomoveit.waystone.empty": "Aucune autre pierre dans cette dimension",
@@ -3,7 +3,13 @@
"itemGroup.iliketomoveit.transport": "I Like To Move It",
"item.iliketomoveit.aircraft": "Самолёт",
"item.iliketomoveit.magic_cloud": "Волшебное облако",
"item.iliketomoveit.magic_carpet": "Ковёр-самолёт (лаборатория)",
"item.iliketomoveit.magic_carpet": "Ковёр-самолёт",
"item.portals.notch_totem": "Тотем Нотча (старый)",
"item.iliketomoveit.magic_carpet.notch_reward_name": "Ковёр-самолёт Нотча",
"item.iliketomoveit.magic_carpet.description": "В руке поддерживает временную платформу 3 × 3 под ногами.",
"item.iliketomoveit.magic_carpet.origin.notch": "Уникальная мировая награда за Нотча",
"item.iliketomoveit.magic_carpet.origin.shop": "Замена, купленная в Магазине",
"item.iliketomoveit.magic_carpet.origin.legacy": "Преобразован из исторического Тотема Нотча",
"block.iliketomoveit.waystone": "Камень пути",
"block.waystone.waystone": "Камень пути (старый)",
"entity.iliketomoveit.aircraft": "Самолёт",
@@ -11,6 +17,7 @@
"container.iliketomoveit.aircraft_engine": "Двигатель самолёта",
"message.iliketomoveit.magic_carpet.enabled": "Ковёр-самолёт включён",
"message.iliketomoveit.magic_carpet.disabled": "Ковёр-самолёт выключен",
"message.iliketomoveit.magic_carpet.reward_created": "Уникальный ковёр-самолёт Нотча появился в сундуке возле его дома.",
"subtitles.iliketomoveit.magic_cloud.fly": "Волшебное облако летит",
"screen.iliketomoveit.waystone.title": "Камни пути",
"screen.iliketomoveit.waystone.empty": "В этом измерении нет других камней",
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:block/purple_wool"
"layer0": "iliketomoveit:item/magic_carpet"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "iliketomoveit:item/magic_carpet"
}
}
@@ -33,13 +33,13 @@
"java": ">=25",
"fabric-api": ">=0.154.2+26.2",
"anotherworld": ">=0.0.0-alpha.46",
"sanctuary": ">=0.0.0-alpha.21"
"sanctuary": ">=0.0.0-alpha.127"
},
"custom": {
"sanctuary26": {
"system_type": "gameplay-system",
"namespace": "iliketomoveit",
"data_version": 3,
"data_version": 4,
"network_protocol": 5,
"lifecycle": "${lifecycle}",
"pack_version": "${pack_version}",
@@ -3,7 +3,9 @@
"package": "fr.koka99cab.sanctuary26.iliketomoveit.mixin",
"compatibilityLevel": "JAVA_25",
"mixins": [
"HappyGhastMixin"
"HappyGhastMixin",
"MagicCarpetContainerMixin",
"MagicCarpetItemEntityMixin"
],
"injectors": {
"defaultRequire": 1
@@ -0,0 +1,45 @@
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
/** Regression checks for overlap, world changes and shutdown cleanup ownership. */
public final class MagicCarpetLedgerSmoke {
private MagicCarpetLedgerSmoke() {
}
public static void main(String[] args) {
MagicCarpetLedger ledger = new MagicCarpetLedger();
UUID first = UUID.fromString("00000000-0000-0000-0000-000000000001");
UUID second = UUID.fromString("00000000-0000-0000-0000-000000000002");
ResourceKey<Level> firstWorld = ResourceKey.create(Registries.DIMENSION,
Identifier.fromNamespaceAndPath("test", "first"));
ResourceKey<Level> secondWorld = ResourceKey.create(Registries.DIMENSION,
Identifier.fromNamespaceAndPath("test", "second"));
BlockPos shared = new BlockPos(4, 70, 4);
ledger.track(first, firstWorld, Set.of(shared));
ledger.track(second, firstWorld, Set.of(shared));
if (!ledger.trackedByAnother(first, firstWorld, shared)) {
throw new AssertionError("Overlapping carpets lost their second owner");
}
ledger.remove(first);
if (ledger.trackedByAnother(second, firstWorld, shared)) {
throw new AssertionError("Removed owner still controls the shared glass");
}
ledger.track(second, secondWorld, Set.of(new BlockPos(0, 64, 0)));
if (!ledger.state(second, secondWorld).dimension().equals(secondWorld)
|| !ledger.state(second, firstWorld).dimension().equals(secondWorld)) {
throw new AssertionError("Dimension change did not replace the tracked world");
}
Map<UUID, MagicCarpetLedger.State> shutdown = ledger.drain();
if (shutdown.size() != 1 || !ledger.owners().isEmpty()) {
throw new AssertionError("Server shutdown did not atomically drain temporary platforms");
}
}
}
+9 -1
View File
@@ -2,7 +2,15 @@
It's Alive possède le vivant de Sanctuary. Il enrichit directement le Creeper vanilla et accueille désormais les papillons de Pipallon, les Mooblooms fleuries et les créatures de Real Ghost — baleine volante comprise — sous un référencement unifié `itsalive:*`.
## Version courante — `0.0.0-alpha.36`
## Version courante — `0.0.0-alpha.37`
## Résident Notch
- `itsalive:notch` est l'unique résident persistant de la maison Indev dans `sanctuary:alpha` ; il n'apparaît jamais naturellement et ne peut pas être invoqué par les commandes génériques.
- Son UUID canonique est sauvegardé, les doublons sont supprimés et le service le recrée au domicile s'il manque. L'alias caché `portals:notch` charge les anciennes entités du prototype sans dupliquer les règles.
- Le premier coup volontaire d'un joueur transforme l'humain en Titan. Le nombre de participants est borné à huit, la santé va de 360 à 600 et un combat abandonné se réinitialise après quinze secondes sans participant actif.
- It's Alive possède l'entité et son cycle de vie ; les attaques passent exclusivement par l'API publique `NotchCombatApi`, implémentée par Ouch.
- Diagnostics : `/masterkey notch inspect` et `/masterkey notch restore`.
## Creepers
+15 -6
View File
@@ -35,6 +35,14 @@ tasks.register("culinaryPartialMatchingSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.itsalive.culinary.recipe.CulinaryPartialMatchingSmoke"
}
tasks.register("notchFightRulesSmoke", JavaExec) {
group = "verification"
description = "Checks bounded Notch Titan scaling, reset timing and reflected-fireball damage."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchFightRulesSmoke"
}
tasks.named("test") {
// Quantity contracts are executable smoke tasks, not JUnit engine tests.
failOnNoDiscoveredTests = false
@@ -43,6 +51,7 @@ tasks.named("test") {
tasks.named("check") {
dependsOn tasks.named("canapliaFoundationSmoke")
dependsOn tasks.named("canapliaGameplaySmoke")
dependsOn tasks.named("notchFightRulesSmoke")
}
def generatedResources = layout.buildDirectory.dir("generated/resources")
@@ -556,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.36"
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")
@@ -1313,7 +1322,7 @@ tasks.register("verifyCulinaryReliability") {
}
}
}
if (project.version.toString() != "0.0.0-alpha.36"
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
@@ -1351,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.36"
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"
@@ -1389,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.36"
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
@@ -1437,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.36"
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
@@ -1500,7 +1509,7 @@ tasks.register("verifyCanapliaForbiddenBook") {
fr_fr: "Livre interdit",
en_us: "Forbidden Book",
ru_ru: "Запретная книга"]
if (project.version.toString() != "0.0.0-alpha.36"
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())")
@@ -1,6 +1,7 @@
package fr.koka99cab.sanctuary26.itsalive;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaFoundation;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchResidentService;
import fr.koka99cab.sanctuary26.itsalive.network.ItsAliveNetworking;
import fr.koka99cab.sanctuary26.itsalive.culinary.knowledge.CulinaryRecipeKnowledge;
import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveRegistries;
@@ -13,7 +14,7 @@ import org.slf4j.LoggerFactory;
public final class ItsAliveMod implements ModInitializer {
public static final String MOD_ID = "itsalive";
public static final String DISPLAY_NAME = "It's Alive !";
public static final int CURRENT_DATA_VERSION = 3;
public static final int CURRENT_DATA_VERSION = 4;
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public ItsAliveMod() {
@@ -27,6 +28,7 @@ public final class ItsAliveMod implements ModInitializer {
public void onInitialize() {
CanapliaFoundation.initialize();
ItsAliveRegistries.initialize();
NotchResidentService.initialize();
ItsAliveNetworking.initialize();
CulinaryRecipeKnowledge.initialize();
ProceduralVillagerNames.initialize();
@@ -0,0 +1,46 @@
package fr.koka99cab.sanctuary26.itsalive.api.notch;
import java.util.Objects;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.LivingEntity;
/** Public bridge allowing the combat-owning Ouch module to drive Notch attacks. */
public final class NotchCombatApi {
private static Engine engine = Engine.NOOP;
private static boolean registered;
private NotchCombatApi() {
}
public static synchronized void register(Engine implementation) {
Objects.requireNonNull(implementation, "implementation");
if (registered) throw new IllegalStateException("A Notch combat engine is already registered");
engine = implementation;
registered = true;
}
public static void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) {
engine.telegraph(level, boss, target, attack);
}
public static void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) {
engine.execute(level, boss, target, attack);
}
public enum Attack {
MELEE,
FIREBALL,
LIGHTNING
}
public interface Engine {
Engine NOOP = new Engine() {
@Override public void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) { }
@Override public void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) { }
};
void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack);
void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack);
}
}
@@ -34,7 +34,8 @@ public final class CanapliaHarvestService {
public static void onMatureHarvest(ServerLevel level, ServerPlayer player, BlockPos pos, BlockState state) {
if (!state.is(CanapliaContent.HEMP_CROP) || !CanapliaContent.HEMP_CROP.isMaxAge(state)) return;
CanapliaVariantKey parent = state.getValue(CanapliaHempCropBlock.VARIANT);
CanapliaVariantKey parent = CanapliaVariantLifecycle.harvestedFromPlant(
state.getValue(CanapliaHempCropBlock.VARIANT));
CanapliaKnowledge.discover(player, parent, "harvest");
ClimateCropForaging.CropClimate climate = ClimateCropForaging.climate(level.getBiome(pos));
AmbianceLunarHarvestApi.Conditions lunar = AmbianceLunarHarvestApi.evaluate(level, pos);
@@ -65,7 +66,8 @@ public final class CanapliaHarvestService {
if (pos.equals(center)) continue;
BlockState state = level.getBlockState(pos);
if (state.is(CanapliaContent.HEMP_CROP) && CanapliaContent.HEMP_CROP.isMaxAge(state)) {
variants.add(state.getValue(CanapliaHempCropBlock.VARIANT));
variants.add(CanapliaVariantLifecycle.harvestedFromPlant(
state.getValue(CanapliaHempCropBlock.VARIANT)));
}
}
return Set.copyOf(variants);
@@ -0,0 +1,36 @@
package fr.koka99cab.sanctuary26.itsalive.canaplia;
/** Stable variant hand-off across placement, growth, block-state persistence and harvest. */
public final class CanapliaVariantLifecycle {
private CanapliaVariantLifecycle() {
}
public static CanapliaVariantKey plantedFromSeed(CanapliaVariantKey seedVariant) {
return require(seedVariant);
}
public static CanapliaVariantKey afterGrowth(CanapliaVariantKey currentVariant) {
return require(currentVariant);
}
public static CanapliaVariantKey upperFromLower(CanapliaVariantKey lowerVariant) {
return require(lowerVariant);
}
public static CanapliaVariantKey harvestedFromPlant(CanapliaVariantKey plantVariant) {
return require(plantVariant);
}
public static String persistedKey(CanapliaVariantKey variant) {
return require(variant).key();
}
public static CanapliaVariantKey fromPersistedKey(String key) {
return CanapliaVariantKey.byKey(key).orElse(CanapliaVariantKey.COMMON);
}
private static CanapliaVariantKey require(CanapliaVariantKey variant) {
if (variant == null) throw new IllegalArgumentException("Canaplia variant cannot be null");
return variant;
}
}
@@ -2,6 +2,7 @@ package fr.koka99cab.sanctuary26.itsalive.canaplia.block;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaContent;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaHarvestService;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantLifecycle;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantKey;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
@@ -43,19 +44,28 @@ public final class CanapliaHempCropBlock extends CropBlock {
@Override
protected ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state, boolean includeData) {
return new ItemStack(CanapliaContent.family(state.getValue(VARIANT)).seeds());
CanapliaVariantKey variant = CanapliaVariantLifecycle.harvestedFromPlant(state.getValue(VARIANT));
return new ItemStack(CanapliaContent.family(variant).seeds());
}
@Override
protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
super.randomTick(state, level, pos, random);
synchronizeUpper(level, pos, level.getBlockState(pos));
if (level.getRawBrightness(pos, 0) < 9) return;
int age = getAge(state);
if (age >= getMaxAge()) return;
float speed = getGrowthSpeed(this, level, pos);
if (random.nextInt((int) (25.0F / speed) + 1) != 0) return;
BlockState grown = state.setValue(AGE, age + 1).setValue(VARIANT,
CanapliaVariantLifecycle.afterGrowth(state.getValue(VARIANT)));
level.setBlock(pos, grown, Block.UPDATE_CLIENTS);
synchronizeUpper(level, pos, grown);
}
@Override
public void growCrops(Level level, BlockPos pos, BlockState state) {
int age = Math.min(getMaxAge(), getAge(state) + getBonemealAgeIncrease(level));
BlockState grown = state.setValue(AGE, age);
BlockState grown = state.setValue(AGE, age).setValue(VARIANT,
CanapliaVariantLifecycle.afterGrowth(state.getValue(VARIANT)));
level.setBlock(pos, grown, Block.UPDATE_CLIENTS);
synchronizeUpper(level, pos, grown);
}
@@ -78,7 +88,7 @@ public final class CanapliaHempCropBlock extends CropBlock {
if (!(level instanceof ServerLevel serverLevel) || !(player instanceof ServerPlayer serverPlayer)) {
return InteractionResult.FAIL;
}
CanapliaVariantKey variant = state.getValue(VARIANT);
CanapliaVariantKey variant = CanapliaVariantLifecycle.harvestedFromPlant(state.getValue(VARIANT));
Block.popResource(serverLevel, pos,
new ItemStack(CanapliaContent.family(variant).bud(), 1 + serverLevel.getRandom().nextInt(3)));
CanapliaHarvestService.onMatureHarvest(serverLevel, serverPlayer, pos, state);
@@ -97,7 +107,8 @@ public final class CanapliaHempCropBlock extends CropBlock {
if (getAge(state) >= UPPER_START_AGE) {
if (aboveState.isAir() || aboveState.is(CanapliaContent.HEMP_TOP)) {
level.setBlock(above, CanapliaContent.HEMP_TOP.defaultBlockState()
.setValue(AGE, getAge(state)).setValue(VARIANT, state.getValue(VARIANT)), Block.UPDATE_CLIENTS);
.setValue(AGE, getAge(state)).setValue(VARIANT,
CanapliaVariantLifecycle.upperFromLower(state.getValue(VARIANT))), Block.UPDATE_CLIENTS);
}
} else if (aboveState.is(CanapliaContent.HEMP_TOP)) {
level.removeBlock(above, false);
@@ -1,6 +1,7 @@
package fr.koka99cab.sanctuary26.itsalive.canaplia.block;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaContent;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantLifecycle;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantKey;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
@@ -26,7 +27,9 @@ public final class CanapliaHempTopBlock extends CropBlock {
@Override
protected ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state, boolean includeData) {
return new ItemStack(CanapliaContent.family(state.getValue(CanapliaHempCropBlock.VARIANT)).seeds());
CanapliaVariantKey variant = CanapliaVariantLifecycle.harvestedFromPlant(
state.getValue(CanapliaHempCropBlock.VARIANT));
return new ItemStack(CanapliaContent.family(variant).seeds());
}
@Override
@@ -1,5 +1,6 @@
package fr.koka99cab.sanctuary26.itsalive.canaplia.item;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantLifecycle;
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaVariantKey;
import fr.koka99cab.sanctuary26.itsalive.canaplia.block.CanapliaHempCropBlock;
import fr.koka99cab.sanctuary26.itsalive.canaplia.block.CanapliaResinBlock;
@@ -24,12 +25,17 @@ public final class CanapliaVariantBlockItem extends BlockItem {
@Override
protected BlockState getPlacementState(BlockPlaceContext context) {
BlockState state = super.getPlacementState(context);
if (state == null) return null;
return applyVariant(state, variant);
}
public static BlockState applyVariant(BlockState state, CanapliaVariantKey variant) {
if (state == null || variant == null) return state;
CanapliaVariantKey placed = CanapliaVariantLifecycle.plantedFromSeed(variant);
if (state.hasProperty(CanapliaHempCropBlock.VARIANT)) {
return state.setValue(CanapliaHempCropBlock.VARIANT, variant);
return state.setValue(CanapliaHempCropBlock.VARIANT, placed);
}
if (state.hasProperty(CanapliaResinBlock.VARIANT)) {
return state.setValue(CanapliaResinBlock.VARIANT, variant);
return state.setValue(CanapliaResinBlock.VARIANT, placed);
}
return state;
}
@@ -5,6 +5,7 @@ import fr.koka99cab.sanctuary26.itsalive.client.model.ButterflyModel;
import fr.koka99cab.sanctuary26.itsalive.client.model.GhostModel;
import fr.koka99cab.sanctuary26.itsalive.client.model.FlyingWhaleModel;
import fr.koka99cab.sanctuary26.itsalive.client.model.StandingCowModel;
import fr.koka99cab.sanctuary26.itsalive.client.model.NotchModel;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.BrackenRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.ButterflyRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.GhostRenderer;
@@ -12,6 +13,7 @@ import fr.koka99cab.sanctuary26.itsalive.client.renderer.GemChickenRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.FlyingWhaleRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.InfectedRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.MoobloomRenderer;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.NotchRenderer;
import fr.koka99cab.sanctuary26.itsalive.culinary.client.renderer.FryingPanBlockEntityRenderer;
import fr.koka99cab.sanctuary26.itsalive.culinary.client.renderer.FermentationBarrelBlockEntityRenderer;
import fr.koka99cab.sanctuary26.itsalive.culinary.client.FermentationBarrelHud;
@@ -62,6 +64,7 @@ public final class ItsAliveClient implements ClientModInitializer {
ModelLayerRegistry.registerModelLayer(StandingCowModel.TEMPERATE_LAYER, StandingCowModel::createTemperateLayer);
ModelLayerRegistry.registerModelLayer(StandingCowModel.COLD_LAYER, StandingCowModel::createColdLayer);
ModelLayerRegistry.registerModelLayer(StandingCowModel.WARM_LAYER, StandingCowModel::createWarmLayer);
ModelLayerRegistry.registerModelLayer(NotchModel.LAYER_LOCATION, NotchModel::createBodyLayer);
EntityRendererRegistry.register(ItsAliveEntityTypes.BUTTERFLY, ButterflyRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.GHOST, GhostRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.BRACKEN, BrackenRenderer::new);
@@ -70,6 +73,8 @@ public final class ItsAliveClient implements ClientModInitializer {
EntityRendererRegistry.register(ItsAliveEntityTypes.MOOBLOOM, MoobloomRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.GEM_CHICKEN, GemChickenRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.ACID_GLOB, ThrownItemRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.NOTCH, NotchRenderer::new);
EntityRendererRegistry.register(ItsAliveEntityTypes.LEGACY_NOTCH, NotchRenderer::new);
BlockEntityRendererRegistry.register(
ItsAliveFoodProcessing.FRYING_PAN_BLOCK_ENTITY,
FryingPanBlockEntityRenderer::new
@@ -0,0 +1,21 @@
package fr.koka99cab.sanctuary26.itsalive.client.model;
import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.state.NotchRenderState;
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.builders.CubeDeformation;
import net.minecraft.client.model.geom.builders.LayerDefinition;
public final class NotchModel extends HumanoidModel<NotchRenderState> {
public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(ItsAliveMod.id("notch"), "main");
public NotchModel(ModelPart root) {
super(root);
}
public static LayerDefinition createBodyLayer() {
return LayerDefinition.create(HumanoidModel.createMesh(CubeDeformation.NONE, 0.0F), 64, 64);
}
}
@@ -0,0 +1,45 @@
package fr.koka99cab.sanctuary26.itsalive.client.renderer;
import com.mojang.blaze3d.vertex.PoseStack;
import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
import fr.koka99cab.sanctuary26.itsalive.client.model.NotchModel;
import fr.koka99cab.sanctuary26.itsalive.client.renderer.state.NotchRenderState;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.HumanoidMobRenderer;
import net.minecraft.resources.Identifier;
import net.minecraft.util.Mth;
public final class NotchRenderer extends HumanoidMobRenderer<NotchEntity, NotchRenderState, NotchModel> {
private static final Identifier TEXTURE = ItsAliveMod.id("textures/entity/notch.png");
public NotchRenderer(EntityRendererProvider.Context context) {
super(context, new NotchModel(context.bakeLayer(NotchModel.LAYER_LOCATION)), 0.5F);
}
@Override
public Identifier getTextureLocation(NotchRenderState state) {
return TEXTURE;
}
@Override
public NotchRenderState createRenderState() {
return new NotchRenderState();
}
@Override
public void extractRenderState(NotchEntity notch, NotchRenderState state, float partialTick) {
super.extractRenderState(notch, state, partialTick);
state.titan = notch.isTitan();
state.titanTransformationProgress = notch.titanTransformationProgress(partialTick);
}
@Override
protected void scale(NotchRenderState state, PoseStack poseStack) {
super.scale(state, poseStack);
float scale = state.titan
? Mth.lerp(state.titanTransformationProgress, 1.0F, NotchEntity.TITAN_RENDER_SCALE)
: 1.0F;
poseStack.scale(scale, scale, scale);
}
}
@@ -0,0 +1,8 @@
package fr.koka99cab.sanctuary26.itsalive.client.renderer.state;
import net.minecraft.client.renderer.entity.state.HumanoidRenderState;
public final class NotchRenderState extends HumanoidRenderState {
public boolean titan;
public float titanTransformationProgress;
}
@@ -0,0 +1,495 @@
package fr.koka99cab.sanctuary26.itsalive.entity.notch;
import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
import fr.koka99cab.sanctuary26.itsalive.api.notch.NotchCombatApi;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
import java.util.EnumSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.network.chat.Component;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.server.level.ServerBossEvent;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.Mth;
import net.minecraft.world.BossEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityDimensions;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.PathfinderMob;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.ai.goal.FloatGoal;
import net.minecraft.world.entity.ai.goal.Goal;
import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.Projectile;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
import net.minecraft.world.phys.Vec3;
/** The unique human resident of Alpha and his server-authoritative Titan phase. */
public final class NotchEntity extends PathfinderMob {
private static final EntityDataAccessor<Byte> PHASE = SynchedEntityData.defineId(
NotchEntity.class, EntityDataSerializers.BYTE);
private static final EntityDataAccessor<Integer> PHASE_STARTED_TICK = SynchedEntityData.defineId(
NotchEntity.class, EntityDataSerializers.INT);
public static final float TITAN_RENDER_SCALE = 8.0F;
private static final float TITAN_HITBOX_SCALE = 5.0F;
private static final double HUMAN_HOME_RADIUS = 9.0D;
private static final double TITAN_HOME_RADIUS = 54.0D;
private static final double PARTICIPANT_RADIUS = 64.0D;
private static final String DATA_VERSION_KEY = "ItsAliveDataVersion";
private static final String PARTICIPANTS_KEY = "NotchParticipants";
private static final String LEGACY_REWARD_KEY = "NotchRewardGranted";
private final ServerBossEvent bossEvent = new ServerBossEvent(UUID.randomUUID(),
Component.translatable("boss.itsalive.notch_titan"), BossEvent.BossBarColor.RED,
BossEvent.BossBarOverlay.NOTCHED_20);
private final LinkedHashSet<UUID> participants = new LinkedHashSet<>();
private BlockPos home;
private int ticksWithoutParticipant;
private float titanMaximumHealth = NotchFightRules.MIN_TITAN_HEALTH;
private boolean legacyRewardGranted;
public NotchEntity(net.minecraft.world.entity.EntityType<? extends NotchEntity> type, Level level) {
super(type, level);
this.xpReward = 0;
this.setCustomName(Component.translatable("entity.itsalive.notch"));
this.setCustomNameVisible(true);
this.setPersistenceRequired();
this.bossEvent.setDarkenScreen(true);
this.bossEvent.setCreateWorldFog(true);
this.bossEvent.setVisible(false);
this.applyPhaseAttributes(true);
}
public static AttributeSupplier.Builder createAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, NotchFightRules.HUMAN_HEALTH)
.add(Attributes.ATTACK_DAMAGE, 1.0D)
.add(Attributes.FOLLOW_RANGE, 96.0D)
.add(Attributes.MOVEMENT_SPEED, 0.16D)
.add(Attributes.KNOCKBACK_RESISTANCE, 1.0D)
.add(Attributes.ARMOR, 0.0D)
.add(Attributes.ARMOR_TOUGHNESS, 0.0D)
.add(Attributes.STEP_HEIGHT, 2.0D);
}
@Override
protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder);
builder.define(PHASE, (byte)NotchFightRules.Phase.HUMAN.id());
builder.define(PHASE_STARTED_TICK, 0);
}
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(1, new TitanCombatGoal());
this.goalSelector.addGoal(5, new BoundedStrollGoal());
this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 24.0F));
this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10,
true, false, (target, level) -> this.isTitan() && target instanceof Player player
&& this.canParticipate(player)));
}
@Override
protected void customServerAiStep(ServerLevel level) {
super.customServerAiStep(level);
this.ensureHome(level);
this.bossEvent.setVisible(this.isTitan());
if (this.isTitan()) {
this.collectParticipants(level);
this.bossEvent.setProgress(Mth.clamp(this.getHealth() / this.getMaxHealth(), 0.0F, 1.0F));
if (this.hasActiveParticipant(level)) {
this.ticksWithoutParticipant = 0;
} else if (NotchFightRules.shouldReset(++this.ticksWithoutParticipant)) {
this.resetInterruptedFight(level);
return;
}
this.returnInsideBoundary(TITAN_HOME_RADIUS);
} else {
this.bossEvent.setProgress(1.0F);
this.ticksWithoutParticipant = 0;
if (this.getTarget() != null) this.setTarget(null);
this.returnInsideBoundary(HUMAN_HOME_RADIUS + 4.0D);
}
}
@Override
public boolean hurtServer(ServerLevel level, DamageSource source, float damage) {
if (this.isDefeated()) return false;
Entity attacker = source.getEntity();
if (this.isHuman()) {
if (attacker instanceof ServerPlayer player) {
this.beginFight(level, player);
return true;
}
return false;
}
if (attacker == this) return false;
if (source.getDirectEntity() instanceof Projectile projectile && projectile.getOwner() == this) return false;
if (attacker instanceof ServerPlayer player) this.addParticipant(player);
boolean hurt = super.hurtServer(level, source, Math.max(0.0F, damage));
if (hurt && attacker instanceof LivingEntity living && this.canAttack(living)) this.setTarget(living);
return hurt;
}
@Override
public void die(DamageSource source) {
if (this.isTitan() && this.level() instanceof ServerLevel level) {
this.completeFight(level);
return;
}
super.die(source);
}
@Override
public boolean canAttack(LivingEntity target) {
return this.isTitan() && super.canAttack(target);
}
@Override
protected void checkFallDamage(double distance, boolean landed, BlockState state, BlockPos pos) {
}
public void initializeAtHome(BlockPos home, boolean defeated) {
this.home = home.immutable();
this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, 180.0F, 0.0F);
this.setYHeadRot(180.0F);
this.setPhase(defeated ? NotchFightRules.Phase.DEFEATED : NotchFightRules.Phase.HUMAN, true);
}
public void restoreAtHome(BlockPos home, boolean defeated) {
this.participants.clear();
this.ticksWithoutParticipant = 0;
this.setTarget(null);
this.getNavigation().stop();
this.setDeltaMovement(Vec3.ZERO);
this.initializeAtHome(home, defeated);
}
public NotchFightRules.Phase phase() {
return NotchFightRules.Phase.byId(this.entityData.get(PHASE));
}
public boolean isHuman() {
return phase() == NotchFightRules.Phase.HUMAN;
}
public boolean isTitan() {
return phase() == NotchFightRules.Phase.TITAN;
}
public boolean isDefeated() {
return phase() == NotchFightRules.Phase.DEFEATED;
}
public float titanTransformationProgress(float partialTick) {
if (!isTitan()) return 0.0F;
return Mth.clamp((this.tickCount + partialTick - this.entityData.get(PHASE_STARTED_TICK)) / 30.0F,
0.0F, 1.0F);
}
public boolean legacyRewardGranted() {
return legacyRewardGranted;
}
public Set<UUID> participantIds() {
return Set.copyOf(participants);
}
private void beginFight(ServerLevel level, ServerPlayer attacker) {
this.participants.clear();
this.addParticipant(attacker);
level.players().stream()
.filter(this::canParticipate)
.sorted(java.util.Comparator.comparingDouble(this::distanceToSqr))
.forEach(this::addParticipant);
this.titanMaximumHealth = NotchFightRules.titanHealth(participants.size());
this.setPhase(NotchFightRules.Phase.TITAN, true);
this.setTarget(attacker);
this.bossEvent.setVisible(true);
this.spawnLightningRing(level, 4);
level.explode(this, this.getX(), this.getY() + 1.0D, this.getZ(), 4.0F,
Level.ExplosionInteraction.BLOCK);
this.playSound(SoundEvents.WITHER_SPAWN, 1.4F, 0.72F);
}
private void completeFight(ServerLevel level) {
this.collectParticipants(level);
this.setPhase(NotchFightRules.Phase.DEFEATED, true);
this.setTarget(null);
this.getNavigation().stop();
this.setDeltaMovement(Vec3.ZERO);
this.deathTime = 0;
this.bossEvent.setVisible(false);
this.spawnLightningRing(level, 3);
level.sendParticles(ParticleTypes.EXPLOSION_EMITTER, this.getX(), this.getY() + 1.0D,
this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
this.playSound(SoundEvents.WITHER_DEATH, 1.25F, 1.15F);
SanctuaryNotchMilestone.recordVictory(level, participants);
}
private void resetInterruptedFight(ServerLevel level) {
this.setPhase(NotchFightRules.Phase.HUMAN, true);
this.participants.clear();
this.setTarget(null);
this.getNavigation().stop();
this.setDeltaMovement(Vec3.ZERO);
this.bossEvent.setVisible(false);
if (home != null) this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, 180.0F, 0.0F);
level.sendParticles(ParticleTypes.SMOKE, this.getX(), this.getY() + 1.0D, this.getZ(),
18, 0.8D, 1.0D, 0.8D, 0.04D);
}
private void setPhase(NotchFightRules.Phase phase, boolean heal) {
this.entityData.set(PHASE, (byte)phase.id());
this.entityData.set(PHASE_STARTED_TICK, this.tickCount);
this.applyPhaseAttributes(heal);
this.refreshDimensions();
}
private void applyPhaseAttributes(boolean heal) {
boolean titan = isTitan();
setBaseValue(Attributes.MAX_HEALTH, titan ? titanMaximumHealth : NotchFightRules.HUMAN_HEALTH);
setBaseValue(Attributes.ATTACK_DAMAGE, titan ? 18.0D : 1.0D);
setBaseValue(Attributes.MOVEMENT_SPEED, titan ? 0.235D : 0.16D);
setBaseValue(Attributes.ARMOR, titan ? 10.0D : 0.0D);
setBaseValue(Attributes.ARMOR_TOUGHNESS, titan ? 8.0D : 0.0D);
if (heal) this.setHealth(this.getMaxHealth());
}
private void setBaseValue(net.minecraft.core.Holder<net.minecraft.world.entity.ai.attributes.Attribute> attribute,
double value) {
AttributeInstance instance = this.getAttribute(attribute);
if (instance != null) instance.setBaseValue(value);
}
private void ensureHome(ServerLevel level) {
if (home == null) home = SanctuaryAlphaWorld.residence(level.getSeed());
}
private void returnInsideBoundary(double radius) {
if (home == null || this.distanceToSqr(Vec3.atCenterOf(home)) <= radius * radius) return;
this.getNavigation().stop();
this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, this.getYRot(), this.getXRot());
}
private boolean canParticipate(Player player) {
return player.isAlive() && !player.isSpectator() && player.level() == this.level()
&& this.distanceToSqr(player) <= PARTICIPANT_RADIUS * PARTICIPANT_RADIUS;
}
private void addParticipant(Player player) {
if (participants.size() < NotchFightRules.MAX_PARTICIPANTS && canParticipate(player)) {
participants.add(player.getUUID());
}
}
private void collectParticipants(ServerLevel level) {
level.players().stream().filter(this::canParticipate)
.sorted(java.util.Comparator.comparingDouble(this::distanceToSqr))
.forEach(this::addParticipant);
}
private boolean hasActiveParticipant(ServerLevel level) {
return participants.stream().map(level.getServer().getPlayerList()::getPlayer)
.anyMatch(player -> player != null && canParticipate(player));
}
private void spawnLightningRing(ServerLevel level, int strikes) {
for (int index = 0; index < strikes; index++) {
double angle = Math.PI * 2.0D * index / Math.max(1, strikes);
net.minecraft.world.entity.LightningBolt lightning = net.minecraft.world.entity.EntityTypes.LIGHTNING_BOLT
.create(level, net.minecraft.world.entity.EntitySpawnReason.TRIGGERED);
if (lightning == null) continue;
lightning.setVisualOnly(true);
lightning.setPos(this.getX() + Math.cos(angle) * 2.4D, this.getY(),
this.getZ() + Math.sin(angle) * 2.4D);
level.addFreshEntity(lightning);
}
}
@Override
protected EntityDimensions getDefaultDimensions(Pose pose) {
EntityDimensions dimensions = super.getDefaultDimensions(pose);
return isTitan() ? dimensions.scale(TITAN_HITBOX_SCALE) : dimensions;
}
@Override
public void onSyncedDataUpdated(EntityDataAccessor<?> key) {
super.onSyncedDataUpdated(key);
if (PHASE.equals(key)) this.refreshDimensions();
}
@Override
protected void addAdditionalSaveData(ValueOutput output) {
super.addAdditionalSaveData(output);
output.putInt(DATA_VERSION_KEY, ItsAliveMod.CURRENT_DATA_VERSION);
output.putByte("NotchPhase", this.entityData.get(PHASE));
output.putInt("NotchPhaseStartedTick", this.entityData.get(PHASE_STARTED_TICK));
output.putFloat("NotchStoredHealth", this.getHealth());
output.putFloat("NotchTitanMaximumHealth", this.titanMaximumHealth);
output.putString(PARTICIPANTS_KEY, participants.stream().map(UUID::toString).collect(Collectors.joining(",")));
output.putBoolean(LEGACY_REWARD_KEY, legacyRewardGranted);
if (home != null) {
output.putInt("NotchHomeX", home.getX());
output.putInt("NotchHomeY", home.getY());
output.putInt("NotchHomeZ", home.getZ());
}
}
@Override
protected void readAdditionalSaveData(ValueInput input) {
super.readAdditionalSaveData(input);
NotchFightRules.Phase phase = NotchFightRules.Phase.byId(input.getByteOr("NotchPhase", (byte)0));
this.entityData.set(PHASE, (byte)phase.id());
this.entityData.set(PHASE_STARTED_TICK, input.getIntOr("NotchPhaseStartedTick", 0));
this.titanMaximumHealth = Mth.clamp(input.getFloatOr("NotchTitanMaximumHealth",
NotchFightRules.MIN_TITAN_HEALTH), NotchFightRules.MIN_TITAN_HEALTH,
NotchFightRules.MAX_TITAN_HEALTH);
this.participants.clear();
input.getString(PARTICIPANTS_KEY).ifPresent(value -> {
for (String token : value.split(",")) {
if (participants.size() >= NotchFightRules.MAX_PARTICIPANTS) break;
try { participants.add(UUID.fromString(token)); } catch (IllegalArgumentException ignored) { }
}
});
this.legacyRewardGranted = input.getBooleanOr(LEGACY_REWARD_KEY, false);
if (input.getInt("NotchHomeX").isPresent() && input.getInt("NotchHomeY").isPresent()
&& input.getInt("NotchHomeZ").isPresent()) {
this.home = new BlockPos(input.getIntOr("NotchHomeX", 0), input.getIntOr("NotchHomeY", 0),
input.getIntOr("NotchHomeZ", 0));
}
this.applyPhaseAttributes(false);
this.setHealth(Mth.clamp(input.getFloatOr("NotchStoredHealth", this.getMaxHealth()),
1.0F, this.getMaxHealth()));
this.refreshDimensions();
this.bossEvent.setVisible(isTitan());
}
@Override
public void startSeenByPlayer(ServerPlayer player) {
super.startSeenByPlayer(player);
this.bossEvent.addPlayer(player);
}
@Override
public void stopSeenByPlayer(ServerPlayer player) {
super.stopSeenByPlayer(player);
this.bossEvent.removePlayer(player);
}
@Override
public boolean removeWhenFarAway(double distance) {
return false;
}
@Override
public int getMaxSpawnClusterSize() {
return 1;
}
private final class BoundedStrollGoal extends WaterAvoidingRandomStrollGoal {
private BoundedStrollGoal() {
super(NotchEntity.this, 0.72D, 0.008F);
}
@Override public boolean canUse() { return !NotchEntity.this.isTitan() && super.canUse(); }
@Override public boolean canContinueToUse() { return !NotchEntity.this.isTitan() && super.canContinueToUse(); }
}
private final class TitanCombatGoal extends Goal {
private static final double STRAFE_DISTANCE_SQUARED = 18.0D * 18.0D;
private int rangedCooldown;
private int meleeCooldown;
private int attackIndex;
private int windup;
private NotchCombatApi.Attack pendingAttack;
private boolean clockwise;
private int strafeTicks;
private TitanCombatGoal() {
this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
}
@Override public boolean canUse() {
LivingEntity target = NotchEntity.this.getTarget();
return NotchEntity.this.isTitan() && target != null && target.isAlive();
}
@Override public boolean canContinueToUse() { return canUse(); }
@Override public void start() {
rangedCooldown = 45;
meleeCooldown = 0;
attackIndex = 0;
windup = 0;
pendingAttack = null;
clockwise = NotchEntity.this.getRandom().nextBoolean();
}
@Override public void stop() {
NotchEntity.this.getNavigation().stop();
pendingAttack = null;
}
@Override public boolean requiresUpdateEveryTick() { return true; }
@Override public void tick() {
LivingEntity target = NotchEntity.this.getTarget();
if (target == null || !(NotchEntity.this.level() instanceof ServerLevel level)) return;
double distanceSquared = NotchEntity.this.distanceToSqr(target);
boolean canSee = NotchEntity.this.getSensing().hasLineOfSight(target);
NotchEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F);
if (!canSee || distanceSquared > STRAFE_DISTANCE_SQUARED) {
NotchEntity.this.getNavigation().moveTo(target, 1.12D);
} else {
NotchEntity.this.getNavigation().stop();
if (++strafeTicks >= 45) { strafeTicks = 0; clockwise = !clockwise; }
NotchEntity.this.getMoveControl().strafe(distanceSquared < 100.0D ? -0.45F : 0.28F,
clockwise ? 0.7F : -0.7F);
}
if (meleeCooldown > 0) meleeCooldown--;
if (distanceSquared <= 64.0D && meleeCooldown == 0) {
NotchCombatApi.execute(level, NotchEntity.this, target, NotchCombatApi.Attack.MELEE);
meleeCooldown = 24;
}
if (pendingAttack != null) {
if (--windup <= 0) {
NotchCombatApi.execute(level, NotchEntity.this, target, pendingAttack);
pendingAttack = null;
rangedCooldown = 65 + NotchEntity.this.getRandom().nextInt(32);
}
return;
}
if (rangedCooldown > 0) rangedCooldown--;
if (canSee && rangedCooldown == 0) {
pendingAttack = attackIndex++ % 5 == 4
? NotchCombatApi.Attack.LIGHTNING : NotchCombatApi.Attack.FIREBALL;
windup = pendingAttack == NotchCombatApi.Attack.LIGHTNING ? 24 : 14;
NotchCombatApi.telegraph(level, NotchEntity.this, target, pendingAttack);
}
}
}
}
@@ -0,0 +1,49 @@
package fr.koka99cab.sanctuary26.itsalive.entity.notch;
import net.minecraft.util.Mth;
/** Pure bounded rules shared by the live Notch entity and deterministic tests. */
public final class NotchFightRules {
public static final int MAX_PARTICIPANTS = 8;
public static final int RESET_AFTER_EMPTY_TICKS = 20 * 15;
public static final float HUMAN_HEALTH = 20.0F;
public static final float MIN_TITAN_HEALTH = 360.0F;
public static final float MAX_TITAN_HEALTH = 600.0F;
public static final float RETURNED_FIREBALL_DAMAGE = 40.0F;
private NotchFightRules() {
}
public static float titanHealth(int participantCount) {
int bounded = Mth.clamp(participantCount, 1, MAX_PARTICIPANTS);
return Math.min(MAX_TITAN_HEALTH, MIN_TITAN_HEALTH + (bounded - 1) * 40.0F);
}
public static boolean shouldReset(int ticksWithoutParticipant) {
return ticksWithoutParticipant >= RESET_AFTER_EMPTY_TICKS;
}
public enum Phase {
HUMAN(0),
TITAN(1),
DEFEATED(2);
private final int id;
Phase(int id) {
this.id = id;
}
public int id() {
return id;
}
public static Phase byId(int id) {
return switch (id) {
case 1 -> TITAN;
case 2 -> DEFEATED;
default -> HUMAN;
};
}
}
}
@@ -0,0 +1,156 @@
package fr.koka99cab.sanctuary26.itsalive.entity.notch;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveEntityTypes;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.core.BlockPos;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.datafix.DataFixTypes;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.level.saveddata.SavedData;
import net.minecraft.world.level.saveddata.SavedDataType;
/** Maintains exactly one persistent Notch resident in the finite Alpha world. */
public final class NotchResidentService {
private static final int CHECK_INTERVAL = 40;
private static boolean initialized;
private NotchResidentService() {
}
public static void initialize() {
if (initialized) return;
initialized = true;
ServerTickEvents.END_LEVEL_TICK.register(NotchResidentService::tick);
ItsAliveMod.LOGGER.debug("[{}] Registered the unique Alpha resident service.",
ItsAliveMod.DISPLAY_NAME);
}
public static Inspection inspect(MinecraftServer server) {
ServerLevel level = server.getLevel(SanctuaryDimensions.ALPHA);
if (level == null) return Inspection.unavailable();
SpawnState state = level.getDataStorage().computeIfAbsent(SpawnState.TYPE);
List<NotchEntity> residents = loadedResidents(level);
NotchEntity canonical = selectCanonical(residents, state.canonicalUuid()).orElse(null);
return new Inspection(true, residents.size(), canonical == null ? null : canonical.getUUID(),
canonical == null ? null : canonical.phase(), canonical == null ? null : canonical.blockPosition(),
SanctuaryNotchMilestone.isDefeated(server));
}
/** Force-loads the house chunk, removes duplicates and restores the canonical resident. */
public static Inspection restore(MinecraftServer server) {
ServerLevel level = server.getLevel(SanctuaryDimensions.ALPHA);
if (level == null) return Inspection.unavailable();
BlockPos home = SanctuaryAlphaWorld.residence(level.getSeed());
level.getChunkAt(home);
reconcile(level, true);
return inspect(server);
}
private static void tick(ServerLevel level) {
if (!level.dimension().equals(SanctuaryDimensions.ALPHA)
|| level.players().isEmpty()
|| level.getGameTime() % CHECK_INTERVAL != 0) return;
reconcile(level, false);
}
private static void reconcile(ServerLevel level, boolean forceHome) {
BlockPos home = SanctuaryAlphaWorld.residence(level.getSeed());
if (!forceHome && !level.isLoaded(home)) return;
SpawnState state = level.getDataStorage().computeIfAbsent(SpawnState.TYPE);
List<NotchEntity> residents = loadedResidents(level);
NotchEntity canonical = selectCanonical(residents, state.canonicalUuid()).orElse(null);
if (canonical == null) {
canonical = ItsAliveEntityTypes.NOTCH.create(level, EntitySpawnReason.EVENT);
if (canonical == null) return;
canonical.initializeAtHome(home, SanctuaryNotchMilestone.isDefeated(level.getServer()));
if (!level.addFreshEntity(canonical)) return;
residents = List.of(canonical);
ItsAliveMod.LOGGER.info("[{}] Placed Notch in the Alpha residence at {}.",
ItsAliveMod.DISPLAY_NAME, home);
}
for (NotchEntity resident : residents) {
if (resident != canonical) resident.discard();
}
state.setCanonicalUuid(canonical.getUUID());
if (canonical.isDefeated() && !SanctuaryNotchMilestone.isDefeated(level.getServer())) {
SanctuaryNotchMilestone.migrateLegacyVictory(level, canonical.legacyRewardGranted());
}
boolean defeated = SanctuaryNotchMilestone.isDefeated(level.getServer());
if (forceHome || defeated != canonical.isDefeated()) canonical.restoreAtHome(home, defeated);
}
private static List<NotchEntity> loadedResidents(ServerLevel level) {
List<NotchEntity> residents = new ArrayList<>();
for (Entity entity : level.getAllEntities()) {
if (entity instanceof NotchEntity notch && !notch.isRemoved()) residents.add(notch);
}
return residents;
}
private static Optional<NotchEntity> selectCanonical(List<NotchEntity> residents, UUID storedUuid) {
return residents.stream().min(Comparator
.comparing((NotchEntity notch) -> !notch.getUUID().equals(storedUuid))
.thenComparing(notch -> notch.getType() != ItsAliveEntityTypes.NOTCH)
.thenComparing(notch -> notch.getUUID().toString()));
}
public record Inspection(boolean alphaAvailable, int loadedResidents, UUID canonicalUuid,
NotchFightRules.Phase phase, BlockPos position, boolean worldDefeated) {
private static Inspection unavailable() {
return new Inspection(false, 0, null, null, null, false);
}
}
private static final class SpawnState extends SavedData {
private static final Codec<SpawnState> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.INT.optionalFieldOf("data_version", ItsAliveMod.CURRENT_DATA_VERSION)
.forGetter(state -> state.dataVersion),
Codec.STRING.optionalFieldOf("canonical_uuid", "").forGetter(state -> state.canonicalUuid)
).apply(instance, SpawnState::new));
private static final SavedDataType<SpawnState> TYPE = new SavedDataType<>(
ItsAliveMod.id("alpha_notch_resident"), SpawnState::new, CODEC, DataFixTypes.LEVEL);
private int dataVersion;
private String canonicalUuid;
private SpawnState() {
this(ItsAliveMod.CURRENT_DATA_VERSION, "");
}
private SpawnState(int dataVersion, String canonicalUuid) {
this.dataVersion = Math.max(1, dataVersion);
this.canonicalUuid = canonicalUuid == null ? "" : canonicalUuid;
if (this.dataVersion < ItsAliveMod.CURRENT_DATA_VERSION) {
this.dataVersion = ItsAliveMod.CURRENT_DATA_VERSION;
setDirty();
}
}
private UUID canonicalUuid() {
try {
return UUID.fromString(canonicalUuid);
} catch (IllegalArgumentException ignored) {
return new UUID(0L, 0L);
}
}
private void setCanonicalUuid(UUID uuid) {
String value = uuid.toString();
if (value.equals(canonicalUuid)) return;
canonicalUuid = value;
setDirty();
}
}
}
@@ -9,6 +9,7 @@ import fr.koka99cab.sanctuary26.itsalive.entity.FlyingWhaleEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.GemChickenEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.InfectedEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.MoobloomEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
import java.util.function.Predicate;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext;
@@ -44,6 +45,8 @@ public final class ItsAliveEntityTypes {
public static final Identifier ACID_GLOB_ID = ItsAliveMod.id("acid_glob");
public static final Identifier MOOBLOOM_ID = ItsAliveMod.id("moobloom");
public static final Identifier GEM_CHICKEN_ID = ItsAliveMod.id("gem_chicken");
public static final Identifier NOTCH_ID = ItsAliveMod.id("notch");
public static final Identifier LEGACY_NOTCH_ID = Identifier.fromNamespaceAndPath("portals", "notch");
public static final EntityType<ButterflyEntity> BUTTERFLY = Registry.register(
BuiltInRegistries.ENTITY_TYPE,
@@ -167,6 +170,10 @@ public final class ItsAliveEntityTypes {
.build(ResourceKey.create(Registries.ENTITY_TYPE, GEM_CHICKEN_ID))
);
public static final EntityType<NotchEntity> NOTCH = registerNotch(NOTCH_ID);
/** Hidden alias used only to deserialize Notch entities written by the historical Portals prototype. */
public static final EntityType<NotchEntity> LEGACY_NOTCH = registerNotch(LEGACY_NOTCH_ID);
private ItsAliveEntityTypes() {
}
@@ -192,7 +199,19 @@ public final class ItsAliveEntityTypes {
entity.discard();
}
});
ItsAliveMod.LOGGER.info("[{}] Registered papillon, 16-variant moobloom, three gem chickens, ghost, bracken, flying whale and five-role infected; vanilla phantoms disabled.",
ItsAliveMod.LOGGER.info("[{}] Registered papillon, 16-variant moobloom, three gem chickens, ghost, bracken, flying whale, five-role infected and the unique Alpha resident; vanilla phantoms disabled.",
ItsAliveMod.DISPLAY_NAME);
}
private static EntityType<NotchEntity> registerNotch(Identifier id) {
return Registry.register(BuiltInRegistries.ENTITY_TYPE, id,
FabricEntityType.Builder.createMob(NotchEntity::new, MobCategory.CREATURE,
mob -> mob.defaultAttributes(NotchEntity::createAttributes))
.sized(0.6F, 1.8F)
.clientTrackingRange(96)
.updateInterval(2)
.noSummon()
.noLootTable()
.build(ResourceKey.create(Registries.ENTITY_TYPE, id)));
}
}
@@ -288,5 +288,7 @@
"hud.itsalive.cooking_cauldron.assembly": "Mixture incomplete: %s",
"hud.itsalive.cooking_cauldron.cooking": "Cooking: %s",
"hud.itsalive.cooking_cauldron.expired": "Mixture failed — collect the failed dish",
"hud.itsalive.cooking_cauldron.ready": "Dish ready"
"hud.itsalive.cooking_cauldron.ready": "Dish ready",
"entity.itsalive.notch": "Notch",
"boss.itsalive.notch_titan": "Notch Titan"
}
@@ -288,5 +288,7 @@
"hud.itsalive.cooking_cauldron.assembly": "Mélange incomplet : %s",
"hud.itsalive.cooking_cauldron.cooking": "Cuisson : %s",
"hud.itsalive.cooking_cauldron.expired": "Plat raté — récupère le résultat",
"hud.itsalive.cooking_cauldron.ready": "Plat prêt"
"hud.itsalive.cooking_cauldron.ready": "Plat prêt",
"entity.itsalive.notch": "Notch",
"boss.itsalive.notch_titan": "Notch Titan"
}
@@ -288,5 +288,7 @@
"hud.itsalive.cooking_cauldron.assembly": "Mixture incomplete: %s",
"hud.itsalive.cooking_cauldron.cooking": "Cooking: %s",
"hud.itsalive.cooking_cauldron.expired": "Mixture failed — collect the failed dish",
"hud.itsalive.cooking_cauldron.ready": "Dish ready"
"hud.itsalive.cooking_cauldron.ready": "Dish ready",
"entity.itsalive.notch": "Нотч",
"boss.itsalive.notch_titan": "Нотч-Титан"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

+2 -2
View File
@@ -38,13 +38,13 @@
"fabric-api": ">=0.154.2+26.2",
"anotherworld": "*",
"ambiance": ">=0.0.0-alpha.14",
"sanctuary": ">=0.0.0-alpha.117"
"sanctuary": ">=0.0.0-alpha.126"
},
"custom": {
"sanctuary26": {
"system_type": "gameplay-system",
"namespace": "itsalive",
"data_version": 3,
"data_version": 4,
"network_protocol": 4,
"lifecycle": "${lifecycle}",
"pack_version": "${pack_version}",
@@ -61,6 +61,22 @@ public final class CanapliaGameplaySmoke {
Set.of(), Temperature.COLD, Humidity.BALANCED, 12, false, false, true, true, false)).isEmpty(),
"lunar harvest requires a sky dimension");
for (CanapliaVariantKey variant : CanapliaVariantKey.values()) {
CanapliaVariantKey placed = CanapliaVariantLifecycle.plantedFromSeed(variant);
assertEquals(variant, placed,
"historical seed placement variant " + variant.key());
CanapliaVariantKey grown = CanapliaVariantLifecycle.afterGrowth(placed);
assertEquals(variant, grown,
"natural growth variant " + variant.key());
CanapliaVariantKey persisted = CanapliaVariantLifecycle.fromPersistedKey(
CanapliaVariantLifecycle.persistedKey(grown));
assertEquals(variant, persisted, "persisted variant " + variant.key());
assertEquals(variant, CanapliaVariantLifecycle.upperFromLower(persisted),
"upper crop variant " + variant.key());
assertEquals(variant, CanapliaVariantLifecycle.harvestedFromPlant(persisted),
"harvest variant " + variant.key());
}
CanapliaEffectRules.Plan minimum = CanapliaEffectRules.plan(0, 1, 0, 0);
assertEquals(CanapliaEffectRules.MIN_PRIMARY_TICKS, minimum.primaryTicks(), "minimum primary duration");
assertTrue(!minimum.badTrip(), "nonzero bad-trip roll");
@@ -0,0 +1,34 @@
package fr.koka99cab.sanctuary26.itsalive.entity.notch;
public final class NotchFightRulesSmoke {
private NotchFightRulesSmoke() {
}
public static void main(String[] args) {
assertFloat(NotchFightRules.MIN_TITAN_HEALTH, NotchFightRules.titanHealth(-20),
"health below one participant");
assertFloat(400.0F, NotchFightRules.titanHealth(2), "two participant scaling");
assertFloat(NotchFightRules.MAX_TITAN_HEALTH,
NotchFightRules.titanHealth(NotchFightRules.MAX_PARTICIPANTS), "maximum scaling");
assertFloat(NotchFightRules.MAX_TITAN_HEALTH, NotchFightRules.titanHealth(200),
"participant bound");
if (NotchFightRules.shouldReset(NotchFightRules.RESET_AFTER_EMPTY_TICKS - 1)) {
throw new AssertionError("Fight reset one tick too early");
}
if (!NotchFightRules.shouldReset(NotchFightRules.RESET_AFTER_EMPTY_TICKS)) {
throw new AssertionError("Fight did not reset at the documented threshold");
}
if (NotchFightRules.RETURNED_FIREBALL_DAMAGE != 40.0F
|| NotchFightRules.Phase.byId(-1) != NotchFightRules.Phase.HUMAN
|| NotchFightRules.Phase.byId(1) != NotchFightRules.Phase.TITAN
|| NotchFightRules.Phase.byId(2) != NotchFightRules.Phase.DEFEATED) {
throw new AssertionError("Notch phase or reflected-fireball contract changed");
}
}
private static void assertFloat(float expected, float actual, String label) {
if (Float.compare(expected, actual) != 0) {
throw new AssertionError(label + ": expected " + expected + ", got " + actual);
}
}
}
@@ -16,6 +16,7 @@ import fr.koka99cab.sanctuary26.itsalive.creeper.ItsAliveCreeper;
import fr.koka99cab.sanctuary26.itsalive.creeper.ItsAliveCreepers;
import fr.koka99cab.sanctuary26.itsalive.entity.InfectedEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.InfectedVariant;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchResidentService;
import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveEntityTypes;
import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceDailyWeather;
import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceEnvironmentController;
@@ -94,6 +95,7 @@ public final class MasterKeyCommands {
.then(creeperCommand())
.then(infectedCommand())
.then(ambianceCommand())
.then(notchCommand())
.then(SanctuaryProgressionCommands.command())
.then(panoramaCommand())
.then(teleportCommand())
@@ -113,6 +115,42 @@ public final class MasterKeyCommands {
);
}
private static com.mojang.brigadier.builder.ArgumentBuilder<CommandSourceStack, ?> notchCommand() {
return Commands.literal("notch")
.executes(context -> inspectNotch(context.getSource()))
.then(Commands.literal("inspect")
.executes(context -> inspectNotch(context.getSource())))
.then(Commands.literal("restore")
.executes(context -> restoreNotch(context.getSource())));
}
private static int inspectNotch(CommandSourceStack source) {
NotchResidentService.Inspection inspection = NotchResidentService.inspect(source.getServer());
if (!inspection.alphaAvailable()) {
source.sendFailure(Component.translatable("command.masterkey.notch.alpha_unavailable"));
return 0;
}
source.sendSuccess(() -> Component.translatable("command.masterkey.notch.inspect",
inspection.loadedResidents(),
inspection.canonicalUuid() == null ? "-" : inspection.canonicalUuid().toString(),
inspection.phase() == null ? "-" : inspection.phase().name().toLowerCase(java.util.Locale.ROOT),
inspection.position() == null ? "-" : inspection.position().toShortString(),
inspection.worldDefeated()), false);
return Command.SINGLE_SUCCESS;
}
private static int restoreNotch(CommandSourceStack source) {
NotchResidentService.Inspection inspection = NotchResidentService.restore(source.getServer());
if (!inspection.alphaAvailable() || inspection.canonicalUuid() == null) {
source.sendFailure(Component.translatable("command.masterkey.notch.restore.failure"));
return 0;
}
source.sendSuccess(() -> Component.translatable("command.masterkey.notch.restore.success",
inspection.canonicalUuid().toString(), inspection.loadedResidents(),
inspection.phase().name().toLowerCase(java.util.Locale.ROOT)), true);
return Command.SINGLE_SUCCESS;
}
private static com.mojang.brigadier.builder.ArgumentBuilder<CommandSourceStack, ?> ambianceCommand() {
var root = Commands.literal("ambiance")
.executes(context -> ambianceStatus(context.getSource()))
@@ -1,6 +1,10 @@
{
"mod.masterkey.description": "Owns administration, diagnostics and developer tools.",
"command.masterkey.help": "MasterKey lab: give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
"command.masterkey.help": "MasterKey lab: give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
"command.masterkey.notch.alpha_unavailable": "The Alpha dimension is not loaded.",
"command.masterkey.notch.inspect": "Notch: %1$s loaded resident(s), UUID %2$s, phase %3$s, position %4$s, world victory: %5$s.",
"command.masterkey.notch.restore.success": "Notch restored: UUID %1$s, %2$s loaded resident, phase %3$s.",
"command.masterkey.notch.restore.failure": "Notch could not be restored in Alpha.",
"command.masterkey.ambiance.status": "Weather: %1$s; lunar night: %2$s (%3$s).",
"command.masterkey.ambiance.mode.auto": "automatic",
"command.masterkey.ambiance.mode.forced": "forced",
@@ -1,6 +1,10 @@
{
"mod.masterkey.description": "Possède l'administration, les diagnostics et les outils de développement.",
"command.masterkey.help": "Laboratoire MasterKey : give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
"command.masterkey.help": "Laboratoire MasterKey : give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
"command.masterkey.notch.alpha_unavailable": "La dimension Alpha n'est pas chargée.",
"command.masterkey.notch.inspect": "Notch : %1$s résident(s) chargé(s), UUID %2$s, phase %3$s, position %4$s, victoire mondiale : %5$s.",
"command.masterkey.notch.restore.success": "Notch restauré : UUID %1$s, %2$s résident chargé, phase %3$s.",
"command.masterkey.notch.restore.failure": "Impossible de restaurer Notch dans Alpha.",
"command.masterkey.ambiance.status": "Météo : %1$s ; nuit lunaire : %2$s (%3$s).",
"command.masterkey.ambiance.mode.auto": "automatique",
"command.masterkey.ambiance.mode.forced": "forcée",
@@ -1,6 +1,10 @@
{
"mod.masterkey.description": "Отвечает за администрирование, диагностику и инструменты разработчика.",
"command.masterkey.help": "Лаборатория MasterKey: give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
"command.masterkey.help": "Лаборатория MasterKey: give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
"command.masterkey.notch.alpha_unavailable": "Измерение Alpha не загружено.",
"command.masterkey.notch.inspect": "Notch: загружено жителей — %1$s, UUID %2$s, фаза %3$s, позиция %4$s, мировая победа: %5$s.",
"command.masterkey.notch.restore.success": "Notch восстановлен: UUID %1$s, загружено жителей — %2$s, фаза %3$s.",
"command.masterkey.notch.restore.failure": "Не удалось восстановить Notch в Alpha.",
"command.masterkey.ambiance.status": "Погода: %1$s; лунная ночь: %2$s (%3$s).",
"command.masterkey.ambiance.mode.auto": "автоматически",
"command.masterkey.ambiance.mode.forced": "принудительно",
+2 -2
View File
@@ -23,8 +23,8 @@
"minecraft": "~26.2",
"java": ">=25",
"fabric-api": ">=0.154.2+26.2",
"itsalive": ">=0.0.0-alpha.1",
"sanctuary": ">=0.0.0-alpha.17",
"itsalive": ">=0.0.0-alpha.37",
"sanctuary": ">=0.0.0-alpha.126",
"ambiance": "*"
},
"custom": {
@@ -48,7 +48,7 @@ public final class OnlyFunMod implements ModInitializer {
OnlyFunCommands.register();
AbjectionActions.initialize();
AbjectionCommands.register();
LOGGER.info("[{}] Loot generator, natural Lucky Blocks, mob lootboxes and chicken rules ready (data v{}, network v{}).",
LOGGER.info("[{}] Loot generator, boss-gated Shop, natural Lucky Blocks, mob lootboxes and chicken rules ready (data v{}, network v{}).",
DISPLAY_NAME, CURRENT_DATA_VERSION, OnlyFunNetworking.PROTOCOL_VERSION);
}
}
@@ -2,6 +2,7 @@ package fr.koka99cab.sanctuary26.onlyfun.loot;
import fr.koka99cab.sanctuary26.onlyfun.OnlyFunMod;
import fr.koka99cab.sanctuary26.onlyfun.registry.OnlyFunRegistries;
import fr.koka99cab.sanctuary26.sanctuary.api.entity.SanctuaryEntityPolicy;
import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
@@ -38,7 +39,8 @@ public final class OnlyFunLootboxDrops {
}
private static void afterDeath(LivingEntity entity, DamageSource source) {
if (!(entity instanceof Mob mob) || !(entity.level() instanceof ServerLevel level)) return;
if (SanctuaryEntityPolicy.isTemporaryCompanion(entity)
|| !(entity instanceof Mob mob) || !(entity.level() instanceof ServerLevel level)) return;
ServerPlayer killer = playerKiller(entity, source);
if (killer == null || killer.isSpectator()) return;
@@ -1,29 +1,22 @@
package fr.koka99cab.sanctuary26.onlyfun.shop;
import java.util.Objects;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import fr.koka99cab.sanctuary26.sanctuary.api.progression.SanctuaryWorldMilestones;
import java.util.Map;
import java.util.Set;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
/** Keeps exceptional boss rewards out of the Shop until their future boss owner unlocks them. */
/** Keeps exceptional boss rewards out of the Shop until their public world milestone is reached. */
public final class OnlyFunBossShopGate {
public static final Identifier MAGIC_CLOUD = Identifier.fromNamespaceAndPath("iliketomoveit", "magic_cloud");
public static final Identifier MAGIC_CARPET = Identifier.fromNamespaceAndPath("iliketomoveit", "magic_carpet");
private static final Set<Identifier> BOSS_REWARDS = Set.of(MAGIC_CLOUD, MAGIC_CARPET);
private static final BossUnlockResolver LOCKED = (server, reward) -> false;
private static volatile BossUnlockResolver resolver = LOCKED;
private static final Map<Identifier, Identifier> IMPLEMENTED_MILESTONES = Map.of(
MAGIC_CARPET, SanctuaryNotchMilestone.NOTCH_DEFEATED);
private OnlyFunBossShopGate() {}
/** Called later by the module that owns the bosses and their persistent defeat state. */
public static synchronized void registerUnlockResolver(BossUnlockResolver value) {
Objects.requireNonNull(value, "value");
if (resolver != LOCKED && resolver != value) {
throw new IllegalStateException("A boss Shop unlock resolver is already registered");
}
resolver = value;
}
public static boolean requiresBoss(String itemId) {
Identifier id = Identifier.tryParse(itemId);
return id != null && BOSS_REWARDS.contains(id);
@@ -31,11 +24,13 @@ public final class OnlyFunBossShopGate {
public static boolean isAvailable(MinecraftServer server, String itemId) {
Identifier id = Identifier.tryParse(itemId);
return id == null || !BOSS_REWARDS.contains(id) || resolver.isUnlocked(server, id);
if (id == null || !BOSS_REWARDS.contains(id)) return true;
Identifier milestone = requiredMilestone(id);
return milestone != null && SanctuaryWorldMilestones.isReached(server, milestone);
}
@FunctionalInterface
public interface BossUnlockResolver {
boolean isUnlocked(MinecraftServer server, Identifier rewardItem);
/** Returns null while the corresponding boss contract is not implemented. */
public static Identifier requiredMilestone(Identifier rewardItem) {
return IMPLEMENTED_MILESTONES.get(rewardItem);
}
}
+2 -2
View File
@@ -26,8 +26,8 @@
"minecraft": "~26.2",
"java": ">=25",
"fabric-api": ">=0.154.2+26.2",
"iliketomoveit": "*",
"sanctuary": "*"
"iliketomoveit": ">=0.0.0-alpha.17",
"sanctuary": ">=0.0.0-alpha.129"
},
"custom": {
"sanctuary26": {
@@ -3,6 +3,7 @@ package fr.koka99cab.sanctuary26.onlyfun.shop;
import fr.koka99cab.sanctuary26.onlyfun.policy.OnlyFunItemPolicy;
import fr.koka99cab.sanctuary26.sanctuary.shop.ShopOffer;
import fr.koka99cab.sanctuary26.sanctuary.shop.ShopOfferCatalog;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -94,12 +95,12 @@ public final class OnlyFunShopCatalogSmoke {
"Magic Cloud must remain boss-gated");
require(!OnlyFunBossShopGate.isAvailable(null, "iliketomoveit:magic_carpet")
&& !OnlyFunBossShopGate.isAvailable(null, "iliketomoveit:magic_cloud"),
"Boss rewards must be unavailable while their bosses do not exist");
OnlyFunBossShopGate.registerUnlockResolver((server, reward) ->
reward.equals(OnlyFunBossShopGate.MAGIC_CARPET));
require(OnlyFunBossShopGate.isAvailable(null, "iliketomoveit:magic_carpet")
&& !OnlyFunBossShopGate.isAvailable(null, "iliketomoveit:magic_cloud"),
"Each future boss must unlock only its corresponding reward");
"Boss rewards must reject lookups without authoritative server state");
require(SanctuaryNotchMilestone.NOTCH_DEFEATED.equals(
OnlyFunBossShopGate.requiredMilestone(OnlyFunBossShopGate.MAGIC_CARPET)),
"Magic Carpet must resolve the public Notch milestone");
require(OnlyFunBossShopGate.requiredMilestone(OnlyFunBossShopGate.MAGIC_CLOUD) == null,
"Magic Cloud must stay locked until its own boss is implemented");
for (String protectedId : List.of(
"anotherworld:ruby", "anotherworld:ruby_block", "anotherworld:deepslate_ruby_ore",
+10 -1
View File
@@ -2,7 +2,7 @@
Ouch possède le combat, les dégâts et la destruction dans Sanctuary 26.2.
## Version courante — `0.0.0-alpha.5`
## Version courante — `0.0.0-alpha.11`
La première version active migre les quatre objets du mod historique Gunz dans
le namespace unique `ouch:*` et les rassemble dans longlet créatif
@@ -79,6 +79,15 @@ najoutent ni payload réseau, ni donnée persistante, ni munition enregistré
LArc bêta réutilise volontairement lapparence statique du bow vanilla et se
fabrique sans forme avec un arc, une redstone et une ficelle.
## Combat de Notch Titan
Ouch implémente le pont public de combat exposé par It's Alive. Le Titan poursuit
ses participants, annonce visuellement ses attaques puis alterne mêlée, boules de
feu renvoyables et éclairs visuels avec dégâts serveur. Une boule renvoyée par un
joueur inflige 40 dégâts au Titan. Les explosions de projectiles utilisent
`ExplosionInteraction.NONE` et les autres attaques ne modifient aucun bloc ;
seule la transformation initiale, pilotée par l'entité, peut endommager le décor.
## Compatibilité
Les anciens IDs `gunz:*` ne sont pas réenregistrés. Le contrat
+1 -1
View File
@@ -118,7 +118,7 @@ tasks.register("verifyOuch") {
def creeperlockRecipe = new JsonSlurper().parse(file("src/main/resources/data/ouch/recipe/creeperlock.json"))
def silverEngineeringMigration = 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.10"
if (project.version.toString() != "0.0.0-alpha.11"
|| mitrailletteRecipe.pattern != ["RRP", "IGI", " B "]
|| mitrailletteRecipe.key != [B: "minecraft:stone_button", G: "minecraft:redstone",
I: "anotherworld:silver_ingot", P: "anotherworld:silver_plate", R: "anotherworld:silver_rod"]
@@ -4,6 +4,7 @@ import fr.koka99cab.sanctuary26.ouch.OuchMod;
import fr.koka99cab.sanctuary26.ouch.entity.WeatherTntEntity;
import fr.koka99cab.sanctuary26.ouch.registry.OuchAbjectionProjectiles;
import fr.koka99cab.sanctuary26.ouch.registry.OuchWeatherTnt;
import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -16,6 +17,8 @@ public final class OuchClient implements ClientModInitializer {
public void onInitializeClient() {
EntityRendererRegistry.register(OuchAbjectionProjectiles.ENTITY,
context -> new ThrownItemRenderer<>(context));
EntityRendererRegistry.register(OuchNotchCombat.FIREBALL,
context -> new ThrownItemRenderer<>(context, 3.0F, true));
registerWeatherRenderer(OuchWeatherTnt.ENTITY);
registerWeatherRenderer(OuchWeatherTnt.REDSTONER_COMPAT_ENTITY);
registerWeatherRenderer(OuchWeatherTnt.LEGACY_ENTITY);
@@ -0,0 +1,61 @@
package fr.koka99cab.sanctuary26.ouch.entity;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchFightRules;
import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.hurtingprojectile.Fireball;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
/** Large, reflectable Titan fireball whose explosion never changes blocks. */
public final class NotchFireballEntity extends Fireball {
private static final int MAX_LIFETIME_TICKS = 200;
private static final float DIRECT_HIT_DAMAGE = 10.0F;
private static final float EXPLOSION_POWER = 2.0F;
public NotchFireballEntity(EntityType<? extends NotchFireballEntity> type, Level level) {
super(type, level);
}
public NotchFireballEntity(ServerLevel level, LivingEntity owner, Vec3 direction) {
super(OuchNotchCombat.FIREBALL, owner, direction, level);
}
@Override
public void tick() {
super.tick();
if (this.tickCount > MAX_LIFETIME_TICKS) this.discard();
}
@Override
protected void onHit(HitResult hitResult) {
super.onHit(hitResult);
if (!(this.level() instanceof ServerLevel level)) return;
level.explode(this, this.getX(), this.getY(), this.getZ(), EXPLOSION_POWER, false,
Level.ExplosionInteraction.NONE);
this.discard();
}
@Override
protected void onHitEntity(EntityHitResult hitResult) {
super.onHitEntity(hitResult);
if (!(this.level() instanceof ServerLevel level)) return;
Entity target = hitResult.getEntity();
Entity owner = this.getOwner();
if (target instanceof NotchEntity && owner instanceof NotchEntity) return;
var source = this.damageSources().fireball(this, owner);
float damage = target instanceof NotchEntity && owner instanceof Player
? NotchFightRules.RETURNED_FIREBALL_DAMAGE : DIRECT_HIT_DAMAGE;
if (target.hurtServer(level, source, damage)) {
EnchantmentHelper.doPostAttackEffects(level, target, source);
}
}
}
@@ -0,0 +1,111 @@
package fr.koka99cab.sanctuary26.ouch.notch;
import fr.koka99cab.sanctuary26.itsalive.api.notch.NotchCombatApi;
import fr.koka99cab.sanctuary26.ouch.OuchMod;
import fr.koka99cab.sanctuary26.ouch.entity.NotchFireballEntity;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.entity.LightningBolt;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
/** Ouch-owned implementation of the server-authoritative Notch attack bridge. */
public final class OuchNotchCombat implements NotchCombatApi.Engine {
private static final Identifier FIREBALL_ID = OuchMod.id("notch_fireball");
private static final ResourceKey<EntityType<?>> FIREBALL_KEY = ResourceKey.create(
Registries.ENTITY_TYPE, FIREBALL_ID);
public static final EntityType<NotchFireballEntity> FIREBALL = Registry.register(
BuiltInRegistries.ENTITY_TYPE, FIREBALL_ID,
EntityType.Builder.<NotchFireballEntity>of(NotchFireballEntity::new, MobCategory.MISC)
.sized(1.0F, 1.0F)
.clientTrackingRange(64)
.updateInterval(1)
.noSave()
.noLootTable()
.build(FIREBALL_KEY));
private static boolean initialized;
private OuchNotchCombat() {
}
public static void initialize() {
if (initialized) return;
initialized = true;
NotchCombatApi.register(new OuchNotchCombat());
OuchMod.LOGGER.debug("[{}] Registered the Notch Titan combat engine.", OuchMod.DISPLAY_NAME);
}
@Override
public void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target,
NotchCombatApi.Attack attack) {
if (attack == NotchCombatApi.Attack.FIREBALL) {
level.sendParticles(ParticleTypes.FLAME, boss.getX(), boss.getEyeY(), boss.getZ(),
28, 0.7D, 1.0D, 0.7D, 0.035D);
level.playSound(null, boss.blockPosition(), SoundEvents.BLAZE_SHOOT, SoundSource.HOSTILE,
0.9F, 0.55F);
} else if (attack == NotchCombatApi.Attack.LIGHTNING) {
level.sendParticles(ParticleTypes.ELECTRIC_SPARK, target.getX(), target.getY() + 0.1D,
target.getZ(), 42, 1.25D, 0.06D, 1.25D, 0.08D);
level.playSound(null, target.blockPosition(), SoundEvents.TRIDENT_THUNDER.value(),
SoundSource.HOSTILE, 1.0F, 1.35F);
}
}
@Override
public void execute(ServerLevel level, LivingEntity boss, LivingEntity target,
NotchCombatApi.Attack attack) {
switch (attack) {
case MELEE -> melee(level, boss, target);
case FIREBALL -> fireball(level, boss, target);
case LIGHTNING -> lightning(level, boss, target);
}
}
private static void melee(ServerLevel level, LivingEntity boss, LivingEntity target) {
boss.swing(InteractionHand.MAIN_HAND);
if (!target.hurtServer(level, level.damageSources().mobAttack(boss), 18.0F)) return;
pushAway(boss, target, 1.4D, 0.48D);
level.sendParticles(ParticleTypes.EXPLOSION, target.getX(), target.getY() + 1.0D,
target.getZ(), 4, 0.35D, 0.55D, 0.35D, 0.02D);
}
private static void fireball(ServerLevel level, LivingEntity boss, LivingEntity target) {
Vec3 origin = boss.getEyePosition().add(boss.getLookAngle().scale(1.5D));
Vec3 aim = target.getEyePosition().subtract(origin).normalize();
NotchFireballEntity projectile = new NotchFireballEntity(level, boss, aim);
projectile.setPos(origin);
level.addFreshEntity(projectile);
}
private static void lightning(ServerLevel level, LivingEntity boss, LivingEntity target) {
LightningBolt lightning = EntityTypes.LIGHTNING_BOLT.create(level, EntitySpawnReason.TRIGGERED);
if (lightning != null) {
lightning.setVisualOnly(true);
lightning.setPos(target.position());
level.addFreshEntity(lightning);
}
if (target.hurtServer(level, level.damageSources().lightningBolt(), 7.0F)) {
pushAway(boss, target, 1.0D, 0.35D);
}
}
private static void pushAway(LivingEntity boss, LivingEntity target, double strength, double lift) {
Vec3 horizontal = target.position().subtract(boss.position()).multiply(1.0D, 0.0D, 1.0D);
if (horizontal.lengthSqr() < 1.0E-6D) horizontal = boss.getLookAngle().multiply(1.0D, 0.0D, 1.0D);
horizontal = horizontal.normalize().scale(strength);
target.push(horizontal.x, lift, horizontal.z);
}
}
@@ -1,6 +1,7 @@
package fr.koka99cab.sanctuary26.ouch.registry;
import fr.koka99cab.sanctuary26.ouch.OuchMod;
import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;
/**
* Single registration entry point for the Ouch namespace.
@@ -20,6 +21,7 @@ public final class OuchRegistries {
OuchItems.initialize();
OuchWeatherTnt.initialize();
OuchAbjectionProjectiles.initialize();
OuchNotchCombat.initialize();
OuchCreativeTab.initialize();
OuchMod.LOGGER.debug("[{}] Weapon registry hub initialized.", OuchMod.DISPLAY_NAME);
}
+2 -1
View File
@@ -26,7 +26,8 @@
"anotherworld": ">=0.0.0-alpha.46",
"ambiance": ">=0.0.0-alpha.12",
"onlyfun": ">=0.0.0-alpha.23",
"sanctuary": ">=0.0.0-alpha.110"
"itsalive": ">=0.0.0-alpha.37",
"sanctuary": ">=0.0.0-alpha.126"
},
"custom": {
"sanctuary26": {
@@ -0,0 +1,60 @@
{
"schema_version": 1,
"source": {
"pack_version": "26.2.0-alpha.222",
"modules": {
"sanctuary": "0.0.0-alpha.124"
}
},
"target": {
"pack_version": "26.2.0-alpha.223",
"modules": {
"sanctuary": "0.0.0-alpha.125"
}
},
"inventory_sort": {
"owner": "sanctuary",
"default_binding": "middle_mouse",
"unlocked_storage_rows_only": true,
"packs_from_top": true,
"merges_identical_stacks": true,
"hotbar_armor_offhand_crafting_and_special_slots_unchanged": true,
"server_authoritative": true,
"server_cooldown_ticks": 8,
"ignored_in_creative": true,
"ignored_while_typing": true
},
"quest_tracker_display": {
"owner": "sanctuary",
"default_mode": "transparent_text",
"mode_toggle_default_key": "N",
"original_chris_panel_available": true,
"transparent_text_below_f3_left_column": true,
"contracts_named_and_sorted_by_reward_tier": true,
"reward_order": [
"ruby",
"sapphire",
"emerald_or_other"
]
},
"compatibility": {
"new_world_required": false,
"save_reset_required": false,
"existing_saves_supported": true,
"registry_ids_changed": false,
"sanctuary_data_version": 11,
"sanctuary_network_protocol": 22
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true,
"jei": {
"source": "30.29.0.196",
"target": "30.29.0.198",
"modrinth_version_id": "67Dvn8sL",
"packwiz_and_prism_synchronized": true
}
}
}
@@ -0,0 +1,129 @@
{
"schema_version": 1,
"status": "released",
"source": {
"pack_version": "26.2.0-alpha.223",
"modules": {
"itsalive": "0.0.0-alpha.36",
"ouch": "0.0.0-alpha.10",
"masterkey": "0.0.0-alpha.8",
"iliketomoveit": "0.0.0-alpha.16",
"onlyfun": "0.0.0-alpha.25",
"sanctuary": "0.0.0-alpha.125"
}
},
"target": {
"pack_version": "26.2.0-alpha.224",
"modules": {
"itsalive": "0.0.0-alpha.37",
"ouch": "0.0.0-alpha.11",
"masterkey": "0.0.0-alpha.9",
"iliketomoveit": "0.0.0-alpha.17",
"onlyfun": "0.0.0-alpha.26",
"sanctuary": "0.0.0-alpha.128"
}
},
"inventory_sort": {
"owner": "sanctuary",
"payload_container_flag": "bounded_boolean",
"sortable_storage_menus": ["chest", "barrel", "shulker_box", "hopper", "dispenser"],
"player_inventory_when_hovered": true,
"hotbar_unchanged": true,
"hotbar_restored_to_bottom_on_login": true,
"hotbar_restored_to_bottom_after_row_purchase": true,
"excluded_menus": ["furnace", "shop", "redstoner_storage_terminal"],
"server_authoritative": true,
"server_validates_open_menu": true
},
"notch_encounter": {
"entity_owner": "itsalive",
"combat_owner": "ouch",
"milestone_owner": "sanctuary",
"diagnostics_owner": "masterkey",
"dimension": "sanctuary:alpha",
"unique_persistent_resident": true,
"legacy_entity": "portals:notch",
"legacy_entity_migrated": true,
"maximum_participants": 8,
"first_transformation_breaks_blocks": true,
"later_attacks_break_blocks": false,
"returned_fireballs_supported": true,
"abandoned_fight_resets": true,
"global_victory_monotonic": true,
"atlas_boss_marker_for_participants": true,
"commands": ["/masterkey notch inspect", "/masterkey notch restore"]
},
"magic_carpet": {
"owner": "iliketomoveit",
"canonical_item": "iliketomoveit:magic_carpet",
"legacy_item": "portals:notch_totem",
"legacy_alias_hidden": true,
"legacy_components_preserved": true,
"legacy_custom_name_preserved": true,
"legacy_locations": ["player_inventory", "container", "item_entity"],
"one_legacy_stack_becomes_one_canonical_stack": true,
"new_worlds_distribute_legacy_item": false,
"temporary_platform": {
"size": [3, 1, 3],
"block": "minecraft:glass",
"air_only_placement": true,
"creative_flight_granted": false,
"overlap_owner_tracking": true,
"cleanup": ["deactivation", "disconnect", "dimension_change", "server_stop"]
}
},
"notch_reward": {
"milestone_owner": "sanctuary",
"milestone": "sanctuary:notch_defeated",
"reservation": "initial_reward_claimed",
"completion": "initial_reward_delivered",
"delivery_owner": "iliketomoveit",
"delivery": "deterministic_chest_near_notch_residence",
"firework_signal": true,
"idempotent_recovery": true,
"maximum_canonical_initial_rewards": 1,
"provenance": "sanctuary:notch_reward"
},
"shop_replacement": {
"catalog_owner": "onlyfun",
"transaction_owner": "sanctuary",
"unlock_resolver": "SanctuaryWorldMilestones",
"hidden_before_notch": true,
"server_authoritative_gate": true,
"configured_ruby_price": 1536,
"configured_sapphire_price": 128,
"daily_rotation_rules_preserved": true,
"mailbox_delivery": true,
"recreates_initial_reward": false,
"provenance": "sanctuary:shop_purchase",
"replacement_logged": true
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"registry_ids_preserved_or_migrated": true,
"client_server_update_required": true,
"itsalive_data_version": 4,
"itsalive_network_protocol": 4,
"ouch_data_version": 1,
"ouch_network_protocol": 1,
"masterkey_data_version": 1,
"masterkey_network_protocol": 2,
"iliketomoveit_data_version": 4,
"iliketomoveit_network_protocol": 5,
"onlyfun_data_version": 2,
"onlyfun_network_protocol": 3,
"sanctuary_data_version": 13,
"sanctuary_notch_state_data_version": 2,
"sanctuary_source_network_protocol": 22,
"sanctuary_target_network_protocol": 23,
"sanctuary_network_protocol_changed": true
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true
}
}
@@ -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
}
}
@@ -0,0 +1,49 @@
{
"schema_version": 1,
"status": "released",
"source": {
"pack_version": "26.2.0-alpha.225",
"modules": {
"sanctuary": "0.0.0-alpha.129"
}
},
"target": {
"pack_version": "26.2.0-alpha.226",
"modules": {
"sanctuary": "0.0.0-alpha.130"
}
},
"white_cape": {
"owner": "sanctuary",
"item_id": "sanctuary:white_cape",
"crafting_material": "minecraft:white_wool",
"crafting_material_count": 6,
"crafting_pattern": ["WW", "WW", "WW"],
"banner_decoration_recipe": "cape_plus_banner",
"accepted_banners": "#minecraft:banners",
"base_color_preserved": true,
"maximum_pattern_layers": 6,
"inventory_pattern_rendering": true,
"equipped_pattern_rendering": true,
"vanilla_cape_physics": true,
"included_in_onlyfun_lootbox": false
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"registry_ids_added": ["sanctuary:white_cape"],
"persistent_data_formats_changed": false,
"sanctuary_data_version": 13,
"sanctuary_source_network_protocol": 23,
"sanctuary_target_network_protocol": 24,
"sanctuary_network_protocol_changed": true,
"client_server_update_required": true
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true
}
}
@@ -0,0 +1,38 @@
{
"schema_version": 1,
"status": "pending_release",
"module": "sanctuary",
"source_module_version": "0.0.0-alpha.130",
"target_module_version": "0.0.0-alpha.131",
"integration_modules": {
"anotherworld": {
"source": "0.0.0-alpha.56",
"target": "0.0.0-alpha.57",
"data_version_changed": false,
"network_protocol_changed": false
}
},
"source_data_version": 13,
"target_data_version": 14,
"migration": {
"kind": "monotone_addition",
"save_key": "sanctuary:backroom",
"existing_player_progress_preserved": true,
"existing_shop_data_preserved": true,
"existing_mailboxes_preserved": true,
"mailbox_transaction_history_default": [],
"backroom_loss_registry_default": [],
"backroom_chest_registry_default": []
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"network_protocol_changed": false,
"registry_ids_added": [
"sanctuary:backroom",
"sanctuary:backroom_loss_id",
"sanctuary:backroom_architecture"
]
}
}
+18 -18
View File
@@ -14,15 +14,15 @@ hash = "41f4f4c88c71d0a23446d5014f7407d55ad477441847099cad24492b032335a0"
[[files]]
file = "mods/ambiance-0.0.0-alpha.22.jar"
hash = "a6b7d98971f411b202f5679aae05c1bc93754ee9a42d10dc903413b17ba97a63"
hash = "0e862db1c5efb5c0745b82f991d5480f4305822c3d3f53ed38e2d2d47efabee1"
[[files]]
file = "mods/anotherworld-0.0.0-alpha.55.jar"
hash = "cac322006ad9a724bb656b400cf47d84a18e76cd1a35f4bd13c112f443d89275"
file = "mods/anotherworld-0.0.0-alpha.56.jar"
hash = "cec8ed493f3c86e4c4481081be110382407f7a5c631b7cf27dd80f80c6f2e92a"
[[files]]
file = "mods/events-0.0.0-alpha.0.jar"
hash = "8d2566ceb838a486fe9d8539acd127446e51d7085dcbefa86ee3c1aea4630a6d"
hash = "16bf9fc194988086f51ba6987546b6aa5bc634fe8fcb118b88540ed16991049c"
[[files]]
file = "mods/fabric-api.pw.toml"
@@ -30,8 +30,8 @@ hash = "df032a6b051d0262cf24945c43e0e6b915e8cc1d62af62fe933932e7f35960c4"
metafile = true
[[files]]
file = "mods/iliketomoveit-0.0.0-alpha.16.jar"
hash = "94e5afefab9485c40a47342dc84f401fa126be40064832929601e781b3a03738"
file = "mods/iliketomoveit-0.0.0-alpha.18.jar"
hash = "94044341de08c9b89e0c1e6af6857da64b472fadbc94051ab76fc3cf1a0f0006"
[[files]]
file = "mods/iris.pw.toml"
@@ -39,33 +39,33 @@ hash = "84a3cef87679c0d21dceb4641167dc0368b9a3593698f6a3632485e9b3a8d5da"
metafile = true
[[files]]
file = "mods/itsalive-0.0.0-alpha.36.jar"
hash = "94899dba383aff41c39f7f25ee1a6b7998aa1e9889e7b9e9039a984e0bc0882f"
file = "mods/itsalive-0.0.0-alpha.38.jar"
hash = "a42885703439646687ac281b1c124d1cddb3ca0595a41d930733b94bd8f1aa2f"
[[files]]
file = "mods/jei.pw.toml"
hash = "115d2239bc86ecdad88705dbc215d27ddb6a08d94f74fa538abb6a67a00bf71e"
hash = "cffb13bae33cd8df605c62e7fa66089428dc684e0ab973f662a8a710c45c306d"
metafile = true
[[files]]
file = "mods/masterkey-0.0.0-alpha.8.jar"
hash = "102c3da5d201452be23ab84338e023c284f4770270ca945b0c63b6a996fb2922"
file = "mods/masterkey-0.0.0-alpha.9.jar"
hash = "979c14e0a527be63688e97af8349be07b027d3149107c3e9e728a2b1e1ec65ff"
[[files]]
file = "mods/onlyfun-0.0.0-alpha.25.jar"
hash = "2676072de7dbc9b27c4fd0e50e797832356fbc903e80c5bd9a5bd55c1a5aff1b"
file = "mods/onlyfun-0.0.0-alpha.27.jar"
hash = "023ba80a8f3326a6b534b343753d5630d3be0700d25613ea21057cbfe44fdc73"
[[files]]
file = "mods/ouch-0.0.0-alpha.10.jar"
hash = "59815a0415c48c92acfc7c18bd2399780bab9b0b5eee69c2b35a66cb1474109b"
file = "mods/ouch-0.0.0-alpha.11.jar"
hash = "2c15c9d0adeb315b2c3a6796f27c9dc62dd33365f35ea584552d97500b833eb8"
[[files]]
file = "mods/redstoner-0.0.0-alpha.13.jar"
hash = "0bd3888b13c894aed806696a5e73e076c7ed985eff2c242f0df9ec64ff3fcb37"
hash = "753835558c1037e39ca669737190013bd59a3ab16f7d5156c52e940c54ff9c60"
[[files]]
file = "mods/sanctuary-0.0.0-alpha.124.jar"
hash = "39a3db3d1d9876ac5c7a7135a3b524c82508d0ee2e0c5c410c6515ff8931c6fb"
file = "mods/sanctuary-0.0.0-alpha.130.jar"
hash = "8906be26de369903a0d5152d80a95a1c47b3468e4afca17ab4683b8300ad69a9"
[[files]]
file = "mods/simple-voice-chat.pw.toml"
+4 -4
View File
@@ -1,14 +1,14 @@
name = "Just Enough Items (JEI)"
filename = "jei-26.2-fabric-30.29.0.196.jar"
filename = "jei-26.2-fabric-30.29.0.198.jar"
side = "both"
pin = true
[download]
url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/vvwsu2BR/jei-26.2-fabric-30.29.0.196.jar"
url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/67Dvn8sL/jei-26.2-fabric-30.29.0.198.jar"
hash-format = "sha512"
hash = "c62a3e264d4b0ec398b9aa717a4832eecb8663bbcec4483dc58a9999d5e4e55ca4f5bca285a0d4a003220c698c3e87c8a3294366e085e72545e4afe84aec92c7"
hash = "06131c9528549840e07ddc9634e23454cd454380d7749a23d818f0efe0dacc02874e967ceb74a24ee82efb13e0fe2df4026f988a68f54f890586967e91dcaa5b"
[update]
[update.modrinth]
mod-id = "u6dRKJwZ"
version = "vvwsu2BR"
version = "67Dvn8sL"
+2 -2
View File
@@ -1,12 +1,12 @@
name = "Sanctuary 26.2"
author = "KOKA99CAB"
version = "26.2.0-alpha.222"
version = "26.2.0-alpha.226"
pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "53b5bec1b113ab2b353e6a142e3dbc4617ea7d27003bcbb09b668938dd262ddd"
hash = "d3b929a596081adc3960866a2f939d4155d1b67ecb22bfe6050931a7d1d0f0a2"
[versions]
fabric = "0.19.3"
+6 -6
View File
@@ -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.222",
"versionId": "26.2.0-alpha.226",
"files": [
{
"path": "mods/fabric-api-0.158.0+26.2.jar",
@@ -21,19 +21,19 @@
"fileSize": 2535765
},
{
"path": "mods/jei-26.2-fabric-30.29.0.196.jar",
"path": "mods/jei-26.2-fabric-30.29.0.198.jar",
"hashes": {
"sha1": "c2f2c6b5822a560fe9872921b908ffc2f3297d00",
"sha512": "c62a3e264d4b0ec398b9aa717a4832eecb8663bbcec4483dc58a9999d5e4e55ca4f5bca285a0d4a003220c698c3e87c8a3294366e085e72545e4afe84aec92c7"
"sha1": "652e964c71a699fdfdd96cda265ea703b13c6ef4",
"sha512": "06131c9528549840e07ddc9634e23454cd454380d7749a23d818f0efe0dacc02874e967ceb74a24ee82efb13e0fe2df4026f988a68f54f890586967e91dcaa5b"
},
"env": {
"client": "required",
"server": "required"
},
"downloads": [
"https://cdn.modrinth.com/data/u6dRKJwZ/versions/vvwsu2BR/jei-26.2-fabric-30.29.0.196.jar"
"https://cdn.modrinth.com/data/u6dRKJwZ/versions/67Dvn8sL/jei-26.2-fabric-30.29.0.198.jar"
],
"fileSize": 1838353
"fileSize": 1839279
},
{
"path": "mods/voicechat-fabric-2.6.22+26.2.jar",
+2 -2
View File
@@ -1,6 +1,6 @@
{
"schema_version": 1,
"pack_version": "26.2.0-alpha.222",
"pack_version": "26.2.0-alpha.226",
"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.222.mrpack",
"primary_file": "sanctuary-26.2.0-alpha.226.mrpack",
"shared_client_server_pack": true,
"update_owner": "packwiz-installer",
"check_on_launch": true,
+25
View File
@@ -36,3 +36,28 @@ l'arrivée sûre du gameplay normal.
Les textures historiques facultatives sont décrites dans
[`ambiance/GOLDEN_DAYS.md`](../ambiance/GOLDEN_DAYS.md). Elles ne font pas
partie de Sanctuary.
## Résident et jalon mondial
It's Alive place exactement un `itsalive:notch` persistant dans la résidence.
Son UUID canonique est sauvegardé dans Alpha, les doublons chargés sont retirés
et `/masterkey notch restore` permet de le recréer ou le ramener chez lui. Un
alias caché `portals:notch` conserve le chargement des anciennes sauvegardes.
Le premier coup volontaire d'un joueur déclenche le combat de Notch Titan.
Ouch possède les attaques et les dégâts ; seule l'explosion de transformation
peut casser des blocs. La victoire est enregistrée une seule fois dans les
données globales Sanctuary, même après redémarrage ou restauration de l'entité.
Les participants reçoivent le jalon `sanctuary:notch_defeated` et un marqueur
de boss dans leur Atlas si Alpha y était déjà découverte. Sanctuary réserve
ensuite une récompense mondiale unique : I Like To Move It place le
`iliketomoveit:magic_carpet` dans un coffre près de la maison et le signale par
un feu d'artifice. La réservation et la livraison sont persistées séparément
afin qu'une reprise serveur termine le coffre sans créer un second tapis.
L'ancien `portals:notch_totem` reste lisible et devient un Magic Carpet en
conservant ses composants et son nom. Après la victoire, Only Fun autorise
l'offre exceptionnelle dans la rotation normale du Shop ; les remplacements
sont payés et livrés par la Mailbox sans recréer la récompense initiale. Le
contrat détaillé est dans
[`iliketomoveit/MAGIC_CARPET.md`](../iliketomoveit/MAGIC_CARPET.md).
+65
View File
@@ -0,0 +1,65 @@
# Backroom
La Backroom est une dimension persistante de récupération et de construction. Elle nest jamais
réinitialisée : routes, bases, coffres et bâtiments posés par les habitants restent dans le monde.
Sa zone architecturale forme un disque de 2 000 blocs autour de lorigine.
## Entrer et sortir
- Saccroupir et utiliser un lit hors de la Backroom déclenche lentrée, sans remplacer lusage
normal du lit.
- Avant toute téléportation, le serveur transfère atomiquement vers la Mailbox enregistrée les
43 emplacements vanilla, les 18 emplacements étendus, l’œuf compagnon et la cape équipée.
- Si aucune Mailbox extérieure nest chargée, ou si elle ne peut pas recevoir lintégralité du
colis, rien ne bouge et lentrée est refusée. Une Mailbox construite dans la Backroom nest jamais
une destination dentrée et ne permet donc pas dimporter du matériel.
- Lidentifiant de transaction est conservé par la Mailbox. Après une interruption, la connexion
suivante termine exactement une fois le vidage correspondant ou annule une transaction qui na
jamais atteint la Mailbox.
- Dans la Backroom, tout lit — généré ou posé par un joueur — ramène au lit de réapparition normal,
ou au point dapparition global sil nexiste plus. Le joueur conserve alors ses trouvailles.
- Aucun autre usage de lit ne définit un point de réapparition dans la dimension.
- Toute autre téléportation vers la Backroom est refusée. Une téléportation forcée vers lextérieur
reste possible pour ladministration, mais replace dabord le butin porté dans le registre : elle
ne constitue jamais une extraction réussie.
## Objets perdus et coffres
Les piles qui disparaissent naturellement ou tombent dans le vide rejoignent un registre mondial
borné. Une mort de joueur dans la Backroom y replace aussi tout ce quil transportait. Chaque pile
réelle matérialisée reçoit un identifiant persistant : elle peut passer du registre à un coffre, puis
à un joueur et revenir au registre, mais elle ne peut jamais exister deux fois.
Une perte associée à un joueur lui reste réservée pendant 24 000 ticks avant de pouvoir rejoindre
les tirages historiques partagés ; une perte sans propriétaire est immédiatement partagée.
Tous les coffres vanilla de la Backroom, générés ou posés, deviennent des nœuds de butin renouvelés
toutes les 12 000 ticks lors de leur prochaine ouverture. Le renouvellement rend au registre les
objets perdus non pris, efface le contenu ordinaire et produit le plus souvent du vide ou des
ressources pauvres : terre, pierre, planches, torches, nourriture et outils simples. Le butin ancien
partagé et les objets de valeur restent rares. Reposer un coffre au même emplacement pendant le
même cycle ne crée pas un nouveau tirage ; multiplier les emplacements donne en revanche bien des
tirages indépendants, au prix des ressources trouvées ou produites sur place.
Pendant une expédition, chaque coffre distinct est un essai personnel. Le premier a 75 % de chance
de proposer une perte récente du joueur, le deuxième 90 %, le troisième 100 %, puis les suivants
65 %. Sans perte personnelle disponible, le coffre suit simplement son tirage général.
## Architecture
Les plans sont déterministes par grandes zones et utilisent cinq familles composées :
- mégalopoles en béton, verre, pierre et voirie ;
- bureaux superposés en bois, clay, textile et éléments techniques ;
- plaines naturelles avec arbres et rares ruines ;
- agrégats de plateformes et de pièces flottantes reliées verticalement ;
- pièces construites visuellement à 90° ou à lenvers, sans modifier la gravité globale.
Les matériaux très marqués dAnother World napparaissent que ponctuellement aux anomalies. Aucun
bloc précieux ne sert de matériau structurel ; de très rares blocs de diamant sont cachés dans les
fondations.
## Exploitation
Les données `sanctuary:backroom` utilisent leur propre `data_version`, ainsi que des limites pour les
transactions, pertes, coffres suivis, visites et arrivées récentes. Les opérateurs disposent de
`/backroom status` et `/backroom inspect <joueur>` pour contrôler les registres sans les modifier.
+219 -20
View File
@@ -76,6 +76,14 @@ tasks.register("questTrackerModelSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.sanctuary.shop.QuestTrackerModelSmoke"
}
tasks.register("questTrackerDisplaySmoke", JavaExec) {
group = "verification"
description = "Checks quest-tracker display modes and permanent-F3 layout."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.client.QuestTrackerDisplaySmoke"
}
tasks.register("questIdSuggestionsSmoke", JavaExec) {
group = "verification"
description = "Checks accent-folded quest-panel item name ranking and inventory pins."
@@ -108,6 +116,30 @@ tasks.register("capeJoinSyncSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.sanctuary.gameplay.CapeJoinSyncQueueSmoke"
}
tasks.register("capeSyncPayloadSmoke", JavaExec) {
group = "verification"
description = "Checks banner cape colors and the six-pattern network bound."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.network.CapeSyncPayloadSmoke"
}
tasks.register("inventorySortSmoke", JavaExec) {
group = "verification"
description = "Checks that storage stacks merge and sort while the hotbar row stays out of the sort."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
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."
@@ -116,6 +148,22 @@ tasks.register("alphaIndevGeneratorSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.sanctuary.worldgen.feature.AlphaIndevGeneratorSmoke"
}
tasks.register("notchVictoryStateSmoke", JavaExec) {
group = "verification"
description = "Checks the monotone, bounded and codec-stable world-wide Notch victory."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryStateSmoke"
}
tasks.register("backroomModelSmoke", JavaExec) {
group = "verification"
description = "Checks bounded Backroom entry data, personal loot priority and composed architecture zones."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.backroom.BackroomModelSmoke"
}
tasks.register("verifyBlackMarket") {
group = "verification"
description = "Checks the physical sign market, flash Shop, escrow ledger and mailbox delivery."
@@ -151,7 +199,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| !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")
@@ -165,7 +213,7 @@ tasks.register("verifyBlackMarket") {
|| !minecraftMixin.contains('method = "pickBlockOrEntity"')
|| !middleClickPayload.contains('SanctuaryMod.id("c2s/black_market_interact")')
|| !middleClickPayload.contains("No client position, listing ID, item or price is trusted")
|| !network.contains("PROTOCOL_VERSION = 22")
|| !network.contains("PROTOCOL_VERSION = 24")
|| !network.contains("BlackMarketService.middleClick(context.player())")
|| !service.contains("loadedDeliveryBox") || !service.contains("PARCEL_RETENTION_MILLIS")
|| !policy.contains("DataComponents.CONTAINER") || !policy.contains("DataComponents.BUNDLE_CONTENTS")
@@ -298,6 +346,7 @@ tasks.register("verifySanctuary") {
tasks.named("questIdSuggestionsSmoke"),
tasks.named("shopHeaderLayoutSmoke"), tasks.named("zombieNamesSmoke"),
tasks.named("capeJoinSyncSmoke"),
tasks.named("inventorySortSmoke"),
tasks.named("verifyBlackMarket")
doLast {
@@ -614,6 +663,22 @@ tasks.register("verifySanctuary") {
,'class SanctuaryHotbarRowsClient'
,'id("c2s/hotbar_row_switch")'
,'id("s2c/hotbar_row_sync")'
,'class SanctuaryInventorySort'
,'class SanctuaryInventorySorter'
,'id("c2s/sort_inventory")'
,'key.sanctuary.sort_inventory'
,'GLFW.GLFW_MOUSE_BUTTON_MIDDLE'
,'matchesMouse'
,'int bankIndex(int visualRow, int visibleRows)'
,'playButtonClickSound'
,'requestVisualRow(client, 0, currentRows)'
,'isSortableStorageMenu'
,'instanceof ChestMenu'
,'instanceof ShulkerBoxMenu'
,'instanceof HopperMenu'
,'instanceof DispenserMenu'
,'buffer.writeBoolean(container)'
,'sortOpenContainer'
,'GLFW.GLFW_KEY_TAB'
,'HOTBAR_TEXTURE'
,'0.0F, 0.0F, 182, 22, 182, 22'
@@ -1143,13 +1208,13 @@ tasks.register("verifySanctuary") {
}
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
if (manifest.custom?.sanctuary26?.data_version != 11
|| manifest.custom?.sanctuary26?.network_protocol != 22
if (manifest.custom?.sanctuary26?.data_version != 14
|| manifest.custom?.sanctuary26?.network_protocol != 24
|| manifest.depends?.jei != ">=30.24.0.176"
|| manifest.depends?."fabric-api" != ">=0.155.0+26.2"
|| !manifest.entrypoints?.client?.contains("fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient")
|| !manifest.mixins?.contains("sanctuary.mixins.json")) {
throw new GradleException("Sanctuary must expose data v11, protocol 22, JEI and the client entrypoint")
throw new GradleException("Sanctuary must expose data v14, protocol 24, JEI and the client entrypoint")
}
def capeMigration = new JsonSlurper().parse(rootProject.file(
"pack/migrations/26.2.0-alpha.155-cape-equipment-to-alpha.156.json"))
@@ -1634,8 +1699,8 @@ tasks.register("verifySanctuary") {
def worldgenRoot = file("src/main/resources/data/sanctuary/worldgen")
def worldgenCounts = [
density_function: 12, biome: 6, configured_feature: 13, configured_carver: 1,
placed_feature: 19, noise_settings: 3, world_preset: 2
density_function: 12, biome: 7, configured_feature: 14, configured_carver: 1,
placed_feature: 20, noise_settings: 4, world_preset: 2
]
worldgenCounts.each { type, expected ->
def actual = fileTree(new File(worldgenRoot, type.toString())).matching { include "**/*.json" }.files.size()
@@ -2850,7 +2915,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| 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
@@ -3016,7 +3081,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| 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
@@ -3054,7 +3119,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| 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]
@@ -3085,7 +3150,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| migration.target?.pack_version != "26.2.0-alpha.195"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
|| migration.compatibility?.sanctuary_data_version != 11
@@ -3116,7 +3181,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
|| migration.mailbox?.id != "sanctuary:delivery_box"
|| migration.mailbox?.horizontal_facing != true
@@ -3144,7 +3209,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| !transfer.contains("shouldAppendOverflow")
|| !transfer.contains("isVanillaStorageRange")
|| !transfer.contains("hotbarStart")
@@ -3190,7 +3255,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
|| migration.quest_requests?.save_key != "quest_requests"
|| migration.quest_requests?.data_version != 1
@@ -3202,7 +3267,7 @@ tasks.register("verifyQuestRequests") {
|| !data.contains('SAVE_KEY = "quest_requests"') || !data.contains("DATA_VERSION = 3")
|| !service.contains("PlayerBlockBreakEvents.BEFORE")
|| !service.contains("player.blockPosition().distSqr(payload.pos()) > 64.0D")
|| !network.contains("PROTOCOL_VERSION = 22")
|| !network.contains("PROTOCOL_VERSION = 24")
|| !network.contains("QuestRequestSubmitPayload.ID")
|| !network.contains("QuestRequestAcceptPayload.ID")
|| !registry.contains('SanctuaryMod.id("quest_request_sign")')
@@ -3248,7 +3313,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| 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"
@@ -3268,7 +3333,7 @@ tasks.register("verifyQuestRequestContracts") {
|| !service.contains('REWARD_LOAN = "loan"')
|| !service.contains('PLAYER.equals(targetKind)')
|| !screen.contains("rewardQuantity") || !screen.contains("killTargetIndex")
|| !network.contains("PROTOCOL_VERSION = 22")
|| !network.contains("PROTOCOL_VERSION = 24")
|| standingModel.textures?.all != "sanctuary:block/pink_quest_request_sign"
|| itemModel.textures?.layer0 != "sanctuary:item/pink_quest_request_sign"
|| blockTexture == null || blockTexture.width != 32 || blockTexture.height != 32
@@ -3317,7 +3382,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| 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"
@@ -3338,7 +3403,7 @@ tasks.register("verifyQuestRequestEscrow") {
|| !service.contains('"quest_request_reward"')
|| !service.contains('"quest_request_delivery"')
|| service.contains("sanctuary_quest_accept")
|| !network.contains("PROTOCOL_VERSION = 22")
|| !network.contains("PROTOCOL_VERSION = 24")
|| !network.contains("QuestRequestAcceptPayload.ID")
|| !network.contains("QuestRequestConfirmPayload.ID")
|| !acceptPayload.contains("readUtf(36)")
@@ -3362,6 +3427,68 @@ tasks.named("verifySanctuary") {
dependsOn tasks.named("verifyInventoryShiftClick")
}
tasks.register("verifyCraftableBannerCape") {
group = "verification"
description = "Checks the white wool recipe, banner decoration and equipped pattern rendering."
inputs.file(rootProject.file(
"pack/migrations/26.2.0-alpha.225-craftable-banner-cape-to-alpha.226.json"))
inputs.file(file("src/main/resources/data/sanctuary/recipe/white_cape.json"))
inputs.file(file("src/main/resources/data/sanctuary/recipe/white_cape_banner.json"))
inputs.file(file("src/main/resources/assets/sanctuary/items/white_cape.json"))
inputs.files(fileTree("src/main/resources/assets/sanctuary/lang") { include "*.json" })
inputs.files(
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/gameplay/SanctuaryCapes.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/CapeSyncPayload.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/SanctuaryNetworking.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryBannerCapeLayer.java"))
doLast {
def migration = new JsonSlurper().parse(rootProject.file(
"pack/migrations/26.2.0-alpha.225-craftable-banner-cape-to-alpha.226.json"))
def baseRecipe = new JsonSlurper().parse(file(
"src/main/resources/data/sanctuary/recipe/white_cape.json"))
def bannerRecipe = new JsonSlurper().parse(file(
"src/main/resources/data/sanctuary/recipe/white_cape_banner.json"))
def itemDefinition = new JsonSlurper().parse(file(
"src/main/resources/assets/sanctuary/items/white_cape.json"))
def capes = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/gameplay/SanctuaryCapes.java").text
def payload = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/CapeSyncPayload.java").text
def networking = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/SanctuaryNetworking.java").text
def renderer = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryBannerCapeLayer.java").text
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.131"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.130"
|| migration.white_cape?.crafting_material_count != 6
|| migration.white_cape?.maximum_pattern_layers != 6
|| baseRecipe.pattern != ["WW", "WW", "WW"]
|| baseRecipe.key?.W != "minecraft:white_wool"
|| baseRecipe.result?.id != "sanctuary:white_cape"
|| bannerRecipe.type != "minecraft:crafting_special_shielddecoration"
|| bannerRecipe.banner != "#minecraft:banners"
|| bannerRecipe.target != "sanctuary:white_cape"
|| itemDefinition.model?.type != "minecraft:special"
|| itemDefinition.model?.model?.type != "minecraft:banner"
|| locales.any { !it.containsKey("item.sanctuary.white_cape") }
|| !capes.contains('WHITE_CAPE_PATH = "white_cape"')
|| !payload.contains("MAX_PATTERN_LAYERS = 6")
|| !payload.contains("DataComponents.BASE_COLOR")
|| !payload.contains("DataComponents.BANNER_PATTERNS")
|| !networking.contains("PROTOCOL_VERSION = 24")
|| !renderer.contains("BannerRenderer.submitPatterns")) {
throw new GradleException("Sanctuary alpha.130 craftable banner cape is incomplete")
}
}
}
tasks.named("verifySanctuary") {
dependsOn tasks.named("verifyCraftableBannerCape")
}
tasks.register("verifyAlphaIndev") {
group = "verification"
description = "Checks the alpha.122 finite Indev world, migration and attribution contract."
@@ -3389,7 +3516,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.124"
if (project.version.toString() != "0.0.0-alpha.131"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.122"
|| migration.alpha_world?.dimension != "sanctuary:alpha"
|| migration.alpha_world?.legacy_dimension != "portals:alpha"
@@ -3411,7 +3538,74 @@ tasks.register("verifyAlphaIndev") {
}
}
tasks.register("verifyBackroom") {
group = "verification"
description = "Checks Backroom dimension, migration, Mailbox boundary, loss registry and translations."
inputs.file(file("BACKROOM.md"))
inputs.file(rootProject.file("pack/migrations/sanctuary-backroom-data-v14.json"))
inputs.files(fileTree("src/main/java/fr/koka99cab/sanctuary26/sanctuary/backroom"))
inputs.files(fileTree("src/main/resources/data/sanctuary") { include "**/*backroom*.json" })
inputs.files(fileTree("src/main/resources/assets/sanctuary/lang") { include "*.json" })
inputs.files(
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/backroom/BackroomMaterialApi.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/DeliveryBoxBlockEntity.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/worldgen/feature/BackroomArchitectureFeature.java"),
file("src/main/resources/data/minecraft/worldgen/world_preset/normal.json"),
file("src/main/resources/data/sanctuary/worldgen/world_preset/overworld.json"),
file("src/main/resources/data/sanctuary/worldgen/world_preset/sanctuary.json"))
doLast {
def migration = new JsonSlurper().parse(rootProject.file("pack/migrations/sanctuary-backroom-data-v14.json"))
def dimensionType = new JsonSlurper().parse(file("src/main/resources/data/sanctuary/dimension_type/backroom.json"))
def presets = [
file("src/main/resources/data/minecraft/worldgen/world_preset/normal.json"),
file("src/main/resources/data/sanctuary/worldgen/world_preset/overworld.json"),
file("src/main/resources/data/sanctuary/worldgen/world_preset/sanctuary.json")
].collect { new JsonSlurper().parse(it) }
def data = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/backroom/BackroomData.java").text
def inventory = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/backroom/BackroomInventory.java").text
def service = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/backroom/BackroomService.java").text
def chest = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/backroom/BackroomChestService.java").text
def mailbox = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/DeliveryBoxBlockEntity.java").text
def architecture = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/worldgen/feature/BackroomArchitectureFeature.java").text
def materialApi = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/backroom/BackroomMaterialApi.java").text
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.131"
|| 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"
|| migration.compatibility?.network_protocol_changed != false
|| presets.any { it.dimensions?.get("sanctuary:backroom") == null }
|| dimensionType.attributes?.get("minecraft:gameplay/bed_rule")?.can_set_spawn != "never"
|| dimensionType.attributes?.get("minecraft:gameplay/bed_rule")?.can_sleep != "never"
|| !data.contains("MAX_LOST_ITEMS = 16_384") || !data.contains("MAX_CHEST_STATES = 65_536")
|| !data.contains("PERSONAL_RESERVATION_TICKS = 24_000L")
|| !data.contains("indexOfLoss(marker)") || !data.contains("BACKROOM_LOSS_COMPONENT")
|| !inventory.contains("companionEgg") || !inventory.contains("equippedCape")
|| !service.contains("ARRIVAL_RADIUS = 2_000") || !service.contains("insertTransaction")
|| !service.contains("AUTHORIZED_TRANSITIONS")
|| !service.contains("level -> !isBackroom(level)")
|| !mailbox.contains("MAX_PROCESSED_TRANSACTIONS = 128")
|| !chest.contains("REFRESH_TICKS = 12_000L") || !chest.contains("ordinal == 3")
|| !architecture.contains("PLAYABLE_RADIUS = 2_000")
|| !architecture.contains("BackroomMaterialApi.anomalyMaterial()")
|| !materialApi.contains("registerAnomalyMaterial")
|| locales.any { !it.containsKey("dimension.sanctuary.backroom")
|| !it.containsKey("message.sanctuary.backroom.bed_entry_only")
|| !it.containsKey("message.sanctuary.backroom.registry_busy")
|| !it.containsKey("message.sanctuary.backroom.mailbox_full")
|| !it.containsKey("message.sanctuary.backroom.exited_with_losses") }) {
throw new GradleException("Sanctuary alpha.131 Backroom contract is incomplete")
}
}
}
tasks.named("check") {
dependsOn tasks.named("backroomModelSmoke")
dependsOn tasks.named("verifyBackroom")
dependsOn tasks.named("notchVictoryStateSmoke")
dependsOn tasks.named("verifySanctuary")
dependsOn tasks.named("verifyDeliveryBoxOrientation")
dependsOn tasks.named("verifyQuestRequests")
@@ -3421,7 +3615,12 @@ tasks.named("check") {
dependsOn tasks.named("celestialGraphSmoke")
dependsOn tasks.named("questRequestModelSmoke")
dependsOn tasks.named("questTrackerModelSmoke")
dependsOn tasks.named("questTrackerDisplaySmoke")
dependsOn tasks.named("questIdSuggestionsSmoke")
dependsOn tasks.named("alphaIndevGeneratorSmoke")
dependsOn tasks.named("capeJoinSyncSmoke")
dependsOn tasks.named("capeSyncPayloadSmoke")
dependsOn tasks.named("inventorySortSmoke")
dependsOn tasks.named("entityPolicySmoke")
dependsOn tasks.named("verifyAlphaIndev")
}
@@ -7,6 +7,7 @@ import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryBulkActions;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventoryCapacity;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanions;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryHotbarRows;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventorySort;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanionPowers;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCapeService;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuarySitting;
@@ -25,6 +26,7 @@ import fr.koka99cab.sanctuary26.sanctuary.shop.ShopService;
import fr.koka99cab.sanctuary26.sanctuary.shop.BlackMarketService;
import fr.koka99cab.sanctuary26.sanctuary.shop.QuestBoardService;
import fr.koka99cab.sanctuary26.sanctuary.shop.QuestRequestService;
import fr.koka99cab.sanctuary26.sanctuary.backroom.BackroomService;
import net.fabricmc.api.ModInitializer;
import net.minecraft.resources.Identifier;
import org.slf4j.Logger;
@@ -33,7 +35,7 @@ import org.slf4j.LoggerFactory;
public final class SanctuaryMod implements ModInitializer {
public static final String MOD_ID = "sanctuary";
public static final String DISPLAY_NAME = "Sanctuary";
public static final int CURRENT_DATA_VERSION = 11;
public static final int CURRENT_DATA_VERSION = 14;
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public SanctuaryMod() {
@@ -52,9 +54,11 @@ public final class SanctuaryMod implements ModInitializer {
SanctuarySpawn.register();
SanctuaryWorldProfileData.register();
SanctuaryRegistries.initialize();
BackroomService.initialize();
SanctuaryBulkActions.initialize();
SanctuaryInventoryCapacity.initialize();
SanctuaryHotbarRows.initialize();
SanctuaryInventorySort.initialize();
SanctuaryCompanions.initialize();
SanctuaryCompanionPowers.initialize();
SanctuaryCapeService.initialize();
@@ -28,7 +28,7 @@ public record AtlasLandmark(
Codec.LONG.optionalFieldOf("discovered_at", 0L).forGetter(AtlasLandmark::discoveredAt),
Codec.BOOL.optionalFieldOf("manual", false).forGetter(AtlasLandmark::manual)
).apply(instance, AtlasLandmark::new));
public static final Set<String> AUTOMATIC_TYPES = Set.of("danger", "mine", "portal", "chest", "spawner");
public static final Set<String> AUTOMATIC_TYPES = Set.of("danger", "mine", "portal", "chest", "spawner", "boss");
public static final Set<String> MANUAL_TYPES = Set.of("home", "tree");
public AtlasLandmark {
@@ -4,6 +4,7 @@ import fr.koka99cab.sanctuary26.sanctuary.data.SanctuaryData;
import fr.koka99cab.sanctuary26.sanctuary.network.SanctuaryNetworking;
import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryPlayerProgress;
import java.util.Locale;
import java.util.UUID;
import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.core.BlockPos;
@@ -12,6 +13,8 @@ import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.Level;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.entity.monster.Enemy;
import net.minecraft.world.level.block.Blocks;
@@ -56,6 +59,26 @@ public final class SanctuaryAtlasLandmarks {
return true;
}
/** Adds a server-owned landmark only when the player already knows its dimension. */
public static boolean recordTrusted(MinecraftServer server, UUID playerId,
ResourceKey<Level> dimension, BlockPos pos, String type) {
if (!AtlasLandmark.AUTOMATIC_TYPES.contains(type)) return false;
SanctuaryData data = SanctuaryData.get(server);
SanctuaryPlayerProgress progress = data.player(playerId);
String dimensionId = dimension.identifier().toString();
if (!progress.dimensions().contains(dimensionId)
|| progress.hasAtlasLandmarkNear(type, dimensionId, pos, 8)) return false;
ServerLevel level = server.getLevel(dimension);
long gameTime = level == null ? 0L : level.getGameTime();
AtlasLandmark landmark = new AtlasLandmark(type, dimensionId, pos.getX(), pos.getY(), pos.getZ(),
"", gameTime, false);
if (!progress.recordAtlasLandmark(landmark)) return false;
data.markChanged();
ServerPlayer online = server.getPlayerList().getPlayer(playerId);
if (online != null) SanctuaryNetworking.sync(online);
return true;
}
private static void tick(MinecraftServer server) {
if (++tickCounter < SCAN_INTERVAL_TICKS) return;
tickCounter = 0;
@@ -0,0 +1,20 @@
package fr.koka99cab.sanctuary26.sanctuary.api.backroom;
import java.util.Objects;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
/** Public, one-way integration point for rare materials owned by other modules. */
public final class BackroomMaterialApi {
private static Block anomalyMaterial = Blocks.WARPED_WART_BLOCK;
private BackroomMaterialApi() {}
public static void registerAnomalyMaterial(Block material) {
anomalyMaterial = Objects.requireNonNull(material, "Backroom anomaly material");
}
public static Block anomalyMaterial() {
return anomalyMaterial;
}
}
@@ -0,0 +1,21 @@
package fr.koka99cab.sanctuary26.sanctuary.api.entity;
import java.util.Set;
import net.minecraft.world.entity.Entity;
/** Public cross-module policy for Sanctuary-owned temporary gameplay entities. */
public final class SanctuaryEntityPolicy {
public static final String TEMPORARY_COMPANION_TAG = "sanctuary_companion";
private SanctuaryEntityPolicy() {
}
/** Temporary companions must never yield loot, experience or quest progress. */
public static boolean isTemporaryCompanion(Entity entity) {
return entity != null && containsTemporaryCompanionTag(entity.entityTags());
}
static boolean containsTemporaryCompanionTag(Set<String> tags) {
return tags != null && tags.contains(TEMPORARY_COMPANION_TAG);
}
}
@@ -0,0 +1,42 @@
package fr.koka99cab.sanctuary26.sanctuary.api.item;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.CustomData;
/** Stable item metadata used to distinguish boss rewards, migrations and Shop replacements. */
public final class SanctuaryItemProvenance {
public static final Identifier NOTCH_REWARD = SanctuaryMod.id("notch_reward");
public static final Identifier SHOP_PURCHASE = SanctuaryMod.id("shop_purchase");
public static final Identifier LEGACY_NOTCH_TOTEM = SanctuaryMod.id("legacy_notch_totem");
private static final String ORIGIN_KEY = "sanctuary_origin";
private static final String VERSION_KEY = "sanctuary_origin_version";
private SanctuaryItemProvenance() {
}
public static void stamp(ItemStack stack, Identifier origin) {
if (stack == null || stack.isEmpty() || origin == null) return;
CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> {
tag.putString(ORIGIN_KEY, origin.toString());
tag.putInt(VERSION_KEY, 1);
});
}
public static void stampIfAbsent(ItemStack stack, Identifier origin) {
if (origin(stack) == null) stamp(stack, origin);
}
public static Identifier origin(ItemStack stack) {
if (stack == null || stack.isEmpty()) return null;
CustomData data = stack.get(DataComponents.CUSTOM_DATA);
if (data == null) return null;
return Identifier.tryParse(data.copyTag().getStringOr(ORIGIN_KEY, ""));
}
public static boolean hasOrigin(ItemStack stack, Identifier origin) {
return origin != null && origin.equals(origin(stack));
}
}
@@ -0,0 +1,105 @@
package fr.koka99cab.sanctuary26.sanctuary.api.notch;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import fr.koka99cab.sanctuary26.sanctuary.api.atlas.SanctuaryAtlasLandmarks;
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
import fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryData;
import fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryState;
import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryProgressionService;
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.UUID;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
/** Public server-only resolver for the monotone {@code notch_defeated} milestone. */
public final class SanctuaryNotchMilestone {
public static final Identifier NOTCH_DEFEATED = SanctuaryMod.id("notch_defeated");
private static final String SOURCE = "itsalive";
private SanctuaryNotchMilestone() {
}
public static boolean isDefeated(MinecraftServer server) {
return NotchVictoryData.get(server).snapshot().defeated();
}
public static NotchVictoryState snapshot(MinecraftServer server) {
return NotchVictoryData.get(server).snapshot();
}
/** Records a real server-side defeat and credits every bounded canonical participant once. */
public static VictoryResult recordVictory(ServerLevel alphaLevel, Collection<UUID> candidates) {
if (!alphaLevel.dimension().equals(SanctuaryDimensions.ALPHA)) {
throw new IllegalArgumentException("Notch can only be defeated in sanctuary:alpha");
}
List<UUID> participants = sanitizeParticipants(alphaLevel, candidates);
return record(alphaLevel, participants, false, true);
}
/** Imports the defeated phase from the historical portals:notch entity without duplicating rewards. */
public static VictoryResult migrateLegacyVictory(ServerLevel alphaLevel, boolean rewardAlreadyClaimed) {
if (!alphaLevel.dimension().equals(SanctuaryDimensions.ALPHA)) {
throw new IllegalArgumentException("Legacy Notch can only be migrated from sanctuary:alpha");
}
return record(alphaLevel, List.of(), rewardAlreadyClaimed, false);
}
/** Atomically reserves the one canonical initial reward for CARPET-01. */
public static boolean claimInitialReward(MinecraftServer server) {
return NotchVictoryData.get(server).claimInitialReward();
}
/** Completes the reservation only after the physical reward chest exists. */
public static boolean completeInitialReward(MinecraftServer server) {
return NotchVictoryData.get(server).completeInitialReward();
}
private static VictoryResult record(ServerLevel alphaLevel, List<UUID> participants,
boolean rewardAlreadyClaimed, boolean announce) {
NotchVictoryData data = NotchVictoryData.get(alphaLevel.getServer());
boolean newlyDefeated = data.recordDefeat(participants, alphaLevel.getGameTime(), rewardAlreadyClaimed);
NotchVictoryState state = data.snapshot();
BlockPos home = SanctuaryAlphaWorld.residence(alphaLevel.getSeed());
for (UUID participant : state.participants()) {
SanctuaryProgressionService.recordExternalAt(alphaLevel.getServer(), participant,
NOTCH_DEFEATED, SanctuaryDimensions.ALPHA, home, alphaLevel.getGameTime(), SOURCE);
SanctuaryAtlasLandmarks.recordTrusted(alphaLevel.getServer(), participant,
SanctuaryDimensions.ALPHA, home, "boss");
}
if (newlyDefeated && announce) {
alphaLevel.getServer().getPlayerList().broadcastSystemMessage(
Component.translatable("message.sanctuary.notch_defeated").withStyle(ChatFormatting.GOLD), false);
}
return new VictoryResult(newlyDefeated, state.participants(), state.initialRewardClaimed(),
state.initialRewardDelivered());
}
private static List<UUID> sanitizeParticipants(ServerLevel level, Collection<UUID> candidates) {
if (candidates == null || candidates.isEmpty()) return List.of();
LinkedHashSet<UUID> result = new LinkedHashSet<>();
for (UUID candidate : candidates) {
if (result.size() >= NotchVictoryState.MAX_PARTICIPANTS) break;
ServerPlayer player = level.getServer().getPlayerList().getPlayer(candidate);
if (player != null && player.level() == level && !player.isSpectator()
&& SanctuaryAlphaWorld.containsHorizontal(player.blockPosition())) {
result.add(candidate);
}
}
return List.copyOf(result);
}
public record VictoryResult(boolean newlyDefeated, List<UUID> participants,
boolean initialRewardClaimed, boolean initialRewardDelivered) {
public VictoryResult {
participants = List.copyOf(participants);
}
}
}
@@ -0,0 +1,17 @@
package fr.koka99cab.sanctuary26.sanctuary.api.progression;
import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
/** Public, server-authoritative resolver for world-wide progression milestones. */
public final class SanctuaryWorldMilestones {
private SanctuaryWorldMilestones() {
}
public static boolean isReached(MinecraftServer server, Identifier milestone) {
if (server == null || milestone == null) return false;
return milestone.equals(SanctuaryNotchMilestone.NOTCH_DEFEATED)
&& SanctuaryNotchMilestone.isDefeated(server);
}
}
@@ -0,0 +1,149 @@
package fr.koka99cab.sanctuary26.sanctuary.backroom;
import fr.koka99cab.sanctuary26.sanctuary.registry.SanctuaryRegistries;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.ChestBlock;
import net.minecraft.world.level.block.entity.ChestBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.ChestType;
/** Renewable loot nodes backed by the non-duplicating real-item registry. */
public final class BackroomChestService {
public static final long REFRESH_TICKS = 12_000L;
private BackroomChestService() {}
public static void open(ChestBlockEntity opened, ServerPlayer player) {
if (!(opened.getLevel() instanceof ServerLevel level) || !BackroomService.isBackroom(level)) return;
ChestGroup group = group(level, opened);
BackroomData data = BackroomData.get(level.getServer());
long cycle = Math.floorDiv(level.getGameTime(), REFRESH_TICKS);
BackroomData.ChestState state = data.chest(group.anchor).orElse(null);
ArrayList<UUID> assigned = state == null ? new ArrayList<>() : new ArrayList<>(state.assignedIds());
boolean refreshed = state == null || state.cycle() != cycle;
if (refreshed) {
data.reconcileChest(group.anchor, markers(group));
group.clear();
assigned.clear();
}
BackroomData.ChestVisit visit = data.visitChest(player.getUUID(), group.anchor);
boolean personalInserted = false;
if (visit.firstVisit() && personalRoll(player.getRandom(), visit.ordinal())) {
BackroomData.MaterializedLoss loss = data.takePersonal(player.getUUID(), group.anchor).orElse(null);
if (loss != null && group.insertLoss(loss.stack())) {
assigned.add(loss.id());
personalInserted = true;
} else if (loss != null) {
data.capture(loss.stack(), player.getUUID(), "chest_full", level.getGameTime());
}
}
if (refreshed) rollGeneralLoot(level, group, data, assigned, cycle);
if (refreshed || personalInserted) data.updateChest(group.anchor, cycle, assigned);
}
public static boolean personalRoll(RandomSource random, int ordinal) {
if (ordinal <= 0) return false;
if (ordinal == 1) return random.nextFloat() < 0.75F;
if (ordinal == 2) return random.nextFloat() < 0.90F;
if (ordinal == 3) return true;
return random.nextFloat() < 0.65F;
}
private static void rollGeneralLoot(ServerLevel level, ChestGroup group, BackroomData data,
List<UUID> assigned, long cycle) {
RandomSource random = RandomSource.create(level.getSeed() ^ group.anchor ^ cycle * 0x9E3779B97F4A7C15L);
int roll = random.nextInt(100);
if (roll < 55) return;
if (roll < 74) {
insert(group, random, Items.DIRT, 4, 20);
if (random.nextBoolean()) insert(group, random, Items.OAK_PLANKS, 2, 10);
return;
}
if (roll < 90) {
insert(group, random, Items.COBBLESTONE, 6, 24);
insert(group, random, random.nextBoolean() ? Items.TORCH : Items.BREAD, 2, 7);
if (random.nextInt(3) == 0) group.insert(new ItemStack(Items.WOODEN_PICKAXE));
return;
}
if (roll < 97) {
data.takeShared(group.anchor, level.getGameTime()).ifPresent(loss -> {
if (group.insertLoss(loss.stack())) assigned.add(loss.id());
else data.capture(loss.stack(), null, "chest_full", level.getGameTime());
});
return;
}
if (roll < 99) {
group.insert(new ItemStack(Items.IRON_PICKAXE));
insert(group, random, Items.ENDER_PEARL, 1, 2);
} else {
group.insert(new ItemStack(Items.DIAMOND));
}
}
private static void insert(ChestGroup group, RandomSource random, Item item, int minimum, int maximum) {
group.insert(new ItemStack(item, minimum + random.nextInt(maximum - minimum + 1)));
}
private static List<UUID> markers(ChestGroup group) {
ArrayList<UUID> result = new ArrayList<>();
for (ChestBlockEntity chest : group.chests) for (int slot = 0; slot < chest.getContainerSize(); slot++) {
UUID marker = chest.getItem(slot).get(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT);
if (marker != null) result.add(marker);
}
return result;
}
private static ChestGroup group(ServerLevel level, ChestBlockEntity opened) {
BlockPos pos = opened.getBlockPos();
BlockState state = opened.getBlockState();
if (!(state.getBlock() instanceof ChestBlock) || state.getValue(ChestBlock.TYPE) == ChestType.SINGLE) {
return new ChestGroup(pos.asLong(), List.of(opened));
}
BlockPos connectedPos = ChestBlock.getConnectedBlockPos(pos, state);
if (!(level.getBlockEntity(connectedPos) instanceof ChestBlockEntity connected)) {
return new ChestGroup(pos.asLong(), List.of(opened));
}
long anchor = Math.min(pos.asLong(), connectedPos.asLong());
return pos.asLong() == anchor
? new ChestGroup(anchor, List.of(opened, connected))
: new ChestGroup(anchor, List.of(connected, opened));
}
private record ChestGroup(long anchor, List<ChestBlockEntity> chests) {
private void clear() {
chests.forEach(chest -> { chest.clearContent(); chest.setChanged(); });
}
private boolean insert(ItemStack offered) {
if (offered == null || offered.isEmpty()) return false;
for (ChestBlockEntity chest : chests) if (insertInto(chest, offered)) return true;
return false;
}
/** Keeps every real loss in the physical anchor chest tracked by the persisted state. */
private boolean insertLoss(ItemStack offered) {
return offered != null && !offered.isEmpty() && insertInto(chests.getFirst(), offered);
}
private static boolean insertInto(ChestBlockEntity chest, ItemStack offered) {
for (int slot = 0; slot < chest.getContainerSize(); slot++) {
if (!chest.getItem(slot).isEmpty()) continue;
chest.setItem(slot, offered.copy());
chest.setChanged();
return true;
}
return false;
}
}
}
@@ -0,0 +1,316 @@
package fr.koka99cab.sanctuary26.sanctuary.backroom;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import fr.koka99cab.sanctuary26.sanctuary.registry.SanctuaryRegistries;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.saveddata.SavedData;
import net.minecraft.world.level.saveddata.SavedDataType;
/** Persistent, bounded state for Backroom entries and the real-item loss pool. */
public final class BackroomData extends SavedData {
public static final String SAVE_KEY = "backroom";
public static final int DATA_VERSION = 1;
public static final int MAX_PENDING_ENTRIES = 256;
public static final int MAX_ENTRY_SLOTS = 64;
public static final int MAX_LOST_ITEMS = 16_384;
public static final int MAX_CHEST_STATES = 65_536;
public static final int MAX_PLAYER_STATES = 4_096;
public static final int MAX_VISITED_CHESTS = 128;
public static final int MAX_RECENT_ARRIVALS = 8;
public static final long PERSONAL_RESERVATION_TICKS = 24_000L;
public static final String LOST_POOL = "pool";
public static final String LOST_CHEST = "chest";
public static final Codec<EntrySlot> ENTRY_SLOT_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("location").forGetter(EntrySlot::location),
Codec.INT.fieldOf("index").forGetter(EntrySlot::index),
ItemStack.CODEC.fieldOf("item").forGetter(EntrySlot::item)
).apply(instance, EntrySlot::new));
private static final Codec<PendingEntry> PENDING_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("player").forGetter(PendingEntry::player),
Codec.STRING.fieldOf("transaction").forGetter(PendingEntry::transaction),
ENTRY_SLOT_CODEC.listOf(0, MAX_ENTRY_SLOTS).fieldOf("slots").forGetter(PendingEntry::slots)
).apply(instance, PendingEntry::new));
private static final Codec<LostItem> LOST_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("id").forGetter(LostItem::id),
Codec.STRING.optionalFieldOf("owner", "").forGetter(LostItem::owner),
Codec.STRING.fieldOf("cause").forGetter(LostItem::cause),
Codec.LONG.fieldOf("lost_at").forGetter(LostItem::lostAt),
ItemStack.CODEC.fieldOf("item").forGetter(LostItem::item),
Codec.STRING.optionalFieldOf("state", LOST_POOL).forGetter(LostItem::state),
Codec.LONG.optionalFieldOf("chest", Long.MIN_VALUE).forGetter(LostItem::chest)
).apply(instance, LostItem::new));
private static final Codec<ChestState> CHEST_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.LONG.fieldOf("pos").forGetter(ChestState::pos),
Codec.LONG.fieldOf("cycle").forGetter(ChestState::cycle),
Codec.STRING.listOf(0, 54).optionalFieldOf("assigned", List.of()).forGetter(ChestState::assigned)
).apply(instance, ChestState::new));
private static final Codec<PlayerState> PLAYER_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("player").forGetter(PlayerState::player),
Codec.INT.optionalFieldOf("personal_attempts", 0).forGetter(PlayerState::personalAttempts),
Codec.LONG.listOf(0, MAX_VISITED_CHESTS).optionalFieldOf("visited_chests", List.of()).forGetter(PlayerState::visitedChests),
Codec.LONG.listOf(0, MAX_RECENT_ARRIVALS).optionalFieldOf("recent_arrivals", List.of()).forGetter(PlayerState::recentArrivals)
).apply(instance, PlayerState::new));
private static final Codec<BackroomData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.INT.optionalFieldOf("data_version", DATA_VERSION).forGetter(data -> data.dataVersion),
PENDING_CODEC.listOf(0, MAX_PENDING_ENTRIES).optionalFieldOf("pending_entries", List.of()).forGetter(data -> data.pendingEntries),
LOST_CODEC.listOf(0, MAX_LOST_ITEMS).optionalFieldOf("lost_items", List.of()).forGetter(data -> data.lostItems),
CHEST_CODEC.listOf(0, MAX_CHEST_STATES).optionalFieldOf("chests", List.of()).forGetter(data -> data.chests),
PLAYER_CODEC.listOf(0, MAX_PLAYER_STATES).optionalFieldOf("players", List.of()).forGetter(data -> data.players)
).apply(instance, BackroomData::new));
private static final SavedDataType<BackroomData> TYPE = new SavedDataType<>(
SanctuaryMod.id(SAVE_KEY), BackroomData::new, CODEC, null);
private int dataVersion;
private final List<PendingEntry> pendingEntries;
private final List<LostItem> lostItems;
private final List<ChestState> chests;
private final Map<Long, Integer> chestIndices;
private final List<PlayerState> players;
public BackroomData() {
this(DATA_VERSION, List.of(), List.of(), List.of(), List.of());
}
private BackroomData(int dataVersion, List<PendingEntry> pendingEntries, List<LostItem> lostItems,
List<ChestState> chests, List<PlayerState> players) {
this.dataVersion = Math.max(DATA_VERSION, dataVersion);
this.pendingEntries = bounded(pendingEntries, MAX_PENDING_ENTRIES);
this.lostItems = bounded(lostItems, MAX_LOST_ITEMS);
this.chests = bounded(chests, MAX_CHEST_STATES);
this.chestIndices = new HashMap<>();
for (int index = 0; index < this.chests.size(); index++) chestIndices.put(this.chests.get(index).pos, index);
this.players = bounded(players, MAX_PLAYER_STATES);
}
public static BackroomData get(MinecraftServer server) {
ServerLevel overworld = server.getLevel(Level.OVERWORLD);
if (overworld == null) throw new IllegalStateException("Overworld unavailable for Backroom data");
BackroomData data = overworld.getDataStorage().computeIfAbsent(TYPE);
if (data.dataVersion < DATA_VERSION) {
data.dataVersion = DATA_VERSION;
data.setDirty();
}
return data;
}
public Optional<PendingEntry> pendingEntry(UUID player) {
String id = player.toString();
return pendingEntries.stream().filter(entry -> entry.player.equals(id)).findFirst();
}
public Optional<PendingEntry> prepareEntry(UUID player, List<EntrySlot> slots) {
pendingEntries.removeIf(entry -> entry.player.equals(player.toString()));
if (pendingEntries.size() >= MAX_PENDING_ENTRIES) return Optional.empty();
PendingEntry entry = new PendingEntry(player.toString(), UUID.randomUUID().toString(), copySlots(slots));
pendingEntries.add(entry);
setDirty();
return Optional.of(entry);
}
public void finishEntry(UUID player) {
if (pendingEntries.removeIf(entry -> entry.player.equals(player.toString()))) setDirty();
}
/** Adds a new loss or returns a previously materialized loss to the pool. */
public Optional<UUID> capture(ItemStack source, UUID owner, String cause, long gameTime) {
if (source == null || source.isEmpty()) return Optional.empty();
ItemStack clean = source.copy();
UUID marker = clean.get(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT);
clean.remove(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT);
if (marker != null) {
int existing = indexOfLoss(marker);
if (existing >= 0) {
LostItem previous = lostItems.get(existing);
lostItems.set(existing, new LostItem(previous.id, owner == null ? previous.owner : owner.toString(),
cause, gameTime, clean, LOST_POOL, Long.MIN_VALUE));
setDirty();
return Optional.of(marker);
}
}
if (lostItems.size() >= MAX_LOST_ITEMS) return Optional.empty();
UUID id = marker == null ? UUID.randomUUID() : marker;
lostItems.add(new LostItem(id.toString(), owner == null ? "" : owner.toString(), cause,
gameTime, clean, LOST_POOL, Long.MIN_VALUE));
setDirty();
return Optional.of(id);
}
public Optional<MaterializedLoss> takePersonal(UUID owner, long chestPos) {
String player = owner.toString();
return lostItems.stream()
.filter(loss -> loss.state.equals(LOST_POOL) && loss.owner.equals(player))
.max(Comparator.comparingLong(LostItem::lostAt))
.flatMap(loss -> materialize(loss, chestPos));
}
public Optional<MaterializedLoss> takeShared(long chestPos, long gameTime) {
return lostItems.stream()
.filter(loss -> loss.state.equals(LOST_POOL)
&& sharedEligible(loss.owner, loss.lostAt, gameTime))
.min(Comparator.comparingLong(LostItem::lostAt))
.flatMap(loss -> materialize(loss, chestPos));
}
static boolean sharedEligible(String owner, long lostAt, long gameTime) {
return owner == null || owner.isEmpty()
|| gameTime >= lostAt && gameTime - lostAt >= PERSONAL_RESERVATION_TICKS;
}
private Optional<MaterializedLoss> materialize(LostItem loss, long chestPos) {
int index = lostItems.indexOf(loss);
if (index < 0) return Optional.empty();
ItemStack marked = loss.item.copy();
UUID id = loss.uuid();
marked.set(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT, id);
lostItems.set(index, new LostItem(loss.id, loss.owner, loss.cause, loss.lostAt,
loss.item.copy(), LOST_CHEST, chestPos));
setDirty();
return Optional.of(new MaterializedLoss(id, marked));
}
/** Reconciles real items allocated during the chest's previous loot cycle. */
public void reconcileChest(long chestPos, List<UUID> markersStillPresent) {
List<String> present = markersStillPresent.stream().map(UUID::toString).toList();
boolean changed = false;
for (int index = lostItems.size() - 1; index >= 0; index--) {
LostItem loss = lostItems.get(index);
if (!loss.state.equals(LOST_CHEST) || loss.chest != chestPos) continue;
if (present.contains(loss.id)) {
lostItems.set(index, new LostItem(loss.id, loss.owner, loss.cause, loss.lostAt,
loss.item.copy(), LOST_POOL, Long.MIN_VALUE));
} else {
lostItems.remove(index);
}
changed = true;
}
if (changed) setDirty();
}
/** Settles a marked item that successfully left the Backroom. */
public void settle(UUID lossId) {
if (lossId != null && lostItems.removeIf(loss -> loss.id.equals(lossId.toString()))) setDirty();
}
public Optional<ChestState> chest(long pos) {
Integer index = chestIndices.get(pos);
return index == null ? Optional.empty() : Optional.of(chests.get(index));
}
public void updateChest(long pos, long cycle, List<UUID> assigned) {
ChestState replacement = new ChestState(pos, cycle, assigned.stream().limit(54).map(UUID::toString).toList());
Integer existing = chestIndices.get(pos);
if (existing != null) {
chests.set(existing, replacement);
} else {
if (chests.size() >= MAX_CHEST_STATES) {
chests.removeFirst();
chestIndices.clear();
for (int index = 0; index < chests.size(); index++) chestIndices.put(chests.get(index).pos, index);
}
chestIndices.put(pos, chests.size());
chests.add(replacement);
}
setDirty();
}
/** Marks a chest and returns whether it is a new personal-recovery attempt. */
public ChestVisit visitChest(UUID player, long chestPos) {
PlayerState state = playerState(player);
ArrayList<Long> visited = new ArrayList<>(state.visitedChests);
boolean firstVisit = !visited.contains(chestPos);
if (firstVisit) {
if (visited.size() >= MAX_VISITED_CHESTS) visited.removeFirst();
visited.add(chestPos);
state = replacePlayer(state, state.personalAttempts + 1, visited, state.recentArrivals);
}
return new ChestVisit(firstVisit, state.personalAttempts);
}
public void beginExpedition(UUID player, long packedArrival) {
PlayerState state = playerState(player);
ArrayList<Long> arrivals = new ArrayList<>(state.recentArrivals);
arrivals.remove(packedArrival);
arrivals.addFirst(packedArrival);
while (arrivals.size() > MAX_RECENT_ARRIVALS) arrivals.removeLast();
replacePlayer(state, 0, List.of(), arrivals);
}
public List<Long> recentArrivals(UUID player) {
return List.copyOf(playerState(player).recentArrivals);
}
public int lostItemCount() { return lostItems.size(); }
public long pooledItemCount() { return lostItems.stream().filter(loss -> loss.state.equals(LOST_POOL)).count(); }
public long pooledItemCount(UUID owner) {
String id = owner.toString();
return lostItems.stream().filter(loss -> loss.state.equals(LOST_POOL) && loss.owner.equals(id)).count();
}
public int trackedChestCount() { return chests.size(); }
private PlayerState playerState(UUID player) {
String id = player.toString();
return players.stream().filter(state -> state.player.equals(id)).findFirst().orElseGet(() -> {
if (players.size() >= MAX_PLAYER_STATES) players.removeFirst();
PlayerState state = new PlayerState(id, 0, List.of(), List.of());
players.add(state);
setDirty();
return state;
});
}
private PlayerState replacePlayer(PlayerState old, int attempts, List<Long> visited, List<Long> arrivals) {
PlayerState replacement = new PlayerState(old.player, Math.max(0, attempts),
bounded(visited, MAX_VISITED_CHESTS), bounded(arrivals, MAX_RECENT_ARRIVALS));
players.set(players.indexOf(old), replacement);
setDirty();
return replacement;
}
private int indexOfLoss(UUID id) {
String value = id.toString();
for (int index = 0; index < lostItems.size(); index++) if (lostItems.get(index).id.equals(value)) return index;
return -1;
}
private static List<EntrySlot> copySlots(List<EntrySlot> slots) {
return slots.stream().filter(slot -> slot != null && !slot.item.isEmpty()).limit(MAX_ENTRY_SLOTS)
.map(slot -> new EntrySlot(slot.location, slot.index, slot.item.copy())).toList();
}
private static <T> ArrayList<T> bounded(List<T> source, int maximum) {
List<T> safe = source == null ? List.of() : source;
int start = Math.max(0, safe.size() - maximum);
return new ArrayList<>(safe.subList(start, safe.size()));
}
public record EntrySlot(String location, int index, ItemStack item) {
public EntrySlot { item = item == null ? ItemStack.EMPTY : item.copy(); }
}
public record PendingEntry(String player, String transaction, List<EntrySlot> slots) {
public UUID transactionId() { return UUID.fromString(transaction); }
}
public record LostItem(String id, String owner, String cause, long lostAt, ItemStack item,
String state, long chest) {
public UUID uuid() { return UUID.fromString(id); }
}
public record ChestState(long pos, long cycle, List<String> assigned) {
public List<UUID> assignedIds() { return assigned.stream().map(UUID::fromString).toList(); }
}
private record PlayerState(String player, int personalAttempts, List<Long> visitedChests,
List<Long> recentArrivals) {}
public record MaterializedLoss(UUID id, ItemStack stack) {}
public record ChestVisit(boolean firstVisit, int ordinal) {}
}
@@ -0,0 +1,108 @@
package fr.koka99cab.sanctuary26.sanctuary.backroom;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventoryCapacity;
import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryPlayerProgress;
import fr.koka99cab.sanctuary26.sanctuary.registry.SanctuaryRegistries;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack;
/** Exact inventory boundary used by Backroom entry, death and exit. */
public final class BackroomInventory {
private static final String INVENTORY = "inventory";
private static final String OVERFLOW = "overflow";
private static final String EGG = "companion_egg";
private static final String CAPE = "cape";
private BackroomInventory() {}
public static List<BackroomData.EntrySlot> snapshot(ServerPlayer player) {
ArrayList<BackroomData.EntrySlot> result = new ArrayList<>();
Inventory inventory = player.getInventory();
for (int slot = 0; slot < inventory.getContainerSize(); slot++) {
add(result, INVENTORY, slot, inventory.getItem(slot));
}
for (int slot = 0; slot < SanctuaryPlayerProgress.OVERFLOW_SLOT_COUNT; slot++) {
add(result, OVERFLOW, slot, SanctuaryInventoryCapacity.overflowItem(player, slot));
}
add(result, EGG, 0, SanctuaryInventoryCapacity.companionEgg(player));
add(result, CAPE, 0, SanctuaryInventoryCapacity.equippedCape(player));
return result;
}
public static List<ItemStack> parcel(List<BackroomData.EntrySlot> slots) {
return slots.stream().map(BackroomData.EntrySlot::item).filter(stack -> !stack.isEmpty())
.map(ItemStack::copy).toList();
}
/** Clears only exact snapshot values, so recovery never destroys a later replacement item. */
public static void clearMatching(ServerPlayer player, List<BackroomData.EntrySlot> slots) {
for (BackroomData.EntrySlot slot : slots) {
ItemStack current = get(player, slot);
if (ItemStack.matches(current, slot.item())) set(player, slot, ItemStack.EMPTY);
}
player.getInventory().setChanged();
SanctuaryInventoryCapacity.markOverflowChanged(player);
}
public static int captureAll(ServerPlayer player, String cause) {
BackroomData data = BackroomData.get(player.level().getServer());
long now = player.level().getGameTime();
int captured = 0;
for (BackroomData.EntrySlot slot : snapshot(player)) {
if (data.capture(slot.item(), player.getUUID(), cause, now).isEmpty()) continue;
set(player, slot, ItemStack.EMPTY);
captured++;
}
player.getInventory().setChanged();
SanctuaryInventoryCapacity.markOverflowChanged(player);
return captured;
}
/** Removes registry markers only when their real item successfully crosses a bed exit. */
public static int settleCarriedLosses(ServerPlayer player) {
BackroomData data = BackroomData.get(player.level().getServer());
int settled = 0;
for (BackroomData.EntrySlot slot : snapshot(player)) {
ItemStack item = get(player, slot);
UUID id = item.get(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT);
if (id == null) continue;
item.remove(SanctuaryRegistries.BACKROOM_LOSS_COMPONENT);
data.settle(id);
set(player, slot, item);
settled++;
}
return settled;
}
private static void add(List<BackroomData.EntrySlot> target, String location, int index, ItemStack stack) {
if (stack != null && !stack.isEmpty()) target.add(new BackroomData.EntrySlot(location, index, stack));
}
private static ItemStack get(ServerPlayer player, BackroomData.EntrySlot slot) {
return switch (slot.location()) {
case INVENTORY -> slot.index() >= 0 && slot.index() < player.getInventory().getContainerSize()
? player.getInventory().getItem(slot.index()) : ItemStack.EMPTY;
case OVERFLOW -> SanctuaryInventoryCapacity.overflowItem(player, slot.index());
case EGG -> SanctuaryInventoryCapacity.companionEgg(player);
case CAPE -> SanctuaryInventoryCapacity.equippedCape(player);
default -> ItemStack.EMPTY;
};
}
private static void set(ServerPlayer player, BackroomData.EntrySlot slot, ItemStack stack) {
switch (slot.location()) {
case INVENTORY -> {
if (slot.index() >= 0 && slot.index() < player.getInventory().getContainerSize())
player.getInventory().setItem(slot.index(), stack);
}
case OVERFLOW -> SanctuaryInventoryCapacity.setOverflowItem(player, slot.index(), stack);
case EGG -> SanctuaryInventoryCapacity.setCompanionEgg(player, stack);
case CAPE -> SanctuaryInventoryCapacity.setEquippedCape(player, stack);
default -> { }
}
}
}
@@ -0,0 +1,240 @@
package fr.koka99cab.sanctuary26.sanctuary.backroom;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import fr.koka99cab.sanctuary26.sanctuary.shop.ShopData;
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.EntityArgument;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.portal.TeleportTransition;
import net.minecraft.world.phys.Vec3;
/** Bed gateway and crash-safe Mailbox boundary for Backroom expeditions. */
public final class BackroomService {
public static final int ARRIVAL_RADIUS = 2_000;
private static final int ARRIVAL_ATTEMPTS = 48;
private static final Set<UUID> AUTHORIZED_TRANSITIONS = new HashSet<>();
private static boolean initialized;
private BackroomService() {}
public static void initialize() {
if (initialized) return;
initialized = true;
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> reconcile(handler.player));
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
dispatcher.register(Commands.literal("backroom")
.requires(Commands.hasPermission(Commands.LEVEL_GAMEMASTERS))
.executes(context -> status(context.getSource()))
.then(Commands.literal("status").executes(context -> status(context.getSource())))
.then(Commands.literal("inspect")
.then(Commands.argument("player", EntityArgument.player())
.executes(context -> inspect(context.getSource(), EntityArgument.getPlayer(context, "player"))))));
});
SanctuaryMod.LOGGER.info("[{}] Backroom bed gateway ready (arrival radius {} blocks).",
SanctuaryMod.DISPLAY_NAME, ARRIVAL_RADIUS);
}
/** Returns true when the bed interaction belongs to the Backroom feature. */
public static boolean useBed(ServerPlayer player) {
if (isBackroom(player.level())) {
exit(player);
return true;
}
if (!player.isSecondaryUseActive()) return false;
enter(player);
return true;
}
public static boolean isBackroom(ServerLevel level) {
return level != null && level.dimension().equals(SanctuaryDimensions.BACKROOM);
}
public static boolean enter(ServerPlayer player) {
ServerLevel destination = player.level().getServer().getLevel(SanctuaryDimensions.BACKROOM);
if (destination == null) {
notify(player, "message.sanctuary.backroom.unavailable");
return false;
}
if (!reconcile(player)) {
notify(player, "message.sanctuary.backroom.pending");
return false;
}
List<BackroomData.EntrySlot> slots = BackroomInventory.snapshot(player);
ShopData.DeliveryDestination mailbox = null;
if (!slots.isEmpty()) {
mailbox = ShopData.get(player.level().getServer()).loadedDeliveryBox(
player.level().getServer(), player.getUUID(), level -> !isBackroom(level)).orElse(null);
if (mailbox == null) {
notify(player, "message.sanctuary.backroom.mailbox_missing");
return false;
}
}
BackroomData data = BackroomData.get(player.level().getServer());
BackroomData.PendingEntry pending = data.prepareEntry(player.getUUID(), slots).orElse(null);
if (pending == null) {
notify(player, "message.sanctuary.backroom.registry_busy");
return false;
}
if (mailbox != null && !mailbox.box().insertTransaction(pending.transactionId(), BackroomInventory.parcel(slots))) {
data.finishEntry(player.getUUID());
notify(player, "message.sanctuary.backroom.mailbox_full");
return false;
}
BackroomInventory.clearMatching(player, slots);
data.finishEntry(player.getUUID());
BlockPos arrival = chooseArrival(destination, player.getUUID(), data);
data.beginExpedition(player.getUUID(), arrival.asLong());
TeleportTransition transition = new TeleportTransition(destination, Vec3.atBottomCenterOf(arrival),
Vec3.ZERO, player.getYRot(), player.getXRot(),
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET));
ServerPlayer teleported;
AUTHORIZED_TRANSITIONS.add(player.getUUID());
try {
teleported = player.teleport(transition);
} finally {
AUTHORIZED_TRANSITIONS.remove(player.getUUID());
}
if (teleported == null) {
SanctuaryMod.LOGGER.error("Backroom teleport failed after Mailbox transaction {} for {}",
pending.transaction(), player.getGameProfile().name());
return false;
}
notify(player, "message.sanctuary.backroom.entered");
return true;
}
public static boolean exit(ServerPlayer player) {
if (!isBackroom(player.level())) return false;
TeleportTransition transition = player.findRespawnPositionAndUseSpawnBlock(false,
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET));
if (isBackroom(transition.newLevel())) {
transition = TeleportTransition.createDefault(player,
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET));
}
ServerPlayer teleported;
AUTHORIZED_TRANSITIONS.add(player.getUUID());
try {
teleported = player.teleport(transition);
} finally {
AUTHORIZED_TRANSITIONS.remove(player.getUUID());
}
if (teleported == null) return false;
int recovered = BackroomInventory.settleCarriedLosses(teleported);
notify(teleported, recovered == 0
? "message.sanctuary.backroom.exited"
: "message.sanctuary.backroom.exited_with_losses");
return true;
}
public static boolean isAuthorizedTransition(UUID player) {
return player != null && AUTHORIZED_TRANSITIONS.contains(player);
}
/** Resolves a crash between Mailbox insertion and inventory clearing. */
public static boolean reconcile(ServerPlayer player) {
BackroomData data = BackroomData.get(player.level().getServer());
BackroomData.PendingEntry pending = data.pendingEntry(player.getUUID()).orElse(null);
if (pending == null) return true;
ShopData.DeliveryDestination mailbox = ShopData.get(player.level().getServer())
.loadedDeliveryBox(player.level().getServer(), player.getUUID(), level -> !isBackroom(level)).orElse(null);
if (mailbox == null) return false;
if (mailbox.box().hasProcessedTransaction(pending.transactionId())) {
BackroomInventory.clearMatching(player, pending.slots());
}
data.finishEntry(player.getUUID());
return true;
}
private static BlockPos chooseArrival(ServerLevel level, UUID player, BackroomData data) {
RandomSource random = level.getRandom();
List<Long> recent = data.recentArrivals(player);
BlockPos best = null;
for (int attempt = 0; attempt < ARRIVAL_ATTEMPTS; attempt++) {
double angle = random.nextDouble() * Math.PI * 2.0D;
double radius = Math.sqrt(random.nextDouble()) * ARRIVAL_RADIUS;
int x = Mth.floor(Math.cos(angle) * radius);
int z = Mth.floor(Math.sin(angle) * radius);
int y = Mth.clamp(level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z),
level.getMinY() + 2, level.getMaxY() - 3);
BlockPos candidate = new BlockPos(x, y, z);
best = candidate;
if (farFromRecent(candidate, recent) && safe(level, candidate)) return candidate;
}
BlockPos fallback = findSafeNear(level, best == null ? BlockPos.ZERO : best, 32);
if (fallback != null) return fallback;
fallback = findSafeNear(level, BlockPos.ZERO, 48);
if (fallback != null) return fallback;
int originY = Mth.clamp(level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, 0, 0),
level.getMinY() + 2, level.getMaxY() - 3);
return new BlockPos(0, originY, 0);
}
private static boolean farFromRecent(BlockPos candidate, List<Long> recent) {
for (long packed : recent) {
BlockPos old = BlockPos.of(packed);
long dx = old.getX() - candidate.getX(), dz = old.getZ() - candidate.getZ();
if (dx * dx + dz * dz < 128L * 128L) return false;
}
return true;
}
private static boolean safe(ServerLevel level, BlockPos feet) {
return level.getBlockState(feet).isAir() && level.getBlockState(feet.above()).isAir()
&& level.getBlockState(feet.below()).isCollisionShapeFullBlock(level, feet.below());
}
private static BlockPos findSafeNear(ServerLevel level, BlockPos center, int radius) {
for (int ring = 0; ring <= radius; ring += 2) {
for (int dx = -ring; dx <= ring; dx += 2) for (int dz = -ring; dz <= ring; dz += 2) {
if (ring > 0 && Math.abs(dx) != ring && Math.abs(dz) != ring) continue;
int x = center.getX() + dx, z = center.getZ() + dz;
if ((long) x * x + (long) z * z > (long) ARRIVAL_RADIUS * ARRIVAL_RADIUS) continue;
int y = Mth.clamp(level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z),
level.getMinY() + 2, level.getMaxY() - 3);
BlockPos candidate = new BlockPos(x, y, z);
if (safe(level, candidate)) return candidate;
}
}
return null;
}
private static void notify(ServerPlayer player, String translationKey) {
player.sendOverlayMessage(Component.translatable(translationKey));
}
private static int status(CommandSourceStack source) {
BackroomData data = BackroomData.get(source.getServer());
source.sendSuccess(() -> Component.literal("Backroom: " + data.lostItemCount() + " lost stacks ("
+ data.pooledItemCount() + " pooled), " + data.trackedChestCount() + " tracked chest positions; data v"
+ BackroomData.DATA_VERSION + "."), false);
return data.lostItemCount();
}
private static int inspect(CommandSourceStack source, ServerPlayer player) {
BackroomData data = BackroomData.get(source.getServer());
boolean pending = data.pendingEntry(player.getUUID()).isPresent();
source.sendSuccess(() -> Component.literal("Backroom player " + player.getGameProfile().name() + ": "
+ data.pooledItemCount(player.getUUID()) + " personal pooled stacks, entry transaction "
+ (pending ? "pending" : "clear") + ", " + data.recentArrivals(player.getUUID()).size()
+ " remembered arrivals."), false);
return pending ? 0 : 1;
}
}
@@ -0,0 +1,19 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
/** Tracks the exact height occupied by the left-hand F3 column. */
public final class QuestTrackerDebugLayout {
private static final int TOP_MARGIN = 2;
private static final int DEBUG_LINE_HEIGHT = 9;
private static final int GAP = 2;
private static int leftLineCount;
private QuestTrackerDebugLayout() {}
public static void captureLeftLines(int count) {
leftLineCount = Math.max(0, count);
}
static int textTop(boolean debugVisible) {
return debugVisible ? TOP_MARGIN + leftLineCount * DEBUG_LINE_HEIGHT + GAP : TOP_MARGIN;
}
}
@@ -0,0 +1,30 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
/** Persisted visual styles offered by the quest tracker. */
enum QuestTrackerDisplayMode {
TEXT("text"),
PANEL("panel");
private final String id;
QuestTrackerDisplayMode(String id) {
this.id = id;
}
String id() {
return id;
}
QuestTrackerDisplayMode next() {
return this == TEXT ? PANEL : TEXT;
}
static QuestTrackerDisplayMode byId(String value) {
if (value != null) {
for (QuestTrackerDisplayMode mode : values()) {
if (mode.id.equalsIgnoreCase(value)) return mode;
}
}
return TEXT;
}
}
@@ -14,11 +14,21 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.ItemStack;
/** Transparent, toggleable text overlay for accepted quests. */
/** Toggleable quest overlay with transparent F3-aligned and original panel modes. */
final class QuestTrackerHud {
private static final int MAX_WIDTH = 240;
private static final int MARGIN = 2;
private static final int ENTRY_SPACING = 2;
private static final int TEXT_MAX_WIDTH = 240;
private static final int TEXT_MARGIN = 2;
private static final int TEXT_ENTRY_SPACING = 2;
private static final int PANEL_WIDTH = 168;
private static final int PANEL_MARGIN = 6;
private static final int PANEL_HEADER_HEIGHT = 14;
private static final int PANEL_ENTRY_HEIGHT = 22;
private static final int PANEL_EMPTY_HEIGHT = 22;
private static final int PANEL_BACKGROUND = 0xD0181417;
private static final int PANEL_OUTLINE = 0xFFE8A8C3;
private static final int PANEL_TITLE = 0xFFF2C4D7;
private static final int PANEL_MUTED = 0xFF9F8B95;
private static final int PANEL_BAR_BACK = 0xFF3A2A30;
private static final int BODY = 0xFFE9DDE2;
private QuestTrackerHud() {}
@@ -32,29 +42,82 @@ final class QuestTrackerHud {
if (client.player == null || client.level == null || client.gui.screen() != null) return;
if (!SanctuaryClientQuests.visible()) return;
List<QuestTrackerSnapshotPayload.Entry> entries = SanctuaryClientQuests.entries();
if (SanctuaryClientQuests.displayMode() == QuestTrackerDisplayMode.PANEL) {
renderPanel(graphics, client, entries);
return;
}
renderText(graphics, client, entries);
}
private static void renderText(GuiGraphicsExtractor graphics, Minecraft client,
List<QuestTrackerSnapshotPayload.Entry> entries) {
if (entries.isEmpty()) return;
int width = Math.max(1, Math.min(MAX_WIDTH, graphics.guiWidth() - MARGIN * 2));
int y = MARGIN;
int width = Math.max(1, Math.min(TEXT_MAX_WIDTH, graphics.guiWidth() - TEXT_MARGIN * 2));
int y = QuestTrackerDebugLayout.textTop(client.getDebugOverlay().showDebugScreen());
for (QuestTrackerSnapshotPayload.Entry entry : entries) {
drawEntry(graphics, client.font, entry, MARGIN, y, width);
y += client.font.lineHeight * 2 + ENTRY_SPACING;
drawTextEntry(graphics, client.font, entry, TEXT_MARGIN, y, width);
y += client.font.lineHeight * 2 + TEXT_ENTRY_SPACING;
}
}
private static void drawEntry(GuiGraphicsExtractor graphics, Font font,
private static void drawTextEntry(GuiGraphicsExtractor graphics, Font font,
QuestTrackerSnapshotPayload.Entry entry, int x, int y, int width) {
int accent = 0xFF000000 | (entry.accent() & 0xFFFFFF);
graphics.text(font, ellipsize(font, title(entry), width), x, y, accent, true);
Component progress = Component.translatable("hud.sanctuary.quest_tracker.progress",
action(entry), describeTarget(entry), entry.progress(), entry.required());
Component progress = progress(entry);
graphics.text(font, ellipsize(font, progress, width), x, y + font.lineHeight, BODY, true);
}
private static void renderPanel(GuiGraphicsExtractor graphics, Minecraft client,
List<QuestTrackerSnapshotPayload.Entry> entries) {
int height = PANEL_HEADER_HEIGHT + 6
+ (entries.isEmpty() ? PANEL_EMPTY_HEIGHT : entries.size() * PANEL_ENTRY_HEIGHT);
int right = PANEL_MARGIN + PANEL_WIDTH;
int bottom = PANEL_MARGIN + height;
graphics.fill(PANEL_MARGIN, PANEL_MARGIN, right, bottom, PANEL_BACKGROUND);
graphics.outline(PANEL_MARGIN, PANEL_MARGIN, PANEL_WIDTH, height, PANEL_OUTLINE);
graphics.text(client.font, Component.translatable("hud.sanctuary.quest_tracker.title"),
PANEL_MARGIN + 6, PANEL_MARGIN + 4, PANEL_TITLE);
if (entries.isEmpty()) {
graphics.text(client.font, Component.translatable("hud.sanctuary.quest_tracker.empty"),
PANEL_MARGIN + 6, PANEL_MARGIN + PANEL_HEADER_HEIGHT + 4, PANEL_MUTED);
return;
}
int y = PANEL_MARGIN + PANEL_HEADER_HEIGHT + 2;
for (QuestTrackerSnapshotPayload.Entry entry : entries) {
drawPanelEntry(graphics, client.font, entry, PANEL_MARGIN + 6, y, PANEL_WIDTH - 12);
y += PANEL_ENTRY_HEIGHT;
}
}
private static void drawPanelEntry(GuiGraphicsExtractor graphics, Font font,
QuestTrackerSnapshotPayload.Entry entry, int x, int y, int width) {
int accent = 0xFF000000 | (entry.accent() & 0xFFFFFF);
graphics.text(font, ellipsize(font, title(entry), width), x, y, accent);
graphics.text(font, ellipsize(font, progress(entry), width), x, y + 9, BODY);
int barTop = y + 18;
graphics.fill(x, barTop, x + width, barTop + 2, PANEL_BAR_BACK);
int filled = Math.round(width * Math.min(1.0F, entry.progress() / (float) entry.required()));
if (filled > 0) graphics.fill(x, barTop, x + filled, barTop + 2, accent);
}
private static Component title(QuestTrackerSnapshotPayload.Entry entry) {
if (QuestTrackerSync.SOURCE_BOARD.equals(entry.source())) {
return switch (entry.title()) {
case "ruby", "sapphire", "emerald" -> Component.translatable(
"hud.sanctuary.quest_tracker.reward." + entry.title());
default -> Component.translatable("hud.sanctuary.quest_tracker.source.board");
};
}
if (!entry.title().isBlank()) return Component.literal(entry.title());
return Component.translatable("hud.sanctuary.quest_tracker.source." + entry.source());
}
private static Component progress(QuestTrackerSnapshotPayload.Entry entry) {
return Component.translatable("hud.sanctuary.quest_tracker.progress",
action(entry), describeTarget(entry), entry.progress(), entry.required());
}
private static Component action(QuestTrackerSnapshotPayload.Entry entry) {
if (QuestTrackerSync.SOURCE_BOARD.equals(entry.source())) {
return Component.translatable("sign.sanctuary.quest_board.action." + entry.action());

Some files were not shown because too many files have changed in this diff Show More