Compare commits
133
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a9263d273 | ||
|
|
4a74b6dfed | ||
|
|
06da8fbd2b | ||
|
|
bd747afbe0 | ||
|
|
7e459e3615 | ||
|
|
67220fa0c7 | ||
|
|
a345db5aeb | ||
|
|
0bd60d01cc | ||
|
|
94e6cf380d | ||
|
|
43962f4857 | ||
|
|
5af573deb4 | ||
|
|
e552bd68fd | ||
|
|
69dd9f919d | ||
|
|
2d212ae6a1 | ||
|
|
2b614ce5a8 | ||
|
|
99ac5fc3a7 | ||
|
|
ab82c3929e | ||
|
|
4820c736f4 | ||
|
|
a16347140a | ||
|
|
75fa88cfc5 | ||
|
|
f04aeb02b2 | ||
|
|
4ca42cb18a | ||
|
|
985e8b9192 | ||
|
|
1d8ab0b30a | ||
|
|
083c3449d5 | ||
|
|
51d630037d | ||
|
|
341f1eb8e5 | ||
|
|
10b606d01d | ||
|
|
b39c271c96 | ||
|
|
a16156b005 | ||
|
|
2518c20071 | ||
|
|
b7497c81d1 | ||
|
|
97638e0fa2 | ||
|
|
a071a0b746 | ||
|
|
6fcc56552c | ||
|
|
66944ec492 | ||
|
|
b513ab1262 | ||
|
|
b2222c5d33 | ||
|
|
2d0be21c5b | ||
|
|
a0b0788869 | ||
|
|
106d730dd8 | ||
|
|
21dd089486 | ||
|
|
e3b6c6ed01 | ||
|
|
7387096d98 | ||
|
|
457f91b92e | ||
|
|
f283c1705b | ||
|
|
6ee5cdc2fb | ||
|
|
87428c5f0d | ||
|
|
0599bf6885 | ||
|
|
624f441578 | ||
|
|
d6ca1140b5 | ||
|
|
53fa32bbc5 | ||
|
|
7a2f697024 | ||
|
|
4d0750e993 | ||
|
|
c49673801f | ||
|
|
5386c7ac8a | ||
|
|
eb25625a45 | ||
|
|
05c445eaeb | ||
|
|
788928f2d9 | ||
|
|
5d3db9bb42 | ||
|
|
fd528abb9d | ||
|
|
40acccc818 | ||
|
|
62c8c87eb0 | ||
|
|
b5dab3b5f6 | ||
|
|
90790161db | ||
|
|
e8dee9b7f8 | ||
|
|
6fc93ca732 | ||
|
|
8787969347 | ||
|
|
01a82c3c93 | ||
|
|
f23f741a9d | ||
|
|
4714c69255 | ||
|
|
c03e5d8555 | ||
|
|
9abf6bbea7 | ||
|
|
9c09664778 | ||
|
|
87f11f6127 | ||
|
|
c04cd78ae9 | ||
|
|
7ae99a12a8 | ||
|
|
1b1f3a791d | ||
|
|
10b1cd9c5e | ||
|
|
ef18e0ae32 | ||
|
|
1c2e000da3 | ||
|
|
9e35c244ec | ||
|
|
e82cb33407 | ||
|
|
6e58d44c71 | ||
|
|
d45afc7767 | ||
|
|
e126ec9eea | ||
|
|
13a74ddbd2 | ||
|
|
b221ca1b52 | ||
|
|
05505279f8 | ||
|
|
61e66d3a11 | ||
|
|
3aa36ed129 | ||
|
|
90b9eee27e | ||
|
|
7d800d8932 | ||
|
|
913a754f20 | ||
|
|
73d32999e5 | ||
|
|
86034ca71f | ||
|
|
db91698c09 | ||
|
|
7f74114d31 | ||
|
|
53db634ec2 | ||
|
|
400f1f6289 | ||
|
|
596432f3f7 | ||
|
|
14980c993f | ||
|
|
e17433f28f | ||
|
|
0833d4e44f | ||
|
|
07b2eba5c5 | ||
|
|
0f95a5cfc7 | ||
|
|
028d63b64a | ||
|
|
61ba842206 | ||
|
|
0476a74d43 | ||
|
|
d5fe55ddcc | ||
|
|
4a9f50e488 | ||
|
|
b9aabae914 | ||
|
|
b121606b4e | ||
|
|
fa40548db7 | ||
|
|
7ee1e5f094 | ||
|
|
91b4def490 | ||
|
|
122ff939aa | ||
|
|
3fef2d5437 | ||
|
|
75ddc5b682 | ||
|
|
bf09bdfa78 | ||
|
|
2df4f35e48 | ||
|
|
4b4881d922 | ||
|
|
66cd185983 | ||
|
|
bd93dc1cd6 | ||
|
|
2838bf0767 | ||
|
|
e6740ff891 | ||
|
|
054c8e4ad4 | ||
|
|
4b11d217c2 | ||
|
|
3923b8547c | ||
|
|
76915e2f44 | ||
|
|
5aaaf3831c | ||
|
|
37beda56ec | ||
|
|
5d48917cf4 |
+5
-3
@@ -32,9 +32,11 @@ Ambiance possède les trois payloads historiques canaplia:hemp_visual_sync, cana
|
||||
|
||||
## Codex
|
||||
|
||||
Les monstres tués par un joueur peuvent laisser une `canaplia:codex_page` et, très rarement, le `canaplia:codex` complet. Quatre pages récupérées permettent aussi de relier le Codex autour d'un livre. L'objet utilise la texture du livre Minecraft et son écran repose sur les pages vanilla. Il distingue les découvertes personnelles des silhouettes connues par la communauté ; les origines génériques et les conditions détaillées se révèlent progressivement sans envoyer de payload de découverte client-vers-serveur.
|
||||
Les monstres tués par un joueur peuvent laisser une `canaplia:codex_page` et, très rarement, le `canaplia:codex` complet. Quatre pages récupérées permettent aussi d'assembler le Livre interdit autour d'un livre vanilla. Un clic droit sur une page découvre au hasard une entrée encore inconnue et ne consomme la page qu'en cas de nouvelle découverte.
|
||||
|
||||
Les données canaplia:codex sont versionnées. Les clés futures syntaxiquement valides restent conservées lors d'un aller-retour afin qu'une migration ne perde pas les découvertes ajoutées par une version ultérieure.
|
||||
L'ID historique `canaplia:codex` est conservé, mais l'objet s'affiche désormais comme le « Livre interdit » : il utilise la couleur du livre enchanté, ouvre directement les seize entrées et les présente sur les pages claires du livre vanilla. En main, son contenu est strictement personnel. Posé sur un pupitre, il est temporairement inscrit au nom du joueur qui le pose et partage ses découvertes avec tous les lecteurs ; le récupérer en s'accroupissant ou casser le pupitre efface cette inscription.
|
||||
|
||||
Les données `canaplia:codex` restent en version 1. Les clés futures syntaxiquement valides et l'ancien champ partagé restent conservés lors d'un aller-retour afin qu'une migration ne perde aucune découverte, mais les nouvelles découvertes ne sont plus publiées globalement. Aucun payload de découverte n'est accepté du client vers le serveur et le protocole It's Alive reste en version 4.
|
||||
|
||||
## Tickets livrés
|
||||
|
||||
@@ -55,4 +57,4 @@ Les IDs historiques, les clés et le namespace sont inchangés. L'ancien format
|
||||
|
||||
La source historique 2.0.0 demeure **All Rights Reserved**, copyright KOKA99CAB. À la demande explicite du détenteur des droits, ses 224 textures 16×16 ont été restaurées dans l'alpha.209 ; leur provenance est documentée avec les ressources. Aucun fichier Java, modèle, son ou JSON historique n'est copié. Le code d'intégration reste sous GPL-3.0-or-later.
|
||||
|
||||
Les inventaires machine sont dans `pack/migrations/canaplia-foundation-alpha32.json` et `pack/migrations/canaplia-gameplay-alpha33.json`. La release `26.2.0-alpha.209` décrit la correction de gameplay et l'import autorisé dans `pack/migrations/26.2.0-alpha.208-canaplia-fixes-to-alpha.209.json`.
|
||||
Les inventaires machine sont dans `pack/migrations/canaplia-foundation-alpha32.json` et `pack/migrations/canaplia-gameplay-alpha33.json`. La release `26.2.0-alpha.209` décrit la correction de gameplay et l'import autorisé dans `pack/migrations/26.2.0-alpha.208-canaplia-fixes-to-alpha.209.json`; l’alpha.210 décrit le Livre interdit et les autres changements distribués dans `pack/migrations/26.2.0-alpha.209-forbidden-book-and-polish-to-alpha.210.json`.
|
||||
|
||||
+251
@@ -6,6 +6,257 @@ 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.135`** et **Red-Stoner `0.0.0-alpha.17`**.
|
||||
|
||||
- attribue les demandes de quêtes personnalisées terminées à leur preneur directement sur le panneau et dans les détails au clic, avec son pseudonyme et sa couleur conservés ;
|
||||
- répartit les lits de sortie rares sur chacun des cinq niveaux de la Backroom, avec exactement un lit par cellule de 10 × 10 chunks et par niveau dans les nouveaux chunks ;
|
||||
- conserve les IDs, les données Sanctuary v14 et le protocole réseau 24 ; les chunks Backroom déjà générés restent inchangés.
|
||||
- ajoute l’API publique Sanctuary de métriques et de classements persistants par UUID, avec import monotone des statistiques vanilla, podium borné et exclusion des actions créatives, spectateur ou simulées ;
|
||||
- ajoute `redstoner:trophy_panel`, panneau mural configurable par son propriétaire avec un item non consommé, pages publiques, rendu en monde et rafraîchissement serveur limité à une fois par seconde ;
|
||||
- passe Sanctuary aux données v15 et Red-Stoner aux données v4 sans nouveau payload ni changement de leurs protocoles réseau 24 et 7.
|
||||
|
||||
## `26.2.0-alpha.229`
|
||||
|
||||
Module modifié : **Red-Stoner `0.0.0-alpha.16`**.
|
||||
|
||||
- ajoute au terminal les tris alphabétique, par quantité croissante et par quantité décroissante, appliqués explicitement sans déplacer les objets sous le curseur lors des rafraîchissements périodiques ;
|
||||
|
||||
## `26.2.0-alpha.228`
|
||||
|
||||
Modules modifiés : **Sanctuary `0.0.0-alpha.132`** et **Red-Stoner `0.0.0-alpha.15`**.
|
||||
|
||||
- étend `sanctuary:backroom` à toute la hauteur Y -64 → 383 et empile cinq niveaux thématiques de haut en bas : seuil modulaire, archives, ville, services et glitch ;
|
||||
- remplace les volumes ouverts par des pièces et couloirs raccordés, quatre angles de salle déclinés en cinq matériaux, des bibliothèques immenses, des tours plus serrées, des autoroutes continues et de rares parcs ;
|
||||
- ajoute au niveau inférieur une grille de prismes 3D et un labyrinthe déterministe connecté, avec portes physiquement ouvertes, salles fusionnées et trous volontaires vers le vide ;
|
||||
- fait correspondre exactement chaque ouverture entre le sol supérieur et le plafond inférieur, place une torche récupérable à chaque arrivée et raréfie fortement les lits de sortie ;
|
||||
- supprime le ciel, les astres, la lumière ambiante et tous les monstres, y compris ceux injectés par un autre système ;
|
||||
- conserve les IDs, les données Sanctuary v14 et le protocole réseau 24 ; seuls les nouveaux chunks Backroom utilisent la nouvelle architecture complète ;
|
||||
- rend le champ de recherche du terminal inactif à l’ouverture puis focalisable au clic, libère le focus au clic extérieur et laisse toujours la touche d’inventaire fermer le terminal ;
|
||||
- permet à la recherche du terminal de retrouver une boîte de Shulker par le nom ou l’identifiant d’un objet qu’elle contient, tout en conservant la boîte comme résultat afin que son aperçu vanilla reste directement consultable ;
|
||||
|
||||
## `26.2.0-alpha.227`
|
||||
|
||||
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 s’accroupissant 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 d’entré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 d’Another World aux anomalies et les blocs précieux à de rares cachettes ;
|
||||
- fait enregistrer la mousse turquoise par Another World via l’API publique de matériaux Backroom, sans dépendance circulaire ;
|
||||
- actualise Fabric API vers `0.159.0+26.2` et JEI vers `30.29.0.199`, avec empreintes Packwiz et Prism synchronisées ;
|
||||
- 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 l’attaquant possède son propre coffre-fort actif avant de commencer un braquage, revalide cette condition pendant le forage et refuse défensivement tout transfert si le coffre disparaît entre-temps ;
|
||||
- empêche les familiers temporaires Sanctuary de produire du butin vanilla, de l’expérience ou une lootbox Only Fun, et les exclut des contrats de panneau comme des demandes communautaires ;
|
||||
- conserve la variante Canaplia des seize graines historiques pendant le placement, la croissance naturelle, la poudre d’os, la création de la partie haute, le rechargement et la récolte, ce qui réactive notamment l’hybridation Tendre + Olive vers Dorée ;
|
||||
- remplace la laine violette du Magic Carpet par la texture historique 16 × 16 du Totem de Notch, utilisée par l’objet canonique et son alias hérité sans modifier la plateforme 3 × 3 ;
|
||||
- conserve tous les IDs, sauvegardes et formats de données ; les protocoles réseau restent Another World 2, It's Alive 4, I Like To Move It 5, Only Fun 3 et Sanctuary 23, sans nouveau monde ni réinitialisation.
|
||||
|
||||
## `26.2.0-alpha.224`
|
||||
|
||||
Modules modifiés : **It's Alive `0.0.0-alpha.37`**, **Ouch `0.0.0-alpha.11`**, **I Like To Move It `0.0.0-alpha.17`**, **Only Fun `0.0.0-alpha.26`**, **Sanctuary `0.0.0-alpha.128`** et **MasterKey `0.0.0-alpha.9`**.
|
||||
|
||||
- é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 l’inventaire 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, l’armure, la main secondaire, le craft ni les emplacements spéciaux ;
|
||||
- garde le tri sous autorité serveur, avec un délai de huit ticks, et l’ignore 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 n’est 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.
|
||||
|
||||
- ajoute au terminal de stockage une recherche clavier focalisée à l'ouverture, compatible avec les noms affichés, les IDs, les traductions, les accents et Unicode ;
|
||||
- affiche les grandes quantités du terminal sous forme compacte (`1K`, `1.2K`, `12K`, `1.2M`) tout en conservant la valeur exacte dans l'infobulle ;
|
||||
- stabilise les emplacements du terminal lorsqu'une pile est vidée afin que les ressources suivantes ne glissent plus sous le curseur, puis recompacte volontairement lors d'une nouvelle recherche ou à la réouverture ;
|
||||
- ajoute un suivi d'avancement des quêtes, affichable ou masquable par une touche configurable (`J` par défaut) ;
|
||||
- affiche chaque quête active comme un simple texte ombré en haut à gauche, sans panneau, bordure, titre, message vide ni barre de progression ;
|
||||
- synchronise un snapshot borné des quêtes acceptées et des contrats réservés, sans les demandes que le joueur a lui-même créées, ni changer les données Sanctuary v11 ni le protocole réseau 22 ;
|
||||
- propose une saisie assistée des IDs d'item et de mob dans l'éditeur de demande, avec icône et noms proches.
|
||||
- actualise JEI vers la bêta Fabric 26.2 `30.29.0.196` et synchronise Packwiz avec l'index Prism/Modrinth ;
|
||||
- conserve Red-Stoner data v3/protocole 7, Sanctuary data v11/protocole 22, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation n'est nécessaire.
|
||||
|
||||
## `26.2.0-alpha.221`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.22`**. Les neuf autres modules conservent leur version issue de l'alpha.220.
|
||||
|
||||
- corrige la cause réelle du disque blanc ralenti et trop grave : la piste AAC YouTube reste décodée en stéréo native à 48 kHz, puis chaque paire gauche/droite est explicitement moyennée en un échantillon mono positionnel ;
|
||||
- supprime la compensation OpenAL approximative à `4/3` et restitue la musique à sa hauteur et sa vitesse originales avec une hauteur `1.0` ;
|
||||
- conserve un flux PCM mono signé 16 bits little-endian pour l'audio positionnel du jukebox, sans silence ajouté ni changement de durée ;
|
||||
- ajoute un test déterministe du downmix stéréo et valide le lien signalé sur quatre secondes : 4 000 ms de source donnent 4 000 ms de PCM à 48 kHz ;
|
||||
- conserve les données Ambiance v2, le protocole réseau 6, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation n'est nécessaire.
|
||||
|
||||
## `26.2.0-alpha.220`
|
||||
|
||||
Module modifié : **Red-Stoner `0.0.0-alpha.12`**. Les neuf autres modules conservent leur version issue de l'alpha.219.
|
||||
|
||||
- remplace l’écran propriétaire du terminal par un véritable menu de conteneur inspiré des coffres vanilla et composé avec le panneau d’inventaire Sanctuary ;
|
||||
- supprime le bouton de fermeture dédié : Échap et la touche d’inventaire suivent désormais le comportement normal du jeu ;
|
||||
- affiche et synchronise toutes les rangées d’inventaire débloquées par Sanctuary, d’une à six, y compris les deux rangées persistantes supplémentaires ;
|
||||
- permet le retrait par clic gauche, le retrait unitaire par clic droit et le retrait vers l’inventaire par shift-clic ; un clic avec une pile portée ou un shift-clic depuis l’inventaire dépose dans le réseau ;
|
||||
- conserve les 54 cases comme une vue agrégée non réorganisable et affiche les quantités exactes sans créer de stockage virtuel ;
|
||||
- dépose dans le premier coffre ou baril disponible selon l’ordre déterministe de découverte, remplit d’abord ses piles compatibles puis ses cases vides et ne passe au stockage suivant qu’en cas de besoin ;
|
||||
- supprime les anciens payloads spécifiques au terminal au profit de la synchronisation native des menus, tout en gardant la distance, la topologie et les transferts sous autorité serveur ;
|
||||
- conserve les données Red-Stoner v3 et les sauvegardes existantes ; le protocole réseau Red-Stoner passe de 6 à 7, sans nouveau monde ni réinitialisation.
|
||||
|
||||
## `26.2.0-alpha.219`
|
||||
|
||||
Modules modifiés : **Sanctuary `0.0.0-alpha.122`**, **I Like To Move It `0.0.0-alpha.16`** et **Ambiance `0.0.0-alpha.21`**. Les sept autres modules conservent leur version issue de l'alpha.218.
|
||||
|
||||
- ajoute `sanctuary:alpha`, une île Minecraft Indev finie de 128 × 128 × 64 blocs, déterministe par seed, avec plages, cavernes, minerais, eau, lave, végétation et maison de départ historique ;
|
||||
- borne le monde par un fond en bedrock et un anneau de barrières, sans placement au-delà de X/Z −64…63, et expose les positions stables de la résidence et de l'arrivée sûre via l'API publique de Sanctuary ;
|
||||
- ajoute la dimension, son biome, son type et ses réglages aux profils Sanctuary et Overworld, tout en conservant la migration `portals:alpha` vers `sanctuary:alpha` ;
|
||||
- active la route de portail v2 en cobblestone moussue, cadre 4 × 5 et intérieur 2 × 3, avec validation serveur, refus si la dimension manque, paire persistante, déliaison à la casse et arrivée distante hors de la maison ;
|
||||
- compose localement les packs officiels Golden Days Base puis Alpha uniquement dans `sanctuary:alpha`, restaure exactement la pile précédente à la sortie ou déconnexion et laisse les textures vanilla fonctionner si les ZIP manquent ;
|
||||
- ne distribue aucun asset Golden Days dans les JAR, Packwiz ou `.mrpack`, documente les liens et la licence officiels, et n'impose aucun fichier au serveur dédié ;
|
||||
- ajoute les traductions FR/EN/RU et des tests déterministes pour le générateur, le portail et la composition des packs ;
|
||||
- conserve Sanctuary data v11/protocole 22, I Like To Move It data v3/protocole 5 et Ambiance data v2/protocole 6, sans réinitialisation de sauvegarde.
|
||||
|
||||
## `26.2.0-alpha.218`
|
||||
|
||||
Modules modifiés : **Red-Stoner `0.0.0-alpha.11`**, **Only Fun `0.0.0-alpha.25`** et **Sanctuary `0.0.0-alpha.121`**. Les sept autres modules conservent leur version issue de l'alpha.217.
|
||||
|
||||
- ajoute `redstoner:storage_terminal`, une demi-dalle verticale de huit pixels qui se pose uniquement sur la face horizontale d’un coffre, coffre piégé ou baril ;
|
||||
- découvre sans charger de chunk les conteneurs adjacents par face, verticalement compris, et refuse clairement tout réseau qui dépasse 128 blocs physiques ;
|
||||
- agrège uniquement les piles dont l’item et tous les composants sont strictement identiques, puis les affiche sur des pages défilantes de 54 entrées ;
|
||||
- valide côté serveur la distance, le terminal, la topologie, la page et l’identité de chaque pile avant un retrait par pile, un retrait unitaire ou un dépôt par shift-clic ;
|
||||
- fabrique le terminal avec quatre plaques d’argent, trois verres teintés, un Controller et un lingot de titane, sans entrée Shop, Black Market ni récompense de lootbox ;
|
||||
- ajoute les traductions FR/EN/RU, les ressources bloc/item/loot/recette et des tests déterministes de topologie, pagination, agrégation et transferts ;
|
||||
- conserve les données Red-Stoner v3, Only Fun v2 et Sanctuary v11 ; seul le protocole réseau Red-Stoner passe de 5 à 6, sans nouveau monde ni réinitialisation des sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.217`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.20`**. Les neuf autres modules conservent leur version issue de l'alpha.216.
|
||||
|
||||
- corrige la hauteur trop grave et la vitesse trop lente du disque blanc en compensant la cadence du flux AAC YouTube par un facteur OpenAL exact de `4/3` ;
|
||||
- réapplique cette hauteur pendant toute la lecture afin qu’aucune mise à jour du canal audio ne la ramène à la valeur ralentie ;
|
||||
- valide la correction sur le lien signalé en comparant vingt secondes décodées par Lavaplayer au flux AAC direct, puis conserve les tests PCM 48 kHz et de niveau sonore ;
|
||||
- conserve les données Ambiance v2, le protocole réseau 6, les IDs et les sauvegardes existantes ;
|
||||
- distribue Ambiance `0.0.0-alpha.20` dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.216`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.19`**. Les neuf autres modules conservent leur version issue de l'alpha.215.
|
||||
|
||||
- corrige le disque blanc ralenti et dégradé en remplissant continûment les tampons PCM d’une seconde demandés par Minecraft au lieu de les compléter prématurément avec du silence ;
|
||||
- conserve une fréquence réelle de 48 kHz, un flux mono 16 bits little-endian et force la vitesse OpenAL normale à `1.0` ;
|
||||
- borne chaque attente de trame à 250 ms après le démarrage afin de garder un flux continu sans bloquer indéfiniment le thread audio ;
|
||||
- ajoute un test déterministe des tampons Minecraft et renforce le test YouTube réel sur quatre secondes complètes ;
|
||||
- conserve les données Ambiance v2, le protocole réseau 6, les IDs et les sauvegardes existantes ;
|
||||
- distribue Ambiance `0.0.0-alpha.19` dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.215`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.18`**. Les neuf autres modules conservent leur version issue de l'alpha.214.
|
||||
|
||||
- corrige le crash natif déclenché par l’insertion ou l’arrêt du disque blanc en laissant Minecraft libérer le canal OpenAL sur son thread audio ;
|
||||
- rétablit le décodage audible du lien YouTube signalé grâce au profil iOS corrigé et à une révision épinglée de `youtube-source` ;
|
||||
- borne uniquement l’attente initiale du flux puis poursuit la lecture sans blocage, avec silence de compensation lorsque les données arrivent en retard ;
|
||||
- transforme les erreurs et blocages de lecture en arrêt propre accompagné d’un message au joueur ;
|
||||
- conserve les données Ambiance v2, le protocole réseau 6, les IDs et les sauvegardes existantes ;
|
||||
- distribue Ambiance `0.0.0-alpha.18` dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.214`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.17`**. Les neuf autres modules conservent leur version issue de l'alpha.213.
|
||||
|
||||
- attend de façon bornée la synchronisation client du jukebox avant de charger un disque blanc, ce qui rétablit sa lecture en solo ;
|
||||
- affiche immédiatement le chargement puis un échec explicite si le jukebox n'est toujours pas synchronisé après cinq secondes ;
|
||||
- accepte toujours les liens de partage YouTube avec paramètres, notamment `https://youtu.be/Ue5ZBe-GzSM?si=…` ;
|
||||
- conserve les données Ambiance v2 et le protocole réseau 6, sans migration de sauvegarde ;
|
||||
- distribue Ambiance `0.0.0-alpha.17` dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.213`
|
||||
|
||||
Module modifié : **Ambiance `0.0.0-alpha.16`**. Les neuf autres modules conservent leur version issue de l'alpha.212.
|
||||
|
||||
- corrige le crash client au démarrage d'Ambiance sous Minecraft 26.2 en ciblant le nouveau gestionnaire vanilla `LevelEventHandler` pour l'arrêt du disque blanc ;
|
||||
- conserve les données Ambiance v2 et le protocole réseau 6, sans migration de sauvegarde ;
|
||||
- remplace le JAR Ambiance cassé dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.212`
|
||||
|
||||
Module modifié : **Sanctuary `0.0.0-alpha.120`**. Les neuf autres modules conservent leur version issue de l'alpha.211.
|
||||
|
||||
- corrige le crash client au démarrage provoqué par le mixin du clic molette du Black Market sous Minecraft 26.2 ;
|
||||
- cible désormais la méthode vanilla `pickBlockOrEntity`, sans modifier les données Sanctuary v11 ni le protocole réseau 22.
|
||||
- remplace le JAR Sanctuary cassé dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.211`
|
||||
|
||||
Modules modifiés : **Ambiance `0.0.0-alpha.15`**, **It's Alive `0.0.0-alpha.36`**, **Only Fun `0.0.0-alpha.24`**, **Ouch `0.0.0-alpha.10`** et **Sanctuary `0.0.0-alpha.119`**. Les cinq autres modules conservent leur version issue de l’alpha.210.
|
||||
|
||||
- remplace les pages noires du Livre interdit par l’affichage clair du livre vanilla ;
|
||||
- conserve les seize entrées, les découvertes personnelles, le partage sur pupitre, les IDs, les données v3 et le protocole réseau 4.
|
||||
- rétablit l'accès au Black Market par clic molette sur un panneau, avec une intention vide et une nouvelle validation complète de la cible côté serveur ;
|
||||
- conserve les données Sanctuary v11 et porte son protocole réseau de 21 à 22, sans nouvel ID persistant.
|
||||
- ajoute le disque blanc, à fabriquer puis renommer avec une URL YouTube HTTPS avant de l’insérer dans un jukebox ;
|
||||
- valide strictement l’hôte et l’identifiant vidéo côté serveur, ne transmet qu’un identifiant borné de onze caractères et limite chaque client à quatre lectures de trente minutes maximum ;
|
||||
- diffuse le son en mono positionnel dans le canal des disques, sans nouvelle donnée persistante ; Ambiance conserve ses données v2 et passe son protocole réseau de 5 à 6.
|
||||
- importe le cœur GPL historique d’Abjection dans Only Fun, sans onzième JAR : `/piss`, `/vomit`, `/shit` et `/smoke` retrouvent leurs durées, jets, impacts et messages ;
|
||||
- restaure `abjection:shit_ball` ainsi que le bloc boueux `abjection:shit_cube`, sa recette, son butin et ses ressources originales en FR/EN/RU ;
|
||||
- expose une API serveur unique pour les commandes et le futur raccourci, nettoie les actions temporaires à la mort, en spectateur ou à la déconnexion, et conserve les données v2 ainsi que le protocole réseau 2 d’Only Fun.
|
||||
- rend `abjection:shit_ball` lançable à la main et par dispenser grâce à une fabrique publique installée par Ouch, sans réenregistrer l’objet possédé par Only Fun ;
|
||||
- restaure le projectile historique de 0,25 bloc, sa consommation unique hors créatif, son rendu d’objet, son impact boueux et ses sept secondes de nausée ajoutées à la durée existante ;
|
||||
- déclare la dépendance sans cycle `ouch -> onlyfun` ; les données et protocoles réseau d’Ouch et d’Only Fun restent inchangés.
|
||||
- ajoute la touche configurable « Chier » dans les contrôles Only Fun, assignée à `J` par défaut et sans répétition lorsque la touche reste maintenue ;
|
||||
- transmet une demande C2S vide, déduplique le spam d’un même tick et revalide côté serveur la connexion, la vie et le mode spectateur avant de réutiliser exactement l’action `/shit` ;
|
||||
- conserve les données Only Fun v2 et porte son protocole réseau de 2 à 3, sans nouveau cooldown, besoin ni donnée persistante.
|
||||
- distribue les cinq JAR mis à jour dans Packwiz et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
## `26.2.0-alpha.210`
|
||||
|
||||
Modules modifiés : **Sanctuary `0.0.0-alpha.118`**, **Only Fun `0.0.0-alpha.21`**, **I Like To Move It `0.0.0-alpha.15`** et **It's Alive `0.0.0-alpha.35`**. Les six autres modules conservent leur version issue de l’alpha.209.
|
||||
|
||||
- sépare le compteur quotidien et le statut de déblocage du Shop pour empêcher leur chevauchement ;
|
||||
- retire du Shop Only Fun les raccourcis qui contournaient la progression normale ;
|
||||
- attribue à tous les Zombies vanilla des gamertags déterministes inspirés de la Xbox 360 ;
|
||||
- resynchronise les capes après une reconnexion avec des tentatives retardées et bornées ;
|
||||
- réserve les requêtes communautaires aux panneaux dédiés au lieu d’intercepter les panneaux ordinaires ;
|
||||
- double la vitesse de croisière du Happy Ghast lorsqu’un joueur le pilote, sans accélérer ses déplacements autonomes ;
|
||||
- conserve les données v3 et le protocole réseau 5, sans migration de sauvegarde ni nouvel ID.
|
||||
- transforme le Codex Canaplia en « Livre interdit » aux pages noires, sans page d'accueil, et fait découvrir une entrée aléatoire encore inconnue à chaque page consommée ;
|
||||
- garde les découvertes du Livre interdit personnelles en main et partage temporairement celles du propriétaire uniquement lorsque le livre est posé sur un pupitre ;
|
||||
- conserve les IDs et les anciennes données partagées, ainsi que les données v3 et le protocole réseau 4 d'It's Alive, sans migration de sauvegarde.
|
||||
- actualise JEI de `30.28.0.191` à la bêta compatible `30.28.0.193` dans Packwiz et le manifeste Prism/Modrinth ;
|
||||
- distribue les quatre JAR mis à jour dans Packwiz, Prism et le `.mrpack` partagé client/serveur, sans exiger de nouveau monde.
|
||||
|
||||
## `26.2.0-alpha.209`
|
||||
|
||||
Module modifié : **It's Alive `0.0.0-alpha.34`**. Les neuf autres modules conservent leur version issue de l’alpha.208.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Sanctuary 26.2
|
||||
|
||||
Workspace Fabric multi-projet de Sanctuary 2.0. Il construit dix JAR indépendants sur Minecraft 26.2, Fabric Loader 0.19.3, Fabric API 0.155.0+26.2, Loom 1.17, Gradle 9.5.1 et Java 25.
|
||||
Workspace Fabric multi-projet de Sanctuary 2.0. Il construit dix JAR indépendants sur Minecraft 26.2, Fabric Loader 0.19.3, Fabric API 0.159.0+26.2, Loom 1.17, Gradle 9.5.1 et Java 25.
|
||||
|
||||
Auteur : **KOKA99CAB**
|
||||
Licence : **GNU GPL 3.0 or Later** (`GPL-3.0-or-later`)
|
||||
@@ -11,22 +11,50 @@ Licence : **GNU GPL 3.0 or Later** (`GPL-3.0-or-later`)
|
||||
|---|---|---|---|
|
||||
| `anotherworld` | Another World | choses matérielles | matière, photographie, instruments météo et 108 biomes natifs |
|
||||
| `itsalive` | It's Alive ! | vivant | Creepers, créatures, agriculture et gameplay serveur complet de Canaplia |
|
||||
| `ambiance` | Ambiance | perception | atmosphère, météo, lumières dynamiques, calendrier et composition visuelle accessible |
|
||||
| `redstoner` | Red-Stoner | calcul et signaux | ordinateurs, identité serveur, Drawer et Particuleur |
|
||||
| `ambiance` | Ambiance | perception | atmosphère, météo, lumières dynamiques, audio positionnel, calendrier et composition visuelle accessible |
|
||||
| `redstoner` | Red-Stoner | calcul et signaux | ordinateurs, identité serveur, terminal de stockage, panneau de trophées, Drawer et Particuleur |
|
||||
| `iliketomoveit` | I Like To Move It | déplacement | portails, véhicules, grappin, poulies et waystones locaux |
|
||||
| `ouch` | Ouch | combat et destruction | arsenal actif (6 armes) et TNT météo |
|
||||
| `onlyfun` | Only Fun | règles ludiques absurdes | lootboxes, Lucky Block, raretés et règles absurdes |
|
||||
| `sanctuary` | Sanctuary | progression et aventure | progression globale, Atlas et monde principal flottant |
|
||||
| `sanctuary` | Sanctuary | progression et aventure | progression globale, classements publics, Atlas et monde principal flottant |
|
||||
| `events` | Events | événements serveur | socle vide |
|
||||
| `masterkey` | MasterKey | administration et diagnostic | laboratoire minimal |
|
||||
|
||||
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.208`**. Cette release distribue Canaplia complet avec It's Alive **`0.0.0-alpha.33`**, Ambiance **`0.0.0-alpha.14`** et Only Fun **`0.0.0-alpha.20`**.
|
||||
Version courante du pack distribué : **`26.2.0-alpha.229`**. Cette release distribue Red-Stoner **`0.0.0-alpha.16`** ; les neuf autres modules conservent leur version issue de l'alpha.228.
|
||||
|
||||
La migration [CANA-01 à CANA-09](CANAPLIA.md) porte Canaplia vers Minecraft 26.2. It's Alive **`0.0.0-alpha.33`** enregistre les seize familles, les découvertes, hybridations, résines, effets serveur et le Codex. 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.20`** exclut explicitement Canaplia du Shop et des récompenses ordinaires. Ces trois modules sont inclus dans l'alpha.208 pour les clients et les serveurs.
|
||||
Le prochain module Sanctuary **`0.0.0-alpha.134`** attribue les quêtes communautaires terminées à leur preneur et répartit les lits de sortie rares sur chacun des cinq niveaux de la Backroom. Chaque niveau garantit désormais un lit par cellule de 10 × 10 chunks dans les nouveaux chunks, sans modifier les sauvegardes, les données v14 ni le protocole réseau 24.
|
||||
|
||||
L’alpha.208 ajoute Canaplia aux packs Modrinth, Prism et Packwiz sans exiger de nouveau monde. Les sources sauvages fonctionnent dans les chunks existants, tandis que les nouvelles données de compostage et de Codex sont créées ou migrées automatiquement à leur première utilisation.
|
||||
Sanctuary **`0.0.0-alpha.135`** et Red-Stoner **`0.0.0-alpha.17`** ajoutent les classements publics et le panneau mural `redstoner:trophy_panel`. Les statistiques vanilla des anciens joueurs sont importées une fois, les scores restent dans Sanctuary et le panneau ne reçoit que sa page visible ainsi qu’un podium de trois noms maximum. Les données passent respectivement à v15 et v4 sans changer les protocoles réseau 24 et 7.
|
||||
|
||||
L’alpha.229 ajoute au terminal les tris alphabétique, par quantité croissante et par quantité décroissante. Le tri ne change que sur demande explicite et les rafraîchissements périodiques conservent l’ordre ainsi que les objets sous le curseur. Les sauvegardes, les données Red-Stoner v3 et le protocole réseau 7 restent compatibles.
|
||||
|
||||
L’alpha.228 reconstruit la Backroom sur cinq niveaux empilés entre Y -64 et Y 383. Le monde devient entièrement noir et sans monstres ; l’arrivée est signalée par une torche récupérable. Les nouveaux chunks composent seuils modulaires, bibliothèques et bureaux, ville dense avec autoroutes et parcs, couloirs techniques, puis une grille 3D et un labyrinthe connecté dont certains trous mènent au vide. Red-Stoner corrige aussi le focus du terminal et permet de retrouver une boîte de Shulker par son contenu. Les chunks déjà générés et les sauvegardes existantes restent compatibles.
|
||||
|
||||
L’alpha.227 ajoute la dimension persistante `sanctuary:backroom`. On y entre accroupi devant un lit et on n’en ressort que par un lit. L’équipement d’entrée est transféré atomiquement vers la Mailbox, tandis que les objets perdus ou abandonnés dans la dimension alimentent des coffres renouvelables sans duplication. Les anciennes sauvegardes sont migrées vers Sanctuary data v14 sans réinitialisation ; le protocole réseau reste en version 24.
|
||||
|
||||
L’alpha.225 corrige quatre tickets : posséder un coffre-fort devient obligatoire pour en braquer un autre, les familiers temporaires ne donnent plus de butin, d’expérience, de lootbox ni de progression de quête, les seize variantes Canaplia survivent à tout leur cycle de culture, et le Magic Carpet retrouve la texture historique du Totem de Notch à la place de la laine violette. Les IDs, sauvegardes, formats de données et protocoles restent compatibles.
|
||||
|
||||
La migration [CANA-01 à CANA-09](CANAPLIA.md) porte Canaplia vers Minecraft 26.2. It's Alive **`0.0.0-alpha.35`** enregistre les seize familles, les découvertes, hybridations, résines, effets serveur et le Livre interdit personnel, partageable temporairement sur un pupitre. Ambiance **`0.0.0-alpha.14`** compose les profils visuels bornés avec ses réglages d'accessibilité, et Only Fun **`0.0.0-alpha.21`** exclut explicitement Canaplia et les raccourcis de progression du Shop.
|
||||
|
||||
L’alpha.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.
|
||||
|
||||
L’alpha.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`.
|
||||
|
||||
L’alpha.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 d’IDs d’items et de mobs dans l’éditeur de demandes. JEI passe à la bêta Fabric 26.2 `30.29.0.196`.
|
||||
|
||||
L’alpha.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.
|
||||
|
||||
L’alpha.220 transforme le terminal de stockage en véritable menu de conteneur, sans bouton de fermeture propriétaire. Les clics gauche/droit et shift-clic permettent maintenant de retirer ou déposer des piles depuis toutes les rangées d’inventaire débloquées par Sanctuary, jusqu’à six ; la grille agrégée reste non réorganisable et remplit chaque coffre ou baril dans l’ordre de découverte avant de passer au suivant.
|
||||
|
||||
L’alpha.219 porte l'île finie Minecraft Indev dans `sanctuary:alpha` : 128 × 128 × 64 blocs déterministes, plages, cavernes, minerais, fluides, végétation et maison historique, le tout borné sans chunks parasites. Le cadre 4 × 5 en cobblestone moussue est maintenant actif et crée une paire persistante à une arrivée sûre hors de la maison. Ambiance peut enfin composer localement Golden Days Base puis Alpha uniquement dans cette dimension, sans redistribuer leurs textures et en restaurant exactement la pile précédente. Voir le [contrat Alpha](sanctuary/ALPHA.md), le [contrat des portails](iliketomoveit/PORTALS.md) et le [guide Golden Days](ambiance/GOLDEN_DAYS.md).
|
||||
|
||||
L’alpha.218 ajoute le terminal de stockage Red-Stoner : cette demi-dalle verticale se fixe sur un coffre, un coffre piégé ou un baril et donne accès, par pages défilantes de 54 types, à un réseau contigu borné à 128 conteneurs chargés. Les retraits et dépôts sont validés par le serveur, les composants d’items restent strictement séparés et le terminal endgame est exclu du Shop, du Black Market et des récompenses Only Fun. La recherche retrouve aussi une boîte de Shulker d’après son contenu direct ; la boîte reste affichée dans la grille afin que son aperçu vanilla soit consultable sans modifier les règles de retrait. Un bouton permet enfin de trier explicitement les résultats par nom, quantité croissante ou quantité décroissante.
|
||||
|
||||
L’alpha.217 tentait de compenser la hauteur trop grave du disque blanc par un facteur OpenAL de `4/3`. Cette compensation est retirée par l’alpha.221, qui corrige directement la conversion stéréo vers mono.
|
||||
|
||||
L’alpha.216 corrige la lecture lente et dégradée du disque blanc : les quatre tampons PCM initiaux de Minecraft sont maintenant remplis continûment à 48 kHz, avec une vitesse OpenAL normale, au lieu d’être majoritairement complétés par du silence. Les packs Modrinth, Prism et Packwiz sont mis à jour sans exiger de nouveau monde ni réinitialiser les sauvegardes.
|
||||
|
||||
L’alpha.207 rend le stockage du coffre-fort pratiquement illimité : rubis, saphirs et émeraudes utilisent chacun un solde 64 bits. Les 27 anciennes piles sont additionnées automatiquement lors du chargement, le Shop continue de consommer directement ces soldes et les 20 % pillés sont crédités dans le coffre-fort de l’attaquant sans créer des millions d’entités ou de piles d’objets.
|
||||
|
||||
@@ -98,6 +126,8 @@ L’alpha.173 centralise l’audio du Miner : une seule boucle de frappe sur le
|
||||
|
||||
L’alpha.171 rassemble les **46 capes** dans un onglet créatif dédié « Capes ». Elles ne sont plus mélangées à l’onglet vanilla Tools & Utilities et ne sont donc affichées qu’une seule fois.
|
||||
|
||||
L’alpha.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 s’affichent dans l’inventaire comme une fois la cape équipée.
|
||||
|
||||
L’alpha.170 ajoute les pictogrammes fournis aux emplacements vides de la cape et du familier. Ils disparaissent dès qu’une cape ou un œuf est équipé, sans modifier les objets, la persistance ni le protocole.
|
||||
|
||||
L’alpha.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 d’inventaire, 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 d’exploration et du donjon de cobblestone.
|
||||
@@ -293,7 +323,9 @@ Le guide détaillé est dans [`masterkey/tools/PANORAMA.md`](masterkey/tools/PAN
|
||||
|
||||
## Red-Stoner et photographie
|
||||
|
||||
Red-Stoner possède quatre blocs actifs sous son namespace : `eight_bit_computer`, `controller`, `personal_computer` et `drawer`. Son onglet créatif expose aussi les trois appareils Canon et les seize styles de pellicule.
|
||||
Red-Stoner possède sept blocs actifs sous son namespace : `eight_bit_computer`, `controller`, `personal_computer`, `drawer`, `particuleur`, `storage_terminal` et `trophy_panel`. Son onglet créatif expose aussi les trois appareils Canon et les seize styles de pellicule.
|
||||
|
||||
Le panneau mural `redstoner:trophy_panel` consomme l’API publique de classement de Sanctuary sans conserver les scores. Le joueur qui le pose peut ajouter des pages statistiques en cliquant avec un item, tandis que tous les visiteurs peuvent faire défiler les pages. Sanctuary importe une fois les statistiques vanilla existantes, garde les classements par UUID — champion déconnecté compris — et fournit seulement un podium borné à trois entrées. Les composants privés de l’item servant d’icône et la base complète des joueurs ne sont jamais synchronisés au client.
|
||||
|
||||
L'ordinateur 8 bits et le contrôleur exécutent la machine virtuelle historique : programme assembleur borné à 4 096 caractères, RAM, inventaire, six ports redstone directionnels, impulsions et sortie comparateur. Le contrôleur dispose de 1 024 cellules de RAM contre 256 pour l'ordinateur. L'instruction destinée à la matrice d'affichage renvoie volontairement une erreur claire tant que ce périphérique reste différé.
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
# Textures historiques Golden Days dans Alpha
|
||||
|
||||
Ambiance peut charger les packs officiels Golden Days uniquement pendant que
|
||||
le client se trouve dans `sanctuary:alpha`. Aucun fichier, texture ou dérivé de
|
||||
Golden Days n'est distribué dans les JAR ou dans le `.mrpack` Sanctuary.
|
||||
|
||||
## Installation cliente facultative
|
||||
|
||||
1. Télécharger [Golden Days Base](https://www.curseforge.com/minecraft/texture-packs/golden-days)
|
||||
depuis sa page officielle.
|
||||
2. Télécharger [Golden Days Alpha](https://www.curseforge.com/minecraft/texture-packs/golden-days-alpha)
|
||||
depuis sa page officielle.
|
||||
3. Placer les deux ZIP sans les extraire dans le dossier `resourcepacks/` du
|
||||
client. Les noms doivent conserver les marqueurs `golden-days-base` et
|
||||
`golden-days-alpha` ; les espaces et `_` sont aussi reconnus.
|
||||
4. Laisser les deux packs désactivés dans l'écran vanilla. Ambiance les compose
|
||||
temporairement dans l'ordre **Base**, puis **Alpha**.
|
||||
|
||||
À l'entrée dans Alpha, Ambiance capture la pile sélectionnée exacte, ajoute les
|
||||
deux packs en mémoire et recharge les ressources. À la sortie ou à la
|
||||
déconnexion, la pile capturée est restaurée exactement. Le fichier d'options
|
||||
vanilla n'est jamais modifié : après une interruption ou un crash pendant un
|
||||
rechargement, le prochain démarrage retrouve donc la pile enregistrée.
|
||||
|
||||
Si un des deux packs manque ou si un rechargement échoue, le client reste
|
||||
jouable avec les textures vanilla et affiche un message lisible. Un serveur
|
||||
dédié n'a besoin d'aucun ZIP.
|
||||
|
||||
## Licence et redistribution
|
||||
|
||||
Golden Days est publié sous **All Rights Reserved**. Sa
|
||||
[licence officielle](https://poeticrainbow.github.io/golden-days/license/)
|
||||
interdit notamment de redistribuer ou de reconditionner les ressources sans
|
||||
autorisation. Sanctuary ne fournit que l'intégration locale ci-dessus et les
|
||||
liens officiels. Les archives de développement restent hors du dépôt et de
|
||||
tous les artefacts distribués.
|
||||
@@ -0,0 +1,13 @@
|
||||
# Third-party notices
|
||||
|
||||
## Golden Days Base and Golden Days Alpha
|
||||
|
||||
Optional client resource packs by PoeticRainbow. No Golden Days asset is
|
||||
included in Ambiance or Sanctuary.
|
||||
|
||||
- Base project: https://www.curseforge.com/minecraft/texture-packs/golden-days
|
||||
- Alpha project: https://www.curseforge.com/minecraft/texture-packs/golden-days-alpha
|
||||
- License: https://poeticrainbow.github.io/golden-days/license/
|
||||
|
||||
Golden Days is All Rights Reserved. Players obtain the two archives separately
|
||||
from the official project pages for local use.
|
||||
@@ -0,0 +1,37 @@
|
||||
# Disque blanc YouTube
|
||||
|
||||
Le disque blanc appartient à **Ambiance**, propriétaire de l’audio positionnel. Il conserve l’ID
|
||||
`ambiance:white_disc` et se fabrique avec un disque 13 entouré de huit colorants blancs. Pour le
|
||||
lire, il faut le renommer dans une enclume avec une URL YouTube HTTPS puis l’insérer dans un
|
||||
jukebox vanilla.
|
||||
|
||||
## Contrat réseau et sécurité
|
||||
|
||||
- le serveur reste l’autorité de l’insertion et refuse les noms qui ne correspondent pas à une URL
|
||||
HTTPS exacte de `youtube.com`, `www.youtube.com`, `m.youtube.com`, `music.youtube.com` ou
|
||||
`youtu.be` ;
|
||||
- les formats `watch`, `shorts`, `embed`, `live` et le lien court sont acceptés, mais l’identifiant
|
||||
doit contenir exactement onze caractères ASCII autorisés ;
|
||||
- le payload S2C ne contient que la position du jukebox et cet identifiant borné, jamais une URL
|
||||
libre ; il est envoyé uniquement aux clients qui suivent le chunk et annoncent le canal ;
|
||||
- chaque client ouvre lui-même la source YouTube, refuse les directs et les vidéos de plus de
|
||||
trente minutes, et limite les lectures simultanées à quatre ;
|
||||
- la source AAC stéréo est décodée à 48 kHz (48 000 Hz) puis convertie explicitement en PCM mono 16 bits
|
||||
little-endian, échantillon gauche/droite par échantillon gauche/droite, afin de conserver la
|
||||
vitesse et la hauteur originales tout en restant positionnelle ;
|
||||
- OpenAL lit ce PCM à sa hauteur native `1.0` sur le canal `RECORDS`, avec une atténuation à
|
||||
64 blocs. La lecture s’arrête lorsque le disque est éjecté, le chunk disparaît ou la session se
|
||||
ferme.
|
||||
|
||||
Le disque ne crée aucune donnée persistante et ne demande aucune migration de sauvegarde.
|
||||
Ambiance conserve ses données v2 ; son protocole passe de 5 à 6.
|
||||
|
||||
## Dépendances clientes embarquées
|
||||
|
||||
Le décodage repose sur Lavaplayer `2.2.7` (Apache-2.0) et sur le commit youtube-source
|
||||
`f45bbb7aebfcbc1c553769e04af6cd43afa8b7c3` (MIT), épinglé pour intégrer les correctifs de lecture
|
||||
YouTube publiés après `1.18.2`. Le profil iOS corrigé est utilisé sans compte, OAuth, jeton privé ou
|
||||
service de chiffrement tiers. Les dépendances sont placées en JAR imbriqués par Loom et leurs avis
|
||||
de licence restent dans les archives d’origine. L’accès YouTube est effectué uniquement par le
|
||||
client et peut cesser de fonctionner si YouTube modifie ses mécanismes de lecture ; aucune clé ou
|
||||
URL arbitraire n’est acceptée par le serveur.
|
||||
+194
-3
@@ -1,8 +1,51 @@
|
||||
import groovy.json.JsonSlurper
|
||||
|
||||
def youtubeSourceVersion = "f45bbb7aebfcbc1c553769e04af6cd43afa8b7c3-SNAPSHOT"
|
||||
|
||||
configurations {
|
||||
whiteDiscLibraries
|
||||
implementation.extendsFrom whiteDiscLibraries
|
||||
include.extendsFrom whiteDiscLibraries
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':sanctuary')
|
||||
compileOnly "maven.modrinth:YL57xq9U:oaD6KQls"
|
||||
whiteDiscLibraries("dev.arbjerg:lavaplayer:2.2.7") {
|
||||
exclude group: "org.slf4j", module: "slf4j-api"
|
||||
exclude group: "org.jetbrains", module: "annotations"
|
||||
}
|
||||
whiteDiscLibraries("dev.lavalink.youtube:v2:${youtubeSourceVersion}") {
|
||||
exclude group: "org.slf4j", module: "slf4j-api"
|
||||
exclude group: "org.jetbrains", module: "annotations"
|
||||
}
|
||||
[
|
||||
"dev.arbjerg:lavaplayer-natives:2.2.7",
|
||||
"dev.arbjerg:lava-common:2.2.7",
|
||||
"dev.lavalink.youtube:common:${youtubeSourceVersion}",
|
||||
"org.mozilla:rhino-engine:1.7.15",
|
||||
"org.mozilla:rhino:1.7.15",
|
||||
"commons-io:commons-io:2.13.0",
|
||||
"org.jsoup:jsoup:1.16.1",
|
||||
"net.iharder:base64:2.3.9",
|
||||
"org.json:json:20240303",
|
||||
"org.apache.httpcomponents:httpclient:4.5.14",
|
||||
"org.apache.httpcomponents:httpcore:4.4.16",
|
||||
"commons-logging:commons-logging:1.2",
|
||||
"commons-codec:commons-codec:1.11",
|
||||
"com.fasterxml.jackson.core:jackson-core:2.15.2",
|
||||
"com.fasterxml.jackson.core:jackson-databind:2.15.2",
|
||||
"com.fasterxml.jackson.core:jackson-annotations:2.15.2",
|
||||
"com.grack:nanojson:1.7"
|
||||
].each { coordinates ->
|
||||
whiteDiscLibraries(coordinates) { transitive = false }
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("jar") {
|
||||
from("THIRD_PARTY_NOTICES.md") {
|
||||
rename { "THIRD_PARTY_NOTICES_ambiance.md" }
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("ambianceVisualApiSmoke", JavaExec) {
|
||||
@@ -21,15 +64,49 @@ tasks.register("ambianceScheduleSmoke", JavaExec) {
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.environment.AmbianceScheduleSmoke"
|
||||
}
|
||||
|
||||
tasks.register("whiteDiscUrlSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks strict and bounded YouTube URL parsing for the white disc."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrlSmoke"
|
||||
}
|
||||
|
||||
tasks.register("whiteDiscPlaybackSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Manually checks live YouTube loading and PCM decoding for the white disc."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.client.audio.WhiteDiscPlaybackSmoke"
|
||||
}
|
||||
|
||||
tasks.register("whiteDiscStreamSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks continuous 48 kHz PCM buffering for Minecraft's white-disc channel."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.client.audio.LavaplayerAudioStreamSmoke"
|
||||
}
|
||||
|
||||
tasks.register("alphaTexturePackManagerSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks local Golden Days detection, ordering and exact stack preservation."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.client.AlphaTexturePackManagerSmoke"
|
||||
}
|
||||
|
||||
tasks.named("test") {
|
||||
failOnNoDiscoveredTests = false
|
||||
}
|
||||
|
||||
tasks.register("verifyAmbiance") {
|
||||
group = "verification"
|
||||
description = "Checks Ambiance alpha.12, including timed weather overrides, playable night fog and weather/lunar controls."
|
||||
description = "Checks Ambiance alpha.22, including native-rate white-disc audio and Alpha textures."
|
||||
inputs.files(fileTree("src/main/java"))
|
||||
inputs.files(fileTree("src/main/resources"))
|
||||
inputs.file(file("src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java"))
|
||||
inputs.file(file("src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/LavaplayerAudioStreamSmoke.java"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.125-realtime-calendar-to-alpha.126.json"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.127-daily-ambiance-sodium-iris-to-alpha.128.json"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.128-ambiance-visuals-canon-iris-to-alpha.129.json"))
|
||||
@@ -68,8 +145,23 @@ tasks.register("verifyAmbiance") {
|
||||
def languages = ["fr_fr", "en_us", "ru_ru"].collectEntries { language ->
|
||||
[(language): new JsonSlurper().parse(file("src/main/resources/assets/realtime/lang/${language}.json"))]
|
||||
}
|
||||
def ambianceLanguages = ["fr_fr", "en_us", "ru_ru"].collectEntries { language ->
|
||||
[(language): new JsonSlurper().parse(file("src/main/resources/assets/ambiance/lang/${language}.json"))]
|
||||
}
|
||||
def whiteDiscTexture = javax.imageio.ImageIO.read(
|
||||
file("src/main/resources/assets/ambiance/textures/item/white_disc.png"))
|
||||
def whiteDiscRecipe = new JsonSlurper().parse(
|
||||
file("src/main/resources/data/ambiance/recipe/white_disc.json"))
|
||||
def whiteDiscSong = new JsonSlurper().parse(
|
||||
file("src/main/resources/data/ambiance/jukebox_song/white_disc.json"))
|
||||
def levelEventMixin = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ambiance/mixin/client/LevelEventHandlerMixin.java").text
|
||||
def whiteDiscAudioPlayer = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscAudioPlayer.java").text
|
||||
def whiteDiscPlaybackSmoke = file(
|
||||
"src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java").text
|
||||
|
||||
if (project.version.toString() != "0.0.0-alpha.14"
|
||||
if (project.version.toString() != "0.0.0-alpha.22"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.125"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.126"
|
||||
|| migration.target?.modules?.ambiance != "0.0.0-alpha.1"
|
||||
@@ -84,7 +176,7 @@ tasks.register("verifyAmbiance") {
|
||||
|| migration.compatibility?.ambiance_data_version != 1
|
||||
|| migration.compatibility?.ambiance_network_protocol != 2
|
||||
|| manifest.custom?.sanctuary26?.data_version != 2
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 6
|
||||
|| dailyMigration.target?.pack_version != "26.2.0-alpha.128"
|
||||
|| dailyMigration.target?.modules?.ambiance != "0.0.0-alpha.2"
|
||||
|| dailyMigration.lunar_schedule?.cycle != "minecraft_native_eight_days"
|
||||
@@ -262,6 +354,60 @@ tasks.register("verifyAmbiance") {
|
||||
|| !javaText.contains("Mth.lerp(night, 1.0F, 0.98F)")) {
|
||||
throw new GradleException("Ambiance alpha.11 playable-night fog contract is incomplete")
|
||||
}
|
||||
if (!javaText.contains('id("white_disc_playback")')
|
||||
|| !javaText.contains('readUtf(WhiteDiscUrl.VIDEO_ID_LENGTH)')
|
||||
|| !javaText.contains('PlayerLookup.tracking(level, pos)')
|
||||
|| !javaText.contains('ServerPlayNetworking.canSend(receiver, WhiteDiscPlaybackPayload.ID)')
|
||||
|| !javaText.contains('MAXIMUM_SIMULTANEOUS_DISCS = 4')
|
||||
|| !javaText.contains('PENDING_STARTS.size() + REQUESTS.size() + PLAYBACKS.size()')
|
||||
|| !javaText.contains('MAXIMUM_START_WAIT_TICKS = 100')
|
||||
|| !javaText.contains('tickPendingStarts(client)')
|
||||
|| !javaText.contains('client.level.dimension().equals(playback.dimension())')
|
||||
|| !javaText.contains('MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L')
|
||||
|| !javaText.contains('new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,')
|
||||
|| !javaText.contains('new YoutubeAudioSourceManager(false, new Ios())')
|
||||
|| !javaText.contains('player.addListener(new AudioEventAdapter()')
|
||||
|| !javaText.contains('failPlayback(client, key, failedPlayer)')
|
||||
|| !javaText.contains('initialWaitAttempted')
|
||||
|| !javaText.contains('CONTINUATION_FRAME_WAIT_MILLIS = 250L')
|
||||
|| !javaText.contains('player.provide(waitMillis, TimeUnit.MILLISECONDS)')
|
||||
|| !whiteDiscAudioPlayer.contains('PLAYBACK_PITCH = 1.0F')
|
||||
|| whiteDiscAudioPlayer.count('channel.setPitch(PLAYBACK_PITCH)') != 2
|
||||
|| !javaText.contains('SOURCE_CHANNELS = 2')
|
||||
|| !javaText.contains('downmixStereoFrame(frame.getData())')
|
||||
|| !javaText.contains('short mixed = (short) (((int) left + right) / SOURCE_CHANNELS)')
|
||||
|| !whiteDiscAudioPlayer.contains('handle.execute(channel -> channel.stop())')
|
||||
|| whiteDiscAudioPlayer.contains('.release()')
|
||||
|| !whiteDiscPlaybackSmoke.contains('https://www.youtube.com/watch?v=Ue5ZBe-GzSM')
|
||||
|| !whiteDiscPlaybackSmoke.contains('PCM cadence: 100%% speed')
|
||||
|| !whiteDiscPlaybackSmoke.contains('stream.decodedTimelineMillis() != 4_000L')
|
||||
|| !whiteDiscPlaybackSmoke.contains('stream.paddedSilenceBytes() != 0L')
|
||||
|| !javaText.contains('SoundSource.RECORDS')
|
||||
|| !javaText.contains('channel.linearAttenuation(ATTENUATION_DISTANCE)')
|
||||
|| !javaText.contains('LONG_HOSTS = Set.of(')
|
||||
|| !javaText.contains('"https".equalsIgnoreCase(uri.getScheme())')
|
||||
|| !file("src/main/resources/assets/ambiance/items/white_disc.json").isFile()
|
||||
|| !file("src/main/resources/assets/ambiance/models/item/white_disc.json").isFile()
|
||||
|| whiteDiscTexture == null || whiteDiscTexture.width != 16 || whiteDiscTexture.height != 16
|
||||
|| whiteDiscRecipe.result?.id != "ambiance:white_disc"
|
||||
|| whiteDiscRecipe.key?.W != "minecraft:white_dye"
|
||||
|| whiteDiscSong.sound_event != "minecraft:intentionally_empty"
|
||||
|| whiteDiscSong.length_in_seconds != 1800
|
||||
|| !levelEventMixin.contains('@Mixin(LevelEventHandler.class)')
|
||||
|| !levelEventMixin.contains('@Inject(method = "levelEvent"')
|
||||
|| !levelEventMixin.contains('ambiance$stopWhiteDisc(int type, BlockPos pos, int data,')
|
||||
|| ambianceLanguages.any { locale, translations ->
|
||||
!["item.ambiance.white_disc", "tooltip.ambiance.white_disc",
|
||||
"message.ambiance.white_disc.invalid_url", "message.ambiance.white_disc.failed"].every {
|
||||
translations.containsKey(it)
|
||||
}
|
||||
}
|
||||
|| !file("build.gradle").text.contains('dev.arbjerg:lavaplayer:2.2.7')
|
||||
|| !file("build.gradle").text.contains(
|
||||
'def youtubeSourceVersion = "f45bbb7aebfcbc1c553769e04af6cd43afa8b7c3-SNAPSHOT"')
|
||||
|| !file("build.gradle").text.contains('dev.lavalink.youtube:v2:${youtubeSourceVersion}')) {
|
||||
throw new GradleException("Ambiance white-disc playback contract is incomplete")
|
||||
}
|
||||
|
||||
[
|
||||
'class RealtimeMod', 'class RealtimeConfig', 'class MinecraftChronology',
|
||||
@@ -309,8 +455,53 @@ tasks.register("verifyAmbiance") {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("verifyAlphaTextures") {
|
||||
group = "verification"
|
||||
description = "Checks the alpha.21 local-only Golden Days overlay and exact restore contract."
|
||||
inputs.file(file("GOLDEN_DAYS.md"))
|
||||
inputs.file(file("THIRD_PARTY_NOTICES.md"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/ambiance/client/AlphaTexturePackManager.java"))
|
||||
inputs.files(fileTree("src/main/resources/assets/ambiance/lang") { include "*.json" })
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.218-alpha-indev-to-alpha.219.json"))
|
||||
doLast {
|
||||
def migration = new JsonSlurper().parse(rootProject.file(
|
||||
"pack/migrations/26.2.0-alpha.218-alpha-indev-to-alpha.219.json"))
|
||||
def manager = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ambiance/client/AlphaTexturePackManager.java").text
|
||||
def locales = ["fr_fr", "en_us", "ru_ru"].collect {
|
||||
new JsonSlurper().parse(file("src/main/resources/assets/ambiance/lang/${it}.json"))
|
||||
}
|
||||
def forbiddenArchives = rootProject.fileTree(rootProject.projectDir) {
|
||||
include "**/*golden*days*.zip", "**/*golden*days*.jar"
|
||||
exclude "**/build/**", "**/.gradle/**", "**/.git/**"
|
||||
}.files
|
||||
if (project.version.toString() != "0.0.0-alpha.22"
|
||||
|| migration.alpha_textures?.destination != "sanctuary:alpha"
|
||||
|| migration.alpha_textures?.client_only != true
|
||||
|| migration.alpha_textures?.bundled_assets != false
|
||||
|| migration.alpha_textures?.overlay_order != ["base", "alpha"]
|
||||
|| migration.alpha_textures?.previous_selection_restored_exactly != true
|
||||
|| migration.alpha_textures?.saved_options_modified != false
|
||||
|| migration.alpha_textures?.dedicated_server_files_required != false
|
||||
|| !manager.contains("SanctuaryDimensions.ALPHA")
|
||||
|| !manager.contains("previousSelection = List.copyOf")
|
||||
|| !manager.contains("selectionWithOverlay(previousSelection")
|
||||
|| manager.contains("updateResourcePacks")
|
||||
|| locales.any { !it.containsKey("message.ambiance.alpha_textures_missing")
|
||||
|| !it.containsKey("message.ambiance.alpha_textures_restore_failed") }
|
||||
|| !forbiddenArchives.isEmpty()
|
||||
|| !file("THIRD_PARTY_NOTICES.md").text.contains("No Golden Days asset")) {
|
||||
throw new GradleException("Ambiance alpha.21 Golden Days overlay contract is incomplete")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("check") {
|
||||
dependsOn tasks.named("verifyAmbiance")
|
||||
dependsOn tasks.named("ambianceScheduleSmoke")
|
||||
dependsOn tasks.named("ambianceVisualApiSmoke")
|
||||
dependsOn tasks.named("whiteDiscUrlSmoke")
|
||||
dependsOn tasks.named("whiteDiscStreamSmoke")
|
||||
dependsOn tasks.named("alphaTexturePackManagerSmoke")
|
||||
dependsOn tasks.named("verifyAlphaTextures")
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceBloodNightAssault;
|
||||
import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceWeatherCommands;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceNetworking;
|
||||
import fr.koka99cab.sanctuary26.ambiance.registry.AmbianceRegistries;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscService;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import org.slf4j.Logger;
|
||||
@@ -29,6 +30,7 @@ public final class AmbianceMod implements ModInitializer {
|
||||
public void onInitialize() {
|
||||
AmbianceRegistries.initialize();
|
||||
AmbianceNetworking.initialize();
|
||||
WhiteDiscService.initialize();
|
||||
RealtimeMod.initialize();
|
||||
AmbianceEnvironmentController.initialize();
|
||||
AmbianceFirstSpawnVision.initialize();
|
||||
|
||||
+192
@@ -0,0 +1,192 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.packs.repository.PackRepository;
|
||||
|
||||
/**
|
||||
* Applies locally installed Golden Days packs only while the player is in
|
||||
* {@code sanctuary:alpha}. The selected stack is changed in memory only; the
|
||||
* player's saved resource-pack options remain untouched.
|
||||
*/
|
||||
public final class AlphaTexturePackManager {
|
||||
static final String BASE_MARKER = "golden-days-base";
|
||||
static final String ALPHA_MARKER = "golden-days-alpha";
|
||||
private static final int MAX_RESTORE_RETRIES = 1;
|
||||
|
||||
private static boolean requestKnown;
|
||||
private static boolean alphaRequested;
|
||||
private static boolean reloadInProgress;
|
||||
private static boolean failedForCurrentRequest;
|
||||
private static boolean missingMessageShown;
|
||||
private static boolean reconcilePending = true;
|
||||
private static int restoreFailures;
|
||||
private static List<String> previousSelection = List.of();
|
||||
private static boolean previousSelectionCaptured;
|
||||
|
||||
private AlphaTexturePackManager() {
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
ClientTickEvents.END_CLIENT_TICK.register(AlphaTexturePackManager::tick);
|
||||
ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> request(client, false));
|
||||
}
|
||||
|
||||
private static void tick(Minecraft client) {
|
||||
boolean shouldUseAlphaTextures = client.level != null
|
||||
&& client.level.dimension().equals(SanctuaryDimensions.ALPHA);
|
||||
request(client, shouldUseAlphaTextures);
|
||||
if (!reloadInProgress && reconcilePending) {
|
||||
reconcilePending = false;
|
||||
reconcile(client);
|
||||
}
|
||||
}
|
||||
|
||||
private static void request(Minecraft client, boolean requested) {
|
||||
if (requestKnown && requested == alphaRequested) return;
|
||||
alphaRequested = requested;
|
||||
requestKnown = true;
|
||||
failedForCurrentRequest = false;
|
||||
missingMessageShown = false;
|
||||
restoreFailures = 0;
|
||||
if (requested && !previousSelectionCaptured) {
|
||||
PackRepository repository = client.getResourcePackRepository();
|
||||
repository.reload();
|
||||
previousSelection = List.copyOf(repository.getSelectedIds());
|
||||
previousSelectionCaptured = true;
|
||||
}
|
||||
reconcilePending = true;
|
||||
}
|
||||
|
||||
private static void reconcile(Minecraft client) {
|
||||
PackRepository repository = client.getResourcePackRepository();
|
||||
repository.reload();
|
||||
List<String> selected = List.copyOf(repository.getSelectedIds());
|
||||
|
||||
if (alphaRequested && !failedForCurrentRequest) {
|
||||
Optional<PackPair> packs = findPacks(repository.getAvailableIds());
|
||||
if (packs.isEmpty()) {
|
||||
failedForCurrentRequest = true;
|
||||
showMissingPackMessage(client);
|
||||
applyIfDifferent(client, selected, previousSelection, false);
|
||||
return;
|
||||
}
|
||||
List<String> desired = selectionWithOverlay(previousSelection, packs.orElseThrow());
|
||||
applyIfDifferent(client, selected, desired, true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!previousSelectionCaptured) return;
|
||||
applyIfDifferent(client, selected, previousSelection, false);
|
||||
}
|
||||
|
||||
private static void applyIfDifferent(Minecraft client, List<String> selected,
|
||||
List<String> desired, boolean enablingAlpha) {
|
||||
if (selected.equals(desired)) {
|
||||
if (!enablingAlpha && !alphaRequested) clearSnapshot();
|
||||
return;
|
||||
}
|
||||
client.getResourcePackRepository().setSelected(desired);
|
||||
reloadInProgress = true;
|
||||
AmbianceMod.LOGGER.info("[{}] Reloading client resources for Alpha texture mode: {}.",
|
||||
AmbianceMod.DISPLAY_NAME, enablingAlpha ? "enabled" : "disabled");
|
||||
client.reloadResourcePacks().whenComplete((ignored, error) -> client.execute(() -> {
|
||||
reloadInProgress = false;
|
||||
if (error != null) {
|
||||
AmbianceMod.LOGGER.error("[{}] Could not {} the Golden Days Alpha overlay.",
|
||||
AmbianceMod.DISPLAY_NAME, enablingAlpha ? "enable" : "restore", error);
|
||||
if (enablingAlpha) {
|
||||
failedForCurrentRequest = true;
|
||||
reconcilePending = true;
|
||||
} else if (++restoreFailures <= MAX_RESTORE_RETRIES) {
|
||||
reconcilePending = true;
|
||||
} else {
|
||||
client.getResourcePackRepository().setSelected(previousSelection);
|
||||
showRestoreFailureMessage(client);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!enablingAlpha && !alphaRequested) clearSnapshot();
|
||||
if (enablingAlpha != alphaRequested) reconcilePending = true;
|
||||
}));
|
||||
}
|
||||
|
||||
static Optional<PackPair> findPacks(Collection<String> availableIds) {
|
||||
Optional<String> base = findPack(availableIds, BASE_MARKER);
|
||||
Optional<String> alpha = findPack(availableIds, ALPHA_MARKER);
|
||||
return base.isPresent() && alpha.isPresent()
|
||||
? Optional.of(new PackPair(base.orElseThrow(), alpha.orElseThrow()))
|
||||
: Optional.empty();
|
||||
}
|
||||
|
||||
static List<String> selectionWithOverlay(Collection<String> previous, PackPair packs) {
|
||||
List<String> desired = selectedWithoutGoldenDays(previous);
|
||||
// Pack order is bottom-to-top: Base first, then its Alpha overlay.
|
||||
desired.add(packs.base());
|
||||
desired.add(packs.alpha());
|
||||
return List.copyOf(desired);
|
||||
}
|
||||
|
||||
private static List<String> selectedWithoutGoldenDays(Collection<String> selectedIds) {
|
||||
List<String> result = new ArrayList<>(selectedIds.size());
|
||||
for (String id : selectedIds) {
|
||||
if (!isGoldenDaysPack(id)) result.add(id);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static Optional<String> findPack(Collection<String> availableIds, String marker) {
|
||||
return availableIds.stream()
|
||||
.filter(id -> normalized(id).contains(marker))
|
||||
.sorted(Comparator.naturalOrder())
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
static boolean isGoldenDaysPack(String id) {
|
||||
String normalized = normalized(id);
|
||||
return normalized.contains(BASE_MARKER) || normalized.contains(ALPHA_MARKER);
|
||||
}
|
||||
|
||||
private static String normalized(String id) {
|
||||
return id.toLowerCase(Locale.ROOT).replace('_', '-').replace(' ', '-');
|
||||
}
|
||||
|
||||
private static void clearSnapshot() {
|
||||
previousSelection = List.of();
|
||||
previousSelectionCaptured = false;
|
||||
restoreFailures = 0;
|
||||
}
|
||||
|
||||
private static void showMissingPackMessage(Minecraft client) {
|
||||
if (!missingMessageShown && client.player != null) {
|
||||
client.gui.hud.getChat().addClientSystemMessage(
|
||||
Component.translatable("message.ambiance.alpha_textures_missing"));
|
||||
missingMessageShown = true;
|
||||
}
|
||||
}
|
||||
|
||||
private static void showRestoreFailureMessage(Minecraft client) {
|
||||
if (client.player != null) {
|
||||
client.gui.hud.getChat().addClientSystemMessage(
|
||||
Component.translatable("message.ambiance.alpha_textures_restore_failed"));
|
||||
}
|
||||
}
|
||||
|
||||
record PackPair(String base, String alpha) {
|
||||
PackPair {
|
||||
if (base == null || alpha == null || base.equals(alpha)) {
|
||||
throw new IllegalArgumentException("Golden Days Base and Alpha packs must be distinct");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,10 @@ import fr.koka99cab.realtime.client.RealtimeClient;
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceEnvironmentPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceCanapliaVisualPayloads;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.WhiteDiscPlaybackPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.client.audio.WhiteDiscAudioPlayer;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
@@ -30,6 +33,7 @@ public final class AmbianceClient implements ClientModInitializer {
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
RealtimeClient.initialize();
|
||||
AlphaTexturePackManager.register();
|
||||
CelestialSkyRenderer.register();
|
||||
ClientTickEvents.END_CLIENT_TICK.register(DynamicTorchLights::tick);
|
||||
ClientPlayNetworking.registerGlobalReceiver(AmbianceEnvironmentPayload.TYPE, (payload, context) ->
|
||||
@@ -41,11 +45,15 @@ public final class AmbianceClient implements ClientModInitializer {
|
||||
context.client().execute(() -> AmbianceClientVisualEffects.apply(payload)));
|
||||
ClientPlayNetworking.registerGlobalReceiver(AmbianceCanapliaVisualPayloads.Clear.ID, (payload, context) ->
|
||||
context.client().execute(AmbianceClientVisualEffects::clear));
|
||||
ClientPlayNetworking.registerGlobalReceiver(WhiteDiscPlaybackPayload.ID, (payload, context) ->
|
||||
context.client().execute(() -> WhiteDiscAudioPlayer.play(
|
||||
context.client(), payload.pos(), payload.videoId())));
|
||||
visualSettingsKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
|
||||
"key.ambiance.visual_settings", InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_UNKNOWN, AMBIANCE_CATEGORY));
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||
AmbianceClientVisualEffects.tick();
|
||||
WhiteDiscAudioPlayer.tick(client);
|
||||
while (visualSettingsKey.consumeClick()) {
|
||||
if (client.gui.screen() == null) client.gui.setScreen(new AmbianceVisualSettingsScreen(null));
|
||||
}
|
||||
@@ -54,7 +62,9 @@ public final class AmbianceClient implements ClientModInitializer {
|
||||
AmbianceClientEnvironment.reset();
|
||||
DynamicTorchLights.reset();
|
||||
AmbianceClientVisualEffects.clear();
|
||||
WhiteDiscAudioPlayer.clear();
|
||||
});
|
||||
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> WhiteDiscAudioPlayer.shutdown());
|
||||
AmbianceVisualOverlay.register();
|
||||
AmbianceBiomeTints.registerColorResolvers();
|
||||
registerWaterFluidTint();
|
||||
|
||||
+145
@@ -0,0 +1,145 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
import javax.sound.sampled.AudioFormat;
|
||||
import net.minecraft.client.sounds.AudioStream;
|
||||
|
||||
/** Downmixes bounded stereo PCM frames from Lavaplayer for Minecraft's mono OpenAL stream. */
|
||||
final class LavaplayerAudioStream implements AudioStream {
|
||||
static final int SAMPLE_RATE = 48_000;
|
||||
static final int SOURCE_CHANNELS = 2;
|
||||
static final int FRAME_SAMPLES = 960;
|
||||
private static final int BYTES_PER_SAMPLE = Short.BYTES;
|
||||
private static final int SOURCE_FRAME_SIZE = SOURCE_CHANNELS * BYTES_PER_SAMPLE;
|
||||
private static final long INITIAL_FRAME_WAIT_MILLIS = 2_000L;
|
||||
private static final long CONTINUATION_FRAME_WAIT_MILLIS = 250L;
|
||||
private static final AudioFormat FORMAT =
|
||||
new AudioFormat(SAMPLE_RATE, 16, 1, true, false);
|
||||
private final AudioPlayer player;
|
||||
private byte[] pending = new byte[0];
|
||||
private int pendingOffset;
|
||||
private long decodedBytes;
|
||||
private long paddedSilenceBytes;
|
||||
private long firstFrameTimecode = -1L;
|
||||
private long lastFrameTimecode = -1L;
|
||||
private int decodedFrames;
|
||||
private boolean initialWaitAttempted;
|
||||
private volatile boolean closed;
|
||||
private volatile boolean ended;
|
||||
|
||||
LavaplayerAudioStream(AudioPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AudioFormat getFormat() {
|
||||
return FORMAT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ByteBuffer read(int maximumBytes) throws IOException {
|
||||
if (closed || maximumBytes <= 0) return null;
|
||||
ByteBuffer output = ByteBuffer.allocateDirect(maximumBytes);
|
||||
while (output.hasRemaining() && !closed) {
|
||||
if (pendingOffset < pending.length) {
|
||||
int length = Math.min(output.remaining(), pending.length - pendingOffset);
|
||||
output.put(pending, pendingOffset, length);
|
||||
pendingOffset += length;
|
||||
decodedBytes += length;
|
||||
continue;
|
||||
}
|
||||
AudioFrame frame = nextFrame();
|
||||
if (frame == null) {
|
||||
if (ended) break;
|
||||
while (output.hasRemaining()) {
|
||||
output.put((byte) 0);
|
||||
paddedSilenceBytes++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (frame.isTerminator()) {
|
||||
ended = true;
|
||||
break;
|
||||
}
|
||||
if (firstFrameTimecode < 0L) firstFrameTimecode = frame.getTimecode();
|
||||
lastFrameTimecode = frame.getTimecode();
|
||||
decodedFrames++;
|
||||
pending = downmixStereoFrame(frame.getData());
|
||||
pendingOffset = 0;
|
||||
}
|
||||
if (output.position() == 0 && ended) return null;
|
||||
output.flip();
|
||||
return output;
|
||||
}
|
||||
|
||||
private static byte[] downmixStereoFrame(byte[] stereo) throws IOException {
|
||||
if (stereo.length == 0 || stereo.length % SOURCE_FRAME_SIZE != 0) {
|
||||
throw new IOException("Invalid stereo PCM frame length: " + stereo.length);
|
||||
}
|
||||
byte[] mono = new byte[stereo.length / SOURCE_CHANNELS];
|
||||
for (int sourceOffset = 0, targetOffset = 0;
|
||||
sourceOffset < stereo.length;
|
||||
sourceOffset += SOURCE_FRAME_SIZE, targetOffset += BYTES_PER_SAMPLE) {
|
||||
short left = littleEndianSample(stereo, sourceOffset);
|
||||
short right = littleEndianSample(stereo, sourceOffset + BYTES_PER_SAMPLE);
|
||||
short mixed = (short) (((int) left + right) / SOURCE_CHANNELS);
|
||||
mono[targetOffset] = (byte) mixed;
|
||||
mono[targetOffset + 1] = (byte) (mixed >>> 8);
|
||||
}
|
||||
return mono;
|
||||
}
|
||||
|
||||
private static short littleEndianSample(byte[] pcm, int offset) {
|
||||
return (short) (Byte.toUnsignedInt(pcm[offset]) | pcm[offset + 1] << 8);
|
||||
}
|
||||
|
||||
private AudioFrame nextFrame() throws IOException {
|
||||
try {
|
||||
long waitMillis = initialWaitAttempted
|
||||
? CONTINUATION_FRAME_WAIT_MILLIS
|
||||
: INITIAL_FRAME_WAIT_MILLIS;
|
||||
initialWaitAttempted = true;
|
||||
AudioFrame frame = player.provide(waitMillis, TimeUnit.MILLISECONDS);
|
||||
if (frame == null && player.getPlayingTrack() == null) ended = true;
|
||||
return frame;
|
||||
} catch (TimeoutException ignored) {
|
||||
return null;
|
||||
} catch (InterruptedException interrupted) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new IOException("Interrupted while buffering the white disc", interrupted);
|
||||
}
|
||||
}
|
||||
|
||||
boolean ended() {
|
||||
return ended;
|
||||
}
|
||||
|
||||
boolean uses(AudioPlayer expectedPlayer) {
|
||||
return player == expectedPlayer;
|
||||
}
|
||||
|
||||
long decodedBytes() {
|
||||
return decodedBytes;
|
||||
}
|
||||
|
||||
long paddedSilenceBytes() {
|
||||
return paddedSilenceBytes;
|
||||
}
|
||||
|
||||
long decodedTimelineMillis() {
|
||||
if (decodedFrames == 0) return 0L;
|
||||
return lastFrameTimecode - firstFrameTimecode + 20L;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
if (closed) return;
|
||||
closed = true;
|
||||
player.destroy();
|
||||
}
|
||||
}
|
||||
+305
@@ -0,0 +1,305 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.mojang.blaze3d.audio.Library;
|
||||
import com.sedmelluq.discord.lavaplayer.format.Pcm16AudioDataFormat;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
|
||||
import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
|
||||
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
|
||||
import dev.lavalink.youtube.YoutubeAudioSourceManager;
|
||||
import dev.lavalink.youtube.clients.Ios;
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.mixin.client.SoundEngineAccessor;
|
||||
import fr.koka99cab.sanctuary26.ambiance.mixin.client.SoundManagerAccessor;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrl;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.sounds.ChannelAccess;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.JukeboxBlock;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** Client-only, positional and resource-bounded YouTube playback for white discs. */
|
||||
public final class WhiteDiscAudioPlayer {
|
||||
private static final int MAXIMUM_SIMULTANEOUS_DISCS = 4;
|
||||
private static final int MAXIMUM_START_WAIT_TICKS = 100;
|
||||
private static final long MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L;
|
||||
private static final long FINISHED_GRACE_NANOS = 5_000_000_000L;
|
||||
private static final float ATTENUATION_DISTANCE = 64.0F;
|
||||
/** OpenAL must preserve the decoded music's native speed and pitch. */
|
||||
static final float PLAYBACK_PITCH = 1.0F;
|
||||
private static final DefaultAudioPlayerManager MANAGER = createManager();
|
||||
private static final Map<Long, PendingStart> PENDING_STARTS = new HashMap<>();
|
||||
private static final Map<Long, Long> REQUESTS = new HashMap<>();
|
||||
private static final LinkedHashMap<Long, Playback> PLAYBACKS = new LinkedHashMap<>();
|
||||
private static long requestSequence;
|
||||
private static boolean shutdown;
|
||||
|
||||
private WhiteDiscAudioPlayer() {
|
||||
}
|
||||
|
||||
public static void play(Minecraft client, BlockPos pos, String videoId) {
|
||||
if (shutdown || !WhiteDiscUrl.validVideoId(videoId) || !validJukeboxTarget(client, pos)) return;
|
||||
long key = pos.asLong();
|
||||
if (PENDING_STARTS.containsKey(key) || REQUESTS.containsKey(key)) return;
|
||||
boolean replacingPlayback = PLAYBACKS.containsKey(key);
|
||||
if (!replacingPlayback
|
||||
&& PENDING_STARTS.size() + REQUESTS.size() + PLAYBACKS.size()
|
||||
>= MAXIMUM_SIMULTANEOUS_DISCS) return;
|
||||
stop(key);
|
||||
client.player.sendOverlayMessage(Component.translatable("message.ambiance.white_disc.loading"));
|
||||
if (!validTarget(client, pos)) {
|
||||
PENDING_STARTS.put(key, new PendingStart(pos.immutable(), client.level.dimension(), videoId,
|
||||
MAXIMUM_START_WAIT_TICKS));
|
||||
return;
|
||||
}
|
||||
startLoading(client, pos, videoId);
|
||||
}
|
||||
|
||||
private static void startLoading(Minecraft client, BlockPos pos, String videoId) {
|
||||
long key = pos.asLong();
|
||||
long request = ++requestSequence;
|
||||
REQUESTS.put(key, request);
|
||||
MANAGER.loadItemOrdered(key, WhiteDiscUrl.canonicalUrl(videoId), new AudioLoadResultHandler() {
|
||||
@Override
|
||||
public void trackLoaded(AudioTrack track) {
|
||||
client.execute(() -> acceptTrack(client, pos, request, track));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void playlistLoaded(AudioPlaylist playlist) {
|
||||
AudioTrack selected = playlist.getSelectedTrack();
|
||||
if (selected == null && !playlist.getTracks().isEmpty()) selected = playlist.getTracks().getFirst();
|
||||
if (selected == null) noMatches();
|
||||
else trackLoaded(selected);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void noMatches() {
|
||||
client.execute(() -> fail(client, key, request));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadFailed(FriendlyException exception) {
|
||||
AmbianceMod.LOGGER.warn("Unable to load white-disc YouTube video {}: {}", videoId,
|
||||
exception.getMessage());
|
||||
client.execute(() -> fail(client, key, request));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static void acceptTrack(Minecraft client, BlockPos pos, long request, AudioTrack track) {
|
||||
long key = pos.asLong();
|
||||
if (REQUESTS.getOrDefault(key, -1L) != request) return;
|
||||
if (!validTarget(client, pos)) {
|
||||
REQUESTS.remove(key);
|
||||
return;
|
||||
}
|
||||
if (track.getInfo().isStream || track.getDuration() <= 0L
|
||||
|| track.getDuration() > MAXIMUM_TRACK_MILLIS) {
|
||||
REQUESTS.remove(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.too_long"));
|
||||
return;
|
||||
}
|
||||
while (PLAYBACKS.size() >= MAXIMUM_SIMULTANEOUS_DISCS) {
|
||||
stop(PLAYBACKS.keySet().iterator().next());
|
||||
}
|
||||
ChannelAccess channels = ((SoundEngineAccessor) ((SoundManagerAccessor) client.getSoundManager())
|
||||
.ambiance$getSoundEngine()).ambiance$getChannelAccess();
|
||||
channels.createHandle(Library.Pool.STREAMING).thenAccept(handle -> client.execute(() -> {
|
||||
if (handle == null || REQUESTS.getOrDefault(key, -1L) != request
|
||||
|| !validTarget(client, pos)) {
|
||||
if (handle != null) handle.execute(channel -> channel.stop());
|
||||
if (REQUESTS.getOrDefault(key, -1L) == request) REQUESTS.remove(key);
|
||||
return;
|
||||
}
|
||||
AudioPlayer player = MANAGER.createPlayer();
|
||||
LavaplayerAudioStream stream = new LavaplayerAudioStream(player);
|
||||
Playback playback = new Playback(pos.immutable(), client.level.dimension(), handle, stream);
|
||||
PLAYBACKS.put(key, playback);
|
||||
REQUESTS.remove(key);
|
||||
player.addListener(new AudioEventAdapter() {
|
||||
@Override
|
||||
public void onTrackException(AudioPlayer failedPlayer, AudioTrack failedTrack,
|
||||
FriendlyException exception) {
|
||||
AmbianceMod.LOGGER.warn("White-disc playback failed for YouTube video {}: {}",
|
||||
failedTrack.getIdentifier(), exception.getMessage());
|
||||
client.execute(() -> failPlayback(client, key, failedPlayer));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTrackStuck(AudioPlayer stuckPlayer, AudioTrack stuckTrack,
|
||||
long thresholdMs) {
|
||||
AmbianceMod.LOGGER.warn("White-disc playback stalled for YouTube video {} after {} ms",
|
||||
stuckTrack.getIdentifier(), thresholdMs);
|
||||
client.execute(() -> failPlayback(client, key, stuckPlayer));
|
||||
}
|
||||
});
|
||||
player.playTrack(track);
|
||||
float volume = client.options.getFinalSoundSourceVolume(SoundSource.RECORDS);
|
||||
handle.execute(channel -> {
|
||||
try {
|
||||
channel.setSelfPosition(Vec3.atCenterOf(pos));
|
||||
channel.setRelative(false);
|
||||
channel.setPitch(PLAYBACK_PITCH);
|
||||
channel.linearAttenuation(ATTENUATION_DISTANCE);
|
||||
channel.setVolume(volume);
|
||||
channel.attachBufferStream(stream);
|
||||
channel.play();
|
||||
} catch (RuntimeException | LinkageError exception) {
|
||||
AmbianceMod.LOGGER.error("Unable to attach white-disc audio to Minecraft's sound engine",
|
||||
exception);
|
||||
client.execute(() -> failPlayback(client, key, player));
|
||||
}
|
||||
});
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.playing", track.getInfo().title));
|
||||
}));
|
||||
}
|
||||
|
||||
private static void fail(Minecraft client, long key, long request) {
|
||||
if (REQUESTS.getOrDefault(key, -1L) != request) return;
|
||||
REQUESTS.remove(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.failed"));
|
||||
}
|
||||
|
||||
private static void failPlayback(Minecraft client, long key, AudioPlayer player) {
|
||||
Playback playback = PLAYBACKS.get(key);
|
||||
if (playback == null || !playback.stream().uses(player)) return;
|
||||
stop(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.failed"));
|
||||
}
|
||||
|
||||
public static void stop(BlockPos pos) {
|
||||
stop(pos.asLong());
|
||||
}
|
||||
|
||||
private static void stop(long key) {
|
||||
PENDING_STARTS.remove(key);
|
||||
REQUESTS.remove(key);
|
||||
Playback playback = PLAYBACKS.remove(key);
|
||||
if (playback == null) return;
|
||||
playback.stream().close();
|
||||
playback.handle().execute(channel -> channel.stop());
|
||||
}
|
||||
|
||||
public static void tick(Minecraft client) {
|
||||
if (client.level == null) {
|
||||
clear();
|
||||
return;
|
||||
}
|
||||
tickPendingStarts(client);
|
||||
long now = System.nanoTime();
|
||||
for (Map.Entry<Long, Playback> entry : Map.copyOf(PLAYBACKS).entrySet()) {
|
||||
Playback playback = entry.getValue();
|
||||
boolean missing = !client.level.dimension().equals(playback.dimension())
|
||||
|| !client.level.hasChunkAt(playback.pos())
|
||||
|| !client.level.getBlockState(playback.pos()).is(Blocks.JUKEBOX)
|
||||
|| !client.level.getBlockState(playback.pos()).getValue(JukeboxBlock.HAS_RECORD);
|
||||
if (missing || playback.finishedFor(now) >= FINISHED_GRACE_NANOS) {
|
||||
stop(entry.getKey());
|
||||
continue;
|
||||
}
|
||||
float volume = client.options.getFinalSoundSourceVolume(SoundSource.RECORDS);
|
||||
playback.handle().execute(channel -> {
|
||||
channel.setPitch(PLAYBACK_PITCH);
|
||||
channel.setVolume(volume);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
PENDING_STARTS.clear();
|
||||
REQUESTS.clear();
|
||||
for (long key : PLAYBACKS.keySet().stream().mapToLong(Long::longValue).toArray()) stop(key);
|
||||
}
|
||||
|
||||
public static void shutdown() {
|
||||
if (shutdown) return;
|
||||
shutdown = true;
|
||||
clear();
|
||||
MANAGER.shutdown();
|
||||
}
|
||||
|
||||
private static DefaultAudioPlayerManager createManager() {
|
||||
DefaultAudioPlayerManager manager = new DefaultAudioPlayerManager();
|
||||
manager.getConfiguration().setOutputFormat(
|
||||
new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,
|
||||
LavaplayerAudioStream.SAMPLE_RATE, LavaplayerAudioStream.FRAME_SAMPLES, false));
|
||||
manager.setFrameBufferDuration(5_000);
|
||||
manager.setItemLoaderThreadPoolSize(2);
|
||||
manager.registerSourceManager(new YoutubeAudioSourceManager(false, new Ios()));
|
||||
return manager;
|
||||
}
|
||||
|
||||
private static boolean validTarget(Minecraft client, BlockPos pos) {
|
||||
return validJukeboxTarget(client, pos)
|
||||
&& client.level.getBlockState(pos).getValue(JukeboxBlock.HAS_RECORD);
|
||||
}
|
||||
|
||||
private static boolean validJukeboxTarget(Minecraft client, BlockPos pos) {
|
||||
return client.player != null && client.level != null
|
||||
&& client.player.distanceToSqr(Vec3.atCenterOf(pos))
|
||||
<= ATTENUATION_DISTANCE * ATTENUATION_DISTANCE * 4.0D
|
||||
&& client.level.getBlockState(pos).is(Blocks.JUKEBOX);
|
||||
}
|
||||
|
||||
private static void tickPendingStarts(Minecraft client) {
|
||||
for (Map.Entry<Long, PendingStart> entry : Map.copyOf(PENDING_STARTS).entrySet()) {
|
||||
long key = entry.getKey();
|
||||
PendingStart pending = entry.getValue();
|
||||
if (!client.level.dimension().equals(pending.dimension())
|
||||
|| !validJukeboxTarget(client, pending.pos())) {
|
||||
PENDING_STARTS.remove(key);
|
||||
continue;
|
||||
}
|
||||
if (validTarget(client, pending.pos())) {
|
||||
PENDING_STARTS.remove(key);
|
||||
startLoading(client, pending.pos(), pending.videoId());
|
||||
continue;
|
||||
}
|
||||
if (pending.ticksRemaining() <= 1) {
|
||||
PENDING_STARTS.remove(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.failed"));
|
||||
continue;
|
||||
}
|
||||
PENDING_STARTS.put(key, pending.waitOneTick());
|
||||
}
|
||||
}
|
||||
|
||||
private record PendingStart(BlockPos pos, ResourceKey<Level> dimension, String videoId,
|
||||
int ticksRemaining) {
|
||||
private PendingStart waitOneTick() {
|
||||
return new PendingStart(pos, dimension, videoId, ticksRemaining - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private record Playback(BlockPos pos, ResourceKey<Level> dimension,
|
||||
ChannelAccess.ChannelHandle handle,
|
||||
LavaplayerAudioStream stream, long[] finishedAt) {
|
||||
private Playback(BlockPos pos, ResourceKey<Level> dimension,
|
||||
ChannelAccess.ChannelHandle handle, LavaplayerAudioStream stream) {
|
||||
this(pos, dimension, handle, stream, new long[1]);
|
||||
}
|
||||
|
||||
private long finishedFor(long now) {
|
||||
if (!stream.ended()) return 0L;
|
||||
if (finishedAt[0] == 0L) finishedAt[0] = now;
|
||||
return now - finishedAt[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.item;
|
||||
|
||||
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;
|
||||
|
||||
/** Blank disc whose custom name may hold a validated YouTube URL. */
|
||||
public final class WhiteDiscItem extends Item {
|
||||
public WhiteDiscItem(Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay display,
|
||||
Consumer<Component> tooltip, TooltipFlag flag) {
|
||||
tooltip.accept(Component.translatable("tooltip.ambiance.white_disc")
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.client.audio.WhiteDiscAudioPlayer;
|
||||
import net.minecraft.client.renderer.LevelEventHandler;
|
||||
import net.minecraft.core.BlockPos;
|
||||
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;
|
||||
|
||||
@Mixin(LevelEventHandler.class)
|
||||
public abstract class LevelEventHandlerMixin {
|
||||
@Inject(method = "levelEvent", at = @At("HEAD"))
|
||||
private void ambiance$stopWhiteDisc(int type, BlockPos pos, int data, CallbackInfo callback) {
|
||||
if (type == 1011) WhiteDiscAudioPlayer.stop(pos);
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import net.minecraft.client.sounds.ChannelAccess;
|
||||
import net.minecraft.client.sounds.SoundEngine;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(SoundEngine.class)
|
||||
public interface SoundEngineAccessor {
|
||||
@Accessor("channelAccess")
|
||||
ChannelAccess ambiance$getChannelAccess();
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import net.minecraft.client.sounds.SoundEngine;
|
||||
import net.minecraft.client.sounds.SoundManager;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(SoundManager.class)
|
||||
public interface SoundManagerAccessor {
|
||||
@Accessor("soundEngine")
|
||||
SoundEngine ambiance$getSoundEngine();
|
||||
}
|
||||
+3
-1
@@ -13,7 +13,7 @@ import net.minecraft.server.level.ServerPlayer;
|
||||
* Networking contract for Ambiance. Payload IDs must use the module namespace.
|
||||
*/
|
||||
public final class AmbianceNetworking {
|
||||
public static final int PROTOCOL_VERSION = 5;
|
||||
public static final int PROTOCOL_VERSION = 6;
|
||||
private static boolean initialized;
|
||||
|
||||
private AmbianceNetworking() {
|
||||
@@ -34,6 +34,8 @@ public final class AmbianceNetworking {
|
||||
AmbianceCanapliaVisualPayloads.BadTrip.ID, AmbianceCanapliaVisualPayloads.BadTrip.CODEC);
|
||||
PayloadTypeRegistry.clientboundPlay().register(
|
||||
AmbianceCanapliaVisualPayloads.Clear.ID, AmbianceCanapliaVisualPayloads.Clear.CODEC);
|
||||
PayloadTypeRegistry.clientboundPlay().register(
|
||||
WhiteDiscPlaybackPayload.ID, WhiteDiscPlaybackPayload.CODEC);
|
||||
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) ->
|
||||
send(handler.player, AmbianceEnvironmentController.snapshot(server))
|
||||
);
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.network;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrl;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
|
||||
/** Bounded clientbound intent: a server-resolved jukebox position and an 11-character video ID. */
|
||||
public record WhiteDiscPlaybackPayload(BlockPos pos, String videoId) implements CustomPacketPayload {
|
||||
public static final Type<WhiteDiscPlaybackPayload> ID =
|
||||
new Type<>(AmbianceMod.id("white_disc_playback"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, WhiteDiscPlaybackPayload> CODEC =
|
||||
CustomPacketPayload.codec(WhiteDiscPlaybackPayload::write, WhiteDiscPlaybackPayload::new);
|
||||
|
||||
public WhiteDiscPlaybackPayload {
|
||||
if (!WhiteDiscUrl.validVideoId(videoId)) videoId = "";
|
||||
}
|
||||
|
||||
private WhiteDiscPlaybackPayload(RegistryFriendlyByteBuf buffer) {
|
||||
this(buffer.readBlockPos(), buffer.readUtf(WhiteDiscUrl.VIDEO_ID_LENGTH));
|
||||
}
|
||||
|
||||
private void write(RegistryFriendlyByteBuf buffer) {
|
||||
buffer.writeBlockPos(pos);
|
||||
buffer.writeUtf(videoId, WhiteDiscUrl.VIDEO_ID_LENGTH);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return ID;
|
||||
}
|
||||
}
|
||||
+23
-2
@@ -1,12 +1,32 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.registry;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.item.WhiteDiscItem;
|
||||
import net.fabricmc.fabric.api.creativetab.v1.CreativeModeTabEvents;
|
||||
import net.minecraft.core.Registry;
|
||||
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.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.JukeboxSong;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
|
||||
/**
|
||||
* Single registration entry point for the Ambiance namespace.
|
||||
* Feature registries must be called from here to keep initialization ordering explicit.
|
||||
*/
|
||||
public final class AmbianceRegistries {
|
||||
public static final ResourceKey<JukeboxSong> WHITE_DISC_SONG = ResourceKey.create(
|
||||
Registries.JUKEBOX_SONG, AmbianceMod.id("white_disc"));
|
||||
private static final ResourceKey<Item> WHITE_DISC_KEY = ResourceKey.create(
|
||||
Registries.ITEM, AmbianceMod.id("white_disc"));
|
||||
private static final ResourceKey<CreativeModeTab> TOOLS_TAB = ResourceKey.create(
|
||||
Registries.CREATIVE_MODE_TAB, Identifier.withDefaultNamespace("tools_and_utilities"));
|
||||
public static final Item WHITE_DISC = Registry.register(BuiltInRegistries.ITEM, WHITE_DISC_KEY,
|
||||
new WhiteDiscItem(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)
|
||||
.jukeboxPlayable(WHITE_DISC_SONG).setId(WHITE_DISC_KEY)));
|
||||
private static boolean initialized;
|
||||
|
||||
private AmbianceRegistries() {
|
||||
@@ -17,7 +37,8 @@ public final class AmbianceRegistries {
|
||||
return;
|
||||
}
|
||||
initialized = true;
|
||||
AmbianceMod.LOGGER.debug("[{}] Empty registry hub initialized.", AmbianceMod.DISPLAY_NAME);
|
||||
CreativeModeTabEvents.modifyOutputEvent(TOOLS_TAB).register(entries -> entries.accept(WHITE_DISC));
|
||||
AmbianceMod.LOGGER.debug("[{}] Registry hub initialized with the white disc.",
|
||||
AmbianceMod.DISPLAY_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.WhiteDiscPlaybackPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.registry.AmbianceRegistries;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
|
||||
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.JukeboxPlayable;
|
||||
import net.minecraft.world.level.block.JukeboxBlock;
|
||||
import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
|
||||
|
||||
/** Server-authoritative insertion and bounded playback dispatch for the white disc. */
|
||||
public final class WhiteDiscService {
|
||||
private static boolean initialized;
|
||||
|
||||
private WhiteDiscService() {
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
if (initialized) return;
|
||||
initialized = true;
|
||||
UseBlockCallback.EVENT.register((player, level, hand, hit) -> {
|
||||
BlockPos pos = hit.getBlockPos();
|
||||
if (!(level.getBlockEntity(pos) instanceof JukeboxBlockEntity jukebox)
|
||||
|| jukebox.getBlockState().getValue(JukeboxBlock.HAS_RECORD)) return InteractionResult.PASS;
|
||||
ItemStack held = player.getItemInHand(hand);
|
||||
if (!held.is(AmbianceRegistries.WHITE_DISC)) return InteractionResult.PASS;
|
||||
|
||||
Optional<String> videoId = videoId(held);
|
||||
if (videoId.isEmpty()) {
|
||||
if (!level.isClientSide()) player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.invalid_url"));
|
||||
return InteractionResult.FAIL;
|
||||
}
|
||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||
InteractionResult result = JukeboxPlayable.tryInsertIntoJukebox(level, pos, held, player);
|
||||
if (result.consumesAction() && level instanceof ServerLevel serverLevel) {
|
||||
broadcast(serverLevel, pos, videoId.get(), player instanceof ServerPlayer serverPlayer
|
||||
? serverPlayer : null);
|
||||
}
|
||||
return result;
|
||||
});
|
||||
}
|
||||
|
||||
public static Optional<String> videoId(ItemStack stack) {
|
||||
Component name = stack.get(DataComponents.CUSTOM_NAME);
|
||||
return name == null ? Optional.empty() : WhiteDiscUrl.videoId(name.getString());
|
||||
}
|
||||
|
||||
private static void broadcast(ServerLevel level, BlockPos pos, String videoId, ServerPlayer inserter) {
|
||||
WhiteDiscPlaybackPayload payload = new WhiteDiscPlaybackPayload(pos, videoId);
|
||||
Set<ServerPlayer> receivers = new LinkedHashSet<>(PlayerLookup.tracking(level, pos));
|
||||
if (inserter != null) receivers.add(inserter);
|
||||
for (ServerPlayer receiver : receivers) {
|
||||
if (ServerPlayNetworking.canSend(receiver, WhiteDiscPlaybackPayload.ID)) {
|
||||
ServerPlayNetworking.send(receiver, payload);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Strict, side-effect-free YouTube URL parser used before any client network request. */
|
||||
public final class WhiteDiscUrl {
|
||||
public static final int MAXIMUM_URL_LENGTH = 256;
|
||||
public static final int VIDEO_ID_LENGTH = 11;
|
||||
private static final Pattern VIDEO_ID = Pattern.compile("[A-Za-z0-9_-]{11}");
|
||||
private static final Set<String> LONG_HOSTS = Set.of(
|
||||
"youtube.com", "www.youtube.com", "m.youtube.com", "music.youtube.com");
|
||||
|
||||
private WhiteDiscUrl() {
|
||||
}
|
||||
|
||||
public static Optional<String> videoId(String value) {
|
||||
if (value == null || value.isBlank() || value.length() > MAXIMUM_URL_LENGTH) return Optional.empty();
|
||||
try {
|
||||
URI uri = new URI(value.strip());
|
||||
if (!"https".equalsIgnoreCase(uri.getScheme()) || uri.getUserInfo() != null
|
||||
|| (uri.getPort() != -1 && uri.getPort() != 443)) return Optional.empty();
|
||||
String host = uri.getHost();
|
||||
if (host == null) return Optional.empty();
|
||||
host = host.toLowerCase(Locale.ROOT);
|
||||
if ("youtu.be".equals(host)) return valid(singlePathSegment(uri.getRawPath()));
|
||||
if (!LONG_HOSTS.contains(host)) return Optional.empty();
|
||||
|
||||
String path = uri.getRawPath();
|
||||
if ("/watch".equals(path)) return valid(queryParameter(uri.getRawQuery(), "v"));
|
||||
for (String prefix : new String[] {"/shorts/", "/embed/", "/live/"}) {
|
||||
if (path != null && path.startsWith(prefix)) return valid(singlePathSegment(path.substring(prefix.length())));
|
||||
}
|
||||
} catch (URISyntaxException ignored) {
|
||||
// Invalid user text is rejected without network access.
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
public static boolean validVideoId(String value) {
|
||||
return value != null && VIDEO_ID.matcher(value).matches();
|
||||
}
|
||||
|
||||
public static String canonicalUrl(String videoId) {
|
||||
if (!validVideoId(videoId)) throw new IllegalArgumentException("Invalid YouTube video ID");
|
||||
return "https://www.youtube.com/watch?v=" + videoId;
|
||||
}
|
||||
|
||||
private static String singlePathSegment(String path) {
|
||||
if (path == null || path.isEmpty()) return "";
|
||||
String segment = path.startsWith("/") ? path.substring(1) : path;
|
||||
return segment.contains("/") ? "" : segment;
|
||||
}
|
||||
|
||||
private static String queryParameter(String query, String name) {
|
||||
if (query == null) return "";
|
||||
String found = null;
|
||||
for (String parameter : query.split("&", -1)) {
|
||||
int equals = parameter.indexOf('=');
|
||||
if (equals <= 0 || !name.equals(parameter.substring(0, equals))) continue;
|
||||
if (found != null) return "";
|
||||
found = parameter.substring(equals + 1);
|
||||
}
|
||||
return found == null ? "" : found;
|
||||
}
|
||||
|
||||
private static Optional<String> valid(String candidate) {
|
||||
return validVideoId(candidate) ? Optional.of(candidate) : Optional.empty();
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,9 @@
|
||||
"GameRendererMixin",
|
||||
"LightCoordsUtilMixin",
|
||||
"LightmapRenderStateExtractorMixin",
|
||||
"LevelEventHandlerMixin",
|
||||
"SoundEngineAccessor",
|
||||
"SoundManagerAccessor",
|
||||
"SkyRendererMixin"
|
||||
],
|
||||
"injectors": {
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "ambiance:item/white_disc"
|
||||
}
|
||||
}
|
||||
@@ -24,5 +24,15 @@
|
||||
"options.ambiance.visual.wobble": "Camera wobble",
|
||||
"options.ambiance.visual.ghosting": "Edge ghosting",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Visual accessibility settings"
|
||||
"key.ambiance.visual_settings": "Visual accessibility settings",
|
||||
"item.ambiance.white_disc": "White Disc",
|
||||
"jukebox_song.ambiance.white_disc": "White Disc",
|
||||
"tooltip.ambiance.white_disc": "Rename it to an HTTPS YouTube URL, then insert it into a jukebox.",
|
||||
"message.ambiance.white_disc.invalid_url": "Rename the white disc to a valid HTTPS YouTube URL.",
|
||||
"message.ambiance.white_disc.loading": "Loading YouTube video…",
|
||||
"message.ambiance.white_disc.playing": "Now playing: %s",
|
||||
"message.ambiance.white_disc.failed": "This YouTube video could not be played.",
|
||||
"message.ambiance.white_disc.too_long": "This video is live or longer than 30 minutes.",
|
||||
"message.ambiance.alpha_textures_missing": "Alpha textures are unavailable: install Golden Days Base then Golden Days Alpha in resourcepacks and leave them disabled.",
|
||||
"message.ambiance.alpha_textures_restore_failed": "The previous resource-pack stack could not be reloaded. It will be restored on the next start."
|
||||
}
|
||||
|
||||
@@ -24,5 +24,15 @@
|
||||
"options.ambiance.visual.wobble": "Oscillation de la caméra",
|
||||
"options.ambiance.visual.ghosting": "Rémanence sur les bords",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Réglages d’accessibilité visuelle"
|
||||
"key.ambiance.visual_settings": "Réglages d’accessibilité visuelle",
|
||||
"item.ambiance.white_disc": "Disque blanc",
|
||||
"jukebox_song.ambiance.white_disc": "Disque blanc",
|
||||
"tooltip.ambiance.white_disc": "Renommez-le avec une URL YouTube HTTPS, puis insérez-le dans un jukebox.",
|
||||
"message.ambiance.white_disc.invalid_url": "Renommez le disque blanc avec une URL YouTube HTTPS valide.",
|
||||
"message.ambiance.white_disc.loading": "Chargement de la vidéo YouTube…",
|
||||
"message.ambiance.white_disc.playing": "Lecture : %s",
|
||||
"message.ambiance.white_disc.failed": "Impossible de lire cette vidéo YouTube.",
|
||||
"message.ambiance.white_disc.too_long": "Cette vidéo est en direct ou dépasse 30 minutes.",
|
||||
"message.ambiance.alpha_textures_missing": "Textures Alpha indisponibles : installez Golden Days Base puis Golden Days Alpha dans resourcepacks en les laissant désactivés.",
|
||||
"message.ambiance.alpha_textures_restore_failed": "La pile de packs précédente n’a pas pu être rechargée. Elle sera restaurée au prochain démarrage."
|
||||
}
|
||||
|
||||
@@ -24,5 +24,15 @@
|
||||
"options.ambiance.visual.wobble": "Покачивание камеры",
|
||||
"options.ambiance.visual.ghosting": "Шлейф по краям",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Настройки визуальной доступности"
|
||||
"key.ambiance.visual_settings": "Настройки визуальной доступности",
|
||||
"item.ambiance.white_disc": "Белая пластинка",
|
||||
"jukebox_song.ambiance.white_disc": "Белая пластинка",
|
||||
"tooltip.ambiance.white_disc": "Переименуйте её в HTTPS-ссылку YouTube и вставьте в проигрыватель.",
|
||||
"message.ambiance.white_disc.invalid_url": "Переименуйте белую пластинку в допустимую HTTPS-ссылку YouTube.",
|
||||
"message.ambiance.white_disc.loading": "Загрузка видео YouTube…",
|
||||
"message.ambiance.white_disc.playing": "Сейчас играет: %s",
|
||||
"message.ambiance.white_disc.failed": "Не удалось воспроизвести это видео YouTube.",
|
||||
"message.ambiance.white_disc.too_long": "Это прямая трансляция или видео длиннее 30 минут.",
|
||||
"message.ambiance.alpha_textures_missing": "Текстуры Alpha недоступны: установите Golden Days Base, затем Golden Days Alpha в resourcepacks и оставьте их выключенными.",
|
||||
"message.ambiance.alpha_textures_restore_failed": "Не удалось перезагрузить прежний набор ресурсов. Он будет восстановлен при следующем запуске."
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/template_music_disc",
|
||||
"textures": {
|
||||
"layer0": "ambiance:item/white_disc"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 393 B |
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"comparator_output": 15,
|
||||
"description": {
|
||||
"translate": "jukebox_song.ambiance.white_disc"
|
||||
},
|
||||
"length_in_seconds": 1800.0,
|
||||
"sound_event": "minecraft:intentionally_empty"
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "misc",
|
||||
"pattern": [
|
||||
"WWW",
|
||||
"WDW",
|
||||
"WWW"
|
||||
],
|
||||
"key": {
|
||||
"D": "minecraft:music_disc_13",
|
||||
"W": "minecraft:white_dye"
|
||||
},
|
||||
"result": {
|
||||
"id": "ambiance:white_disc"
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
"id": "ambiance",
|
||||
"version": "${version}",
|
||||
"name": "Ambiance",
|
||||
"description": "Owns world atmosphere, dynamic lights, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"description": "Owns world atmosphere, dynamic lights, positional audio, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"authors": [
|
||||
"KOKA99CAB"
|
||||
],
|
||||
@@ -36,13 +36,13 @@
|
||||
"system_type": "gameplay-system",
|
||||
"namespace": "ambiance",
|
||||
"data_version": 2,
|
||||
"network_protocol": 5,
|
||||
"network_protocol": 6,
|
||||
"lifecycle": "${lifecycle}",
|
||||
"pack_version": "${pack_version}",
|
||||
"descriptions": {
|
||||
"fr_fr": "Gère l'atmosphère, les lumières dynamiques, le calendrier et les effets visuels accessibles et composables, dont Canaplia.",
|
||||
"en_us": "Owns world atmosphere, dynamic lights, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"ru_ru": "Управляет атмосферой, динамическим освещением, календарём и доступными составными визуальными эффектами, включая Canaplia."
|
||||
"fr_fr": "Gère l'atmosphère, les lumières dynamiques, l'audio positionnel, le calendrier et les effets visuels accessibles et composables, dont Canaplia.",
|
||||
"en_us": "Owns world atmosphere, dynamic lights, positional audio, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"ru_ru": "Управляет атмосферой, динамическим освещением, позиционным звуком, календарём и доступными составными визуальными эффектами, включая Canaplia."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/** Executable tests for local Golden Days discovery and exact stack composition. */
|
||||
public final class AlphaTexturePackManagerSmoke {
|
||||
private AlphaTexturePackManagerSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
var packs = AlphaTexturePackManager.findPacks(List.of(
|
||||
"vanilla",
|
||||
"file/Golden Days Base 16.2 [1.20 to 26.2].zip",
|
||||
"file/golden_days_alpha_16.2.zip"
|
||||
)).orElseThrow(() -> new AssertionError("Golden Days packs were not detected"));
|
||||
|
||||
List<String> previous = List.of(
|
||||
"vanilla", "file/custom.zip", "file/golden-days-alpha-old.zip");
|
||||
List<String> desired = AlphaTexturePackManager.selectionWithOverlay(previous, packs);
|
||||
require(desired.equals(List.of("vanilla", "file/custom.zip", packs.base(), packs.alpha())),
|
||||
"Base and Alpha must be appended in bottom-to-top order without disturbing custom packs");
|
||||
require(previous.equals(List.of(
|
||||
"vanilla", "file/custom.zip", "file/golden-days-alpha-old.zip")),
|
||||
"Composing the overlay must not mutate the captured stack");
|
||||
require(AlphaTexturePackManager.findPacks(List.of("file/golden-days-base.zip")).isEmpty(),
|
||||
"A partial installation must keep the vanilla stack");
|
||||
require(AlphaTexturePackManager.isGoldenDaysPack("FILE/GOLDEN_DAYS_ALPHA.ZIP"),
|
||||
"Pack matching must be case- and separator-insensitive");
|
||||
require(!AlphaTexturePackManager.isGoldenDaysPack("file/custom-alpha.zip"),
|
||||
"Unrelated packs must never be removed from the captured stack");
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
+97
@@ -0,0 +1,97 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.sedmelluq.discord.lavaplayer.format.Pcm16AudioDataFormat;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
|
||||
import com.sedmelluq.discord.lavaplayer.track.playback.ImmutableAudioFrame;
|
||||
import java.lang.reflect.Proxy;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Queue;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/** Deterministic check for Minecraft's four one-second streaming buffers. */
|
||||
public final class LavaplayerAudioStreamSmoke {
|
||||
private static final int FRAME_SAMPLES = 960;
|
||||
private static final int SOURCE_FRAME_BYTES = FRAME_SAMPLES
|
||||
* LavaplayerAudioStream.SOURCE_CHANNELS * Short.BYTES;
|
||||
private static final int FRAMES_PER_SECOND = LavaplayerAudioStream.SAMPLE_RATE / FRAME_SAMPLES;
|
||||
|
||||
private LavaplayerAudioStreamSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
if (Math.abs(WhiteDiscAudioPlayer.PLAYBACK_PITCH - 1.0F) > 0.0001F) {
|
||||
throw new IllegalStateException("The white-disc playback pitch is not native");
|
||||
}
|
||||
Queue<AudioFrame> frames = new ArrayDeque<>();
|
||||
Pcm16AudioDataFormat format = new Pcm16AudioDataFormat(
|
||||
LavaplayerAudioStream.SOURCE_CHANNELS, LavaplayerAudioStream.SAMPLE_RATE,
|
||||
FRAME_SAMPLES, false);
|
||||
for (int index = 0; index < FRAMES_PER_SECOND; index++) {
|
||||
byte[] data = new byte[SOURCE_FRAME_BYTES];
|
||||
for (int offset = 0; offset < data.length; offset += 4) {
|
||||
putLittleEndian(data, offset, (short) (1_000 + index));
|
||||
putLittleEndian(data, offset + 2, (short) (3_000 + index));
|
||||
}
|
||||
frames.add(new ImmutableAudioFrame(index * 20L, data, 100, format));
|
||||
}
|
||||
|
||||
AtomicInteger timedProvides = new AtomicInteger();
|
||||
AtomicInteger nonBlockingProvides = new AtomicInteger();
|
||||
AtomicBoolean destroyed = new AtomicBoolean();
|
||||
AudioPlayer player = (AudioPlayer) Proxy.newProxyInstance(
|
||||
AudioPlayer.class.getClassLoader(), new Class<?>[] {AudioPlayer.class},
|
||||
(proxy, method, arguments) -> switch (method.getName()) {
|
||||
case "provide" -> {
|
||||
if (method.getParameterCount() == 2) {
|
||||
timedProvides.incrementAndGet();
|
||||
yield frames.poll();
|
||||
}
|
||||
nonBlockingProvides.incrementAndGet();
|
||||
yield null;
|
||||
}
|
||||
case "destroy" -> {
|
||||
destroyed.set(true);
|
||||
yield null;
|
||||
}
|
||||
case "getPlayingTrack" -> null;
|
||||
case "getVolume" -> 100;
|
||||
case "isPaused", "startTrack" -> false;
|
||||
default -> null;
|
||||
});
|
||||
|
||||
LavaplayerAudioStream stream = new LavaplayerAudioStream(player);
|
||||
ByteBuffer pcm = stream.read(LavaplayerAudioStream.SAMPLE_RATE * 2);
|
||||
if (pcm == null || pcm.remaining() != LavaplayerAudioStream.SAMPLE_RATE * 2) {
|
||||
throw new IllegalStateException("The stream did not fill Minecraft's one-second buffer");
|
||||
}
|
||||
for (int frame = 0; frame < FRAMES_PER_SECOND; frame++) {
|
||||
short expected = (short) (2_000 + frame);
|
||||
for (int sample = 0; sample < FRAME_SAMPLES; sample++) {
|
||||
int low = Byte.toUnsignedInt(pcm.get());
|
||||
short actual = (short) (low | pcm.get() << 8);
|
||||
if (actual != expected) {
|
||||
throw new IllegalStateException("Stereo PCM was not downmixed in sample order");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (timedProvides.get() != FRAMES_PER_SECOND || nonBlockingProvides.get() != 0) {
|
||||
throw new IllegalStateException("PCM frames were not read with bounded waits");
|
||||
}
|
||||
if (stream.getFormat().getSampleRate() != LavaplayerAudioStream.SAMPLE_RATE
|
||||
|| stream.getFormat().isBigEndian()) {
|
||||
throw new IllegalStateException("The OpenAL PCM format is not 48 kHz little-endian");
|
||||
}
|
||||
stream.close();
|
||||
if (!destroyed.get()) {
|
||||
throw new IllegalStateException("Closing the stream did not destroy its player");
|
||||
}
|
||||
}
|
||||
|
||||
private static void putLittleEndian(byte[] data, int offset, short sample) {
|
||||
data[offset] = (byte) sample;
|
||||
data[offset + 1] = (byte) (sample >>> 8);
|
||||
}
|
||||
}
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.sedmelluq.discord.lavaplayer.format.Pcm16AudioDataFormat;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
|
||||
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
|
||||
import dev.lavalink.youtube.YoutubeAudioSourceManager;
|
||||
import dev.lavalink.youtube.clients.Ios;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/** Manual network smoke test for the exact YouTube playback path used by white discs. */
|
||||
public final class WhiteDiscPlaybackSmoke {
|
||||
private static final String VIDEO_URL = "https://www.youtube.com/watch?v=Ue5ZBe-GzSM";
|
||||
|
||||
private WhiteDiscPlaybackSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
DefaultAudioPlayerManager manager = new DefaultAudioPlayerManager();
|
||||
manager.getConfiguration().setOutputFormat(
|
||||
new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,
|
||||
LavaplayerAudioStream.SAMPLE_RATE, LavaplayerAudioStream.FRAME_SAMPLES, false));
|
||||
manager.registerSourceManager(new YoutubeAudioSourceManager(false, new Ios()));
|
||||
try {
|
||||
AudioTrack track = load(manager).get(30, TimeUnit.SECONDS);
|
||||
AudioPlayer player = manager.createPlayer();
|
||||
player.playTrack(track);
|
||||
LavaplayerAudioStream stream = new LavaplayerAudioStream(player);
|
||||
int totalBytes = 0;
|
||||
long squaredSampleSum = 0L;
|
||||
int sampleCount = 0;
|
||||
int peakSample = 0;
|
||||
for (int index = 0; index < 4; index++) {
|
||||
ByteBuffer pcm = stream.read(LavaplayerAudioStream.SAMPLE_RATE * 2);
|
||||
if (pcm == null) break;
|
||||
totalBytes += pcm.remaining();
|
||||
while (pcm.remaining() >= 2) {
|
||||
int low = Byte.toUnsignedInt(pcm.get());
|
||||
int high = pcm.get();
|
||||
short sample = (short) ((high << 8) | low);
|
||||
int magnitude = Math.abs((int) sample);
|
||||
peakSample = Math.max(peakSample, magnitude);
|
||||
squaredSampleSum += (long) sample * sample;
|
||||
sampleCount++;
|
||||
}
|
||||
}
|
||||
int expectedBytes = LavaplayerAudioStream.SAMPLE_RATE * 2 * 4;
|
||||
if (totalBytes != expectedBytes) {
|
||||
throw new IllegalStateException("YouTube playback did not fill four PCM seconds");
|
||||
}
|
||||
if (stream.decodedBytes() != expectedBytes || stream.paddedSilenceBytes() != 0L) {
|
||||
throw new IllegalStateException("YouTube playback was not 100% decoded PCM: "
|
||||
+ stream.decodedBytes() + " decoded bytes and "
|
||||
+ stream.paddedSilenceBytes() + " padded bytes");
|
||||
}
|
||||
if (stream.decodedTimelineMillis() != 4_000L) {
|
||||
throw new IllegalStateException("PCM cadence mismatch: four seconds of samples cover "
|
||||
+ stream.decodedTimelineMillis() + " ms of the YouTube timeline");
|
||||
}
|
||||
double rmsSample = Math.sqrt((double) squaredSampleSum / sampleCount);
|
||||
if (rmsSample < 256.0 || peakSample < 2_048) {
|
||||
throw new IllegalStateException("YouTube PCM signal is too quiet: RMS "
|
||||
+ Math.round(rmsSample) + ", peak " + peakSample);
|
||||
}
|
||||
System.out.printf(
|
||||
"PCM cadence: 100%% speed, 4000 ms decoded into 4000 ms at %.0f Hz; RMS %.0f, peak %d from %s%n",
|
||||
stream.getFormat().getSampleRate(), rmsSample, peakSample, track.getInfo().title);
|
||||
stream.close();
|
||||
} finally {
|
||||
manager.shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
private static CompletableFuture<AudioTrack> load(DefaultAudioPlayerManager manager) {
|
||||
CompletableFuture<AudioTrack> result = new CompletableFuture<>();
|
||||
manager.loadItem(VIDEO_URL, new AudioLoadResultHandler() {
|
||||
@Override
|
||||
public void trackLoaded(AudioTrack track) {
|
||||
result.complete(track);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void playlistLoaded(AudioPlaylist playlist) {
|
||||
AudioTrack selected = playlist.getSelectedTrack();
|
||||
if (selected == null && !playlist.getTracks().isEmpty()) {
|
||||
selected = playlist.getTracks().getFirst();
|
||||
}
|
||||
if (selected == null) result.completeExceptionally(
|
||||
new IllegalStateException("YouTube playlist contained no track"));
|
||||
else result.complete(selected);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void noMatches() {
|
||||
result.completeExceptionally(new IllegalStateException("YouTube returned no match"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadFailed(FriendlyException exception) {
|
||||
result.completeExceptionally(exception);
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
/** Executable URL-policy regression test, intentionally independent from a running game. */
|
||||
public final class WhiteDiscUrlSmoke {
|
||||
private static final String VIDEO_ID = "dQw4w9WgXcQ";
|
||||
|
||||
private WhiteDiscUrlSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/watch?v=" + VIDEO_ID)), "watch URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://youtu.be/" + VIDEO_ID + "?si=abc")), "short URL rejected");
|
||||
require("Ue5ZBe-GzSM".equals(id("https://youtu.be/Ue5ZBe-GzSM?si=78LSbtBQzUYzhA2Y")),
|
||||
"reported white-disc URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://music.youtube.com/watch?v=" + VIDEO_ID)), "music URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/shorts/" + VIDEO_ID)), "shorts URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/embed/" + VIDEO_ID)), "embed URL rejected");
|
||||
|
||||
reject("http://www.youtube.com/watch?v=" + VIDEO_ID);
|
||||
reject("https://youtube.example/watch?v=" + VIDEO_ID);
|
||||
reject("https://youtube.com.evil.example/watch?v=" + VIDEO_ID);
|
||||
reject("https://user@www.youtube.com/watch?v=" + VIDEO_ID);
|
||||
reject("https://www.youtube.com:8443/watch?v=" + VIDEO_ID);
|
||||
reject("https://www.youtube.com/watch?v=too_short");
|
||||
reject("https://www.youtube.com/watch?v=" + VIDEO_ID + "&v=" + VIDEO_ID);
|
||||
reject("https://youtu.be/" + VIDEO_ID + "/extra");
|
||||
reject("https://www.youtube.com/watch?v=dQw4w9WgX%63Q");
|
||||
reject("x".repeat(WhiteDiscUrl.MAXIMUM_URL_LENGTH + 1));
|
||||
}
|
||||
|
||||
private static String id(String url) {
|
||||
return WhiteDiscUrl.videoId(url).orElseThrow();
|
||||
}
|
||||
|
||||
private static void reject(String url) {
|
||||
require(WhiteDiscUrl.videoId(url).isEmpty(), "Unsafe URL accepted: " + url);
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
@@ -1647,6 +1647,7 @@ tasks.register("generateAnotherWorldResources") {
|
||||
"message.anotherworld.safe_vault.empty_before_break": "Videz le coffre-fort et attendez la fin du forage avant de le démonter.",
|
||||
"message.anotherworld.safe_vault.drill_own": "Vous ne pouvez pas forer votre propre coffre-fort.",
|
||||
"message.anotherworld.safe_vault.inactive": "Ce coffre-fort n’est pas actif.",
|
||||
"message.anotherworld.safe_vault.raid_requires_vault": "Vous devez posséder un coffre-fort actif avant d’en braquer un autre.",
|
||||
"message.anotherworld.safe_vault.empty": "Ce coffre-fort est vide.",
|
||||
"message.anotherworld.safe_vault.owner_offline": "Le propriétaire doit être connecté pour que le coffre-fort soit attaquable.",
|
||||
"message.anotherworld.safe_vault.protected": "Ce coffre-fort reste protégé pendant environ %s minute(s).",
|
||||
@@ -1671,6 +1672,7 @@ tasks.register("generateAnotherWorldResources") {
|
||||
"message.anotherworld.safe_vault.empty_before_break": "Опустошите сейф и дождитесь окончания сверления перед разборкой.",
|
||||
"message.anotherworld.safe_vault.drill_own": "Нельзя сверлить собственный сейф.",
|
||||
"message.anotherworld.safe_vault.inactive": "Этот сейф не активен.",
|
||||
"message.anotherworld.safe_vault.raid_requires_vault": "Для ограбления чужого сейфа нужен собственный активный сейф.",
|
||||
"message.anotherworld.safe_vault.empty": "Этот сейф пуст.",
|
||||
"message.anotherworld.safe_vault.owner_offline": "Владелец должен быть в сети, чтобы атаковать сейф.",
|
||||
"message.anotherworld.safe_vault.protected": "Сейф защищён ещё примерно %s минут(ы).",
|
||||
@@ -1695,6 +1697,7 @@ tasks.register("generateAnotherWorldResources") {
|
||||
"message.anotherworld.safe_vault.empty_before_break": "Empty the safe and wait for drilling to end before dismantling it.",
|
||||
"message.anotherworld.safe_vault.drill_own": "You cannot drill your own safe.",
|
||||
"message.anotherworld.safe_vault.inactive": "This safe is not active.",
|
||||
"message.anotherworld.safe_vault.raid_requires_vault": "You need an active safe of your own before raiding another one.",
|
||||
"message.anotherworld.safe_vault.empty": "This safe is empty.",
|
||||
"message.anotherworld.safe_vault.owner_offline": "The owner must be online before the safe can be raided.",
|
||||
"message.anotherworld.safe_vault.protected": "This safe remains protected for about %s minute(s).",
|
||||
@@ -1953,7 +1956,7 @@ tasks.register("verifyAnotherWorldCatalog") {
|
||||
"src/main/resources/assets/redstoner/textures/item/weather_gauge.png",
|
||||
"src/main/resources/data/redstoner/recipe/weather_gauge.json"
|
||||
]
|
||||
if (project.version.toString() != "0.0.0-alpha.55"
|
||||
if (project.version.toString() != "0.0.0-alpha.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();
|
||||
|
||||
+11
-1
@@ -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);
|
||||
|
||||
+11
@@ -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": {
|
||||
|
||||
+10
@@ -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}) {
|
||||
|
||||
+2787
-166
File diff suppressed because it is too large
Load Diff
+11
-11
@@ -6,29 +6,29 @@ org.gradle.configuration-cache=false
|
||||
minecraft_version=26.2
|
||||
loader_version=0.19.3
|
||||
loom_version=1.17-SNAPSHOT
|
||||
fabric_api_version=0.158.0+26.2
|
||||
fabric_api_version=0.159.0+26.2
|
||||
|
||||
# Sanctuary 26.2
|
||||
# Standby modules stay at zero until their migration really begins.
|
||||
mod_version=0.0.0-alpha.0
|
||||
module_lifecycle=standby
|
||||
ambiance_version=0.0.0-alpha.14
|
||||
ambiance_version=0.0.0-alpha.22
|
||||
ambiance_lifecycle=active
|
||||
redstoner_version=0.0.0-alpha.10
|
||||
redstoner_version=0.0.0-alpha.17
|
||||
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.34
|
||||
itsalive_version=0.0.0-alpha.38
|
||||
itsalive_lifecycle=active
|
||||
ouch_version=0.0.0-alpha.9
|
||||
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.14
|
||||
iliketomoveit_version=0.0.0-alpha.18
|
||||
iliketomoveit_lifecycle=active
|
||||
onlyfun_version=0.0.0-alpha.20
|
||||
onlyfun_version=0.0.0-alpha.27
|
||||
onlyfun_lifecycle=active
|
||||
sanctuary_version=0.0.0-alpha.117
|
||||
sanctuary_version=0.0.0-alpha.135
|
||||
sanctuary_lifecycle=active
|
||||
pack_version=26.2.0-alpha.209
|
||||
pack_version=26.2.0-alpha.229
|
||||
maven_group=fr.koka99cab.sanctuary26
|
||||
|
||||
@@ -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.
|
||||
@@ -29,7 +29,7 @@ Une route est un JSON sous `data/<namespace>/sanctuary_portal/<id>.json` :
|
||||
- `arrival.type` vaut `surface`, `matched_y` ou `fixed_y`; ce dernier exige `arrival.y`.
|
||||
- `priority` départage deux routes acceptant le même cadre.
|
||||
|
||||
Les neuf routes historiques restent déclarées pour la compatibilité. Pour l'alpha.150, seules deux routes sont actives : terre vers la paire Sanctuary/Overworld et pierre vers `sanctuary:caverns`. Alpha, Sheep Land, Skeleton Waste, Lost City, Painted Canyons, Breaker Sea et Laputa restent réservées mais ne sont pas chargeables.
|
||||
Les neuf routes historiques restent déclarées pour la compatibilité. Depuis l'alpha.219, trois routes sont actives : terre vers la paire Sanctuary/Overworld, pierre vers `sanctuary:caverns` et cobblestone moussue vers `sanctuary:alpha`. Sheep Land, Skeleton Waste, Lost City, Painted Canyons, Breaker Sea et Laputa restent réservées mais ne sont pas chargeables.
|
||||
|
||||
La route en terre est la seule route v2 dynamique. Dans le profil Sanctuary, elle relie `minecraft:overworld` à `sanctuary:overworld`. Dans le profil Overworld, elle relie `minecraft:overworld` à `sanctuary:main`. Le choix appartient à la sauvegarde, jamais à une préférence cliente.
|
||||
|
||||
@@ -43,8 +43,16 @@ La route en terre est la seule route v2 dynamique. Dans le profil Sanctuary, ell
|
||||
4. Reconstruire le même cadre réactive son endpoint; la traversée suivante régénère un lien.
|
||||
5. Une destination absente refuse la traversée proprement. Elle ne crée aucune dimension et n'endommage pas la sauvegarde.
|
||||
|
||||
La route Alpha exige un cadre extérieur de 4 × 5 avec un intérieur vide de
|
||||
2 × 3, entièrement en cobblestone moussue, puis un briquet. Le serveur valide
|
||||
le cadre, l'activateur et la présence de `sanctuary:alpha` avant de l'allumer.
|
||||
Sa première moitié distante utilise l'arrivée sûre calculée par l'API publique
|
||||
de Sanctuary, hors de la maison Indev ; le client ne choisit ni la destination
|
||||
ni les coordonnées. L'Atlas découvre le bloc de portail actif comme les autres
|
||||
points d'intérêt locaux.
|
||||
|
||||
Le bloc intérieur actif est `iliketomoveit:portal`. Les neuf anciens blocs `portals:*_portal` restent enregistrés comme compatibilité de lecture; une première utilisation les rattache au nouvel index.
|
||||
|
||||
## État des générateurs
|
||||
|
||||
Le générateur principal Sanctuary et sa paire Overworld sont actifs depuis l'alpha.71. Caverns, Alpha, Sheep Land, Skeleton Waste, Lost City, Painted Canyons, Breaker Sea et Laputa restent réservés mais non générés. Leurs cadres peuvent être allumés et persistés ; une traversée vers une destination encore absente est refusée proprement.
|
||||
Le générateur principal Sanctuary et sa paire Overworld sont actifs depuis l'alpha.71. Caverns et Alpha sont également générés ; Alpha est le monde Indev fini 128 × 128 × 64 possédé par Sanctuary. Sheep Land, Skeleton Waste, Lost City, Painted Canyons, Breaker Sea et Laputa restent réservés mais non générés. Une traversée vers une destination absente est refusée proprement dès l'allumage.
|
||||
|
||||
+80
-12
@@ -16,6 +16,30 @@ tasks.register("waystoneElevatorRulesSmoke", JavaExec) {
|
||||
dependsOn tasks.named("testClasses")
|
||||
}
|
||||
|
||||
tasks.register("happyGhastCruiseSpeedSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks the rider-only Happy Ghast cruise-speed multiplier."
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.iliketomoveit.transport.HappyGhastCruiseSpeedSmoke"
|
||||
dependsOn tasks.named("testClasses")
|
||||
}
|
||||
|
||||
tasks.register("alphaPortalContractSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks the active Alpha route and its finite-world safe-arrival contract."
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.iliketomoveit.portal.AlphaPortalContractSmoke"
|
||||
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
|
||||
@@ -84,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"))
|
||||
@@ -168,6 +192,7 @@ tasks.register("verifyGrappling") {
|
||||
"data/iliketomoveit/loot_table/blocks/pulley_head.json",
|
||||
"data/spiderman/loot_table/blocks/pulley_head.json",
|
||||
"data/minecraft/tags/block/needs_stone_tool.json",
|
||||
"iliketomoveit.mixins.json",
|
||||
"iliketomoveit.client.mixins.json"
|
||||
]
|
||||
def missingResources = requiredResources.findAll { !file("src/main/resources/${it}").isFile() }
|
||||
@@ -184,10 +209,11 @@ tasks.register("verifyGrappling") {
|
||||
}
|
||||
|
||||
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
|
||||
if (!manifest.mixins?.any { it.config == "iliketomoveit.client.mixins.json" && it.environment == "client" }
|
||||
|| manifest.custom?.sanctuary26?.data_version != 3
|
||||
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 != 4
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 5) {
|
||||
throw new GradleException("Grappling must keep I Like To Move It aggregate data v3/protocol 5 and register its client mixin")
|
||||
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"))
|
||||
@@ -258,7 +284,7 @@ tasks.register("verifyPortals") {
|
||||
def routeFile = file("src/main/resources/data/iliketomoveit/sanctuary_portal/${route}.json")
|
||||
if (!routeFile.isFile()) throw new GradleException("Missing portal route ${route}")
|
||||
def json = new JsonSlurper().parse(routeFile)
|
||||
def expectedSchema = route == 'overworld' ? 2 : 1
|
||||
def expectedSchema = route in ['overworld', 'alpha'] ? 2 : 1
|
||||
if (json.schema_version != expectedSchema || json.destination_dimension != destination
|
||||
|| json.source_dimension != "minecraft:overworld"
|
||||
|| (route == 'overworld' && json.destination_resolver != "overworld_pair")
|
||||
@@ -295,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.14"
|
||||
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 != [
|
||||
@@ -303,7 +329,7 @@ tasks.register("verifyPortals") {
|
||||
|| atlasCavernsMigration.portals?.inactive_routes?.size() != 7
|
||||
|| atlasCavernsMigration.portals?.reserved_ids_retained != true
|
||||
|| atlasCavernsMigration.portals?.inactive_routes_loadable != false
|
||||
|| !javaText.contains("ACTIVE_ROUTES = List.of(OVERWORLD, CAVERNS)")
|
||||
|| !javaText.contains("ACTIVE_ROUTES = List.of(OVERWORLD, CAVERNS, ALPHA)")
|
||||
|| !javaText.contains("REQUIRED_ROUTES = ACTIVE_ROUTES")
|
||||
|| atlasCavernsMigration.compatibility?.iliketomoveit_data_version != 3
|
||||
|| atlasCavernsMigration.compatibility?.iliketomoveit_network_protocol != 3) {
|
||||
@@ -331,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.14"
|
||||
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"]
|
||||
@@ -360,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.14"
|
||||
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
|
||||
@@ -392,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.14"
|
||||
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
|
||||
@@ -408,13 +434,55 @@ tasks.register("verifyWaystoneDescendingRelease") {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("verifyAlphaPortal") {
|
||||
group = "verification"
|
||||
description = "Checks the alpha.16 mossy Alpha portal lifecycle and server authority."
|
||||
inputs.file(file("PORTALS.md"))
|
||||
inputs.file(file("src/main/resources/data/iliketomoveit/sanctuary_portal/alpha.json"))
|
||||
inputs.files(fileTree("src/main/resources/assets/iliketomoveit/lang") { include "*.json" })
|
||||
inputs.files(fileTree("src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/portal") { include "*.java" })
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.218-alpha-indev-to-alpha.219.json"))
|
||||
doLast {
|
||||
def route = new JsonSlurper().parse(file(
|
||||
"src/main/resources/data/iliketomoveit/sanctuary_portal/alpha.json"))
|
||||
def migration = new JsonSlurper().parse(rootProject.file(
|
||||
"pack/migrations/26.2.0-alpha.218-alpha-indev-to-alpha.219.json"))
|
||||
def javaText = fileTree("src/main/java/fr/koka99cab/sanctuary26/iliketomoveit/portal")
|
||||
.matching { include "*.java" }.files*.text.join("\n")
|
||||
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.18"
|
||||
|| route.schema_version != 2 || route.source_dimension != "minecraft:overworld"
|
||||
|| route.destination_dimension != "sanctuary:alpha"
|
||||
|| route.destination_resolver != "fixed"
|
||||
|| route.frame_blocks != ["minecraft:mossy_cobblestone"]
|
||||
|| route.activation_items != ["minecraft:flint_and_steel"]
|
||||
|| migration.alpha_portal?.outer_width != 4 || migration.alpha_portal?.outer_height != 5
|
||||
|| migration.alpha_portal?.inner_width != 2 || migration.alpha_portal?.inner_height != 3
|
||||
|| migration.alpha_portal?.inactive_when_destination_absent != true
|
||||
|| migration.alpha_portal?.persistent_pair_reused != true
|
||||
|| migration.alpha_portal?.break_unlinks_pair != true
|
||||
|| !javaText.contains("ACTIVE_ROUTES = List.of(OVERWORLD, CAVERNS, ALPHA)")
|
||||
|| !javaText.contains("SanctuaryAlphaWorld.portalArrival(targetLevel.getSeed())")
|
||||
|| !javaText.contains("getServer().getLevel(")
|
||||
|| locales.any { !it.containsKey("message.iliketomoveit.portal.destination_unavailable") }) {
|
||||
throw new GradleException("I Like To Move It alpha.16 Alpha portal contract is incomplete")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("check") {
|
||||
dependsOn tasks.named("grapplePhysicsSmoke")
|
||||
dependsOn tasks.named("magicCarpetLedgerSmoke")
|
||||
dependsOn tasks.named("waystoneElevatorRulesSmoke")
|
||||
dependsOn tasks.named("happyGhastCruiseSpeedSmoke")
|
||||
dependsOn tasks.named("verifyWaystones")
|
||||
dependsOn tasks.named("verifyGrappling")
|
||||
dependsOn tasks.named("verifyGrapplePrediction")
|
||||
dependsOn tasks.named("verifyWaystoneDescendingRelease")
|
||||
dependsOn tasks.named("verifyPortals")
|
||||
dependsOn tasks.named("verifySilverAircraft")
|
||||
dependsOn tasks.named("alphaPortalContractSmoke")
|
||||
dependsOn tasks.named("verifyAlphaPortal")
|
||||
}
|
||||
|
||||
+5
-1
@@ -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);
|
||||
|
||||
+41
@@ -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);
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package fr.koka99cab.sanctuary26.iliketomoveit.mixin;
|
||||
|
||||
import fr.koka99cab.sanctuary26.iliketomoveit.transport.HappyGhastCruiseSpeed;
|
||||
import net.minecraft.world.entity.animal.happyghast.HappyGhast;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
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.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(HappyGhast.class)
|
||||
public abstract class HappyGhastMixin {
|
||||
@Inject(method = "getRiddenInput", at = @At("RETURN"), cancellable = true)
|
||||
private void iliketomoveit$boostCruiseSpeed(Player rider, Vec3 input,
|
||||
CallbackInfoReturnable<Vec3> callback) {
|
||||
callback.setReturnValue(HappyGhastCruiseSpeed.boost(callback.getReturnValue()));
|
||||
}
|
||||
}
|
||||
+19
@@ -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);
|
||||
}
|
||||
}
|
||||
+21
@@ -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);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -26,7 +26,7 @@ public final class PortalDefinitions {
|
||||
public static final Identifier LAPUTA = ILikeToMoveItMod.id("laputa");
|
||||
|
||||
/** Routes enabled for the current gameplay milestone. Other stable IDs stay reserved. */
|
||||
public static final List<Identifier> ACTIVE_ROUTES = List.of(OVERWORLD, CAVERNS);
|
||||
public static final List<Identifier> ACTIVE_ROUTES = List.of(OVERWORLD, CAVERNS, ALPHA);
|
||||
public static final List<Identifier> REQUIRED_ROUTES = ACTIVE_ROUTES;
|
||||
|
||||
private static volatile Map<Identifier, PortalDefinition> definitions = Map.of();
|
||||
|
||||
+7
@@ -4,6 +4,7 @@ import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItBlocks;
|
||||
import java.util.Optional;
|
||||
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
@@ -37,6 +38,12 @@ public final class PortalIgnitionHandler {
|
||||
}
|
||||
|
||||
ServerLevel serverLevel = (ServerLevel) level;
|
||||
if (serverLevel.getServer().getLevel(
|
||||
selected.targetDimension(serverLevel.getServer(), serverLevel.dimension())) == null) {
|
||||
player.sendOverlayMessage(Component.translatable(
|
||||
"message.iliketomoveit.portal.destination_unavailable"));
|
||||
return InteractionResult.FAIL;
|
||||
}
|
||||
PortalEndpoint endpoint = PortalSavedData.get(serverLevel.getServer())
|
||||
.register(serverLevel, selectedFrame, selected.id());
|
||||
selectedFrame.fill(serverLevel, selected, endpoint, ILikeToMoveItBlocks.PORTAL);
|
||||
|
||||
+5
@@ -3,6 +3,8 @@ package fr.koka99cab.sanctuary26.iliketomoveit.portal;
|
||||
import fr.koka99cab.sanctuary26.iliketomoveit.ILikeToMoveItMod;
|
||||
import fr.koka99cab.sanctuary26.iliketomoveit.block.PortalBlock;
|
||||
import fr.koka99cab.sanctuary26.iliketomoveit.registry.ILikeToMoveItBlocks;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
|
||||
import java.util.Optional;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -92,6 +94,9 @@ public final class PortalTeleporter {
|
||||
|
||||
private static BlockPos targetCenter(ServerLevel sourceLevel, ServerLevel targetLevel,
|
||||
PortalFrame sourceFrame, PortalDefinition definition) {
|
||||
if (targetLevel.dimension().equals(SanctuaryDimensions.ALPHA)) {
|
||||
return SanctuaryAlphaWorld.portalArrival(targetLevel.getSeed());
|
||||
}
|
||||
double scale = definition.scaleFrom(sourceLevel.dimension());
|
||||
int x = Mth.floor(sourceFrame.center().getX() * scale);
|
||||
int z = Mth.floor(sourceFrame.center().getZ() * scale);
|
||||
|
||||
+6
-1
@@ -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",
|
||||
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
|
||||
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** Keeps the Happy Ghast ride practical without changing its autonomous movement. */
|
||||
public final class HappyGhastCruiseSpeed {
|
||||
public static final double RIDER_INPUT_MULTIPLIER = 2.0D;
|
||||
|
||||
private HappyGhastCruiseSpeed() {
|
||||
}
|
||||
|
||||
public static Vec3 boost(Vec3 vanillaInput) {
|
||||
return vanillaInput.scale(RIDER_INPUT_MULTIPLIER);
|
||||
}
|
||||
}
|
||||
+16
-25
@@ -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()); }
|
||||
}
|
||||
}
|
||||
|
||||
+56
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
+39
@@ -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;
|
||||
}
|
||||
}
|
||||
+34
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
+124
@@ -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"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"schema_version": 2,
|
||||
"source_dimension": "minecraft:overworld",
|
||||
"destination_dimension": "sanctuary:alpha",
|
||||
"destination_resolver": "fixed",
|
||||
"frame_blocks": ["minecraft:mossy_cobblestone"],
|
||||
"preferred_frame_block": "minecraft:mossy_cobblestone",
|
||||
"activation_items": ["minecraft:flint_and_steel"],
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
{
|
||||
"config": "iliketomoveit.mixins.json"
|
||||
},
|
||||
{
|
||||
"config": "iliketomoveit.client.mixins.json",
|
||||
"environment": "client"
|
||||
@@ -30,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}",
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"required": true,
|
||||
"package": "fr.koka99cab.sanctuary26.iliketomoveit.mixin",
|
||||
"compatibilityLevel": "JAVA_25",
|
||||
"mixins": [
|
||||
"HappyGhastMixin",
|
||||
"MagicCarpetContainerMixin",
|
||||
"MagicCarpetItemEntityMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package fr.koka99cab.sanctuary26.iliketomoveit.portal;
|
||||
|
||||
import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
|
||||
import java.util.Set;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.Bootstrap;
|
||||
|
||||
/** Executable cross-module contract for the active mossy Alpha portal. */
|
||||
public final class AlphaPortalContractSmoke {
|
||||
private AlphaPortalContractSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SharedConstants.tryDetectVersion();
|
||||
Bootstrap.bootStrap();
|
||||
require(PortalDefinitions.ACTIVE_ROUTES.equals(PortalDefinitions.REQUIRED_ROUTES),
|
||||
"Every active portal definition must be required at reload");
|
||||
require(Set.copyOf(PortalDefinitions.ACTIVE_ROUTES).equals(Set.of(
|
||||
PortalDefinitions.OVERWORLD, PortalDefinitions.CAVERNS, PortalDefinitions.ALPHA)),
|
||||
"Exactly the Overworld, Caverns and Alpha routes must be active");
|
||||
|
||||
for (long seed : new long[] { 0L, 1L, 46L }) {
|
||||
BlockPos arrival = SanctuaryAlphaWorld.portalArrival(seed);
|
||||
BlockPos residence = SanctuaryAlphaWorld.residence(seed);
|
||||
require(SanctuaryAlphaWorld.containsHorizontal(arrival),
|
||||
"Server-selected Alpha arrival must stay inside the finite island");
|
||||
require(Math.max(Math.abs(arrival.getX() - residence.getX()),
|
||||
Math.abs(arrival.getZ() - residence.getZ())) >= 10,
|
||||
"The remote portal must not damage the Indev residence");
|
||||
}
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package fr.koka99cab.sanctuary26.iliketomoveit.transport;
|
||||
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** Regression checks for the rider-only Happy Ghast cruise multiplier. */
|
||||
public final class HappyGhastCruiseSpeedSmoke {
|
||||
private HappyGhastCruiseSpeedSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
Vec3 vanillaInput = new Vec3(-0.195D, 0.0975D, 0.195D);
|
||||
Vec3 boosted = HappyGhastCruiseSpeed.boost(vanillaInput);
|
||||
|
||||
assertNear(boosted.x, -0.39D, "sideways input");
|
||||
assertNear(boosted.y, 0.195D, "vertical input");
|
||||
assertNear(boosted.z, 0.39D, "forward input");
|
||||
if (!HappyGhastCruiseSpeed.boost(Vec3.ZERO).equals(Vec3.ZERO)) {
|
||||
throw new IllegalStateException("Idle Happy Ghasts must remain idle");
|
||||
}
|
||||
}
|
||||
|
||||
private static void assertNear(double actual, double expected, String label) {
|
||||
if (Math.abs(actual - expected) > 1.0E-12D) {
|
||||
throw new IllegalStateException(label + ": expected " + expected + ", got " + actual);
|
||||
}
|
||||
}
|
||||
}
|
||||
+45
@@ -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
@@ -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.20`
|
||||
## 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
|
||||
|
||||
|
||||
+85
-6
@@ -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")
|
||||
@@ -153,7 +162,7 @@ tasks.register("generateCanapliaResources") {
|
||||
writeJson("data/c/tags/item/seeds.json", [replace: false, values: seedIds])
|
||||
writeJson("data/canaplia/tags/item/hemp_buds.json", [replace: false, values: budIds])
|
||||
|
||||
itemDefinition("codex", "minecraft:item/book")
|
||||
itemDefinition("codex", "minecraft:item/enchanted_book")
|
||||
itemDefinition("codex_page", "minecraft:item/paper")
|
||||
writeJson("data/canaplia/recipe/codex.json", [
|
||||
type: "minecraft:crafting_shaped", category: "misc",
|
||||
@@ -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.34"
|
||||
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.34"
|
||||
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.34"
|
||||
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.34"
|
||||
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.34"
|
||||
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
|
||||
@@ -1461,9 +1470,79 @@ tasks.register("verifyCulinaryLecternRelease") {
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("verifyCanapliaForbiddenBook") {
|
||||
group = "verification"
|
||||
description = "Checks personal Forbidden Books, random page learning and lectern sharing."
|
||||
dependsOn tasks.named("generateCanapliaResources")
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaKnowledge.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaKnowledgeData.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaLectern.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/item/CanapliaCodexPageItem.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/client/CanapliaCodexScreen.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/itsalive/registry/ItsAliveDataComponents.java"))
|
||||
inputs.file(file("src/main/resources/data/minecraft/tags/item/lectern_books.json"))
|
||||
inputs.files(fileTree("src/main/resources/assets/canaplia/lang") { include "*.json" })
|
||||
inputs.file(rootProject.file("CANAPLIA.md"))
|
||||
|
||||
doLast {
|
||||
def knowledge = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaKnowledge.java").text
|
||||
def knowledgeData = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaKnowledgeData.java").text
|
||||
def lectern = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/CanapliaLectern.java").text
|
||||
def pageItem = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/item/CanapliaCodexPageItem.java").text
|
||||
def screen = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/canaplia/client/CanapliaCodexScreen.java").text
|
||||
def components = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/itsalive/registry/ItsAliveDataComponents.java").text
|
||||
def lecternBooks = new JsonSlurper().parse(file(
|
||||
"src/main/resources/data/minecraft/tags/item/lectern_books.json"))
|
||||
def generatedCodex = new JsonSlurper().parse(new File(
|
||||
generatedCanapliaResources.get().asFile, "assets/canaplia/items/codex.json"))
|
||||
def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
|
||||
[(locale): new JsonSlurper().parse(file(
|
||||
"src/main/resources/assets/canaplia/lang/${locale}.json"))]
|
||||
}
|
||||
def expectedNames = [
|
||||
fr_fr: "Livre interdit",
|
||||
en_us: "Forbidden Book",
|
||||
ru_ru: "Запретная книга"]
|
||||
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())")
|
||||
|| knowledge.contains("data.shared()")
|
||||
|| !knowledgeData.contains("the legacy shared field is preserved")
|
||||
|| !lectern.contains("UseBlockCallback.EVENT.register")
|
||||
|| !lectern.contains("PlayerBlockBreakEvents.BEFORE.register")
|
||||
|| !lectern.contains("CanapliaKnowledge.open(serverPlayer, book)")
|
||||
|| !lectern.contains("CanapliaKnowledge.forgetInscription(taken)")
|
||||
|| screen.contains("PAGE_BACKGROUND")
|
||||
|| screen.contains("extractBackground(GuiGraphicsExtractor")
|
||||
|| screen.contains("extractRenderState(GuiGraphicsExtractor")
|
||||
|| !screen.contains("ChatFormatting.DARK_GRAY")
|
||||
|| !screen.contains("ChatFormatting.DARK_GREEN")
|
||||
|| screen.contains("screen.canaplia.codex.introduction")
|
||||
|| !components.contains('ItsAliveMod.id("canaplia_codex")')
|
||||
|| lecternBooks["values"] != ["itsalive:culinary_recipe_book", "canaplia:codex"]
|
||||
|| generatedCodex.model?.model != "minecraft:item/enchanted_book"
|
||||
|| locales.any { locale, values ->
|
||||
values["item.canaplia.codex"] != expectedNames[locale]
|
||||
|| values["screen.canaplia.codex.title"] != expectedNames[locale]
|
||||
|| !values.containsKey("message.canaplia.codex_page.complete")
|
||||
|| !values.containsKey("tooltip.canaplia.codex.personal")
|
||||
}) {
|
||||
throw new GradleException("The Canaplia Forbidden Book contract is incomplete")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("check") {
|
||||
dependsOn tasks.named("verifyItsAlive")
|
||||
dependsOn tasks.named("canapliaFoundationSmoke")
|
||||
dependsOn tasks.named("verifyCanapliaForbiddenBook")
|
||||
dependsOn tasks.named("verifyCulinaryReliability")
|
||||
dependsOn tasks.named("verifyCauldronBatching")
|
||||
dependsOn tasks.named("culinaryBatchingSmoke")
|
||||
|
||||
@@ -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();
|
||||
|
||||
+46
@@ -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);
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.canaplia;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.UUID;
|
||||
import net.minecraft.core.UUIDUtil;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.ByteBufCodecs;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
|
||||
/** Binds a placed Forbidden Book to the player whose knowledge it shares. */
|
||||
public record CanapliaCodexInscription(UUID ownerId, String ownerName) {
|
||||
private static final int MAX_NAME_LENGTH = 32;
|
||||
public static final Codec<CanapliaCodexInscription> CODEC = RecordCodecBuilder.create(instance ->
|
||||
instance.group(
|
||||
UUIDUtil.CODEC.fieldOf("owner_id").forGetter(CanapliaCodexInscription::ownerId),
|
||||
Codec.STRING.fieldOf("owner_name").forGetter(CanapliaCodexInscription::ownerName)
|
||||
).apply(instance, CanapliaCodexInscription::new)
|
||||
);
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, CanapliaCodexInscription> STREAM_CODEC =
|
||||
StreamCodec.composite(
|
||||
UUIDUtil.STREAM_CODEC,
|
||||
CanapliaCodexInscription::ownerId,
|
||||
ByteBufCodecs.STRING_UTF8,
|
||||
CanapliaCodexInscription::ownerName,
|
||||
CanapliaCodexInscription::new
|
||||
);
|
||||
|
||||
public CanapliaCodexInscription {
|
||||
if (ownerId == null) throw new IllegalArgumentException("Forbidden Book owner is required");
|
||||
ownerName = sanitizeName(ownerName);
|
||||
}
|
||||
|
||||
public static CanapliaCodexInscription of(UUID ownerId, String ownerName) {
|
||||
return new CanapliaCodexInscription(ownerId, ownerName);
|
||||
}
|
||||
|
||||
private static String sanitizeName(String ownerName) {
|
||||
String cleaned = ownerName == null ? "" : ownerName.replaceAll("\\p{Cntrl}", "").trim();
|
||||
if (cleaned.length() > MAX_NAME_LENGTH) cleaned = cleaned.substring(0, MAX_NAME_LENGTH);
|
||||
return cleaned.isEmpty() ? "?" : cleaned;
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -6,6 +6,7 @@ import fr.koka99cab.sanctuary26.itsalive.canaplia.block.CanapliaHempTopBlock;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.block.CanapliaResinBlock;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.block.CanapliaResinBlockEntity;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.item.CanapliaCodexItem;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.item.CanapliaCodexPageItem;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.item.CanapliaJointItem;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.item.CanapliaVariantBlockItem;
|
||||
import java.util.ArrayList;
|
||||
@@ -37,7 +38,7 @@ public final class CanapliaContent {
|
||||
public static final BlockEntityType<CanapliaResinBlockEntity> RESIN_BLOCK_ENTITY_TYPE = registerResinBlockEntity();
|
||||
private static final Map<CanapliaVariantKey, Family> FAMILIES = registerFamilies();
|
||||
public static final Item CODEX_PAGE = registerItem("codex_page", key ->
|
||||
new Item(new Item.Properties().setId(key)));
|
||||
new CanapliaCodexPageItem(new Item.Properties().setId(key)));
|
||||
public static final Item CODEX = registerItem("codex", key ->
|
||||
new CanapliaCodexItem(new Item.Properties().stacksTo(1).setId(key)));
|
||||
private static final List<Item> CREATIVE_ITEMS = createCreativeItems();
|
||||
|
||||
+1
@@ -21,6 +21,7 @@ public final class CanapliaFoundation {
|
||||
throw new IllegalStateException("Unsupported Ambiance visual contract");
|
||||
}
|
||||
CanapliaContent.register();
|
||||
CanapliaLectern.initialize();
|
||||
CanapliaCodexDrops.initialize();
|
||||
CanapliaDiscoverySources.register();
|
||||
CanapliaDiscovery.initialize();
|
||||
|
||||
+4
-2
@@ -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);
|
||||
|
||||
+47
-2
@@ -1,11 +1,16 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.canaplia;
|
||||
|
||||
import fr.koka99cab.sanctuary26.itsalive.network.CanapliaCodexPayload;
|
||||
import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveDataComponents;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryProgressionService;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** Trusted discovery service and compact Codex snapshot builder. */
|
||||
public final class CanapliaKnowledge {
|
||||
@@ -22,10 +27,50 @@ public final class CanapliaKnowledge {
|
||||
}
|
||||
|
||||
public static void open(ServerPlayer player) {
|
||||
open(player, player.getUUID(), Set.of());
|
||||
}
|
||||
|
||||
public static void open(ServerPlayer player, ItemStack book) {
|
||||
CanapliaCodexInscription inscription = book.get(ItsAliveDataComponents.CANAPLIA_CODEX);
|
||||
if (inscription == null) {
|
||||
open(player);
|
||||
return;
|
||||
}
|
||||
CanapliaKnowledgeData data = CanapliaKnowledgeData.get(player.level().getServer());
|
||||
open(player, player.getUUID(), data.personal(inscription.ownerId()));
|
||||
}
|
||||
|
||||
public static boolean learnRandomUnknown(ServerPlayer player) {
|
||||
CanapliaKnowledgeData data = CanapliaKnowledgeData.get(player.level().getServer());
|
||||
List<CanapliaVariantKey> unknown = unknownVariants(data.personal(player.getUUID()));
|
||||
if (unknown.isEmpty()) {
|
||||
player.sendSystemMessage(Component.translatable("message.canaplia.codex_page.complete"));
|
||||
return false;
|
||||
}
|
||||
CanapliaVariantKey selected = unknown.get(player.getRandom().nextInt(unknown.size()));
|
||||
return discover(player, selected, "codex_page");
|
||||
}
|
||||
|
||||
public static void inscribe(ItemStack stack, ServerPlayer player) {
|
||||
if (!stack.is(CanapliaContent.CODEX)) return;
|
||||
stack.set(ItsAliveDataComponents.CANAPLIA_CODEX, CanapliaCodexInscription.of(
|
||||
player.getUUID(), player.getGameProfile().name()));
|
||||
}
|
||||
|
||||
public static void forgetInscription(ItemStack stack) {
|
||||
if (stack.is(CanapliaContent.CODEX)) stack.remove(ItsAliveDataComponents.CANAPLIA_CODEX);
|
||||
}
|
||||
|
||||
static List<CanapliaVariantKey> unknownVariants(Set<String> learned) {
|
||||
return Arrays.stream(CanapliaVariantKey.values())
|
||||
.filter(variant -> !learned.contains(variant.key()))
|
||||
.toList();
|
||||
}
|
||||
|
||||
private static void open(ServerPlayer player, UUID personalOwner, Set<String> shared) {
|
||||
if (!ServerPlayNetworking.canSend(player, CanapliaCodexPayload.ID)) return;
|
||||
CanapliaKnowledgeData data = CanapliaKnowledgeData.get(player.level().getServer());
|
||||
Set<String> personal = data.personal(player.getUUID());
|
||||
Set<String> shared = data.shared();
|
||||
Set<String> personal = data.personal(personalOwner);
|
||||
int personalMask = mask(personal);
|
||||
int sharedMask = mask(shared);
|
||||
int originHints = 0;
|
||||
|
||||
+2
-3
@@ -15,7 +15,7 @@ import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.saveddata.SavedData;
|
||||
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||
|
||||
/** Versioned personal and shared discoveries; unknown future keys survive round-trips. */
|
||||
/** Versioned personal discoveries; the legacy shared field is preserved but no longer exposed globally. */
|
||||
public final class CanapliaKnowledgeData extends SavedData {
|
||||
public static final int DATA_VERSION = 1;
|
||||
private static final Codec<CanapliaKnowledgeData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||
@@ -57,8 +57,7 @@ public final class CanapliaKnowledgeData extends SavedData {
|
||||
public boolean discover(UUID player, String key) {
|
||||
if (!validKey(key)) return false;
|
||||
boolean personal = players.computeIfAbsent(player.toString(), ignored -> new LinkedHashSet<>()).add(key);
|
||||
boolean community = shared.add(key);
|
||||
if (personal || community) setDirty();
|
||||
if (personal) setDirty();
|
||||
return personal;
|
||||
}
|
||||
|
||||
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.canaplia;
|
||||
|
||||
import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
|
||||
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.LecternBlock;
|
||||
import net.minecraft.world.level.block.entity.LecternBlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
|
||||
/** Shares only the placer's Canaplia knowledge while the Forbidden Book remains on a lectern. */
|
||||
public final class CanapliaLectern {
|
||||
private CanapliaLectern() {
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
UseBlockCallback.EVENT.register(CanapliaLectern::use);
|
||||
PlayerBlockBreakEvents.BEFORE.register((level, player, pos, state, blockEntity) -> {
|
||||
if (blockEntity instanceof LecternBlockEntity lectern) {
|
||||
CanapliaKnowledge.forgetInscription(lectern.getBook());
|
||||
}
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
private static InteractionResult use(Player player, Level level, InteractionHand hand, BlockHitResult hit) {
|
||||
if (hand != InteractionHand.MAIN_HAND || player.isSpectator()) return InteractionResult.PASS;
|
||||
BlockPos pos = hit.getBlockPos();
|
||||
BlockState state = level.getBlockState(pos);
|
||||
if (!state.is(Blocks.LECTERN)) return InteractionResult.PASS;
|
||||
|
||||
ItemStack held = player.getItemInHand(hand);
|
||||
if (!state.getValue(LecternBlock.HAS_BOOK)) {
|
||||
if (held.is(CanapliaContent.CODEX)
|
||||
&& !level.isClientSide()
|
||||
&& player instanceof ServerPlayer serverPlayer) {
|
||||
CanapliaKnowledge.inscribe(held, serverPlayer);
|
||||
}
|
||||
return InteractionResult.PASS;
|
||||
}
|
||||
if (!(level.getBlockEntity(pos) instanceof LecternBlockEntity lectern)) {
|
||||
return InteractionResult.PASS;
|
||||
}
|
||||
ItemStack book = lectern.getBook();
|
||||
if (!book.is(CanapliaContent.CODEX)) return InteractionResult.PASS;
|
||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||
if (!(player instanceof ServerPlayer serverPlayer) || !level.mayInteract(serverPlayer, pos)) {
|
||||
return InteractionResult.FAIL;
|
||||
}
|
||||
if (serverPlayer.isSecondaryUseActive()) {
|
||||
return takeBook(serverPlayer, level, pos, state, lectern);
|
||||
}
|
||||
CanapliaKnowledge.open(serverPlayer, book);
|
||||
return InteractionResult.SUCCESS;
|
||||
}
|
||||
|
||||
private static InteractionResult takeBook(ServerPlayer player, Level level, BlockPos pos,
|
||||
BlockState state, LecternBlockEntity lectern) {
|
||||
ItemStack taken = lectern.getBook().copy();
|
||||
if (taken.isEmpty()) return InteractionResult.PASS;
|
||||
CanapliaKnowledge.forgetInscription(taken);
|
||||
lectern.setBook(ItemStack.EMPTY);
|
||||
LecternBlock.resetBookState(player, level, pos, state, false);
|
||||
player.getInventory().placeItemBackInInventory(taken);
|
||||
level.playSound(null, pos, SoundEvents.ITEM_FRAME_REMOVE_ITEM, SoundSource.BLOCKS, 1.0F, 1.0F);
|
||||
return InteractionResult.SUCCESS;
|
||||
}
|
||||
}
|
||||
+36
@@ -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;
|
||||
}
|
||||
}
|
||||
+17
-6
@@ -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);
|
||||
|
||||
+4
-1
@@ -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
|
||||
|
||||
+9
-10
@@ -16,8 +16,7 @@ public final class CanapliaCodexScreen extends BookViewScreen {
|
||||
}
|
||||
|
||||
private static List<Component> pages(CanapliaCodexPayload snapshot) {
|
||||
List<Component> pages = new ArrayList<>(CanapliaVariantKey.values().length + 1);
|
||||
pages.add(Component.translatable("screen.canaplia.codex.introduction"));
|
||||
List<Component> pages = new ArrayList<>(CanapliaVariantKey.values().length);
|
||||
CanapliaVariantKey[] variants = CanapliaVariantKey.values();
|
||||
for (int index = 0; index < variants.length; index++) {
|
||||
pages.add(variantPage(snapshot, variants[index], index));
|
||||
@@ -39,16 +38,16 @@ public final class CanapliaCodexScreen extends BookViewScreen {
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
|
||||
page.append((personal
|
||||
? Component.translatable("variant.canaplia." + variant.key())
|
||||
: Component.translatable("screen.canaplia.codex.silhouette"))
|
||||
.withStyle(personal ? ChatFormatting.DARK_GREEN : ChatFormatting.GRAY));
|
||||
if (personal || originHint) {
|
||||
page.append(Component.translatable("variant.canaplia." + variant.key())
|
||||
.withStyle(personal ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_PURPLE));
|
||||
if (personal || shared || originHint) {
|
||||
page.append("\n\n").append(Component.translatable("screen.canaplia.codex.origin",
|
||||
Component.translatable("origin.canaplia." + variant.key())));
|
||||
Component.translatable("origin.canaplia." + variant.key()))
|
||||
.withStyle(ChatFormatting.DARK_GRAY));
|
||||
}
|
||||
if (personal || conditionHint) {
|
||||
page.append("\n\n").append(Component.translatable("hint.canaplia." + variant.key()));
|
||||
if (personal || shared || conditionHint) {
|
||||
page.append("\n\n").append(Component.translatable("hint.canaplia." + variant.key())
|
||||
.withStyle(ChatFormatting.DARK_GRAY));
|
||||
}
|
||||
return page;
|
||||
}
|
||||
|
||||
+13
@@ -1,11 +1,17 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.canaplia.item;
|
||||
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaKnowledge;
|
||||
import java.util.function.Consumer;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
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;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
/** Opens the server-authored personal/shared Canaplia collection snapshot. */
|
||||
@@ -20,4 +26,11 @@ public final class CanapliaCodexItem extends Item {
|
||||
if (player instanceof ServerPlayer serverPlayer) CanapliaKnowledge.open(serverPlayer);
|
||||
return InteractionResult.SUCCESS_SERVER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay display,
|
||||
Consumer<Component> tooltip, TooltipFlag flag) {
|
||||
tooltip.accept(Component.translatable("tooltip.canaplia.codex.personal")
|
||||
.withStyle(ChatFormatting.DARK_PURPLE));
|
||||
}
|
||||
}
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.canaplia.item;
|
||||
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaKnowledge;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
/** Consumable unidentified page which discovers one random unknown Canaplia entry. */
|
||||
public final class CanapliaCodexPageItem extends Item {
|
||||
public CanapliaCodexPageItem(Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public InteractionResult use(Level level, Player player, InteractionHand hand) {
|
||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||
if (!(player instanceof ServerPlayer serverPlayer)) return InteractionResult.PASS;
|
||||
if (CanapliaKnowledge.learnRandomUnknown(serverPlayer)) {
|
||||
ItemStack held = player.getItemInHand(hand);
|
||||
if (!player.getAbilities().instabuild) held.shrink(1);
|
||||
}
|
||||
return InteractionResult.SUCCESS_SERVER;
|
||||
}
|
||||
}
|
||||
+9
-3
@@ -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);
|
||||
}
|
||||
}
|
||||
+45
@@ -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);
|
||||
}
|
||||
}
|
||||
+8
@@ -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;
|
||||
}
|
||||
+495
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+49
@@ -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;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
+156
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
@@ -1,6 +1,7 @@
|
||||
package fr.koka99cab.sanctuary26.itsalive.registry;
|
||||
|
||||
import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
|
||||
import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaCodexInscription;
|
||||
import fr.koka99cab.sanctuary26.itsalive.culinary.knowledge.CulinaryBookInscription;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.component.DataComponentType;
|
||||
@@ -8,6 +9,15 @@ import net.minecraft.core.registries.BuiltInRegistries;
|
||||
|
||||
/** Persistent item components owned by It's Alive. */
|
||||
public final class ItsAliveDataComponents {
|
||||
public static final DataComponentType<CanapliaCodexInscription> CANAPLIA_CODEX = Registry.register(
|
||||
BuiltInRegistries.DATA_COMPONENT_TYPE,
|
||||
ItsAliveMod.id("canaplia_codex"),
|
||||
DataComponentType.<CanapliaCodexInscription>builder()
|
||||
.persistent(CanapliaCodexInscription.CODEC)
|
||||
.networkSynchronized(CanapliaCodexInscription.STREAM_CODEC)
|
||||
.cacheEncoding()
|
||||
.build()
|
||||
);
|
||||
public static final DataComponentType<CulinaryBookInscription> CULINARY_BOOK = Registry.register(
|
||||
BuiltInRegistries.DATA_COMPONENT_TYPE,
|
||||
ItsAliveMod.id("culinary_book"),
|
||||
|
||||
+20
-1
@@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user