Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ec5b0d028 | ||
|
|
67e6e7c4f2 | ||
|
|
00179e30ef | ||
|
|
87f823af67 | ||
|
|
4552cc347b | ||
|
|
49131b4c53 | ||
|
|
edc7fc3dfb | ||
|
|
9b0104d27a | ||
|
|
d9b3dd6bed | ||
|
|
e732da8800 | ||
|
|
248dff47b7 | ||
|
|
6aaabf1cb9 | ||
|
|
72e9263339 | ||
|
|
3fd64e1f2a | ||
|
|
8af406a028 |
@@ -20,12 +20,11 @@ La [vision complète](docs/vision.md) conserve les intentions ; le
|
||||
L’économie, les claims et les dimensions décrits dans la vision restent
|
||||
à implémenter.
|
||||
|
||||
La version **beta.118** ajoute les seize murets en briques colorées, avec
|
||||
leurs textures existantes, les raccords natifs et leurs recettes. Ils forment
|
||||
une série de seize après les dalles dans l'onglet des blocs colorés.
|
||||
Le [ticket de livraison](docs/colored-brick-walls-beta118.md) conserve les
|
||||
contrôles et le suivi de distribution. Livraison en préparation ; l'instance
|
||||
**Sanctuary Beta** publiée reste beta.117 jusqu'à sa synchronisation.
|
||||
La version **beta.125** étend les sculptures au centre, aux bords et aux coins,
|
||||
en bas, au milieu ou en haut du bloc. Les éclats reprennent la couleur des voxels
|
||||
et le Clay Workshop propose les animaux déjà découverts, en plus des imports GLB.
|
||||
Le [ticket de livraison](docs/sculpture-placement-beta125.md) décrit le placement,
|
||||
la compatibilité des anciennes sculptures et les vérifications.
|
||||
La [livraison précédente](docs/clay-workshop-integration-beta110.md) réunit déjà
|
||||
l’atelier, les œufs et la neige saisonnière dans l’instance **Sanctuary Beta**.
|
||||
Les [synchronisations antérieures](docs/git-sync-beta092.md) restent documentées.
|
||||
@@ -36,10 +35,61 @@ La [carte native beta.005](docs/atlas-beta005.md) prend le relais après
|
||||
l’étude de Xaero et des alternatives libres.
|
||||
|
||||
|
||||
## beta.125 — Sculptures : placement, éclats et animaux
|
||||
|
||||
Coins et trois hauteurs sur la grille 1/16 ; particules issues des voxels ;
|
||||
modèles découverts disponibles dans le Clay Workshop.
|
||||
[Contrat et vérifications](docs/sculpture-placement-beta125.md).
|
||||
|
||||
## beta.124 — Une boîte par sculpture
|
||||
|
||||
Sélection et collisions simplifiées, dimensions ajustées et lumière conservée.
|
||||
[Contrat et vérifications](docs/sculpture-bounds-beta124.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.124/Sanctuary-beta.124.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.124/Sanctuary-Test-beta.124.mrpack).
|
||||
|
||||
## beta.123 — Clé dorée et clé de Steve
|
||||
|
||||
Orientations cohérentes, inventaires et eau préservés ; clé de Steve pour
|
||||
l’édition libre, utilisable aussi en survie. [Contrat et vérifications](docs/wrench-safety-beta123.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.123/Sanctuary-beta.123.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.123/Sanctuary-Test-beta.123.mrpack).
|
||||
|
||||
## beta.122 — Sculptures : forme et lumière
|
||||
|
||||
Collisions et sélection sur les voxels réels, creux traversables, lumière sans
|
||||
occlusion cubique. [Contrat et vérifications](docs/sculpture-shape-light-beta122.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.122/Sanctuary-beta.122.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.122/Sanctuary-Test-beta.122.mrpack).
|
||||
|
||||
## beta.121 — Texture de clé et pack personnel
|
||||
|
||||
Copie complète des ressources, création depuis le jeu et guide FR/EN inclus.
|
||||
[Contrat et vérifications](docs/resourcepack-template-beta121.md) ·
|
||||
[Template personnel](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-Template-beta.121.zip) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-beta.121.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-Test-beta.121.mrpack).
|
||||
|
||||
## beta.120 — Clé dorée et états de blocs
|
||||
|
||||
Gestes du debug stick, rotation de textures et assemblage des machines conservé.
|
||||
[Contrat et vérifications](docs/golden-wrench-beta120.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.120/Sanctuary-beta.120.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.120/Sanctuary-Test-beta.120.mrpack).
|
||||
|
||||
## beta.119 — Sculptures au centre ou au bord
|
||||
|
||||
Pose selon le point visé, centrage sur la grille entière et ancrage conservé
|
||||
en sauvegarde. [Contrat et vérifications](docs/sculpture-center-beta119.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.119/Sanctuary-beta.119.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.119/Sanctuary-Test-beta.119.mrpack).
|
||||
|
||||
## beta.118 — Murets en briques colorées
|
||||
|
||||
Seize couleurs, fabrication et tailleur de pierre, eau, raccords et collisions
|
||||
natifs. [Contrat et vérifications](docs/colored-brick-walls-beta118.md).
|
||||
natifs. [Contrat et vérifications](docs/colored-brick-walls-beta118.md) ·
|
||||
[Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.118/Sanctuary-beta.118.mrpack) ·
|
||||
[Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.118/Sanctuary-Test-beta.118.mrpack).
|
||||
|
||||
## beta.117 — Grain des textures et sculptures en chapeau
|
||||
|
||||
@@ -2118,7 +2168,7 @@ Depuis beta.090, la cible est **Minecraft 26.3 finale**, publiée le 15 septembr
|
||||
| Fabric API | 0.160.5+26.3 |
|
||||
| Fabric Loom | 1.17.20 |
|
||||
| Gradle Wrapper | 9.5.1, distribution vérifiée par SHA-256 |
|
||||
| Sanctuary / pack | beta.112 |
|
||||
| Sanctuary / pack | beta.122 |
|
||||
|
||||
Java 25 et Python 3.11 ou plus récent sont nécessaires. Le script pack utilise
|
||||
uniquement la bibliothèque standard et repère aussi une installation Python
|
||||
@@ -2147,7 +2197,7 @@ décrits dans [Validation](docs/testing.md).
|
||||
|
||||
Résultats :
|
||||
|
||||
- `mods/sanctuary/build/libs/sanctuary-beta.112.jar` : mod à installer avec
|
||||
- `mods/sanctuary/build/libs/sanctuary-beta.122.jar` : mod à installer avec
|
||||
Fabric API sur la version Minecraft indiquée.
|
||||
- `build/packwiz/` : pack de développement complet, avec le mod construit et
|
||||
l'index vérifié. Voir [Installation packwiz](packwiz/README.md).
|
||||
|
||||
@@ -127,3 +127,12 @@ de modèles, butin et états reprennent leurs équivalents natifs 26.3.
|
||||
`tools/generate-colored-bricks.py` documente cette transformation ;
|
||||
`tools/colored-bricks-palette.json` conserve couleurs et empreintes des PNG fournis.
|
||||
Ces ressources dérivées ne sont pas présentées comme des créations originales.
|
||||
|
||||
## Clé dorée beta.121
|
||||
|
||||
Le PNG 16 × 16 `golden_wrench.png` a été fourni par le créateur de Sanctuary
|
||||
le 17 septembre 2026. Il est conservé octet pour octet dans le mod, le pack
|
||||
intégré et le template personnel (SHA-256
|
||||
`a97570908db75caf8e6fc2f5ecabf12c54fd99bfea7be634df66c4310dca22af`).
|
||||
Le template regroupe les ressources client déjà distribuées par Sanctuary ;
|
||||
leurs crédits et conditions respectives restent applicables.
|
||||
|
||||
+19
-1
@@ -15,7 +15,7 @@ tasks.register('verifyPack', Exec) {
|
||||
tasks.register('assemblePack', Exec) {
|
||||
group = 'distribution'
|
||||
description = 'Assemble a local packwiz pack including the built Sanctuary mod.'
|
||||
dependsOn(':sanctuary:build', 'verifyPack', 'assembleResourcePack')
|
||||
dependsOn(':sanctuary:build', 'verifyPack', 'assembleResourcePack', 'assembleResourceTemplate')
|
||||
commandLine('python3', 'scripts/pack.py', 'assemble')
|
||||
}
|
||||
|
||||
@@ -46,3 +46,21 @@ tasks.register('assembleTestPack', Exec) {
|
||||
dependsOn('assemblePack', ':sanctuary-test:build')
|
||||
commandLine('python3', 'scripts/test_pack.py')
|
||||
}
|
||||
|
||||
tasks.register('assembleResourceTemplate', Zip) {
|
||||
group = 'distribution'
|
||||
description = 'Export all Sanctuary client assets as an editable personal resource pack.'
|
||||
dependsOn(':sanctuary:processResources', 'verifyResourcePack')
|
||||
def resources = project(':sanctuary').layout.buildDirectory.dir('resources/main')
|
||||
// Same precedence as the native exporter: built-in textures override mod defaults.
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
from(resources.map { it.dir('resourcepacks/textures/assets') }) { into 'assets' }
|
||||
from(resources.map { it.dir('assets') }) { into 'assets' }
|
||||
from(resources.map { it.dir('resourcepacks/template') })
|
||||
from(resources.map { it.file('resourcepacks/textures/pack.png') })
|
||||
exclude '**/.DS_Store'
|
||||
destinationDirectory = layout.buildDirectory
|
||||
archiveFileName = "Sanctuary-Template-${mod_version}.zip"
|
||||
preserveFileTimestamps = false
|
||||
reproducibleFileOrder = true
|
||||
}
|
||||
|
||||
@@ -65,5 +65,19 @@ identiques. Les textures existantes sont toutes conservées octet pour octet.
|
||||
- JAR Sanctuary :
|
||||
`fc6edf4046a8ace357d561ed942213a22c7a27164fa160cdb4316f72ec302575`.
|
||||
|
||||
Reçu : `build/walls118-artifact.json`. Publication et synchronisation finales
|
||||
en cours.
|
||||
Reçu : `build/walls118-artifact.json`.
|
||||
|
||||
## Publication et instance
|
||||
|
||||
La [release beta.118](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.118)
|
||||
est publiée : JAR, MRpack normal/Test et amorçage Prism, téléchargements publics
|
||||
et empreintes vérifiés. Le tag immuable désigne
|
||||
`0a81b3c1471c43d705eec4e31a8f6f1820049ca8`. Le canal packwiz avance au commit
|
||||
`e6bab433bea9528f67d39af0d6c7bcb6443e4817`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans l'unique instance **Sanctuary
|
||||
Beta** réussissent, la seconde passe laissant les fichiers gérés identiques.
|
||||
Un seul JAR Sanctuary beta.118 est actif. Les 923 fichiers personnels et
|
||||
réglages suivis sont inchangés ; aucun monde personnel n'a été ouvert.
|
||||
Copie préalable des fichiers remplacés dans `sanctuary-backups/before-beta.118/`.
|
||||
Reçus : `build/walls118-isolated.json`, `build/walls118-prism.json`.
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
# TOOL-01 — Clé dorée et états de blocs — beta.120
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/golden-wrench-beta120`.
|
||||
Le créateur valide les gestes du debug stick : clic gauche choisit la propriété,
|
||||
clic droit parcourt ses valeurs, Maj inverse le parcours. L'orientation est
|
||||
proposée en premier, puis les propriétés de forme et les autres états natifs.
|
||||
La sélection est personnelle, par type de bloc, pour la session courante.
|
||||
Une indication dans la barre d'action affiche la propriété et sa valeur.
|
||||
La clé ne casse pas le bloc, y compris en créatif, et ne remplace pas son type.
|
||||
|
||||
Les propriétés natives sont disponibles en survie avec la clé, sans condition
|
||||
opérateur, dans le respect des droits de construction, protections, portée et
|
||||
verrous de conteneurs. Comme avec le debug stick, les formes choisies restent
|
||||
en place immédiatement ; les mises à jour ultérieures du jeu peuvent recalculer
|
||||
les états dynamiques (redstone, connexions, cultures…).
|
||||
|
||||
Les multiblocs assemblés gardent leurs commandes d'ouverture/dissociation et
|
||||
leurs propriétés techniques ne sont pas éditées individuellement. Un assemblage
|
||||
complet garde priorité au clic droit ; Maj permet de régler les composants
|
||||
non assemblés. Hors d'un assemblage complet, même un four, un baril, un piston
|
||||
ou un établi reçoit l'action générique.
|
||||
|
||||
## Rotation de texture et contrat de stockage
|
||||
|
||||
La terre n'a pas d'orientation dans son blockstate vanilla. Une propriété
|
||||
supplémentaire de la clé, « Rotation des textures », parcourt 0°, 90°, 180° et
|
||||
270° sur les faces des modèles de blocs. La géométrie, l'éclairage, les teintes,
|
||||
les ressources actives, le bloc, son inventaire et son butin restent natifs.
|
||||
Les rendus spéciaux d'entités de blocs ne sont pas transformés par ce réglage
|
||||
des faces ; leur orientation demeure modifiable par leurs états natifs.
|
||||
|
||||
Nouvelle donnée facultative `sanctuary:wrench_textures_v1`, attachée au chunk :
|
||||
table immuable position entière → quart de tour (1 à 3). Une absence signifie
|
||||
0°. Elle n'est créée qu'après une action de clé ; revenir à 0° retire l'entrée,
|
||||
puis l'attachement s'il est vide. Aucun état vanilla ni format existant n'est
|
||||
modifié ; aucun parcours, conversion ou régénération des anciens mondes.
|
||||
Les modifications de blockstate du même type conservent la rotation. Casser,
|
||||
remplacer ou déplacer par piston retire la rotation à l'ancienne position ;
|
||||
les objets récupérés restent ordinaires. Les nouveaux clients la reçoivent
|
||||
après le chunk natif, par lots bornés de 1 024 entrées au maximum.
|
||||
Déconnexion, changement de dimension et déchargement libèrent le cache visuel.
|
||||
Revenir à une ancienne version du mod supprime seulement cet effet visuel ;
|
||||
les blocs conservent leurs identifiants, données et états natifs.
|
||||
|
||||
## Vérifications et livraison
|
||||
|
||||
Le parcours `Wrench120ClientChecks` passe en **47 s** sur Minecraft 26.3,
|
||||
client macOS et serveur intégré, dans un monde plat jetable de graine 120 :
|
||||
|
||||
- **2 522 propriétés natives** parcourues, avec valeurs inverses et type conservé.
|
||||
- Vrais clics sur les escaliers : orientation, moitié supérieure et forme,
|
||||
sans casser le bloc en créatif ; gestes inverses et sélection distincte.
|
||||
Les doubles événements créatifs d'un même clic sont filtrés à la cadence
|
||||
native de cinq ticks.
|
||||
- Terre en survie : rotation réelle des UV émis, positions des sommets et nombre
|
||||
de faces identiques ; retour exact après quatre quarts de tour ou un inverse.
|
||||
- Rechargement des ressources conservant les UV tournés ; capture de terre relue.
|
||||
- Coffre tourné avec ses 23 diamants intacts, sans ouverture accidentelle.
|
||||
- Assemblage/dissociation par vrais clics des quatre familles : Métabli, Fût,
|
||||
Fourneau et super piston. Un clic gauche sur un assemblage ne modifie pas
|
||||
les numéros de composants ; barils et pistons isolés tournent normalement.
|
||||
- Refus en aventure, spectateur ou hors portée ; retrait des données visuelles
|
||||
après remplacement, maintien lors d'un changement d'état du même bloc.
|
||||
- Sauvegarde/reconnexion : rotation de terre côté serveur et client, état
|
||||
natif de l'escalier et inventaire du coffre conservés.
|
||||
|
||||
```sh
|
||||
./gradlew :sanctuary:runClientGameTest \
|
||||
-PsanctuaryClientTests=true -PsanctuaryWrench120ClientTests=true \
|
||||
-PsanctuaryClientNoVsync=true -PsanctuaryQuickTests=true
|
||||
```
|
||||
|
||||
Marqueurs `WRENCH120_PASS` et `WRENCH120_PROPERTIES 2522` dans
|
||||
`build/wrench120-client.log`, captures dans `build/wrench120-evidence/`.
|
||||
Aucun monde personnel ouvert ; pas de validation Windows ni depuis deux
|
||||
ordinateurs. Les rendus de faces natifs et le rechargement du pack sont vérifiés ;
|
||||
pas de validation spécifique d'un shader tiers.
|
||||
Le GameTest dédié reste exclu conformément au refus antérieur de son EULA.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 12 s**, 125 tâches. Les sources JAR correspondent exactement
|
||||
aux sources du dépôt. La comparaison avec beta.119 limite les différences de
|
||||
production aux classes de clé/assemblage, aux deux nouveaux hooks, au rendu
|
||||
et aux libellés prévus ; toutes les autres ressources sont identiques.
|
||||
Les packs normal/Test contiennent le même JAR Sanctuary et aucune sauvegarde
|
||||
ni fixture de test.
|
||||
|
||||
- Sanctuary-beta.120.mrpack : 10237973 octets, SHA-256
|
||||
`86b5e480a12ba20b5c1e308c77dbb54bdf8a56806915fb32ca2d16f9a72cc9c9`.
|
||||
- Sanctuary-Test-beta.120.mrpack : 10256895 octets, SHA-256
|
||||
`2e3818483ba7dfa6e5652b97933e105a44e7cc4b269fc567116bf895d54bd8d9`.
|
||||
- JAR Sanctuary : SHA-256
|
||||
`8e35ef0f134a46b7760604175ad768264946d31fdd0694982e049e7a928fde2a`.
|
||||
|
||||
Reçu local : `build/wrench120-artifact.json`.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.120](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.120)
|
||||
est publiée depuis `248dff47b7a0ebd11026230581fe69641dbde76d`. Le tag exact et les
|
||||
artefacts sont immuables ; leurs téléchargements publics sont vérifiés.
|
||||
Le canal packwiz avance à `e8060764a444a58b0a17318a3821dfeb1a0c33c6`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.120 est actif ; le second passage est identique.
|
||||
Les **923 fichiers personnels et réglages suivis** restent inchangés, sans
|
||||
ouvrir de monde personnel. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.120/` de l'instance existante. Reçus locaux :
|
||||
`build/wrench120-isolated.json` et `build/wrench120-prism.json`.
|
||||
@@ -14,6 +14,87 @@ JAR Sanctuary sont des pièces jointes de releases Gitea. Aucun JAR de mod ou
|
||||
dépendance téléchargée n'entre dans l'historique Git. Le canal Beta est distinct
|
||||
de l'ancien pack 26.2.
|
||||
|
||||
## beta.124 — une boîte par sculpture
|
||||
|
||||
Une boîte ajustée commune à la sélection et aux collisions ; détails physiques
|
||||
simplifiés, orientation/ancrage et éclairage conservés.
|
||||
[Contrat et vérifications](sculpture-bounds-beta124.md).
|
||||
[Release beta.124](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.124)
|
||||
publiée ; canal `67ebcc7d07f8b75e8988f6099e3d6e5704f123fb`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.124/`. Packs normal/Test et template également
|
||||
copiés et vérifiés dans le dossier habituel `sanctuary-beta/build/`.
|
||||
|
||||
## beta.123 — clé dorée et clé de Steve
|
||||
|
||||
La clé dorée se limite aux orientations cohérentes ; la clé de Steve reprend
|
||||
les états et textures libres, utilisables aussi en survie dès sa récupération.
|
||||
[Contrat et vérifications](wrench-safety-beta123.md).
|
||||
[Release beta.123](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.123)
|
||||
publiée ; canal `f988d01b901f2d3eda0b4ab47a48540dc627d1b5`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.123/`.
|
||||
|
||||
## beta.122 — formes et lumière des sculptures
|
||||
|
||||
Sélection et collisions sur les voxels réels ; suppression de l'occlusion cubique.
|
||||
[Contrat et vérifications](sculpture-shape-light-beta122.md).
|
||||
[Release beta.122](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.122)
|
||||
publiée ; canal `3d340bea0093b709c6018624795a1b3ca557b72d`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.122/`.
|
||||
|
||||
## beta.121 — texture de clé et pack personnel
|
||||
|
||||
PNG du créateur et copie complète modifiable depuis l'écran des packs.
|
||||
[Contrat et vérifications](resourcepack-template-beta121.md).
|
||||
[Release beta.121](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.121)
|
||||
publiée ; canal `e3e6572da9288fbbcfa36bf6b7dd3aa0d1c54f5e`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.121/`. Le template personnel est créé par le
|
||||
joueur, jamais géré ou réécrit par packwiz.
|
||||
|
||||
## beta.120 — clé dorée et états de blocs
|
||||
|
||||
Gestes du debug stick, rotation des textures et assemblages prioritaires.
|
||||
[Contrat et vérifications](golden-wrench-beta120.md).
|
||||
[Release beta.120](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.120)
|
||||
publiée ; canal `e8060764a444a58b0a17318a3821dfeb1a0c33c6`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.120/`.
|
||||
|
||||
## beta.119 — pose centrée des sculptures
|
||||
|
||||
Centre accessible au point visé, bords conservés et grille entière de 1/16.
|
||||
[Contrat et vérifications](sculpture-center-beta119.md).
|
||||
[Release beta.119](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.119)
|
||||
publiée ; canal `5e823af7807f524f6394acad402fe62328c7e4ab`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.119/`.
|
||||
|
||||
## beta.118 — murets en briques colorées
|
||||
|
||||
Seize murets natifs, recettes, tailleur, eau et série créative par couleurs.
|
||||
[Contrat et vérifications](colored-brick-walls-beta118.md).
|
||||
[Release beta.118](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.118)
|
||||
publiée ; canal `e6bab433bea9528f67d39af0d6c7bcb6443e4817`. Deux
|
||||
synchronisations isolées puis deux dans la même instance **Sanctuary Beta**
|
||||
réussies. Les 923 fichiers personnels et réglages suivis sont inchangés ;
|
||||
sauvegardes restées fermées. Copie préalable des fichiers remplacés dans
|
||||
`sanctuary-backups/before-beta.118/`.
|
||||
|
||||
## beta.117 — grain des textures et sculptures en chapeau
|
||||
|
||||
Échantillonnage des pixels de plusieurs textures, grain stable même sur un
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
# RP-02 — Clé dorée et pack personnel — beta.121
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/resourcepack-template-beta121`.
|
||||
Le créateur fournit `golden_wrench.png` et valide un bouton qui crée une copie
|
||||
personnelle complète, modifiable et jamais écrasée par les mises à jour.
|
||||
|
||||
## Résultat
|
||||
|
||||
La clé dorée reprend exactement le PNG fourni, 16 × 16, sans conversion ni
|
||||
redessin. Le modèle reste un item plat `minecraft:item/handheld`. Empreinte :
|
||||
`a97570908db75caf8e6fc2f5ecabf12c54fd99bfea7be634df66c4310dca22af`.
|
||||
Le même fichier est fourni par le mod et par « Textures Sanctuary » ; désactiver
|
||||
le pack intégré conserve donc aussi la nouvelle clé.
|
||||
|
||||
Dans **Options → Packs de ressources**, **Personnaliser Sanctuary** crée
|
||||
`resourcepacks/Sanctuary-Custom/`. Le bouton devient **Ouvrir ma copie**.
|
||||
La copie contient toutes les ressources client de Sanctuary : textures, modèles,
|
||||
étiquettes d'items, blockstates, sons, shaders, langues et remplacements Minecraft
|
||||
présents dans le pack intégré. Celui-ci prend priorité sur les assets de base
|
||||
lors de l'export. Un guide FR/EN, la licence et les crédits accompagnent la copie.
|
||||
|
||||
Le joueur active sa copie avec les commandes natives et la place au-dessus des
|
||||
packs qu'il veut remplacer. Créer la copie ne change ni l'ordre ni la sélection.
|
||||
Une modification se recharge avec F3 + T ; désactiver le pack retrouve les
|
||||
ressources fournies par le mod. L'écran de sélection des datapacks n'est pas modifié.
|
||||
|
||||
La copie est un **instantané**. Elle ne se synchronise pas avec les mises à jour :
|
||||
les fichiers personnalisés restent toujours intacts. Le guide recommande de
|
||||
supprimer les fichiers non personnalisés pour laisser les prochaines ressources
|
||||
du mod s'appliquer. Pour repartir d'un instantané récent, renommer le dossier
|
||||
existant puis créer une nouvelle copie. Aucun fichier utilisateur n'est écrasé.
|
||||
|
||||
La copie s'effectue hors du fil de rendu, dans un dossier temporaire voisin,
|
||||
puis le résultat complet rejoint la liste native. Une erreur de copie est
|
||||
signalée par le bouton et le journal du jeu ; un chemin occupé par un fichier
|
||||
n'est pas remplacé. Aucune extraction au démarrage ni pendant les mises à jour.
|
||||
|
||||
## Distribution
|
||||
|
||||
`./gradlew assembleResourceTemplate` produit
|
||||
`build/Sanctuary-Template-beta.121.zip`, un pack personnel complet à décompresser
|
||||
dans `resourcepacks/Sanctuary-Custom/`. `assemblePack` le produit aussi.
|
||||
`build/Sanctuary-Resource-Pack-beta.121.zip` reste l'export du pack graphique
|
||||
intégré ; son manifeste versionné contient 151 fichiers et les images historiques
|
||||
sont conservées. L'identifiant intégré `sanctuary:textures` reste stable et son
|
||||
activation reste contrôlée par le joueur.
|
||||
|
||||
Le template ne contient pas tous les assets vanilla ni ceux des autres mods.
|
||||
Il ne contient pas les recettes, règles serveur ou sauvegardes. Il conserve
|
||||
les crédits et conditions des ressources d'origine. Aucune génération, aucun
|
||||
identifiant de bloc et aucun format de sauvegarde ne changent.
|
||||
|
||||
## Vérifications
|
||||
|
||||
Le parcours `ResourceTemplate121ClientChecks` passe en **35 s** sur le client
|
||||
Minecraft 26.3 macOS, sans ouvrir de monde :
|
||||
|
||||
- Bouton natif et disposition FR/EN aux échelles 2 et 3, captures relues.
|
||||
- Export complet de **1 202 fichiers**, empreintes identiques aux ressources
|
||||
sources après application des priorités du pack intégré.
|
||||
- PNG fourni vérifié par SHA-256 et affiché avec sa transparence.
|
||||
- Création sans changer la sélection ni l'ordre des packs.
|
||||
- Modification d'une texture et ajout d'un fichier personnel : aucun octet
|
||||
réécrit lors d'un second export ni au rechargement des ressources.
|
||||
- Priorité réelle de la texture personnalisée, puis retour à la clé fournie
|
||||
après désactivation. Activation et désactivation conservées à la redécouverte.
|
||||
- Chemin occupé par un fichier refusé sans le modifier ; aucun bouton ajouté
|
||||
à l'écran des datapacks.
|
||||
|
||||
```sh
|
||||
./gradlew :sanctuary:runClientGameTest \
|
||||
-PsanctuaryClientTests=true -PsanctuaryResourceTemplate121ClientTests=true \
|
||||
-PsanctuaryClientNoVsync=true -PsanctuaryQuickTests=true
|
||||
```
|
||||
|
||||
Marqueur `TEMPLATE121_PASS` dans `build/template121-client.log` ; captures et
|
||||
empreintes de la copie dans `build/template121-evidence/`. Le premier essai
|
||||
avait échoué dans l'aperçu du test qui créait un ItemStack avant connexion à
|
||||
un monde ; cet aperçu affiche maintenant directement la texture résolue.
|
||||
Le modèle plat existant n'est pas modifié. Pas d'essai Windows ni d'ouverture
|
||||
automatisée du gestionnaire de fichiers. Le GameTest serveur dédié reste exclu
|
||||
conformément au refus antérieur de son EULA.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 10 s**, 126 tâches. Les sources JAR correspondent aux sources
|
||||
Java du dépôt. La comparaison avec beta.120 limite les différences de production
|
||||
aux deux nouvelles classes, au hook d'interface, aux libellés et aux ressources
|
||||
prévues (12 entrées). Aucun changement de gameplay, de données serveur ou de
|
||||
monde. Les packs normal/Test contiennent le même JAR Sanctuary, sans fixture
|
||||
ni sauvegarde. Le ZIP du template et l'export natif ont exactement les mêmes
|
||||
1 202 fichiers et empreintes. Le pack intégré conserve ses 151 fichiers vérifiés.
|
||||
|
||||
Reçu : `build/template121-artifact.json`. Artefacts locaux validés :
|
||||
|
||||
- `Sanctuary-beta.121.mrpack` : 10261791 octets, SHA-256
|
||||
`040d68f342155120fa21e0ffcdf34aa38e3225c78862960536622de53ed9fd9f`.
|
||||
- `Sanctuary-Test-beta.121.mrpack` : 10280716 octets, SHA-256
|
||||
`7f5bbd4e13aea4c245d072725c094ca64826ee8debc8607623783c114d437685`.
|
||||
- `Sanctuary-Resource-Pack-beta.121.zip` : 3757952 octets, SHA-256
|
||||
`bbf3c18ea6abc64d951911215975cb6c48c7fc5e0246f6e5f5192a3d061c211d`.
|
||||
- `Sanctuary-Template-beta.121.zip` : 4315131 octets, SHA-256
|
||||
`6fad376c53474fa8bcb0a2e6ae4c13ea61ab91bdd78735be443032d485ed541a`.
|
||||
|
||||
JAR Sanctuary : SHA-256
|
||||
`4276f4fc9834805e3e6d12cd19adba7837e3007656b77f31d525c7b976f9925d`.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.121](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.121)
|
||||
est publiée depuis `d9b3dd6bedf32448f8c6e5bfa4da10cb69968bc7`. Tag et artefacts immuables,
|
||||
téléchargements publics vérifiés. Canal packwiz :
|
||||
`e3e6572da9288fbbcfa36bf6b7dd3aa0d1c54f5e`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.121 est actif ; le second passage est identique.
|
||||
Les **923 fichiers personnels et réglages suivis** restent inchangés,
|
||||
y compris les packs de ressources. Aucune copie personnelle n'est créée par
|
||||
la mise à jour : chaque joueur utilise le bouton quand il le souhaite.
|
||||
Aucun monde personnel ouvert. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.121/` de l'instance existante ; reçus
|
||||
`build/template121-isolated.json` et `build/template121-prism.json`.
|
||||
|
||||
- [Template personnel complet](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-Template-beta.121.zip).
|
||||
- [Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-beta.121.mrpack).
|
||||
- [Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.121/Sanctuary-Test-beta.121.mrpack).
|
||||
@@ -0,0 +1,93 @@
|
||||
# SCULPT-10 — Une boîte par sculpture — beta.124
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/sculpture-bounds-beta124`.
|
||||
Le créateur choisit **une seule boîte pour la sélection et les collisions**.
|
||||
Ce ticket remplace la forme physique détaillée de beta.122.
|
||||
|
||||
La boîte englobe exactement les dimensions occupées par la sculpture, après
|
||||
orientation et ancrage au centre ou au bord. Elle suit toujours la grille 1/16,
|
||||
y compris les tailles impaires et les modèles comportant des marges vides.
|
||||
Les trous et petits détails restent visibles mais n'ont plus leurs propres
|
||||
surfaces de collision : on ne grimpe plus sur leurs petites marches. Une arche
|
||||
se sélectionne et bloque désormais sur tout son volume englobant.
|
||||
|
||||
La pose utilise la même boîte avant la création de l'entité de bloc : elle
|
||||
refuse une intersection avec le joueur, y compris dans les trous visuels.
|
||||
Les petites sculptures laissent libre le reste du bloc autour de leur boîte.
|
||||
La forme reste mise en cache par modèle et état ; elle ne se recalcule qu'après
|
||||
un changement de modèle, d'orientation ou d'ancrage. Les requêtes physiques et
|
||||
le contour partagent cette même forme native.
|
||||
|
||||
Le calcul parcourt les cellules une seule fois, sans créer de copies tournées
|
||||
ni de grille de collisions 16³. Le contour émet toujours douze arêtes.
|
||||
Il s'agit d'une simplification du travail géométrique ; aucun gain de FPS global
|
||||
n'est annoncé sans mesure sur une scène représentative.
|
||||
|
||||
Le rendu des sculptures et les règles de lumière de beta.122 restent inchangés :
|
||||
pas d'occlusion de cube plein, pas d'émission artificielle de lumière. Aucun
|
||||
identifiant, format d'item ou de sauvegarde ne change. Les anciennes sculptures
|
||||
utilisent la nouvelle forme à partir de leurs données existantes, sans réécriture
|
||||
des mondes ni régénération de chunks. L'atelier et les clés restent inchangés.
|
||||
|
||||
## Vérifications
|
||||
|
||||
Le parcours `Sculpture122ClientChecks`, adapté au nouveau contrat, passe en
|
||||
**39 s** sur Minecraft 26.3, client macOS et serveur intégré jetable de graine 122.
|
||||
|
||||
- Sélection native de tout le volume, y compris le trou visuel d'une arche ;
|
||||
contour rectangulaire relu dans la capture.
|
||||
- Même boîte physique et de sélection sur client et serveur ; intérieur rempli,
|
||||
dimensions exactes sans profondeur artificielle de bloc entier.
|
||||
- **80 cas** : boîte unique comparée aux limites du maillage réellement émis,
|
||||
douze arêtes exactement, même objet réutilisé lors des requêtes répétées.
|
||||
Arche, marges vides, cube de 4 096 cellules et voxel unique, dans les quatre
|
||||
orientations et cinq ancrages.
|
||||
- **5 120 placements** de rendu toujours alignés sur la grille entière.
|
||||
- Pose refusée dans le joueur, y compris entre deux piliers séparés ; petite
|
||||
sculpture autorisée à côté du joueur, hors de sa boîte physique.
|
||||
- Cache renouvelé après changement d'orientation/ancrage ou de modèle ;
|
||||
conservation après sauvegarde/reconnexion.
|
||||
- **75 sculptures superposées** : ciel à 15 ; toit de pierre témoin sombre ;
|
||||
lumière de bloc transmise avec atténuation normale ; pièce close à 0.
|
||||
|
||||
Marqueurs dans `build/sculpture124-client.log`, notamment
|
||||
`SCULPTURE124_BOUNDS_PASS 80`, plus les contrôles de régression de beta.122.
|
||||
Captures relues dans `build/sculpture124-evidence/`. Aucun essai Windows,
|
||||
client distant ou shader tiers ; le coût des boîtes est simplifié sans benchmark
|
||||
FPS global.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 9 s**, 126 tâches (110 exécutées, 16 à jour).
|
||||
Les sources des JAR correspondent aux sources du dépôt. La comparaison avec
|
||||
beta.123 limite les différences de production aux trois classes de
|
||||
`SculptureGeometry` ; ressources, clés, interfaces, données et éclairage restent
|
||||
identiques. Les packs normal/Test contiennent le même JAR, sans sauvegarde
|
||||
ni fixture. Le template personnel conserve exactement les ressources de beta.123.
|
||||
|
||||
- Pack normal : 10 271 059 octets, SHA-256
|
||||
`2075e4ac7a7e7e2effcd82586d46769607ca1a67e8d9110b000fa378d1bc5506`.
|
||||
- Pack Test : 10 289 985 octets, SHA-256
|
||||
`88263e6896590ea9694b18084666e7234e934064e8d7d596d34866a68cc5ea23`.
|
||||
- JAR Sanctuary : SHA-256
|
||||
`b3969b1a3738b8a5d332b2083db0dd722900239f73035c335b738f70328d43f1`.
|
||||
|
||||
Reçu local : `build/sculpture124-artifact.json`. Les packs normal/Test et le
|
||||
template sont aussi copiés, avec vérification octet pour octet, dans le dossier
|
||||
habituel `sanctuary-beta/build/`.
|
||||
|
||||
Le GameTest dédié reste exclu conformément au refus antérieur de son EULA.
|
||||
Aucun monde personnel n'est ouvert par les essais.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.124](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.124)
|
||||
est publiée depuis `00179e30ef0b45ef98378bc164a7810552dd1bdd`.
|
||||
Le tag exact et les artefacts sont immuables, leurs téléchargements publics
|
||||
vérifiés. Canal packwiz : `67ebcc7d07f8b75e8988f6099e3d6e5704f123fb`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.124 est actif, conforme au hash vérifié ; le second
|
||||
passage ne change rien. Les **923 fichiers personnels et réglages suivis**
|
||||
restent inchangés, sans ouverture de monde personnel. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.124/` de l'instance existante.
|
||||
Reçus : `build/sculpture124-isolated.json` et `build/sculpture124-prism.json`.
|
||||
@@ -0,0 +1,84 @@
|
||||
# STAT-07 — Pose centrée des sculptures — beta.119
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/sculpture-center-beta119`.
|
||||
|
||||
Viser le carré central de 8 × 8 pixels de la face supérieure ou inférieure
|
||||
du bloc place la sculpture au centre. Les limites de cette zone sont incluses.
|
||||
Autour, le bord horizontal le plus proche reste choisi ; une pose latérale
|
||||
continue à s'appuyer contre le bloc support. L'orientation suit le regard.
|
||||
L'aide du Clay Workshop explique les deux possibilités en français et anglais.
|
||||
|
||||
Le centrage utilise l'emprise réelle des voxels après rotation, en ignorant les
|
||||
marges transparentes. Tous les sommets restent sur la grille de 1/16 de bloc.
|
||||
Une dimension impaire ne peut pas être parfaitement symétrique dans un bloc de
|
||||
16 pixels sans décaler ses voxels : elle prend donc le centrage entier le plus
|
||||
proche, avec un pixel de différence entre les deux marges. Aucune position à
|
||||
un demi-voxel n'est introduite.
|
||||
|
||||
## Compatibilité
|
||||
|
||||
La pose réutilise `anchor=center`, déjà présent depuis beta.113. Aucun nouvel
|
||||
état, identifiant, composant ou format de sauvegarde. Les sculptures existantes
|
||||
gardent leur ancrage ; casser et reposer choisit l'emplacement visé. Le rendu,
|
||||
les couleurs, les chapeaux et les collisions restent inchangés. Aucun parcours
|
||||
de monde existant, aucune régénération. Client et serveur doivent utiliser
|
||||
ensemble la nouvelle version pour le choix de pose.
|
||||
|
||||
## Vérifications et livraison
|
||||
|
||||
Le parcours natif `Statuary106ClientChecks`, avec `Sculpture113ClientChecks`,
|
||||
passe en **54 s** sur Minecraft 26.3/macOS :
|
||||
|
||||
- Vrais clics de pose centrée dans quatre orientations, sur client et serveur,
|
||||
puis pose contre les quatre bords sans modifier les couleurs du modèle.
|
||||
- Limites incluses et points immédiatement de part et d'autre de la zone,
|
||||
faces supérieure/inférieure et positions positives/négatives ; faces
|
||||
latérales toujours calées contre le support.
|
||||
- 5 120 combinaisons de largeur/profondeur, orientation et ancrage : géométrie
|
||||
effectivement rendue sur la grille exacte, emprise sans dépassement,
|
||||
centrage pair/impair et marges transparentes.
|
||||
- Sauvegarde/reconnexion des sculptures centrées et aux bords, sans fichier
|
||||
source ; rotations/miroirs, anciens états, fabrication et hotbar vérifiés.
|
||||
|
||||
```sh
|
||||
./gradlew :sanctuary:runClientGameTest \
|
||||
-PsanctuaryClientTests=true -PsanctuaryStatuary106ClientTests=true \
|
||||
-PsanctuaryClientNoVsync=true -PsanctuaryQuickTests=true
|
||||
```
|
||||
|
||||
Marqueurs `SCULPTURE119_PASS`, `STATUARY113_PASS` et
|
||||
`SCULPTURE113_GEOMETRY_PASS` dans `build/sculpture119-client.log`.
|
||||
Captures conservées dans `build/sculpture119-evidence/`, vue centrée relue.
|
||||
Monde plat jetable de graine 106 ; aucun monde personnel ouvert. Pas de
|
||||
validation Windows ni de test depuis deux ordinateurs.
|
||||
Le GameTest dédié reste exclu conformément au refus antérieur de son EULA ;
|
||||
le parcours natif utilise le serveur intégré.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 24 s**, 125 tâches. Les sources JAR correspondent aux sources
|
||||
du dépôt ; seuls `SculptureAnchor.class` et le texte d'aide FR/EN diffèrent
|
||||
parmi les classes et ressources de production de beta.118. Les deux packs
|
||||
contiennent le même JAR, sans monde ni fixture de test.
|
||||
|
||||
- Sanctuary-beta.119.mrpack : 10216447 octets, SHA-256
|
||||
`ce29702eaaac7301c77fb6af63a76c6bc1c0c704313ce1b8243c95b5fe59d893`.
|
||||
- Sanctuary-Test-beta.119.mrpack : 10235369 octets, SHA-256
|
||||
`a1a2845f9678b1144d7d9eab4867970cc1776fe0ad5d51722c8110b7c1d4c682`.
|
||||
- JAR Sanctuary : SHA-256
|
||||
`d353bd89b16c53ee1ee48836fa2ff4b311249b280992300c28bf03048d805bff`.
|
||||
|
||||
Reçu local : `build/sculpture119-artifact.json`.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.119](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.119)
|
||||
est publiée depuis `3fd64e1f2a77ea2584b087d6339cf605d8ee0e9b`. Le tag exact et les
|
||||
artefacts sont immuables ; leurs téléchargements publics sont vérifiés.
|
||||
Le canal packwiz avance à `5e823af7807f524f6394acad402fe62328c7e4ab`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.119 est actif ; le second passage est identique.
|
||||
Les **923 fichiers personnels et réglages suivis** restent inchangés, sans
|
||||
ouvrir de monde personnel. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.119/` de l'instance existante. Reçus locaux :
|
||||
`build/sculpture119-isolated.json` et `build/sculpture119-prism.json`.
|
||||
@@ -0,0 +1,94 @@
|
||||
# SCULPT-11 — Placement, éclats et modèles découverts — beta.125
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/sculpture-placement-beta125`.
|
||||
|
||||
Le point visé choisit neuf positions horizontales (centre, quatre bords et quatre
|
||||
coins) et trois hauteurs (bas, milieu et haut). Sur un support, la sculpture
|
||||
repose au bas de son bloc ; sous un plafond, elle touche le haut ; sur une face
|
||||
latérale, elle suit la hauteur visée et reste contre le support. Les sculptures
|
||||
restent debout et s'orientent selon le regard horizontal du joueur.
|
||||
La bande centrale occupe les huit pixels médians, limites incluses. Toute pose
|
||||
reste sur la grille 1/16 : une dimension impaire utilise le centre entier le
|
||||
plus proche, jamais un demi-voxel. Rendu, boîte unique de sélection et collision
|
||||
partagent les mêmes offsets. La lumière conserve les règles de beta.122.
|
||||
|
||||
## Compatibilité additive des états existants
|
||||
|
||||
Les cinq anciennes valeurs `anchor` gardent exactement leurs noms. Quatre
|
||||
valeurs de coin sont ajoutées. La nouvelle propriété `vertical_anchor` accepte
|
||||
`bottom`, `center`, `top` et `original`, valeur par défaut réservée à la
|
||||
compatibilité. La lecture d'un ancien bloc sans cette propriété conserve
|
||||
l'ancienne hauteur, même si le modèle a des marges transparentes en bas.
|
||||
Le bloc possède 144 états : 108 placements nouveaux et 36 états de compatibilité.
|
||||
|
||||
Le schéma 1 des sculptures, leurs données de voxels et tous leurs identifiants
|
||||
restent inchangés. Aucun monde n'est parcouru ou réécrit, aucun chunk régénéré.
|
||||
Les nouveaux ancrages nécessitent beta.125 ; le retour à une version antérieure
|
||||
ne garantit pas leur position. Ce contrat autorise l'ajout compatible des états,
|
||||
pas une migration destructive des sauvegardes personnelles.
|
||||
|
||||
## Particules
|
||||
|
||||
Les coups et la casse émettent des éclats de la couleur des surfaces voxelisées
|
||||
réellement affichées, avec leur orientation et leur ancrage. Un coup vise la
|
||||
surface réelle la plus proche du point sélectionné, même devant un trou visuel.
|
||||
La casse échantillonne au plus 64 faces ; aucun calcul de texture n'est refait.
|
||||
Les éclats utilisent une taille de voxel, la gravité et la lumière natives.
|
||||
Une petite mémoire par monde (128 entrées de 64 faces, validité 40 ticks) conserve les
|
||||
surfaces si la suppression du bloc précède l'événement de casse. Les autres
|
||||
blocs gardent leurs particules habituelles.
|
||||
|
||||
## Clay Workshop
|
||||
|
||||
L'onglet Animaux utilise exactement les découvertes serveur du catalogue de
|
||||
statues (rencontre, victoire ou mort face à l'espèce). Le menu transmet cette
|
||||
liste à chaque ouverture, sans dépendre d'une visite préalable au Métabli.
|
||||
Le modèle natif et sa texture sont capturés localement, voxelisés en miniature,
|
||||
puis recolorés par la matière choisie. Le résultat reste fabriqué et payé côté
|
||||
serveur. Les sélections d'espèces non découvertes sont refusées. L'onglet Imports
|
||||
conserve les fichiers GLB. Aucun nouveau format de sculpture n'est introduit.
|
||||
Libellés FR et EN.
|
||||
|
||||
## Vérifications
|
||||
|
||||
Le parcours natif `Sculpture125ClientChecks` passe en **1 min 2 s**, client
|
||||
Minecraft 26.3 sur macOS et serveur intégré jetable (graines 125 et 122).
|
||||
|
||||
- 54 clics réels sur les six faces : centres, bords, coins et hauteurs.
|
||||
- 432 contextes de pose, coordonnées positives/négatives, quatre orientations,
|
||||
rotations et miroirs ; 144 états valides.
|
||||
- 20 anciens états sans `vertical_anchor` conservent leur hauteur et marges.
|
||||
- Couleur exacte des éclats au point frappé, surfaces réellement occupées,
|
||||
limite de 64 fragments, événement après suppression et particules normales
|
||||
d'un bloc de pierre témoin.
|
||||
- Atelier : découvertes par rencontre, victoire et mort, transmission native
|
||||
du menu, refus serveur d'une espèce inconnue, trois modèles natifs (vache,
|
||||
mouton, cochon), paiement d'un bloc en survie et import GLB conservé.
|
||||
- Sauvegarde et reconnexion avec les nouveaux coins et hauteurs.
|
||||
- 576 formes comparées aux limites du maillage affiché, boîte unique partagée,
|
||||
cache réutilisé et 12 arêtes ; 9 216 empreintes orientées sur grille entière.
|
||||
- 75 sculptures superposées : ciel à 15, lumière de bloc à 13 après traversée,
|
||||
pièce noire à 0. Pose dans le joueur refusée, même devant un trou visuel.
|
||||
|
||||
Marqueurs dans `build/sculpture125-client.log`. Captures de plafond, murs et
|
||||
atelier relues dans `build/sculpture125-evidence/`. Aucun essai Windows,
|
||||
client distant ou shader tiers ; trois espèces vérifiées visuellement, sans
|
||||
prétendre avoir inspecté chaque espèce. Aucun benchmark FPS global.
|
||||
|
||||
Le GameTest dédié demeure exclu conformément au refus antérieur de son EULA.
|
||||
Les mondes de test sont jetables ; aucun monde personnel n'est ouvert.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 16 s**, 126 tâches (110 exécutées, 16 à jour). Les sources
|
||||
des JAR correspondent exactement au dépôt. La comparaison avec beta.124
|
||||
limite les différences aux classes de placement, particules et atelier prévues,
|
||||
aux nouveaux libellés FR/EN, au mixin client et à la source blanche de particules.
|
||||
Les packs normal/Test partagent le même JAR, sans monde ni fixture ; le template
|
||||
reproduit les ressources du mod et du pack intégré.
|
||||
|
||||
- Sanctuary-beta.125.mrpack : 10286360 octets, SHA-256 `9277e59c640c40392ab3750b402bb840020884878f6ece6978e6c4653e18655e`.
|
||||
- Sanctuary-Test-beta.125.mrpack : 10305282 octets, SHA-256 `9e3dbfa14b5382ba4eb62a78fa7d2161758c2f0e1fdc50fbd5ed776fd4ce32c5`.
|
||||
- JAR Sanctuary : SHA-256 `b38b75b900dd8cbe015318c739d5547fd7eac52f4337fa517e98f3f6f0ce3b46`.
|
||||
|
||||
Reçu local : `build/sculpture125-artifact.json`. Les deux packs et le template
|
||||
sont copiés et vérifiés dans le dossier habituel `sanctuary-beta/build/`.
|
||||
@@ -0,0 +1,108 @@
|
||||
# SCULPT-09 — Forme physique et lumière — beta.122
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/sculpture-shape-light-beta122`.
|
||||
Le créateur demande des bounding boxes adaptées aux sculptures et la suppression
|
||||
des ombres cubiques visibles lorsqu'on en pose plusieurs côte à côte.
|
||||
|
||||
La sélection, le contact avec les entités et les collisions suivent les voxels
|
||||
occupés de chaque sculpture, y compris les creux. Le rendu et la forme physique
|
||||
partagent leur placement entier sur la grille 1/16, après orientation et ancrage.
|
||||
Le centre, les quatre bords et les dimensions impaires gardent leur alignement.
|
||||
La pose vérifie aussi les voxels portés avant que l’entité de bloc existe :
|
||||
elle refuse une intersection avec le joueur et autorise les espaces libres.
|
||||
La forme est construite directement sur une grille native 16³ et mise en cache
|
||||
par entité de bloc, modèle et état ; aucun calcul complet à chaque interrogation.
|
||||
|
||||
Les sculptures transmettent la lumière et ne sont plus utilisées comme cubes
|
||||
pleins par l'occlusion ambiante. Leurs faces restent éclairées par le monde,
|
||||
sans émission de lumière et sans rendu à luminosité maximale. Cette règle est
|
||||
commune aux sculptures : l'éclairage natif stocké par bloc ne permet pas une
|
||||
ombre distincte pour chaque petit voxel. L'atelier d'argile reste inchangé.
|
||||
|
||||
Aucun identifiant, blockstate, format d'item ou schéma sauvegardé ne change.
|
||||
Les formes sont recalculées à partir des voxels existants ; aucune migration,
|
||||
aucun parcours de monde ni régénération de chunk. Les données inconnues gardent
|
||||
leur conservation opaque et une petite base sélectionnable pour récupérer l'item.
|
||||
Le travail de documentation déjà présent dans l'autre branche reste intact.
|
||||
|
||||
## Vérifications et livraison
|
||||
|
||||
Le parcours `Sculpture122ClientChecks` passe en **37 s** sur Minecraft 26.3,
|
||||
client macOS et serveur intégré, dans un monde plat jetable de graine 122 :
|
||||
|
||||
- Pose par la commande native d'utilisation ; sélection du pilier et visée
|
||||
à travers le trou d'une arche jusqu'au bloc derrière, captures relues.
|
||||
- Requêtes natives de collision côté serveur et client : voxels occupés solides,
|
||||
espace vide libre, aucune profondeur artificielle d'un bloc entier.
|
||||
- Pose refusée dans le joueur, sans consommer l'objet ; petite sculpture acceptée
|
||||
dans la partie libre du même bloc, sans intersection avec le joueur.
|
||||
- **80 cas** confrontent le volume et les faces de collision au maillage réellement
|
||||
émis : arche creuse, marges vides, cube de 4 096 voxels, voxel unique, quatre
|
||||
orientations et cinq ancrages. Chaque interrogation répétée réutilise la forme.
|
||||
- Régression de **5 120 placements** du rendu existant : dimensions paires/impaires,
|
||||
orientations et ancrages, plus marqueurs de direction et modèles avec marges.
|
||||
- Changement d'orientation/ancrage puis changement des voxels sur la même entité :
|
||||
cache recalculé et forme client synchronisée.
|
||||
- **75 sculptures en trois couches** : skylight natif conservé à 15 partout.
|
||||
Un toit de pierre témoin produit toujours une ombre. La lumière d'un bloc
|
||||
traverse une sculpture avec l'atténuation de distance native (13 à deux blocs).
|
||||
- Le rendu reçoit la lumière réelle du monde : 15 au ciel, **0 dans une pièce
|
||||
fermée et obscure**. Aucun rendu artificiellement lumineux.
|
||||
- Sauvegarde/reconnexion : modèle, collisions et lumière conservés sur les
|
||||
deux côtés, sans fichier 3D source.
|
||||
|
||||
```sh
|
||||
./gradlew :sanctuary:runClientGameTest \
|
||||
-PsanctuaryClientTests=true -PsanctuarySculpture122ClientTests=true \
|
||||
-PsanctuaryClientNoVsync=true -PsanctuaryQuickTests=true
|
||||
```
|
||||
|
||||
Marqueurs `SCULPTURE122_PASS`, `SCULPTURE122_GEOMETRY_PASS`,
|
||||
`SCULPTURE122_PLACEMENT_PASS`, `SCULPTURE122_LIGHT_PASS` et
|
||||
`SCULPTURE113_GEOMETRY_PASS` dans `build/sculpture122-client.log` ; captures
|
||||
conservées dans `build/sculpture122-evidence/`. Le test prépare explicitement
|
||||
son sol à Y=0 : le preset plat nu commence à Y=-1.
|
||||
Aucun monde personnel ouvert ; pas d'essai Windows ni depuis deux ordinateurs,
|
||||
ni de garantie sur les ombres ajoutées par des shaders tiers.
|
||||
Le GameTest serveur dédié reste exclu conformément au refus antérieur de son EULA.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 13 s**, 126 tâches. Les sources JAR correspondent aux sources
|
||||
Java du dépôt. Par rapport à beta.121, les différences de production se limitent
|
||||
aux classes des sculptures et à la nouvelle géométrie partagée (14 entrées,
|
||||
y compris le déplacement du sélecteur synthétique d'orientation). Toutes les
|
||||
ressources client, données serveur et configurations de mixins sont identiques.
|
||||
Les packs normal/Test contiennent le même JAR, sans sauvegarde ni fixture.
|
||||
Le template beta.122 contient les mêmes ressources que beta.121, octet pour octet.
|
||||
|
||||
Reçu local : `build/sculpture122-artifact.json`.
|
||||
|
||||
- `Sanctuary-beta.122.mrpack` : 10267459 octets, SHA-256
|
||||
`b6e24d65797eb7f16670d2f3a591b5f2476820608f72241ecd37fb78a486008e`.
|
||||
- `Sanctuary-Test-beta.122.mrpack` : 10286380 octets, SHA-256
|
||||
`90487ee3ad4298fccb8c24e8781af4cbf043d88dc0379fba5c21d99733dac92d`.
|
||||
|
||||
JAR Sanctuary : SHA-256
|
||||
`ff8ebf89f39a64809fae6912253386793e9b5e66ec0adb9fa7521729893d406e`.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.122](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.122)
|
||||
est publiée depuis `edc7fc3dfb117cde61be42c1d79b03af11f5dec6`. Tag et artefacts immuables,
|
||||
téléchargements publics vérifiés. Canal packwiz :
|
||||
`3d340bea0093b709c6018624795a1b3ca557b72d`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.122 est actif ; le second passage est identique.
|
||||
Les **923 fichiers personnels et réglages suivis** restent inchangés.
|
||||
Aucun monde personnel ouvert. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.122/` de l'instance existante ; reçus
|
||||
`build/sculpture122-isolated.json` et `build/sculpture122-prism.json`.
|
||||
|
||||
Le ticket a été réalisé dans le worktree `sanctuary-sculpture-beta122` afin de
|
||||
préserver les changements de `docs/vision.md` et `docs/villageois-illageois.md`
|
||||
déjà présents sur la branche de documentation du checkout principal.
|
||||
|
||||
- [Pack normal](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.122/Sanctuary-beta.122.mrpack).
|
||||
- [Pack de test](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.122/Sanctuary-Test-beta.122.mrpack).
|
||||
- [Template personnel](https://git.botsu.net/koka/sanctuary-beta/releases/download/beta.122/Sanctuary-Template-beta.122.zip).
|
||||
@@ -0,0 +1,129 @@
|
||||
# TOOL-02 — Clé dorée et clé de Steve — beta.123
|
||||
|
||||
Contrat du 17 septembre 2026, branche `codex/wrench-safety-beta123`.
|
||||
Ce ticket remplace le contrat de la clé dorée de beta.120 : l'édition libre
|
||||
reste disponible dans un objet distinct, la **Clé à molette de Steve**.
|
||||
Le créateur précise que la clé de Steve reste utilisable en survie dès qu’un
|
||||
joueur la récupère, sans condition opérateur. Elle n’a pas de recette.
|
||||
|
||||
## Clé dorée : orientations natives
|
||||
|
||||
L'identifiant `sanctuary:golden_wrench`, sa recette et sa texture restent stables.
|
||||
Clic droit parcourt l'orientation native ; Maj parcourt en sens inverse.
|
||||
Clic gauche rappelle les gestes, sans casser le bloc ni sélectionner un état.
|
||||
Les familles de propriétés autorisées sont les orientations horizontales,
|
||||
les six directions, les trois axes, la rotation native des panneaux et
|
||||
l'orientation native des blocs qui la proposent. La règle porte sur les
|
||||
propriétés Minecraft, sans catalogue à maintenir pour chaque type de bloc.
|
||||
|
||||
L'eau, la moitié d'un escalier, les inventaires, les états de croissance,
|
||||
les quantités, la puissance et les autres propriétés ne sont jamais proposées.
|
||||
Aucune transformation indépendante des textures n'est créée par la clé dorée.
|
||||
Les textures suivent seulement le modèle orienté par Minecraft.
|
||||
Les connexions et formes sont recalculées à partir des voisins réels, avec les
|
||||
mises à jour natives actives. Une orientation privée de support est refusée
|
||||
sans casser le bloc. L'eau déjà contenue dans un bloc est conservée.
|
||||
|
||||
Les coffres doubles, portes, lits, étagères reliées, pistons sortis et leurs
|
||||
pièces mobiles ne peuvent pas être tournés individuellement. Ils restent dans
|
||||
leur état courant et une indication explique le refus. Il faut replacer les
|
||||
éléments concernés ou rétracter le piston ; ce ticket ne déplace pas un
|
||||
ensemble lié. Les coffres simples conservent leur entité et leur inventaire.
|
||||
|
||||
L'assemblage, l'ouverture et la dissociation des Métablis, Fûts, Fourneaux et
|
||||
super pistons restent prioritaires avec les deux clés. Les parties techniques
|
||||
d'un multibloc Sanctuary assemblé ne sont pas éditées individuellement.
|
||||
|
||||
## Clé de Steve
|
||||
|
||||
Nouvel identifiant `sanctuary:steve_wrench`, dans la section créative des outils,
|
||||
sans recette de survie. La possession de cet objet donne accès à ses pouvoirs,
|
||||
y compris en survie sans commandes et sans statut opérateur, dans les deux
|
||||
mains. Les restrictions natives de construction, aventure, spectateur, portée,
|
||||
protection et verrouillage restent appliquées côté serveur.
|
||||
|
||||
Les gestes de beta.120 sont conservés : clic gauche choisit la propriété,
|
||||
clic droit la modifie, Maj inverse le parcours. Tous les états natifs et la
|
||||
rotation indépendante des textures y restent volontairement accessibles.
|
||||
La clé de Steve est donc volontairement capable de produire des états non
|
||||
naturels, y compris pour le joueur qui la récupère en survie.
|
||||
|
||||
La texture finale est le PNG 16 × 16 bleu fourni par le créateur dans ce ticket,
|
||||
copié sans transformation dans `assets/sanctuary/textures/item/steve_wrench.png`.
|
||||
SHA-256 : `0084c41e1f46958903075e21866facd97d85e03fb8e06742e25b2ab254956fa3`.
|
||||
Le modèle reste un objet Minecraft 2D tenu en main, avec rareté épique et reflet.
|
||||
La proposition imagegen intermédiaire n'est pas livrée. Les noms, messages et
|
||||
indications des deux outils existent en français et en anglais.
|
||||
|
||||
## Sauvegardes et ressources
|
||||
|
||||
Aucune migration, modification de génération ni parcours des mondes existants.
|
||||
Les transformations de texture précédemment sauvegardées sont conservées ;
|
||||
la clé de Steve permet de les modifier. Les états non naturels déjà présents
|
||||
ne sont pas automatiquement réécrits. Les clés dorées existantes reçoivent
|
||||
immédiatement les nouvelles restrictions par leur identifiant inchangé.
|
||||
Le template personnel inclut le nouvel objet à sa prochaine création ; une
|
||||
copie personnelle existante n'est jamais écrasée.
|
||||
|
||||
## Vérifications
|
||||
|
||||
Le parcours `Wrench123ClientChecks` passe en **1 min 12 s**, client macOS et
|
||||
serveur intégré, Minecraft 26.3, dans des mondes plats jetables de graines
|
||||
123 et 120. Il reprend le parcours avancé de beta.120 sur la clé de Steve :
|
||||
|
||||
- Vrais clics dorés répétés sur escalier, coffre et terre : pas de nouvelle eau,
|
||||
pas de sélection libre, pas de faux coffre double ni de rotation de texture.
|
||||
- Rotation inverse, eau existante conservée, formes recalculées selon les voisins,
|
||||
trois axes de bûches et six orientations des pistons isolés.
|
||||
- Coffre double avec ses deux inventaires intacts ; portes, lits, pistons sortis
|
||||
et pièces mobiles protégés ; torche murale sans support laissée intacte.
|
||||
- Vrais clics Steve en survie sans commandes : états et textures accessibles,
|
||||
dans les deux mains. Créatif accessible aussi sans commandes ; restrictions
|
||||
aventure/spectateur/portée conservées.
|
||||
- **2 522 propriétés natives** toujours réversibles pour Steve, UV réellement
|
||||
tournés sans déplacer la géométrie, rechargement des ressources, inventaires
|
||||
et sauvegarde/reconnexion conservés.
|
||||
- Assemblage et dissociation des quatre familles avec la clé dorée par vrais
|
||||
clics ; le PNG de Steve apparaît en main et dans la barre rapide.
|
||||
|
||||
Marqueurs `WRENCH123_SAFE_PASS`, `WRENCH123_PASS`, `WRENCH120_PASS` dans
|
||||
`build/wrench123-client.log`. Captures relues dans `build/wrench123-evidence/`.
|
||||
Pas de validation Windows, de client distant ou de shader tiers.
|
||||
|
||||
`./gradlew check build assemblePack assembleTestPack -x :sanctuary:runGameTest`
|
||||
passe en **2 min 19 s**, 126 tâches (103 exécutées, 23 à jour).
|
||||
Les sources des JAR correspondent aux sources du dépôt. La comparaison avec
|
||||
beta.122 limite les dix entrées de production modifiées aux classes des clés,
|
||||
aux libellés et aux ressources du nouvel objet. Les autres ressources,
|
||||
notamment les sculptures et la texture dorée, sont identiques.
|
||||
Les packs normal/Test contiennent le même JAR Sanctuary, sans sauvegarde ni
|
||||
fixture de test. Le template ZIP correspond exactement aux ressources du JAR
|
||||
et à ses ressources embarquées, dont le PNG bleu du créateur.
|
||||
|
||||
- Pack normal : 10 270 954 octets, SHA-256
|
||||
`a7401dbef1bd1b888da2686368943eddc82d0d43e20449330c4849b4dff93e5f`.
|
||||
- Pack Test : 10 289 877 octets, SHA-256
|
||||
`c57cc6fc47f887b90850473e51407b610a6c5639c35fc2b78dc9ddb74f795b80`.
|
||||
- JAR Sanctuary : SHA-256
|
||||
`23e1a81c793a048c6375a0da07eb0bbe1a18f833a9ceb61a3c1dc5f1a3e65a30`.
|
||||
|
||||
Reçu local : `build/wrench123-artifact.json`.
|
||||
|
||||
Le GameTest dédié reste exclu conformément au refus antérieur de son EULA.
|
||||
Aucun monde personnel n'est ouvert par les essais.
|
||||
|
||||
## Publication et installation
|
||||
|
||||
La [release beta.123](https://git.botsu.net/koka/sanctuary-beta/releases/tag/beta.123)
|
||||
est publiée depuis `4552cc347b7fded610b1eda7a67ffaad56a5e201`.
|
||||
Le tag exact et les artefacts sont immuables ; les téléchargements publics
|
||||
ont été vérifiés. Canal packwiz : `f988d01b901f2d3eda0b4ab47a48540dc627d1b5`.
|
||||
Le template personnel publié inclut la clé de Steve ; SHA-256
|
||||
`f84d3c1c0e38232add90fb943dc39fd3e89138576df86024ceaa311478ed5cb9`.
|
||||
|
||||
Deux synchronisations isolées puis deux dans **Sanctuary Beta** réussissent.
|
||||
Un seul JAR Sanctuary beta.123 est actif, conforme au hash vérifié ; le second
|
||||
passage ne change rien. Les **923 fichiers personnels et réglages suivis**
|
||||
restent inchangés, sans ouverture de monde personnel. Copie préalable dans
|
||||
`sanctuary-backups/before-beta.123/` de l'instance existante.
|
||||
Reçus : `build/wrench123-isolated.json` et `build/wrench123-prism.json`.
|
||||
+3
-3
@@ -9,8 +9,8 @@ loom_version=1.17.20
|
||||
fabric_api_version=0.160.5+26.3
|
||||
|
||||
# Release counter: beta.001, .002, .003, ... (see docs/versioning.md).
|
||||
mod_version=beta.118
|
||||
pack_version=beta.118
|
||||
resource_pack_version=beta.090
|
||||
mod_version=beta.125
|
||||
pack_version=beta.125
|
||||
resource_pack_version=beta.121
|
||||
maven_group=fr.koka.sanctuary
|
||||
jei_version=30.32.0-sanctuary.3
|
||||
|
||||
@@ -93,6 +93,26 @@ tasks.named('runGameTest') {
|
||||
}
|
||||
|
||||
tasks.named('processGametestResources') {
|
||||
def sculpture125Client = providers.gradleProperty('sanctuarySculpture125ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuarySculpture125ClientTests', sculpture125Client)
|
||||
if (sculpture125Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.Sculpture125ClientChecks') }
|
||||
|
||||
def wrench123Client = providers.gradleProperty('sanctuaryWrench123ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuaryWrench123ClientTests', wrench123Client)
|
||||
if (wrench123Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.Wrench123ClientChecks') }
|
||||
|
||||
def sculpture122Client = providers.gradleProperty('sanctuarySculpture122ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuarySculpture122ClientTests', sculpture122Client)
|
||||
if (sculpture122Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.Sculpture122ClientChecks') }
|
||||
|
||||
def template121Client = providers.gradleProperty('sanctuaryResourceTemplate121ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuaryResourceTemplate121ClientTests', template121Client)
|
||||
if (template121Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.ResourceTemplate121ClientChecks') }
|
||||
|
||||
def wrench120Client = providers.gradleProperty('sanctuaryWrench120ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuaryWrench120ClientTests', wrench120Client)
|
||||
if (wrench120Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.Wrench120ClientChecks') }
|
||||
|
||||
def sculpture116Client = providers.gradleProperty('sanctuarySculpture116ClientTests').map { it.toBoolean() }.getOrElse(false)
|
||||
inputs.property('sanctuarySculpture116ClientTests', sculpture116Client)
|
||||
if (sculpture116Client) filter { line -> line.replace('fr.koka.sanctuary.gametest.SanctuaryClientRenderTests', 'fr.koka.sanctuary.client.Sculpture116ClientChecks') }
|
||||
@@ -440,6 +460,15 @@ tasks.withType(JavaCompile).configureEach {
|
||||
}
|
||||
|
||||
processResources {
|
||||
from(rootProject.file('ressources-pack/template')) {
|
||||
exclude '**/.DS_Store'
|
||||
into 'resourcepacks/template'
|
||||
}
|
||||
from(rootProject.file('LICENSE')) {
|
||||
rename { 'LICENSE_sanctuary' }
|
||||
into 'resourcepacks/template'
|
||||
}
|
||||
from(rootProject.file('THIRD_PARTY_NOTICES.md')) { into 'resourcepacks/template' }
|
||||
from(rootProject.file('ressources-pack/sanctuary')) {
|
||||
include 'assets/**', 'pack.mcmeta', 'pack.png'
|
||||
exclude '**/.DS_Store'
|
||||
|
||||
+165
@@ -0,0 +1,165 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.Arrays;
|
||||
import java.util.HexFormat;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.client.renderer.RenderPipelines;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.contents.TranslatableContents;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.server.packs.repository.PackCompatibility;
|
||||
|
||||
/** Native screen/export, complete snapshot, real resource precedence and preservation of edits. */
|
||||
public final class ResourceTemplate121ClientChecks implements FabricClientGameTest {
|
||||
private static final String BUILTIN = "sanctuary:textures";
|
||||
private static final String PERSONAL = "file/" + ResourcePackTemplate.FOLDER;
|
||||
private static final String WRENCH = "sanctuary:textures/item/golden_wrench.png";
|
||||
private static final String WRENCH_PATH = "assets/sanctuary/textures/item/golden_wrench.png";
|
||||
private static final String WRENCH_SHA = "a97570908db75caf8e6fc2f5ecabf12c54fd99bfea7be634df66c4310dca22af";
|
||||
|
||||
public void runTest(ClientGameTestContext c) {
|
||||
try { run(c); } catch (IOException error) { throw new AssertionError(error); }
|
||||
}
|
||||
|
||||
private void run(ClientGameTestContext c) throws IOException {
|
||||
var previous = c.computeOnClient(m -> m.gui.screen());
|
||||
var packDirectory = c.computeOnClient(Minecraft::getResourcePackDirectory);
|
||||
var selected = c.computeOnClient(m -> List.copyOf(m.getResourcePackRepository().getSelectedIds()));
|
||||
var target = packDirectory.resolve(ResourcePackTemplate.FOLDER);
|
||||
check(!Files.exists(target), "Fresh disposable client directory");
|
||||
c.runOnClient(m -> {
|
||||
check(source(m).equals(BUILTIN), "Built-in pack active");
|
||||
check(hash(resource(m, WRENCH)).equals(WRENCH_SHA), "Exact creator PNG active");
|
||||
m.getWindow().setWindowed(1280, 800);
|
||||
});
|
||||
for (int scale : new int[]{2, 3}) for (String language : List.of("fr_fr", "en_us")) {
|
||||
c.runOnClient(m -> {
|
||||
m.options.guiScale().set(scale); m.resizeGui();
|
||||
m.getLanguageManager().setSelected(language);
|
||||
m.getLanguageManager().onResourceManagerReload(m.getResourceManager());
|
||||
screen(m, packDirectory);
|
||||
var button = button(m, "customize");
|
||||
check(button.getX() >= 0 && button.getRight() <= m.gui.screen().width, "Template button fits width");
|
||||
check(button.getY() > 60 && button.getBottom() < m.gui.screen().height, "Template button fits height");
|
||||
var done = m.gui.screen().children().stream().filter(Button.class::isInstance).map(Button.class::cast)
|
||||
.filter(b -> key(b, "gui.done")).findFirst().orElseThrow();
|
||||
check(done.getY() >= button.getBottom() + 4, "Separate native footer row");
|
||||
check(m.font.width(button.getMessage()) < button.getWidth() - 8, "Localized label fits");
|
||||
});
|
||||
c.waitTicks(3); c.takeScreenshot("template121-create-" + language + "-" + scale);
|
||||
}
|
||||
c.runOnClient(m -> button(m, "customize").onPress(new KeyEvent(InputConstants.KEY_RETURN, 0, 0)));
|
||||
c.waitFor(m -> m.gui.screen().children().stream().filter(Button.class::isInstance).map(Button.class::cast)
|
||||
.anyMatch(b -> b.active && key(b, "sanctuary.resource_pack.open_copy")), 1200);
|
||||
c.waitFor(m -> m.getResourcePackRepository().getAvailableIds().contains(PERSONAL), 1200);
|
||||
c.runOnClient(m -> {
|
||||
check(List.copyOf(m.getResourcePackRepository().getSelectedIds()).equals(selected), "Creating never changes selection");
|
||||
check(m.getResourcePackRepository().getPack(PERSONAL).getCompatibility() == PackCompatibility.COMPATIBLE,
|
||||
"Template format accepted by exact Minecraft version");
|
||||
});
|
||||
var mod = FabricLoader.getInstance().getModContainer("sanctuary").orElseThrow();
|
||||
Map<String, String> expected = new TreeMap<>();
|
||||
merge(expected, mod.findPath("assets").orElseThrow(), "assets/");
|
||||
merge(expected, mod.findPath("resourcepacks/textures/assets").orElseThrow(), "assets/");
|
||||
merge(expected, mod.findPath("resourcepacks/template").orElseThrow(), "");
|
||||
expected.put("pack.png", hash(Files.readAllBytes(mod.findPath("resourcepacks/textures/pack.png").orElseThrow())));
|
||||
check(snapshot(target).equals(expected), "Complete byte-identical snapshot with built-in precedence");
|
||||
Files.writeString(packDirectory.getParent().resolve("template121-export-sha256.json"),
|
||||
new com.google.gson.GsonBuilder().setPrettyPrinting().create().toJson(expected));
|
||||
check(expected.containsKey("README.md") && expected.containsKey("LICENSE_sanctuary")
|
||||
&& expected.containsKey("THIRD_PARTY_NOTICES.md"), "Editable copy includes guide and credits");
|
||||
check(expected.keySet().stream().noneMatch(p -> p.startsWith("data/") || p.endsWith(".class")), "Client assets only");
|
||||
c.waitTicks(4); c.takeScreenshot("template121-copy-ready");
|
||||
c.runOnClient(m -> m.gui.setScreen(new Screen(Component.literal("Golden wrench")) {
|
||||
@Override public void extractRenderState(GuiGraphicsExtractor g, int x, int y, float delta) {
|
||||
g.fill(0, 0, width, height, 0xff292929);
|
||||
g.centeredText(font, Component.translatable("item.sanctuary.golden_wrench"), width / 2, 55, 0xffffffff);
|
||||
g.blit(RenderPipelines.GUI_TEXTURED, Identifier.parse(WRENCH), width / 2 - 48, 85, 0, 0, 96, 96, 16, 16, 16, 16);
|
||||
}
|
||||
}));
|
||||
c.waitTicks(4); c.takeScreenshot("template121-wrench-exact-texture");
|
||||
|
||||
byte[] replacement = c.computeOnClient(m -> resource(m, "minecraft:textures/item/golden_pickaxe.png"));
|
||||
Files.write(target.resolve(WRENCH_PATH), replacement);
|
||||
Files.writeString(target.resolve("my-notes.txt"), "Personal edits must survive all subsequent exports.");
|
||||
var edited = snapshot(target);
|
||||
check(ResourcePackTemplate.create(packDirectory).equals(target.toAbsolutePath().normalize()), "Existing copy returned");
|
||||
check(snapshot(target).equals(edited), "Second export preserves every edited byte and extra file");
|
||||
c.runOnClient(m -> {
|
||||
var repo = m.getResourcePackRepository(); repo.addPack(PERSONAL); m.options.updateResourcePacks(repo);
|
||||
});
|
||||
c.waitFor(m -> source(m).equals(PERSONAL) && m.gui.overlay() == null, 1200);
|
||||
c.runOnClient(m -> {
|
||||
check(Arrays.equals(resource(m, WRENCH), replacement), "Personal edit overrides built-in texture");
|
||||
var repo = m.getResourcePackRepository(); repo.reload(); m.options.loadSelectedResourcePacks(repo);
|
||||
check(repo.getSelectedIds().contains(PERSONAL), "Personal activation persists after rediscovery");
|
||||
screen(m, packDirectory); button(m, "open_copy");
|
||||
});
|
||||
c.waitTicks(3); c.takeScreenshot("template121-personal-active");
|
||||
var reload = c.computeOnClient(Minecraft::reloadResourcePacks);
|
||||
c.waitFor(m -> reload.isDone() && m.gui.overlay() == null, 1200); reload.join();
|
||||
check(snapshot(target).equals(edited), "Reload never writes personal assets");
|
||||
c.runOnClient(m -> {
|
||||
check(Arrays.equals(resource(m, WRENCH), replacement), "Reload still uses personal PNG");
|
||||
var repo = m.getResourcePackRepository(); repo.removePack(PERSONAL); m.options.updateResourcePacks(repo);
|
||||
});
|
||||
c.waitFor(m -> source(m).equals(BUILTIN) && m.gui.overlay() == null, 1200);
|
||||
c.runOnClient(m -> {
|
||||
check(hash(resource(m, WRENCH)).equals(WRENCH_SHA), "Disabling restores creator texture");
|
||||
var repo = m.getResourcePackRepository(); repo.reload(); m.options.loadSelectedResourcePacks(repo);
|
||||
check(!repo.getSelectedIds().contains(PERSONAL), "Explicit opt-out retained");
|
||||
});
|
||||
|
||||
Path collision = Files.createTempDirectory(packDirectory.getParent(), "template121-collision-");
|
||||
Files.writeString(collision.resolve(ResourcePackTemplate.FOLDER), "Do not replace this file");
|
||||
try { ResourcePackTemplate.create(collision); throw new AssertionError("Existing file must be refused"); }
|
||||
catch (IOException expectedError) { check(Files.readString(collision.resolve(ResourcePackTemplate.FOLDER)).equals("Do not replace this file"), "Collision leaves file intact"); }
|
||||
Path datapacks = Files.createTempDirectory(packDirectory.getParent(), "template121-datapacks-");
|
||||
c.runOnClient(m -> {
|
||||
screen(m, datapacks);
|
||||
check(m.gui.screen().children().stream().filter(Button.class::isInstance).map(Button.class::cast)
|
||||
.noneMatch(b -> key(b, "sanctuary.resource_pack.customize") || key(b, "sanctuary.resource_pack.open_copy")), "No button in datapack selector");
|
||||
m.gui.setScreen(previous);
|
||||
});
|
||||
System.out.println("TEMPLATE121_PASS: " + expected.size() + " exact files; native button FR/EN at scales 2/3; complete copy; edits and selection preserved; actual override, reload and opt-out; collision safe; datapacks untouched");
|
||||
}
|
||||
|
||||
private static void screen(Minecraft m, Path directory) {
|
||||
m.gui.setScreen(new PackSelectionScreen(m.getResourcePackRepository(), repo -> {}, directory, Component.translatable("resourcePack.title")));
|
||||
}
|
||||
private static Button button(Minecraft m, String suffix) {
|
||||
return m.gui.screen().children().stream().filter(Button.class::isInstance).map(Button.class::cast)
|
||||
.filter(b -> key(b, "sanctuary.resource_pack." + suffix)).findFirst().orElseThrow();
|
||||
}
|
||||
private static boolean key(Button b, String key) { return b.getMessage().getContents() instanceof TranslatableContents t && t.getKey().equals(key); }
|
||||
private static String source(Minecraft m) { return m.getResourceManager().getResource(Identifier.parse(WRENCH)).orElseThrow().sourcePackId(); }
|
||||
private static byte[] resource(Minecraft m, String name) {
|
||||
try (var in = m.getResourceManager().getResource(Identifier.parse(name)).orElseThrow().open()) { return in.readAllBytes(); }
|
||||
catch (IOException error) { throw new AssertionError(error); }
|
||||
}
|
||||
private static String hash(byte[] bytes) {
|
||||
try { return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes)); }
|
||||
catch (java.security.NoSuchAlgorithmException error) { throw new AssertionError(error); }
|
||||
}
|
||||
private static Map<String, String> snapshot(Path root) throws IOException { Map<String, String> result = new TreeMap<>(); merge(result, root, ""); return result; }
|
||||
private static void merge(Map<String, String> result, Path root, String prefix) throws IOException {
|
||||
try (var files = Files.walk(root)) { for (Path file : files.filter(Files::isRegularFile).toList()) result.put(prefix + root.relativize(file).toString().replace('\\', '/'), hash(Files.readAllBytes(file))); }
|
||||
}
|
||||
private static void check(boolean value, String message) { if (!value) throw new AssertionError(message); }
|
||||
}
|
||||
+20
-5
@@ -18,7 +18,20 @@ import net.minecraft.world.phys.*;
|
||||
final class Sculpture113ClientChecks {
|
||||
static void placementContexts(ServerPlayer player){
|
||||
for(var pos:List.of(new BlockPos(2,0,-2),new BlockPos(-2,0,2))){
|
||||
for(var face:List.of(Direction.UP,Direction.DOWN)){
|
||||
for(double x:new double[]{.25,.5,.75})for(double z:new double[]{.25,.5,.75}){
|
||||
var hit=new Vec3(pos.getX()+x,pos.getY()+(face==Direction.UP?1:0),pos.getZ()+z);
|
||||
var context=new BlockPlaceContext(player,InteractionHand.MAIN_HAND,new ItemStack(Statuary.ITEM),new BlockHitResult(hit,face,pos,false));
|
||||
check(Statuary.BLOCK.getStateForPlacement(context).getValue(Statuary.ANCHOR)==SculptureAnchor.CENTER,"Middle square including boundaries selects center on top/bottom faces");
|
||||
}
|
||||
}
|
||||
for(var edge:Direction.Plane.HORIZONTAL){
|
||||
for(double offset:new double[]{.25-1e-6,.25+1e-6}){
|
||||
var hit=new Vec3(pos.getX()+.5+edge.getStepX()*offset,pos.getY()+1,pos.getZ()+.5+edge.getStepZ()*offset);
|
||||
var context=new BlockPlaceContext(player,InteractionHand.MAIN_HAND,new ItemStack(Statuary.ITEM),new BlockHitResult(hit,Direction.UP,pos,false));
|
||||
var expected=offset<.25?SculptureAnchor.CENTER:SculptureAnchor.of(edge);
|
||||
check(Statuary.BLOCK.getStateForPlacement(context).getValue(Statuary.ANCHOR)==expected,"Center boundary switches to the aimed edge");
|
||||
}
|
||||
var top=new Vec3(pos.getX()+.5+edge.getStepX()*.4,pos.getY()+1,pos.getZ()+.5+edge.getStepZ()*.4);
|
||||
var context=new BlockPlaceContext(player,InteractionHand.MAIN_HAND,new ItemStack(Statuary.ITEM),new BlockHitResult(top,Direction.UP,pos,false));
|
||||
var state=Statuary.BLOCK.getStateForPlacement(context);
|
||||
@@ -28,7 +41,7 @@ final class Sculpture113ClientChecks {
|
||||
check(Statuary.BLOCK.getStateForPlacement(context).getValue(Statuary.ANCHOR)==SculptureAnchor.of(edge.getOpposite()),"Side hit anchors against supporting block");
|
||||
}
|
||||
}
|
||||
for(var facing:Direction.Plane.HORIZONTAL)for(var anchor:SculptureAnchor.values()){
|
||||
for(var facing:Direction.Plane.HORIZONTAL)for(var anchor:List.of(SculptureAnchor.CENTER,SculptureAnchor.NORTH,SculptureAnchor.SOUTH,SculptureAnchor.EAST,SculptureAnchor.WEST)){
|
||||
var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,facing).setValue(Statuary.ANCHOR,anchor);
|
||||
for(var rotation:Rotation.values()){
|
||||
var actual=state.rotate(rotation);
|
||||
@@ -61,7 +74,7 @@ final class Sculpture113ClientChecks {
|
||||
}
|
||||
var itemMesh=new StatuaryRenderer.ItemRenderer().extractArgument(StatuaryEntity.item(sculpture));
|
||||
check(itemMesh.equals(mesh(entity(client,sculpture,Direction.SOUTH,SculptureAnchor.CENTER))),"Item preview shares exact centered grid geometry");
|
||||
System.out.println("SCULPTURE113_GEOMETRY_PASS 5120 footprints/orientations/anchors and colored direction markers");
|
||||
System.out.println("SCULPTURE113_GEOMETRY_PASS 9216 footprints/orientations/anchors and colored direction markers");
|
||||
}
|
||||
private static StatuaryEntity entity(Minecraft client,VoxelSculpture sculpture,Direction facing,SculptureAnchor anchor){
|
||||
var entity=new StatuaryEntity(BlockPos.ZERO,Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,facing).setValue(Statuary.ANCHOR,anchor));entity.setLevel(client.level);
|
||||
@@ -81,10 +94,12 @@ final class Sculpture113ClientChecks {
|
||||
var anchor=entity.getBlockState().getValue(Statuary.ANCHOR);
|
||||
switch(anchor){
|
||||
case NORTH -> check(minZ==0,"North edge flush");case SOUTH -> check(maxZ==1,"South edge flush");
|
||||
case WEST -> check(minX==0,"West edge flush");case EAST -> check(maxX==1,"East edge flush");default -> {}
|
||||
case WEST -> check(minX==0,"West edge flush");case EAST -> check(maxX==1,"East edge flush");
|
||||
case NORTH_WEST -> check(minX==0&&minZ==0,"North-west corner flush");case NORTH_EAST -> check(maxX==1&&minZ==0,"North-east corner flush");
|
||||
case SOUTH_WEST -> check(minX==0&&maxZ==1,"South-west corner flush");case SOUTH_EAST -> check(maxX==1&&maxZ==1,"South-east corner flush");default -> {}
|
||||
}
|
||||
if(anchor!=SculptureAnchor.WEST&&anchor!=SculptureAnchor.EAST)check(Math.abs(minX-(1-maxX))<=1/16f,"Other axis centered to nearest whole voxel");
|
||||
if(anchor!=SculptureAnchor.NORTH&&anchor!=SculptureAnchor.SOUTH)check(Math.abs(minZ-(1-maxZ))<=1/16f,"Other axis centered to nearest whole voxel");
|
||||
if(anchor==SculptureAnchor.CENTER||anchor==SculptureAnchor.NORTH||anchor==SculptureAnchor.SOUTH)check(Math.abs(minX-(1-maxX))<=1/16f,"Other axis centered to nearest whole voxel");
|
||||
if(anchor==SculptureAnchor.CENTER||anchor==SculptureAnchor.EAST||anchor==SculptureAnchor.WEST)check(Math.abs(minZ-(1-maxZ))<=1/16f,"Other axis centered to nearest whole voxel");
|
||||
}
|
||||
private static void check(boolean ok,String message){if(!ok)throw new AssertionError(message);}
|
||||
}
|
||||
|
||||
+161
@@ -0,0 +1,161 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import fr.koka.sanctuary.gametest.Starter039TestSupport;
|
||||
import fr.koka.sanctuary.plans.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.contents.TranslatableContents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.util.ProblemReporter;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.storage.TagValueInput;
|
||||
import net.minecraft.world.phys.*;
|
||||
import net.minecraft.world.phys.shapes.*;
|
||||
|
||||
/** Single-box selection/collision bounds and light propagation compared with the real sculpture mesh. */
|
||||
public final class Sculpture122ClientChecks implements FabricClientGameTest {
|
||||
private static final String MODEL="sanctuary:model/"+"1".repeat(64);
|
||||
private static final BlockPos TARGET=new BlockPos(0,1,0),SKY=new BlockPos(10,2,2),CONTROL=new BlockPos(18,2,2);
|
||||
private static final VoxelSculpture ARCH=arch();
|
||||
|
||||
public void runTest(ClientGameTestContext c){
|
||||
var intro=new AtomicBoolean(true);
|
||||
c.runOnClient(m->{m.options.renderDistance().set(6);m.options.simulationDistance().set(5);m.options.pauseOnLostFocus=false;IntroClient.setQuickTestIntro(true);});
|
||||
ClientTickEvents.END_CLIENT_TICK.register(m->{if(intro.get()&&m.gui.screen() instanceof HelloWorldScreen screen){
|
||||
Starter039TestSupport.selectFirst(screen);
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getClass().getSimpleName().equals("ColorButton")).findFirst().orElseThrow().onPress(new KeyEvent(InputConstants.KEY_RETURN,0,0));
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getContents() instanceof TranslatableContents t&&t.getKey().equals("sanctuary.progression.enter")).findFirst().orElseThrow().onPress(new KeyEvent(InputConstants.KEY_RETURN,0,0));intro.set(false);
|
||||
}});
|
||||
net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldSave saved;
|
||||
try(var world=c.worldBuilder().adjustSettings(s->{s.setName("Sculpture122 "+UUID.randomUUID());s.setSeed("122");s.setAllowCommands(true);s.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);s.setWorldType(s.getNormalPresetList().stream().filter(e->e.preset()!=null&&e.preset().getRegisteredName().equals("sanctuary_test:flat")).findFirst().orElseThrow());}).create()){
|
||||
saved=world.getWorldSave();c.waitFor(m->ProgressionClient.active()&&m.player!=null&&m.gui.screen()==null&&!IntroSpawnFlash.active(),1200);var server=world.getServer();
|
||||
server.runOnServer(s->{var p=player(s);var l=p.level();for(int x=-14;x<=21;x++)for(int z=-6;z<=9;z++)l.setBlockAndUpdate(new BlockPos(x,0,z),Blocks.STONE.defaultBlockState());p.teleportTo(.5,1,3.2);p.setYRot(0);p.getInventory().setItem(p.getInventory().getSelectedSlot(),StatuaryEntity.item(ARCH));p.inventoryMenu.broadcastFullState();
|
||||
s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary time vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"time set noon");
|
||||
s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary weather vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"weather clear");
|
||||
});
|
||||
c.waitFor(m->m.player.distanceToSqr(.5,1,3.2)<.1&&m.player.getMainHandItem().is(Statuary.ITEM)&&m.level.getBlockState(TARGET.below()).is(Blocks.STONE),150);
|
||||
c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(.5,.999,.5)));c.waitTicks(3);
|
||||
c.runOnClient(m->check(m.hitResult instanceof BlockHitResult hit&&hit.getBlockPos().equals(TARGET.below())&&hit.getDirection()==Direction.UP,"Cursor aims at placement support"));
|
||||
c.getInput().holdKey(o->o.keyUse);c.waitTicks(1);c.getInput().releaseKey(o->o.keyUse);c.waitTicks(3);
|
||||
server.runOnServer(s->System.out.println("SCULPTURE122_PLACED "+player(s).level().getBlockState(TARGET)+" "+player(s).level().getBlockEntity(TARGET)));
|
||||
c.waitFor(m->m.level.getBlockEntity(TARGET) instanceof StatuaryEntity e&&ARCH.equals(e.sculpture()),150);
|
||||
server.runOnServer(s->{physical(player(s).level(),TARGET);placementOverlap(player(s));});
|
||||
c.runOnClient(m->{physical(m.level,TARGET);geometry(m);Sculpture113ClientChecks.geometry(m,MODEL);});
|
||||
c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(.0625,1.5,.5)));c.waitTicks(5);
|
||||
c.runOnClient(m->check(m.hitResult instanceof BlockHitResult hit&&hit.getBlockPos().equals(TARGET),"Native cursor selects an occupied pillar"));
|
||||
c.takeScreenshot("sculpture124-single-outline");
|
||||
server.runOnServer(s->player(s).level().setBlockAndUpdate(TARGET.north(),Blocks.REDSTONE_BLOCK.defaultBlockState()));
|
||||
c.waitFor(m->m.level.getBlockState(TARGET.north()).is(Blocks.REDSTONE_BLOCK),100);
|
||||
c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(.5,1.5,.5)));c.waitTicks(5);
|
||||
c.runOnClient(m->check(m.hitResult instanceof BlockHitResult hit&&hit.getBlockPos().equals(TARGET),"Native cursor selects the sculpture bounds even through its visual hole"));
|
||||
c.takeScreenshot("sculpture124-select-volume");
|
||||
// A state edit and fresh entity payload must invalidate geometry on both sides.
|
||||
server.runOnServer(s->{var l=player(s).level();l.setBlockAndUpdate(TARGET,l.getBlockState(TARGET).setValue(Statuary.FACING,Direction.WEST).setValue(Statuary.ANCHOR,SculptureAnchor.EAST));});
|
||||
c.waitFor(m->m.level.getBlockState(TARGET).getValue(Statuary.FACING)==Direction.WEST,100);
|
||||
server.runOnServer(s->{var l=player(s).level();var bounds=l.getBlockState(TARGET).getShape(l,TARGET).bounds();check(bounds.maxX==1&&bounds.getXsize()==.25,"Server shape rotates and moves to aimed edge");});
|
||||
c.runOnClient(m->{var bounds=m.level.getBlockState(TARGET).getShape(m.level,TARGET).bounds();check(bounds.maxX==1&&bounds.getXsize()==.25,"Client shape follows changed blockstate");});
|
||||
var small=new VoxelSculpture(MODEL,"Small",1,1,1,List.of(new VoxelSculpture.Cell(0,0,0,-1)));
|
||||
server.runOnServer(s->place(player(s).level(),TARGET,small,Direction.WEST,SculptureAnchor.EAST));
|
||||
c.waitFor(m->m.level.getBlockEntity(TARGET) instanceof StatuaryEntity e&&small.equals(e.sculpture()),100);
|
||||
c.runOnClient(m->check(m.level.getBlockState(TARGET).getShape(m.level,TARGET).bounds().getYsize()==1/16d,"Changed block entity payload invalidates cached shape"));
|
||||
server.runOnServer(s->{var l=player(s).level();place(l,TARGET,ARCH,Direction.SOUTH,SculptureAnchor.CENTER);l.setBlockAndUpdate(TARGET.north(),Blocks.AIR.defaultBlockState());
|
||||
for(int x=8;x<=12;x++)for(int z=0;z<=4;z++)for(int y=3;y<=5;y++)place(l,new BlockPos(x,y,z),ARCH,Direction.SOUTH,SculptureAnchor.CENTER);
|
||||
for(int x=16;x<=20;x++)for(int z=0;z<=4;z++)l.setBlockAndUpdate(new BlockPos(x,3,z),Blocks.STONE.defaultBlockState());
|
||||
l.setBlockAndUpdate(new BlockPos(-8,2,0),Blocks.GLOWSTONE.defaultBlockState());place(l,new BlockPos(-7,2,0),ARCH,Direction.SOUTH,SculptureAnchor.CENTER);
|
||||
});
|
||||
server.waitFor(s->{var l=player(s).level();return l.getBrightness(LightLayer.SKY,SKY)==15&&l.getBrightness(LightLayer.SKY,CONTROL)<15&&l.getBrightness(LightLayer.BLOCK,new BlockPos(-6,2,0))==13;},200);
|
||||
c.waitFor(m->m.level.getBrightness(LightLayer.SKY,SKY)==15&&m.level.getBrightness(LightLayer.SKY,CONTROL)<15&&m.level.getBrightness(LightLayer.BLOCK,new BlockPos(-6,2,0))==13,200);
|
||||
server.runOnServer(s->{var l=player(s).level();for(int x=8;x<=12;x++)for(int z=0;z<=4;z++)for(int y=3;y<=5;y++)check(l.getBrightness(LightLayer.SKY,new BlockPos(x,y,z))==15,"All 75 sculptures keep full native skylight");});
|
||||
c.runOnClient(m->{var e=(StatuaryEntity)m.level.getBlockEntity(new BlockPos(10,4,2));var renderer=new StatuaryRenderer();var state=renderer.createRenderState();renderer.extractRenderState(e,state,0,Vec3.ZERO,null);check(net.minecraft.util.LightCoordsUtil.sky(state.lightCoords)==15,"Actual renderer receives full skylight inside a group");});
|
||||
// Visual crowd at ground level: no whole-block AO squares between the models.
|
||||
server.runOnServer(s->{var p=player(s);for(int x=-3;x<=3;x++)for(int z=-5;z<=-2;z++)place(p.level(),new BlockPos(x,1,z),ARCH,Direction.from2DDataValue(Math.floorMod(x+z,4)),SculptureAnchor.CENTER);p.teleportTo(.5,3,5.5);p.getAbilities().flying=true;p.onUpdateAbilities();});
|
||||
c.waitFor(m->m.player.distanceToSqr(.5,3,5.5)<.1,100);c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(.5,1,-3)));c.waitTicks(12);c.takeScreenshot("sculpture122-crowd-light");
|
||||
// Transparent-to-light is not emissive: in a closed room sculpture faces stay dark.
|
||||
server.runOnServer(s->{var l=player(s).level();for(int x=-13;x<=-9;x++)for(int y=1;y<=5;y++)for(int z=5;z<=9;z++)l.setBlockAndUpdate(new BlockPos(x,y,z),x==-13||x==-9||y==1||y==5||z==5||z==9?Blocks.STONE.defaultBlockState():Blocks.AIR.defaultBlockState());place(l,new BlockPos(-11,2,7),ARCH,Direction.SOUTH,SculptureAnchor.CENTER);});
|
||||
c.waitFor(m->m.level.getBlockEntity(new BlockPos(-11,2,7)) instanceof StatuaryEntity&&m.level.getBrightness(LightLayer.SKY,new BlockPos(-11,2,7))==0&&m.level.getBrightness(LightLayer.BLOCK,new BlockPos(-11,2,7))==0,200);
|
||||
c.runOnClient(m->{var renderer=new StatuaryRenderer();var state=renderer.createRenderState();renderer.extractRenderState((StatuaryEntity)m.level.getBlockEntity(new BlockPos(-11,2,7)),state,0,Vec3.ZERO,null);check(state.lightCoords==0,"No fullbright workaround: a dark room produces dark faces");});
|
||||
System.out.println("SCULPTURE122_LIGHT_PASS: 75 stacked models sky=15; opaque control shadow; block light=13 across sculpture; dark room=0; shade brightness=1");
|
||||
}
|
||||
try(var world=saved.open()){
|
||||
c.waitFor(m->m.player!=null&&m.gui.screen()==null&&m.level.getBlockEntity(TARGET) instanceof StatuaryEntity e&&ARCH.equals(e.sculpture()),1200);
|
||||
world.getServer().runOnServer(s->physical(player(s).level(),TARGET));c.runOnClient(m->physical(m.level,TARGET));
|
||||
c.waitFor(m->m.level.getBrightness(LightLayer.SKY,SKY)==15,200);
|
||||
System.out.println("SCULPTURE122_PASS: native placement, one-box outline including holes, single-box physical collisions, shared render geometry, cache refresh, light propagation and save/reconnect");
|
||||
}
|
||||
}
|
||||
private static void placementOverlap(ServerPlayer player){
|
||||
var pos=new BlockPos(3,1,0);var level=player.level();player.teleportTo(3.75,1,.5);player.setYRot(0);
|
||||
var filled=new ArrayList<VoxelSculpture.Cell>();for(int x=0;x<16;x++)for(int y=0;y<16;y++)for(int z=0;z<16;z++)filled.add(new VoxelSculpture.Cell(x,y,z,-1));
|
||||
var dense=new VoxelSculpture(MODEL,"Solid",16,16,16,filled);var stack=StatuaryEntity.item(dense);player.getInventory().setItem(player.getInventory().getSelectedSlot(),stack);
|
||||
var hit=new BlockHitResult(new Vec3(3.01,1,.5),Direction.UP,pos.below(),false);
|
||||
var blocked=((BlockItem)Statuary.ITEM).place(new BlockPlaceContext(player,InteractionHand.MAIN_HAND,stack,hit));
|
||||
check(!blocked.consumesAction()&&level.getBlockState(pos).isAir()&&stack.getCount()==1,"Native placement refuses occupied voxels inside player without consuming sculpture");
|
||||
player.teleportTo(3.5,1,.5);var pillars=new ArrayList<VoxelSculpture.Cell>();for(int y=0;y<16;y++)for(int x:new int[]{0,15})pillars.add(new VoxelSculpture.Cell(x,y,0,-1));
|
||||
var hollow=new VoxelSculpture(MODEL,"Two pillars",16,16,1,pillars);stack=StatuaryEntity.item(hollow);player.getInventory().setItem(player.getInventory().getSelectedSlot(),stack);
|
||||
var hollowBlocked=((BlockItem)Statuary.ITEM).place(new BlockPlaceContext(player,InteractionHand.MAIN_HAND,stack,hit));
|
||||
check(!hollowBlocked.consumesAction()&&level.getBlockState(pos).isAir(),"Placement also rejects a player inside the enclosing box between separated pillars");player.teleportTo(3.75,1,.5);
|
||||
var postCells=new ArrayList<VoxelSculpture.Cell>();for(int y=0;y<16;y++)for(int x=0;x<2;x++)for(int z=0;z<2;z++)postCells.add(new VoxelSculpture.Cell(x,y,z,-1));
|
||||
var post=new VoxelSculpture(MODEL,"Post",2,16,2,postCells);stack=StatuaryEntity.item(post);player.getInventory().setItem(player.getInventory().getSelectedSlot(),stack);
|
||||
var allowed=((BlockItem)Statuary.ITEM).place(new BlockPlaceContext(player,InteractionHand.MAIN_HAND,stack,hit));
|
||||
check(allowed.consumesAction()&&level.getBlockState(pos).is(Statuary.BLOCK),"Native placement allows empty part of block beside player");
|
||||
check(level.noCollision(player,player.getBoundingBox()),"Accepted sculpture does not intersect player");
|
||||
level.setBlockAndUpdate(pos,Blocks.AIR.defaultBlockState());player.teleportTo(.5,1,3.2);player.getInventory().setItem(player.getInventory().getSelectedSlot(),StatuaryEntity.item(ARCH));player.inventoryMenu.broadcastFullState();
|
||||
System.out.println("SCULPTURE122_PLACEMENT_PASS native item rejects occupied bounds including visual holes, allows space outside the box, preserves stack on rejection");
|
||||
}
|
||||
private static void physical(Level level,BlockPos pos){
|
||||
var state=level.getBlockState(pos);var shape=state.getShape(level,pos);var collision=state.getCollisionShape(level,pos);
|
||||
check(shape==collision&&shape.toAabbs().size()==1,"Selection and collision share one cached bounding box");check(shape==state.getShape(level,pos),"Selection queries reuse the cached box");check(shape.bounds().getZsize()==.25,"No invisible full-block depth");
|
||||
check(level.clip(new ClipContext(new Vec3(.5,1.5,2),new Vec3(.5,1.5,-.1),ClipContext.Block.OUTLINE,ClipContext.Fluid.NONE,CollisionContext.empty())).getType()==HitResult.Type.BLOCK,"Outline ray selects the whole sculpture volume");
|
||||
check(level.clip(new ClipContext(new Vec3(.0625,1.5,2),new Vec3(.0625,1.5,-.1),ClipContext.Block.COLLIDER,ClipContext.Fluid.NONE,CollisionContext.empty())).getType()==HitResult.Type.BLOCK,"Collision ray hits pillar");
|
||||
check(level.clip(new ClipContext(new Vec3(.5,1.5,2),new Vec3(.5,1.5,-.1),ClipContext.Block.COLLIDER,ClipContext.Fluid.NONE,CollisionContext.empty())).getType()==HitResult.Type.BLOCK,"Physical collision uses the enclosing volume, including visual holes");
|
||||
check(!level.noCollision(new AABB(.35,1.2,.35,.65,1.7,.65)),"Native collision query fills the inner volume instead of following tiny details");
|
||||
check(!level.noCollision(new AABB(.02,1.2,.4,.1,1.7,.6)),"Native collision query blocks occupied pillar");
|
||||
check(!state.isCollisionShapeFullBlock(level,pos)&&!state.isSolidRender()&&!state.canOcclude(),"Sculpture is not a solid occluding cube");
|
||||
check(state.getOcclusionShape().isEmpty()&&state.propagatesSkylightDown()&&state.getLightDampening()==0&&state.getShadeBrightness(level,pos)==1,"Light metadata never reintroduces full-block occlusion");
|
||||
check(!state.isSuffocating(level,pos)&&state.getLightEmission()==0,"Decorative shape neither suffocates nor emits light");
|
||||
}
|
||||
private static void geometry(Minecraft m){
|
||||
var padded=new VoxelSculpture(MODEL,"Padded",13,5,15,List.of(new VoxelSculpture.Cell(2,2,3,-1),new VoxelSculpture.Cell(6,4,10,-1)));
|
||||
var dense=new ArrayList<VoxelSculpture.Cell>();for(int x=0;x<16;x++)for(int y=0;y<16;y++)for(int z=0;z<16;z++)dense.add(new VoxelSculpture.Cell(x,y,z,-1));
|
||||
var models=List.of(ARCH,padded,new VoxelSculpture(MODEL,"Dense",16,16,16,dense),new VoxelSculpture(MODEL,"One voxel",1,1,1,List.of(new VoxelSculpture.Cell(0,0,0,-1))));
|
||||
int cases=0;for(var model:models)for(var direction:Direction.Plane.HORIZONTAL)for(var anchor:SculptureAnchor.values())for(var height:SculptureHeight.values()){
|
||||
var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,direction).setValue(Statuary.ANCHOR,anchor).setValue(Statuary.HEIGHT,height);var entity=new StatuaryEntity(BlockPos.ZERO,state);entity.setLevel(m.level);load(entity,model,m.level);
|
||||
var shape=entity.shape(state);check(shape==entity.shape(state),"Repeated geometry queries reuse the same shape");var boxes=shape.toAabbs();double volume=boxes.stream().mapToDouble(b->b.getXsize()*b.getYsize()*b.getZsize()).sum();check(boxes.size()==1&&volume>=model.cells().size()/4096d,"One box encloses all occupied cells");
|
||||
var outline=entity.shape(state);check(outline==entity.shape(state),"Repeated outline queries reuse the cached box");
|
||||
check(outline.toAabbs().size()==1&&outline.bounds().equals(shape.bounds()),"One outline box matches exact rendered extents for every orientation and anchor");
|
||||
int[] edges={0};outline.forAllEdges((x1,y1,z1,x2,y2,z2)->edges[0]++);check(edges[0]==12,"Native outline emits only the 12 enclosing edges, independent of voxel count");
|
||||
var renderer=new StatuaryRenderer();var render=renderer.createRenderState();renderer.extractRenderState(entity,render,0,Vec3.ZERO,null);
|
||||
double minX=1,minY=1,minZ=1,maxX=0,maxY=0,maxZ=0;
|
||||
for(var q:render.mesh){minX=Math.min(minX,q.x());minY=Math.min(minY,q.y());minZ=Math.min(minZ,q.z());maxX=Math.max(maxX,q.x()+1/16d);maxY=Math.max(maxY,q.y()+1/16d);maxZ=Math.max(maxZ,q.z()+1/16d);var center=new Vec3(q.x()+1/32d,q.y()+1/32d,q.z()+1/32d);check(boxes.stream().anyMatch(b->b.contains(center)),"Every rendered cell is physically present");
|
||||
}
|
||||
check(shape.bounds().equals(new AABB(minX,minY,minZ,maxX,maxY,maxZ)),"Single collision box exactly matches visible mesh extents");
|
||||
cases++;
|
||||
}
|
||||
System.out.println("SCULPTURE124_BOUNDS_PASS "+cases+" cached single boxes agree with exact renderer extents; 12 outline edges each");
|
||||
System.out.println("SCULPTURE122_GEOMETRY_PASS "+cases+" native bounding boxes agree with emitted mesh extents, plus cached 12-edge selection bounds for holes, padding, dense 4096 cells, single voxel, 4 directions, 9 anchors and 4 vertical modes");
|
||||
}
|
||||
private static void place(ServerLevel level,BlockPos pos,VoxelSculpture model,Direction facing,SculptureAnchor anchor){
|
||||
var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,facing).setValue(Statuary.ANCHOR,anchor);level.setBlockAndUpdate(pos,state);var entity=(StatuaryEntity)level.getBlockEntity(pos);load(entity,model,level);entity.setChanged();level.sendBlockUpdated(pos,state,state,3);
|
||||
}
|
||||
private static void load(StatuaryEntity entity,VoxelSculpture model,Level level){var tag=new CompoundTag();tag.put("sculpture",StatuaryEntity.encode(model));entity.loadWithComponents(TagValueInput.create(ProblemReporter.DISCARDING,level.registryAccess(),tag));}
|
||||
private static VoxelSculpture arch(){var cells=new ArrayList<VoxelSculpture.Cell>();for(int x=0;x<16;x++)for(int y=0;y<16;y++)for(int z=0;z<4;z++)if(x<2||x>=14||y>=14)cells.add(new VoxelSculpture.Cell(x,y,z,0xffc99679));return new VoxelSculpture(MODEL,"Arch",16,16,4,cells);}
|
||||
private static ServerPlayer player(MinecraftServer server){return server.getPlayerList().getPlayers().getFirst();}
|
||||
private static void check(boolean value,String reason){if(!value)throw new AssertionError(reason);}
|
||||
}
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import fr.koka.sanctuary.gametest.Starter039TestSupport;
|
||||
import fr.koka.sanctuary.plans.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.nbt.*;
|
||||
import net.minecraft.network.chat.contents.TranslatableContents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.*;
|
||||
import net.minecraft.util.ProblemReporter;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.block.*;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.storage.TagValueInput;
|
||||
import net.minecraft.world.phys.*;
|
||||
|
||||
/** Native clicks on all six support faces; additive saved-state compatibility and real renderer bounds. */
|
||||
public final class Sculpture125ClientChecks implements FabricClientGameTest {
|
||||
private static final BlockPos SUPPORT=new BlockPos(0,4,0);
|
||||
private static final String MODEL="sanctuary:model/"+"2".repeat(64);
|
||||
private static final VoxelSculpture STATUE=statue();
|
||||
private static final SculptureAnchor[][] ANCHORS={{SculptureAnchor.NORTH_WEST,SculptureAnchor.WEST,SculptureAnchor.SOUTH_WEST},{SculptureAnchor.NORTH,SculptureAnchor.CENTER,SculptureAnchor.SOUTH},{SculptureAnchor.NORTH_EAST,SculptureAnchor.EAST,SculptureAnchor.SOUTH_EAST}};
|
||||
private static final SculptureHeight[] HEIGHTS={SculptureHeight.BOTTOM,SculptureHeight.CENTER,SculptureHeight.TOP};
|
||||
private record Spot(Direction face,int u,int v){
|
||||
Vec3 hit(BlockPos p){double a=.1+.4*u,b=.1+.4*v;return switch(face){
|
||||
case UP,DOWN->new Vec3(p.getX()+a,p.getY()+(face==Direction.UP?1:0),p.getZ()+b);
|
||||
case NORTH,SOUTH->new Vec3(p.getX()+a,p.getY()+b,p.getZ()+(face==Direction.SOUTH?1:0));
|
||||
case WEST,EAST->new Vec3(p.getX()+(face==Direction.EAST?1:0),p.getY()+b,p.getZ()+a);
|
||||
};}
|
||||
SculptureAnchor anchor(){return switch(face){case UP,DOWN->ANCHORS[u][v];case NORTH->ANCHORS[u][2];case SOUTH->ANCHORS[u][0];case EAST->ANCHORS[0][u];case WEST->ANCHORS[2][u];};}
|
||||
SculptureHeight height(){return face==Direction.UP?SculptureHeight.BOTTOM:face==Direction.DOWN?SculptureHeight.TOP:HEIGHTS[v];}
|
||||
}
|
||||
public void runTest(ClientGameTestContext c){
|
||||
var intro=new AtomicBoolean(true);
|
||||
c.runOnClient(m->{m.options.renderDistance().set(6);m.options.simulationDistance().set(5);m.options.pauseOnLostFocus=false;IntroClient.setQuickTestIntro(true);});
|
||||
ClientTickEvents.END_CLIENT_TICK.register(m->{if(intro.get()&&m.gui.screen() instanceof HelloWorldScreen screen){
|
||||
Starter039TestSupport.selectFirst(screen);var enter=new KeyEvent(InputConstants.KEY_RETURN,0,0);
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getClass().getSimpleName().equals("ColorButton")).findFirst().orElseThrow().onPress(enter);
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getContents() instanceof TranslatableContents t&&t.getKey().equals("sanctuary.progression.enter")).findFirst().orElseThrow().onPress(enter);intro.set(false);
|
||||
}});
|
||||
net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldSave saved;
|
||||
var persistent=new HashMap<BlockPos,BlockState>();
|
||||
try(var world=c.worldBuilder().adjustSettings(s->{s.setName("Sculpture125 "+UUID.randomUUID());s.setSeed("125");s.setAllowCommands(true);s.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);s.setWorldType(s.getNormalPresetList().stream().filter(e->e.preset()!=null&&e.preset().getRegisteredName().equals("sanctuary_test:flat")).findFirst().orElseThrow());}).create()){
|
||||
c.waitFor(m->ProgressionClient.active()&&m.player!=null&&m.gui.screen()==null&&!IntroSpawnFlash.active(),1200);var server=world.getServer();
|
||||
server.runOnServer(s->{var p=player(s);var l=p.level();for(int x=-8;x<=8;x++)for(int z=-8;z<=8;z++)l.setBlockAndUpdate(new BlockPos(x,0,z),Blocks.STONE.defaultBlockState());p.getAbilities().flying=true;p.onUpdateAbilities();p.getInventory().setItem(p.getInventory().getSelectedSlot(),StatuaryEntity.item(STATUE));p.inventoryMenu.broadcastFullState();
|
||||
s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary time vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"time set noon");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary weather vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"weather clear");contexts(p);legacy(p);Sculpture113ClientChecks.placementContexts(p);l.setBlockAndUpdate(SUPPORT,Blocks.STONE.defaultBlockState());
|
||||
});
|
||||
c.waitFor(m->m.player.getMainHandItem().is(Statuary.ITEM)&&m.level.getBlockState(SUPPORT).is(Blocks.STONE),150);
|
||||
int clicks=0;
|
||||
for(var face:Direction.values()){
|
||||
Vec3 eye= switch(face){case UP->new Vec3(.5,6,3);case DOWN->new Vec3(.5,1.3,2.5);case NORTH->new Vec3(.5,3,-2.2);case SOUTH->new Vec3(.5,3,3.2);case EAST->new Vec3(3.2,3,.5);case WEST->new Vec3(-2.2,3,.5);};
|
||||
server.runOnServer(s->{var p=player(s);p.teleportTo(eye.x,eye.y,eye.z);p.setDeltaMovement(Vec3.ZERO);p.getAbilities().flying=true;p.onUpdateAbilities();});c.waitFor(m->m.player.distanceToSqr(eye)<.05,100);c.runOnClient(m->{m.player.getAbilities().flying=true;m.player.setDeltaMovement(Vec3.ZERO);m.player.onUpdateAbilities();});c.waitTicks(10);
|
||||
for(int u=0;u<3;u++)for(int v=0;v<3;v++){
|
||||
var spot=new Spot(face,u,v);var target=SUPPORT.relative(face);
|
||||
server.runOnServer(s->{for(var direction:Direction.values())player(s).level().setBlockAndUpdate(SUPPORT.relative(direction),Blocks.AIR.defaultBlockState());});
|
||||
c.waitFor(m->m.level.getBlockState(target).isAir(),100);
|
||||
c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,spot.hit(SUPPORT)));c.waitTicks(3);
|
||||
c.runOnClient(m->check(m.hitResult instanceof BlockHitResult h&&h.getBlockPos().equals(SUPPORT)&&h.getDirection()==face,"Native cursor hits requested support face "+spot+" instead of "+m.hitResult+" at "+m.hitResult.getLocation()+" eye "+m.player.getEyePosition()+" flying "+m.player.getAbilities().flying));
|
||||
var facing=c.computeOnClient(m->{System.out.println("SCULPTURE125_AIM "+spot+" actual "+m.hitResult.getLocation()+" eye "+m.player.getEyePosition());return m.player.getDirection();});c.getInput().holdKey(o->o.keyUse);c.waitTicks(1);c.getInput().releaseKey(o->o.keyUse);c.waitTicks(3);
|
||||
c.waitFor(m->m.level.getBlockEntity(target) instanceof StatuaryEntity e&&STATUE.equals(e.sculpture()),100);
|
||||
server.runOnServer(s->{var l=player(s).level();var state=l.getBlockState(target);check(state.getValue(Statuary.ANCHOR)==spot.anchor()&&state.getValue(Statuary.HEIGHT)==spot.height()&&state.getValue(Statuary.FACING)==facing,"Server uses aimed position and horizontal gaze for "+spot+" got "+state+" expected facing "+facing);});
|
||||
c.runOnClient(m->{var e=(StatuaryEntity)m.level.getBlockEntity(target);renderBounds(e);});
|
||||
if(u==0&&v==2)c.takeScreenshot("sculpture125-"+face.getSerializedName());clicks++;
|
||||
}
|
||||
}
|
||||
System.out.println("SCULPTURE125_CLICKS_PASS "+clicks+" real placements: all six faces, every corner/edge/center and supported heights");
|
||||
c.runOnClient(m->Sculpture125ParticleChecks.exercise(m,SUPPORT.relative(Direction.EAST)));
|
||||
Sculpture125WorkshopChecks.exercise(c,server);
|
||||
server.runOnServer(s->{var l=player(s).level();for(var direction:Direction.values())l.setBlockAndUpdate(SUPPORT.relative(direction),Blocks.AIR.defaultBlockState());for(int x=0;x<3;x++)for(int y=0;y<3;y++){
|
||||
var pos=new BlockPos(x*2-2,y+1,0);l.setBlockAndUpdate(pos.north(),Blocks.STONE.defaultBlockState());var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,Direction.SOUTH).setValue(Statuary.ANCHOR,ANCHORS[x][0]).setValue(Statuary.HEIGHT,HEIGHTS[y]);place(l,pos,state);persistent.put(pos,state);
|
||||
}player(s).teleportTo(.5,2,5);});
|
||||
c.waitFor(m->m.player.distanceToSqr(.5,2,5)<.05,100);c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(.5,2.5,.5)));c.waitTicks(8);c.takeScreenshot("sculpture125-wall-placements");saved=world.getWorldSave();
|
||||
}
|
||||
try(var world=saved.open()){
|
||||
c.waitFor(m->m.player!=null&&m.gui.screen()==null,1200);world.getServer().runOnServer(s->{for(var entry:persistent.entrySet()){var state=player(s).level().getBlockState(entry.getKey());check(state==entry.getValue(),"New anchors and heights persist exactly");check(STATUE.equals(((StatuaryEntity)player(s).level().getBlockEntity(entry.getKey())).sculpture()),"Model data persists unchanged");}});
|
||||
c.waitFor(m->persistent.keySet().stream().allMatch(p->m.level.getBlockEntity(p) instanceof StatuaryEntity e&&STATUE.equals(e.sculpture())),150);c.runOnClient(m->persistent.keySet().forEach(p->renderBounds((StatuaryEntity)m.level.getBlockEntity(p))));
|
||||
}
|
||||
new Sculpture122ClientChecks().runTest(c);
|
||||
System.out.println("SCULPTURE125_PASS new placement gestures, native picking, collision/render agreement, legacy states and saved new positions");
|
||||
}
|
||||
private static void contexts(ServerPlayer p){int count=0;
|
||||
for(var pos:List.of(new BlockPos(5,3,5),new BlockPos(-5,3,-5))){p.level().setBlockAndUpdate(pos,Blocks.STONE.defaultBlockState());
|
||||
for(int turn=0;turn<4;turn++){p.setYRot(turn*90);for(var face:Direction.values())for(int u=0;u<3;u++)for(int v=0;v<3;v++){
|
||||
var spot=new Spot(face,u,v);var context=new BlockPlaceContext(p,InteractionHand.MAIN_HAND,StatuaryEntity.item(STATUE),new BlockHitResult(spot.hit(pos),face,pos,false));var state=Statuary.BLOCK.getStateForPlacement(context);
|
||||
check(context.getClickedPos().equals(pos.relative(face))&&state.getValue(Statuary.ANCHOR)==spot.anchor()&&state.getValue(Statuary.HEIGHT)==spot.height()&&state.getValue(Statuary.FACING)==p.getDirection(),"Native placement context agrees at signed coordinates: "+spot);count++;
|
||||
}}p.level().setBlockAndUpdate(pos,Blocks.AIR.defaultBlockState());
|
||||
}
|
||||
check(Statuary.BLOCK.getStateDefinition().getPossibleStates().size()==144,"108 placement states plus 36 legacy-height states");
|
||||
for(var anchor:SculptureAnchor.values())for(var height:SculptureHeight.values()){
|
||||
var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.ANCHOR,anchor).setValue(Statuary.HEIGHT,height);var box=SculptureGeometry.shape(STATUE,Direction.SOUTH,anchor,height).bounds();
|
||||
for(var rotation:Rotation.values()){var rotated=state.rotate(rotation);check(rotated.getValue(Statuary.HEIGHT)==height,"Yaw rotation retains height");var b=SculptureGeometry.shape(STATUE,rotated.getValue(Statuary.FACING),rotated.getValue(Statuary.ANCHOR),height).bounds();double ex=box.getCenter().x-.5,ez=box.getCenter().z-.5;double tx=switch(rotation){case NONE->ex;case CLOCKWISE_90->-ez;case CLOCKWISE_180->-ex;case COUNTERCLOCKWISE_90->ez;};double tz=switch(rotation){case NONE->ez;case CLOCKWISE_90->ex;case CLOCKWISE_180->-ez;case COUNTERCLOCKWISE_90->-ex;};check(Math.abs((b.getCenter().x-.5)-tx)<=1/16d&&Math.abs((b.getCenter().z-.5)-tz)<=1/16d&&b.minY==box.minY,"Rotated anchor follows native structure rotation without half voxels");}
|
||||
for(var mirror:Mirror.values()){var mirrored=state.mirror(mirror);var b=SculptureGeometry.shape(STATUE,mirrored.getValue(Statuary.FACING),mirrored.getValue(Statuary.ANCHOR),height).bounds();double x=mirror==Mirror.FRONT_BACK?1-box.getCenter().x:box.getCenter().x,z=mirror==Mirror.LEFT_RIGHT?1-box.getCenter().z:box.getCenter().z;check(Math.abs(b.getCenter().x-x)<=1/16d&&Math.abs(b.getCenter().z-z)<=1/16d&&b.minY==box.minY,"Mirrored corner and vertical placement follow native structure mirror");}
|
||||
}
|
||||
System.out.println("SCULPTURE125_CONTEXT_PASS "+count+" contexts, signed coordinates, four headings, rotations/mirrors and 144 valid states");
|
||||
}
|
||||
private static void legacy(ServerPlayer p){int n=0;
|
||||
for(var facing:Direction.Plane.HORIZONTAL)for(var anchor:List.of(SculptureAnchor.CENTER,SculptureAnchor.NORTH,SculptureAnchor.SOUTH,SculptureAnchor.WEST,SculptureAnchor.EAST)){
|
||||
var state=Statuary.BLOCK.defaultBlockState().setValue(Statuary.FACING,facing).setValue(Statuary.ANCHOR,anchor).setValue(Statuary.HEIGHT,SculptureHeight.TOP);var nbt=NbtUtils.writeBlockState(state);nbt.getCompoundOrEmpty("properties").remove("vertical_anchor");var restored=NbtUtils.readBlockState(BuiltInRegistries.BLOCK,nbt);
|
||||
check(restored.getValue(Statuary.HEIGHT)==SculptureHeight.ORIGINAL&&restored.getValue(Statuary.ANCHOR)==anchor&&restored.getValue(Statuary.FACING)==facing,"Old NBT keeps orientation and anchor and defaults original Y");var b=SculptureGeometry.shape(STATUE,facing,anchor,restored.getValue(Statuary.HEIGHT)).bounds();check(b.minY==2/16d&&b.maxY==10/16d,"Legacy vertical padding is preserved exactly");n++;
|
||||
}System.out.println("SCULPTURE125_LEGACY_PASS "+n+" old blockstates retain exact placements without rewriting payloads");
|
||||
}
|
||||
private static void renderBounds(StatuaryEntity entity){var renderer=new StatuaryRenderer();var render=renderer.createRenderState();renderer.extractRenderState(entity,render,0,Vec3.ZERO,null);double x0=1,y0=1,z0=1,x1=0,y1=0,z1=0;for(var q:render.mesh){x0=Math.min(x0,q.x());y0=Math.min(y0,q.y());z0=Math.min(z0,q.z());x1=Math.max(x1,q.x()+1/16d);y1=Math.max(y1,q.y()+1/16d);z1=Math.max(z1,q.z()+1/16d);}var bounds=entity.shape(entity.getBlockState()).bounds();check(bounds.equals(new AABB(x0,y0,z0,x1,y1,z1)),"Native single box follows actual rendered offsets on all three axes");Sculpture113ClientChecks.rendered(entity);}
|
||||
private static void place(ServerLevel level,BlockPos pos,BlockState state){level.setBlockAndUpdate(pos,state);var e=(StatuaryEntity)level.getBlockEntity(pos);var data=new CompoundTag();data.put("sculpture",StatuaryEntity.encode(STATUE));e.loadWithComponents(TagValueInput.create(ProblemReporter.DISCARDING,level.registryAccess(),data));e.setChanged();level.sendBlockUpdated(pos,state,state,3);}
|
||||
private static VoxelSculpture statue(){var cells=new ArrayList<VoxelSculpture.Cell>();for(int y=2;y<10;y++)for(int x=y<6?2:1;x<=(y<6?4:5);x++)for(int z=y<6?1:0;z<=(y<6?3:4);z++)cells.add(new VoxelSculpture.Cell(x,y,z,y<6?0xff44aabb:0xffddb88b));return new VoxelSculpture(MODEL,"Placement statue",7,10,5,cells);}
|
||||
private static ServerPlayer player(MinecraftServer s){return s.getPlayerList().getPlayers().getFirst();}
|
||||
private static void check(boolean ok,String reason){if(!ok)throw new AssertionError(reason);}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import fr.koka.sanctuary.plans.*;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.*;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.*;
|
||||
|
||||
final class Sculpture125ParticleChecks {
|
||||
static void exercise(Minecraft mc,BlockPos pos){
|
||||
var entity=(StatuaryEntity)mc.level.getBlockEntity(pos);var state=entity.getBlockState();
|
||||
var render=new StatuaryRenderer();var rs=render.createRenderState();render.extractRenderState(entity,rs,0,Vec3.ZERO,null);
|
||||
Set<Integer> colors=new HashSet<>();for(var q:rs.mesh)colors.add(q.color());
|
||||
var queue=queue(mc);queue.clear();var q=rs.mesh.getLast();var hit=Vec3.atLowerCornerOf(pos).add(SculptureParticles.center(q));
|
||||
mc.hitResult=new BlockHitResult(hit,Direction.UP,pos,false);mc.level.addBreakingBlockEffects(pos,Direction.UP,false);
|
||||
check(queue.size()==1&&queue.peek() instanceof SculptureParticles.Fragment,"Native hit emits one voxel chip, no clay debris");
|
||||
var chip=(SingleQuadParticle)queue.peek();check(color(chip)==q.color(),"Hit chip uses the exact targeted voxel color");
|
||||
queue.clear();mc.level.addDestroyBlockEffect(pos,state);verify(queue,rs.mesh,colors,pos);int count=queue.size();
|
||||
queue.clear();mc.level.setBlock(pos,Blocks.AIR.defaultBlockState(),3);check(mc.level.getBlockEntity(pos)==null,"Native block update removes sculpture before break effect");
|
||||
mc.level.addDestroyBlockEffect(pos,state);verify(queue,rs.mesh,colors,pos);check(queue.size()==count,"Late break event retains voxel colors and offsets");
|
||||
queue.clear();mc.level.addDestroyBlockEffect(pos,Blocks.STONE.defaultBlockState());check(!queue.isEmpty()&&queue.stream().noneMatch(SculptureParticles.Fragment.class::isInstance),"Other blocks retain native particles");queue.clear();
|
||||
System.out.println("SCULPTURE125_PARTICLES_PASS native hit/destroy hooks, exact voxel colors, real surface origins, 64-chip bound, late removal and ordinary block regression");
|
||||
}
|
||||
private static void verify(Queue<Particle> queue,List<StatuaryRenderer.Quad> mesh,Set<Integer> colors,BlockPos pos){
|
||||
check(!queue.isEmpty()&&queue.size()<=64,"Bounded destruction particles");var observed=new HashSet<Integer>();
|
||||
for(var p:queue){check(p instanceof SculptureParticles.Fragment,"No clay fallback particles");int color=color((SingleQuadParticle)p);observed.add(color);check(colors.contains(color),"Particle retains an actual model color");var point=new Vec3(number(p,"x"),number(p,"y"),number(p,"z")).subtract(Vec3.atLowerCornerOf(pos));check(mesh.stream().anyMatch(q->q.color()==color&&SculptureParticles.center(q).equals(point)),"Particle belongs to an actual colored voxel face after rotation/anchor");check(((SingleQuadParticle)p).getQuadSize(0)==1/32f,"One voxel diameter, no oversized clay chips");}
|
||||
check(observed.size()==colors.size(),"Both fixture material colors occur in destruction chips");
|
||||
}
|
||||
@SuppressWarnings("unchecked") private static Queue<Particle> queue(Minecraft mc){try{var f=ParticleEngine.class.getDeclaredField("particlesToAdd");f.setAccessible(true);return (Queue<Particle>)f.get(mc.particleEngine);}catch(Exception e){throw new AssertionError(e);}}
|
||||
private static double number(Object value,String name){try{Class<?> type=value.getClass();Field f=null;while(type!=null){try{f=type.getDeclaredField(name);break;}catch(NoSuchFieldException ignored){type=type.getSuperclass();}}f.setAccessible(true);return ((Number)f.get(value)).doubleValue();}catch(Exception e){throw new AssertionError(e);}}
|
||||
private static int color(SingleQuadParticle p){return 0xff000000|Math.round((float)number(p,"rCol")*255)<<16|Math.round((float)number(p,"gCol")*255)<<8|Math.round((float)number(p,"bCol")*255);}
|
||||
private static void check(boolean ok,String reason){if(!ok)throw new AssertionError(reason);}
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import fr.koka.sanctuary.companion.CompanionService;
|
||||
import fr.koka.sanctuary.plans.*;
|
||||
import java.nio.file.*;
|
||||
import java.util.*;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.*;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.stats.Stats;
|
||||
import net.minecraft.world.entity.EntityTypes;
|
||||
import net.minecraft.world.inventory.ContainerInput;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.GameType;
|
||||
|
||||
final class Sculpture125WorkshopChecks {
|
||||
static void exercise(ClientGameTestContext c,TestServerContext server){
|
||||
var pos=new BlockPos(4,1,4);
|
||||
server.runOnServer(s->{var p=s.getPlayerList().getPlayers().getFirst();p.teleportTo(3,1,3);p.setGameMode(GameType.SURVIVAL);p.getAbilities().invulnerable=true;p.onUpdateAbilities();p.level().setBlockAndUpdate(pos,Statuary.WORKSHOP.defaultBlockState());
|
||||
CompanionService.save(p,CompanionService.record(p).note("seen_mobs",""));Statuary.open(p,pos);
|
||||
});
|
||||
c.waitForScreen(ClayWorkshopScreen.class);
|
||||
c.runOnClient(m->{var menu=(ClayWorkshopMenu)m.player.containerMenu;check(!menu.view.statues().contains("minecraft:cow"),"Unseen cow is absent without visiting Metabli");var screen=(ClayWorkshopScreen)m.gui.screen();screen.load(EntityTypes.COW);check(screen.selected()==null&&!screen.busy(),"Unseen animal cannot start local generation");});
|
||||
server.runOnServer(s->{var p=s.getPlayerList().getPlayers().getFirst();var menu=(ClayWorkshopMenu)p.containerMenu;menu.getSlot(0).set(new ItemStack(Items.OAK_PLANKS,2));var locked=new VoxelSculpture(StatueDiscoveries.modelId("minecraft:cow"),"Cow",1,1,1,List.of(new VoxelSculpture.Cell(0,0,0,-1)));menu.select(p,locked,Items.OAK_PLANKS,new SculpturePalette(List.of(-1)));check(menu.getSlot(1).getItem().isEmpty(),"Server rejects a locked animal model despite valid material");p.closeContainer();
|
||||
CompanionService.save(p,CompanionService.record(p).note("seen_mobs","cow"));p.awardStat(Stats.ENTITY_KILLED.get(EntityTypes.SHEEP));p.awardStat(Stats.ENTITY_KILLED_BY.get(EntityTypes.PIG));
|
||||
});
|
||||
c.waitFor(m->m.gui.screen()==null,100);
|
||||
server.runOnServer(s->{var p=s.getPlayerList().getPlayers().getFirst();Statuary.open(p,pos);var menu=(ClayWorkshopMenu)p.containerMenu;check(menu.view.statues().equals(StatueDiscoveries.known(p)),"Workshop uses the exact statue catalogue discoveries");menu.getSlot(0).set(new ItemStack(Items.OAK_PLANKS,4));menu.broadcastChanges();});
|
||||
c.waitForScreen(ClayWorkshopScreen.class);
|
||||
c.runOnClient(m->{m.options.guiScale().set(2);m.getWindow().setWindowed(1280,800);m.resizeGui();var menu=(ClayWorkshopMenu)m.player.containerMenu;check(menu.view.statues().containsAll(List.of("minecraft:cow","minecraft:sheep","minecraft:pig")),"Encounter, kill and killed-by unlocks are transmitted");});
|
||||
for(var type:List.of(EntityTypes.COW,EntityTypes.SHEEP,EntityTypes.PIG)){
|
||||
String model=StatueDiscoveries.modelId(BuiltInRegistries.ENTITY_TYPE.getKey(type).toString());
|
||||
c.runOnClient(m->{var screen=(ClayWorkshopScreen)m.gui.screen();screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getString().equals(type.getDescription().getString())).findFirst().orElseThrow().onPress(new KeyEvent(257,0,0));});
|
||||
c.waitTicks(10);c.runOnClient(m->{var screen=(ClayWorkshopScreen)m.gui.screen();System.out.println("SCULPTURE125_WORKSHOP_DEBUG "+type+" busy "+screen.busy()+" source "+(screen.selected()==null?"null":screen.selected().modelId())+" input "+m.player.containerMenu.getSlot(0).getItem()+" output "+m.player.containerMenu.getSlot(1).getItem());});
|
||||
c.waitFor(m->{var screen=(ClayWorkshopScreen)m.gui.screen();return !screen.busy()&&screen.selected()!=null&&screen.selected().modelId().equals(model)&&m.player.containerMenu.getSlot(1).getItem().is(Statuary.ITEM)&&StatuaryEntity.sculpture(m.player.containerMenu.getSlot(1).getItem()).modelId().equals(model);},250);
|
||||
c.runOnClient(m->{var screen=(ClayWorkshopScreen)m.gui.screen();var source=screen.selected();check(source.cells().size()>20&&Math.max(source.width(),Math.max(source.height(),source.depth()))==16,"Native animal model voxelized at miniature scale");check(ItemStack.matches(screen.preview(),m.player.containerMenu.getSlot(1).getItem()),"Animal preview equals server-paid palette result");});
|
||||
c.takeScreenshot("sculpture125-workshop-"+BuiltInRegistries.ENTITY_TYPE.getKey(type).getPath());
|
||||
}
|
||||
c.runOnClient(m->m.gameMode.handleContainerInput(m.player.containerMenu.containerId,1,0,ContainerInput.PICKUP,m.player));
|
||||
c.waitFor(m->m.player.containerMenu.getCarried().is(Statuary.ITEM)&&m.player.containerMenu.getSlot(0).getItem().getCount()==3,100);
|
||||
server.waitFor(s->{var menu=s.getPlayerList().getPlayers().getFirst().containerMenu;return menu.getCarried().is(Statuary.ITEM)&&menu.getSlot(0).getItem().getCount()==3;},100);
|
||||
server.runOnServer(s->{var p=s.getPlayerList().getPlayers().getFirst();check(p.containerMenu.getSlot(0).getItem().getCount()==3&&p.containerMenu.getCarried().is(Statuary.ITEM),"Exactly one block consumed for native animal sculpture in survival");});
|
||||
Path file=PlanClient.directory().resolve("sculpture125-"+UUID.randomUUID()+".glb");
|
||||
try{Files.createDirectories(file.getParent());Files.write(file,Statuary106ClientChecks.fixture(true));c.runOnClient(m->{var screen=(ClayWorkshopScreen)m.gui.screen();screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getString().equals(ClayWorkshopScreen.text("imports").getString())).findFirst().orElseThrow().onPress(new KeyEvent(257,0,0));screen.load(file);});
|
||||
var id=GlbModel.load(file).id();c.waitFor(m->{var screen=(ClayWorkshopScreen)m.gui.screen();return !screen.busy()&&screen.selected()!=null&&screen.selected().modelId().equals(id)&&id.equals(Optional.ofNullable(StatuaryEntity.sculpture(m.player.containerMenu.getSlot(1).getItem())).map(VoxelSculpture::modelId).orElse(""));},250);c.takeScreenshot("sculpture125-workshop-import");
|
||||
}catch(Exception e){throw new AssertionError(e);}finally{try{Files.deleteIfExists(file);}catch(Exception ignored){}}
|
||||
server.runOnServer(s->{var p=s.getPlayerList().getPlayers().getFirst();p.closeContainer();p.setGameMode(GameType.CREATIVE);p.getAbilities().flying=true;p.onUpdateAbilities();});c.waitFor(m->m.gui.screen()==null,100);
|
||||
System.out.println("SCULPTURE125_WORKSHOP_PASS encounter/kill/death unlocks, native menu sync, locked server rejection, three textured animals, paid survival craft and GLB import");
|
||||
}
|
||||
private static void check(boolean ok,String reason){if(!ok)throw new AssertionError(reason);}
|
||||
}
|
||||
+11
-2
@@ -119,7 +119,14 @@ public final class Statuary106ClientChecks implements FabricClientGameTest {
|
||||
for(var direction:Direction.Plane.HORIZONTAL){
|
||||
var pos=DIRECTIONS.get(direction);double px=pos.getX()+.5-direction.getStepX()*2,pz=pos.getZ()+.5-direction.getStepZ()*2;
|
||||
server.runOnServer(s->{var p=player(s);p.teleportTo(px,1,pz);p.getInventory().setItem(p.getInventory().getSelectedSlot(),StatuaryEntity.item(source));p.inventoryMenu.broadcastFullState();});
|
||||
c.waitFor(m->m.player.distanceToSqr(px,1,pz)<.05&&m.player.getMainHandItem().is(Statuary.ITEM),150);place(c,pos,direction.getOpposite());
|
||||
c.waitFor(m->m.player.distanceToSqr(px,1,pz)<.05&&m.player.getMainHandItem().is(Statuary.ITEM),150);place(c,pos);
|
||||
server.waitFor(s->player(s).level().getBlockState(pos).is(Statuary.BLOCK),100);
|
||||
server.runOnServer(s->{var state=player(s).level().getBlockState(pos);check(state.getValue(Statuary.FACING)==direction&&state.getValue(Statuary.ANCHOR)==SculptureAnchor.CENTER,"Native center placement follows gaze on server");});
|
||||
c.waitFor(m->m.level.getBlockEntity(pos) instanceof StatuaryEntity e&&source.equals(e.sculpture())&&e.getBlockState().getValue(Statuary.ANCHOR)==SculptureAnchor.CENTER,100);
|
||||
c.runOnClient(m->Sculpture113ClientChecks.rendered((StatuaryEntity)m.level.getBlockEntity(pos)));
|
||||
c.takeScreenshot("sculpture119-center-"+direction.getSerializedName());
|
||||
server.runOnServer(s->{var p=player(s);p.level().removeBlock(pos,false);p.getInventory().setItem(p.getInventory().getSelectedSlot(),StatuaryEntity.item(source));p.inventoryMenu.broadcastFullState();});
|
||||
c.waitFor(m->m.level.getBlockState(pos).isAir()&&m.player.getMainHandItem().is(Statuary.ITEM),100);place(c,pos,direction.getOpposite());
|
||||
server.waitFor(s->player(s).level().getBlockState(pos).is(Statuary.BLOCK),100);
|
||||
server.runOnServer(s->{var state=player(s).level().getBlockState(pos);check(state.getValue(Statuary.FACING)==direction,"Native placement faces gaze: "+direction);
|
||||
check(state.getValue(Statuary.ANCHOR)==SculptureAnchor.of(direction.getOpposite()),"Aimed edge stored on server");
|
||||
@@ -189,12 +196,14 @@ public final class Statuary106ClientChecks implements FabricClientGameTest {
|
||||
server.runOnServer(s->check(player(s).level().getBlockState(pos).getValue(Statuary.ANCHOR)==SculptureAnchor.of(direction.getOpposite()),"Anchor survives server save/reload"));
|
||||
c.waitFor(m->m.level.getBlockEntity(pos) instanceof StatuaryEntity e&&ORIGINAL.get().equals(e.sculpture())&&e.getBlockState().getValue(Statuary.FACING)==direction,150);
|
||||
}
|
||||
c.waitFor(m->m.level.getBlockEntity(SCULPTURE) instanceof StatuaryEntity e&&e.sculpture()!=null,150);c.runOnClient(m->check(((StatuaryEntity)m.level.getBlockEntity(SCULPTURE)).sculpture().equals(ORIGINAL.get()),"Fresh client receives server model without file"));
|
||||
server.runOnServer(s->check(player(s).level().getBlockState(SCULPTURE).getValue(Statuary.ANCHOR)==SculptureAnchor.CENTER,"Centered placement survives server save/reload"));
|
||||
c.waitFor(m->m.level.getBlockEntity(SCULPTURE) instanceof StatuaryEntity e&&e.sculpture()!=null,150);c.runOnClient(m->{check(((StatuaryEntity)m.level.getBlockEntity(SCULPTURE)).sculpture().equals(ORIGINAL.get()),"Fresh client receives server model without file");check(m.level.getBlockState(SCULPTURE).getValue(Statuary.ANCHOR)==SculptureAnchor.CENTER,"Fresh client receives centered anchor");});
|
||||
c.getInput().lookAt(SCULPTURE);c.takeScreenshot("statuary106-reload-no-source");
|
||||
}
|
||||
System.out.println("STATUARY106_PASS GLB textured scene, bounded import, shared folder filters, native paid crafting, 16 clay colors, model ID, shift-click, place/drop/re-place, Metabli plan, cancellation, server save/reconnect without source");
|
||||
System.out.println("STATUARY111_PASS nine-slice GUI FR/EN scales 2/3, four native gaze placements, renderer directions, structure rotation/mirror, legacy state default, drop/re-place and persisted orientation");
|
||||
System.out.println("STATUARY113_PASS clay sculpture FR/EN, native aimed edges, voxel grid across every footprint/orientation/anchor, side placement, legacy states, rotated/mirrored anchor, save/reconnect");
|
||||
System.out.println("SCULPTURE119_PASS native centered placements in four directions, center/edge boundaries, odd/even voxel grid, side anchoring and center save/reconnect");
|
||||
System.out.println("STATUARY112_PASS fixed compact hotbar-only menu, native input transfer, hidden slots/offhand rejected, full hotbar no consumption, partial merge exact cost, closing restitution");
|
||||
}catch(IOException e){throw new AssertionError(e);}finally{try{Files.deleteIfExists(file);}catch(IOException ignored){}}
|
||||
}
|
||||
|
||||
+140
@@ -0,0 +1,140 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import fr.koka.sanctuary.gametest.Starter039TestSupport;
|
||||
import fr.koka.sanctuary.multiblock.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
|
||||
import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.network.chat.contents.TranslatableContents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.GameType;
|
||||
import net.minecraft.world.level.block.*;
|
||||
import net.minecraft.world.level.block.entity.*;
|
||||
import net.minecraft.world.level.block.piston.PistonBaseBlock;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.*;
|
||||
import net.minecraft.world.phys.*;
|
||||
|
||||
/** Real client gestures and persisted server state; rendered UVs must change without moving geometry. */
|
||||
public final class Wrench120ClientChecks implements FabricClientGameTest {
|
||||
private static final BlockPos TARGET=new BlockPos(0,1,0),CHEST=new BlockPos(2,1,0),DIRT=new BlockPos(-2,1,0);
|
||||
public void runTest(ClientGameTestContext c){
|
||||
var intro=new AtomicBoolean(true);
|
||||
c.runOnClient(m->{m.options.renderDistance().set(6);m.options.simulationDistance().set(5);m.options.pauseOnLostFocus=false;IntroClient.setQuickTestIntro(true);});
|
||||
ClientTickEvents.END_CLIENT_TICK.register(m->{if(intro.get()&&m.gui.screen() instanceof HelloWorldScreen screen){
|
||||
Starter039TestSupport.selectFirst(screen);
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getClass().getSimpleName().equals("ColorButton")).findFirst().orElseThrow().onPress(enter());
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getContents() instanceof TranslatableContents t&&t.getKey().equals("sanctuary.progression.enter")).findFirst().orElseThrow().onPress(enter());intro.set(false);
|
||||
}});
|
||||
net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldSave saved;
|
||||
try(var world=c.worldBuilder().adjustSettings(s->{s.setName("Wrench120 "+UUID.randomUUID());s.setSeed("120");s.setAllowCommands(true);s.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);s.setWorldType(s.getNormalPresetList().stream().filter(e->e.preset()!=null&&e.preset().getRegisteredName().equals("sanctuary_test:flat")).findFirst().orElseThrow());}).create()){
|
||||
c.waitFor(m->ProgressionClient.active()&&m.player!=null&&m.gui.screen()==null&&!IntroSpawnFlash.active(),1200);var server=world.getServer();
|
||||
server.runOnServer(s->{var p=player(s);var l=p.level();p.teleportTo(.5,1,3.2);p.getInventory().setItem(p.getInventory().getSelectedSlot(),new ItemStack(Multiblocks.STEVE_WRENCH));p.inventoryMenu.broadcastFullState();
|
||||
l.setBlockAndUpdate(TARGET,Blocks.OAK_STAIRS.defaultBlockState());l.setBlockAndUpdate(CHEST,Blocks.CHEST.defaultBlockState());((ChestBlockEntity)l.getBlockEntity(CHEST)).setItem(0,new ItemStack(Items.DIAMOND,23));l.setBlockAndUpdate(DIRT,Blocks.DIRT.defaultBlockState());
|
||||
s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary time vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"time set noon");
|
||||
int tested=0;for(var block:BuiltInRegistries.BLOCK)for(var property:block.getStateDefinition().getProperties()){
|
||||
var before=block.defaultBlockState();var after=GoldenWrench.cycle(before,property,false);
|
||||
check(after.is(block)&&GoldenWrench.cycle(after,property,true)==before,"Every registered native property has reversible values");tested++;
|
||||
}
|
||||
check(tested>1000,"Broad block property coverage");System.out.println("WRENCH120_PROPERTIES "+tested);
|
||||
});
|
||||
c.waitFor(m->m.player.getMainHandItem().is(Multiblocks.STEVE_WRENCH)&&m.player.distanceToSqr(.5,1,3.2)<.1&&m.level.getBlockState(TARGET).is(Blocks.OAK_STAIRS),150);
|
||||
var stairs=c.computeOnClient(m->m.level.getBlockState(TARGET));click(c,TARGET,false,false);
|
||||
server.waitFor(s->player(s).level().getBlockState(TARGET)!=stairs,100);c.waitFor(m->m.level.getBlockState(TARGET)!=stairs,100);
|
||||
server.runOnServer(s->{var actual=player(s).level().getBlockState(TARGET);check(actual.getValue(StairBlock.FACING)!=stairs.getValue(StairBlock.FACING)&&actual.getValue(StairBlock.HALF)==stairs.getValue(StairBlock.HALF),"Right click changes facing only");});
|
||||
click(c,TARGET,false,true);server.waitFor(s->player(s).level().getBlockState(TARGET)==stairs,100);
|
||||
click(c,TARGET,true,false);server.runOnServer(s->check(GoldenWrench.selected(player(s),stairs).equals("half"),"Left click selects half without breaking creative block: "+GoldenWrench.selected(player(s),stairs)));
|
||||
click(c,TARGET,false,false);server.waitFor(s->player(s).level().getBlockState(TARGET).getValue(StairBlock.HALF)==Half.TOP,100);
|
||||
click(c,TARGET,true,false);server.runOnServer(s->check(GoldenWrench.selected(player(s),stairs).equals("shape"),"Next property is stair shape"));
|
||||
click(c,TARGET,false,false);server.waitFor(s->player(s).level().getBlockState(TARGET).getValue(StairBlock.SHAPE)!=StairsShape.STRAIGHT,100);
|
||||
c.takeScreenshot("wrench120-stairs");
|
||||
// A container rotates in place; inventory and block entity survive the full native interaction.
|
||||
click(c,CHEST,false,false);server.runOnServer(s->{var p=player(s);var chest=(ChestBlockEntity)p.level().getBlockEntity(CHEST);check(chest.getItem(0).is(Items.DIAMOND)&&chest.getItem(0).getCount()==23,"Chest contents retained");check(p.containerMenu==p.inventoryMenu,"Wrench does not open ordinary chest");check(chest.getBlockState().getValue(ChestBlock.FACING)!=Blocks.CHEST.defaultBlockState().getValue(ChestBlock.FACING),"Chest rotates");});
|
||||
// Ordinary survival without commands retains Steve’s full powers; dirt keeps its native ID, shape and loot.
|
||||
server.runOnServer(s->{s.getWorldData().setAllowCommands(false);player(s).setGameMode(GameType.SURVIVAL);});c.waitFor(m->!m.player.isCreative(),100);
|
||||
var original=c.computeOnClient(m->geometry(m,DIRT));c.takeScreenshot("wrench120-dirt-before");
|
||||
click(c,DIRT,false,false);server.waitFor(s->WrenchTextures.rotation(player(s).level().getChunkAt(DIRT),DIRT)==1,100);c.waitFor(m->WrenchTextureModels.rotation(DIRT)==1,100);
|
||||
var rotated=c.computeOnClient(m->geometry(m,DIRT));checkUvs(original,rotated);c.takeScreenshot("wrench120-dirt-90");
|
||||
server.runOnServer(s->check(player(s).level().getBlockState(DIRT)==Blocks.DIRT.defaultBlockState(),"Dirt type and native state unchanged"));
|
||||
click(c,DIRT,true,false);server.runOnServer(s->check(player(s).level().getBlockState(DIRT).is(Blocks.DIRT),"Left click never breaks dirt in survival"));
|
||||
click(c,DIRT,false,true);c.waitFor(m->WrenchTextureModels.rotation(DIRT)==0,100);checkGeometry(original,c.computeOnClient(m->geometry(m,DIRT)),"Reverse restores exact UVs");
|
||||
for(int i=1;i<=4;i++){click(c,DIRT,false,false);int expected=i%4;c.waitFor(m->WrenchTextureModels.rotation(DIRT)==expected,100);}
|
||||
checkGeometry(original,c.computeOnClient(m->geometry(m,DIRT)),"Four turns restore exact original geometry and UVs");
|
||||
click(c,DIRT,false,false);c.waitFor(m->WrenchTextureModels.rotation(DIRT)==1,100);
|
||||
var reload=c.computeOnClient(Minecraft::reloadResourcePacks);c.waitFor(m->reload.isDone()&&m.gui.overlay()==null,1200);reload.join();checkGeometry(rotated,c.computeOnClient(m->geometry(m,DIRT)),"Resource reload retains texture rotation");
|
||||
// Replacing a block clears the visual receipt; blockstate edits retain it.
|
||||
server.runOnServer(s->{var l=player(s).level();var q=new BlockPos(-3,1,0);l.setBlockAndUpdate(q,Blocks.OAK_LOG.defaultBlockState());WrenchTextures.turn(l,q,1);l.setBlock(q,Blocks.OAK_LOG.defaultBlockState().setValue(RotatedPillarBlock.AXIS,Direction.Axis.X),18);check(WrenchTextures.rotation(l.getChunkAt(q),q)==1,"State edit preserves texture rotation");l.removeBlock(q,false);l.setBlockAndUpdate(q,Blocks.OAK_LOG.defaultBlockState());check(WrenchTextures.rotation(l.getChunkAt(q),q)==0,"Break/replacement clears rotation");
|
||||
var p=player(s);p.setGameMode(GameType.ADVENTURE);check(!GoldenWrench.allowed(p,TARGET,InteractionHand.MAIN_HAND,Direction.UP),"Adventure cannot edit");p.setGameMode(GameType.SPECTATOR);check(!GoldenWrench.allowed(p,TARGET,InteractionHand.MAIN_HAND,Direction.UP),"Spectator cannot edit");p.setGameMode(GameType.SURVIVAL);check(!GoldenWrench.allowed(p,TARGET.offset(100,0,0),InteractionHand.MAIN_HAND,Direction.UP),"Out-of-range edit refused");
|
||||
});
|
||||
// A full Metabli still assembles with two normal right clicks, then separates with sneak-use.
|
||||
var table=new BlockPos(6,1,0);server.runOnServer(s->{var p=player(s);p.getInventory().setItem(p.getInventory().getSelectedSlot(),new ItemStack(Multiblocks.WRENCH));p.inventoryMenu.broadcastFullState();for(var q:Metatable.members(table))p.level().setBlockAndUpdate(q,Blocks.CRAFTING_TABLE.defaultBlockState());p.teleportTo(7.5,1,4);});
|
||||
c.waitFor(m->m.player.distanceToSqr(7.5,1,4)<.1&&m.level.getBlockState(table).is(Blocks.CRAFTING_TABLE),100);
|
||||
click(c,table.offset(1,0,2),false,false);click(c,table.offset(1,0,2),false,false);
|
||||
server.waitFor(s->player(s).level().getBlockState(table).is(Metatable.BLOCK),100);c.waitFor(m->m.level.getBlockState(table).is(Metatable.BLOCK),100);
|
||||
click(c,table.offset(1,0,2),true,false);server.runOnServer(s->check(Metatable.state(player(s).level(),table,true)==1,"Left click cannot corrupt a multiblock's part states"));
|
||||
click(c,table.offset(1,0,2),false,true);server.waitFor(s->Metatable.state(player(s).level(),table,false)==1,100);
|
||||
// Both container assemblers and the piston assembler must win over generic state editing.
|
||||
for(var component:List.of(Blocks.BARREL,Blocks.FURNACE)){
|
||||
server.runOnServer(s->{var l=player(s).level();for(int y=0;y<3;y++)for(int z=0;z<3;z++)for(int x=0;x<3;x++)l.setBlockAndUpdate(table.offset(x,y,z),component.defaultBlockState());});
|
||||
c.waitFor(m->m.level.getBlockState(table.offset(1,0,2)).is(component),100);
|
||||
click(c,table.offset(1,0,2),false,false);click(c,table.offset(1,0,2),false,false);
|
||||
server.runOnServer(s->check(MultiblockData.get(player(s).level()).at(table)!=null,"Complete container machine assembles before generic rotation"));
|
||||
click(c,table.offset(1,0,2),false,true);
|
||||
server.runOnServer(s->check(MultiblockData.get(player(s).level()).at(table)==null,"Container machine still separates"));
|
||||
}
|
||||
server.runOnServer(s->{var l=player(s).level();for(int y=2;y>=0;y--)for(int z=0;z<3;z++)for(int x=0;x<3;x++)l.setBlockAndUpdate(table.offset(x,y,z),y==0?Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.FACING,Direction.UP):Blocks.AIR.defaultBlockState());});
|
||||
c.waitFor(m->m.level.getBlockState(table.offset(1,0,2)).is(Blocks.PISTON),100);
|
||||
click(c,table.offset(1,0,2),false,false);click(c,table.offset(1,0,2),false,false);
|
||||
server.waitFor(s->SuperPistons.status(player(s).level(),table.offset(1,0,1),Direction.UP,false)==1,100);
|
||||
c.waitFor(m->m.level.getBlockState(table.offset(1,0,2)).is(SuperPistons.NORMAL),100);
|
||||
click(c,table.offset(1,0,2),false,true);
|
||||
server.runOnServer(s->check(player(s).level().getBlockState(table.offset(1,0,2)).is(Blocks.PISTON),"Super piston still separates before editing its parts"));
|
||||
// An isolated barrel and piston now use generic states instead of an incomplete-structure error.
|
||||
server.runOnServer(s->{var p=player(s);p.teleportTo(.5,1,3.2);p.level().setBlockAndUpdate(TARGET,Blocks.BARREL.defaultBlockState());});c.waitFor(m->m.player.distanceToSqr(.5,1,3.2)<.1&&m.level.getBlockState(TARGET).is(Blocks.BARREL),100);
|
||||
click(c,TARGET,false,false);server.runOnServer(s->check(player(s).level().getBlockState(TARGET).getValue(BarrelBlock.FACING)!=Blocks.BARREL.defaultBlockState().getValue(BarrelBlock.FACING),"Isolated barrel rotates"));
|
||||
server.runOnServer(s->player(s).level().setBlockAndUpdate(TARGET,Blocks.PISTON.defaultBlockState()));c.waitFor(m->m.level.getBlockState(TARGET).is(Blocks.PISTON),100);
|
||||
click(c,TARGET,false,false);server.runOnServer(s->check(player(s).level().getBlockState(TARGET).getValue(PistonBaseBlock.FACING)!=Blocks.PISTON.defaultBlockState().getValue(PistonBaseBlock.FACING),"Isolated piston rotates"));
|
||||
server.runOnServer(s->player(s).level().setBlock(TARGET,stairs.setValue(StairBlock.HALF,Half.TOP),18));saved=world.getWorldSave();
|
||||
}
|
||||
try(var world=saved.open()){
|
||||
c.waitFor(m->m.player!=null&&m.gui.screen()==null,1200);world.getServer().runOnServer(s->{var l=player(s).level();check(WrenchTextures.rotation(l.getChunkAt(DIRT),DIRT)==1,"Server persisted dirt texture");check(l.getBlockState(TARGET).getValue(StairBlock.HALF)==Half.TOP,"Server persisted native edited state");check(((ChestBlockEntity)l.getBlockEntity(CHEST)).getItem(0).getCount()==23,"Saved chest keeps inventory");});
|
||||
c.waitFor(m->WrenchTextureModels.rotation(DIRT)==1,150);c.getInput().lookAt(DIRT);c.takeScreenshot("wrench120-reconnect");
|
||||
}
|
||||
System.out.println("WRENCH120_PASS native creative/survival clicks, reverse, properties, textures and resource reload, unchanged geometry, filled chest, multiblock assembly priority, permissions, cleanup and save/reconnect");
|
||||
}
|
||||
static void click(ClientGameTestContext c,BlockPos pos,boolean left,boolean sneak){
|
||||
if(sneak){c.getInput().holdKey(o->o.keyShift);c.waitTicks(3);}
|
||||
c.runOnClient(m->m.player.lookAt(net.minecraft.commands.arguments.EntityAnchorArgument.Anchor.EYES,new Vec3(pos.getX()+.5,pos.getY()+.3,pos.getZ()+.5)));c.waitTicks(3);
|
||||
c.runOnClient(m->check(m.hitResult instanceof BlockHitResult hit&&hit.getBlockPos().equals(pos),"Native cursor hits target "+pos+" instead of "+m.hitResult));
|
||||
if(left){c.getInput().holdKey(o->o.keyAttack);c.waitTicks(1);c.getInput().releaseKey(o->o.keyAttack);}else{c.getInput().holdKey(o->o.keyUse);c.waitTicks(1);c.getInput().releaseKey(o->o.keyUse);}
|
||||
c.waitTicks(5);if(sneak){c.getInput().releaseKey(o->o.keyShift);c.waitTicks(3);}
|
||||
}
|
||||
private static List<float[]> geometry(Minecraft m,BlockPos pos){
|
||||
var result=new ArrayList<float[]>();var state=m.level.getBlockState(pos);
|
||||
var emitter=Renderer.get().quadEmitter(q->{var data=new float[20];for(int i=0;i<4;i++){data[i*5]=q.x(i);data[i*5+1]=q.y(i);data[i*5+2]=q.z(i);data[i*5+3]=q.u(i);data[i*5+4]=q.v(i);}result.add(data);});
|
||||
m.getModelManager().getBlockStateModelSet().get(state).emitQuads(emitter,m.level,pos,state,RandomSource.create(state.getSeed(pos)),face->false);check(!result.isEmpty(),"Native model emits real textured geometry");return result;
|
||||
}
|
||||
private static void checkUvs(List<float[]> before,List<float[]> after){
|
||||
check(before.size()==after.size(),"Same face count");boolean changed=false;
|
||||
for(int q=0;q<before.size();q++)for(int v=0;v<4;v++){for(int axis=0;axis<3;axis++)check(before.get(q)[v*5+axis]==after.get(q)[v*5+axis],"Texture turn never moves geometry");changed|=before.get(q)[v*5+3]!=after.get(q)[v*5+3]||before.get(q)[v*5+4]!=after.get(q)[v*5+4];}
|
||||
check(changed,"Dirt UVs actually change");
|
||||
}
|
||||
private static void checkGeometry(List<float[]> a,List<float[]> b,String message){check(a.size()==b.size(),message);for(int i=0;i<a.size();i++)check(Arrays.equals(a.get(i),b.get(i)),message);}
|
||||
private static ServerPlayer player(MinecraftServer s){return s.getPlayerList().getPlayers().getFirst();}
|
||||
private static KeyEvent enter(){return new KeyEvent(InputConstants.KEY_RETURN,0,0);}
|
||||
private static void check(boolean ok,String message){if(!ok)throw new AssertionError(message);}
|
||||
}
|
||||
+111
@@ -0,0 +1,111 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import fr.koka.sanctuary.gametest.Starter039TestSupport;
|
||||
import fr.koka.sanctuary.multiblock.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
|
||||
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
|
||||
import net.fabricmc.fabric.api.event.player.*;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.contents.TranslatableContents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.*;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.GameType;
|
||||
import net.minecraft.world.level.block.*;
|
||||
import net.minecraft.world.level.block.entity.ChestBlockEntity;
|
||||
import net.minecraft.world.level.block.piston.PistonBaseBlock;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.*;
|
||||
import net.minecraft.world.phys.*;
|
||||
|
||||
/** Native golden-wrench clicks cannot create resources or split linked blocks. */
|
||||
public final class Wrench123ClientChecks implements FabricClientGameTest {
|
||||
private static final BlockPos TARGET=new BlockPos(0,1,0),CHEST=new BlockPos(2,1,0),DIRT=new BlockPos(-2,1,0);
|
||||
public void runTest(ClientGameTestContext c){
|
||||
var intro=new AtomicBoolean(true);
|
||||
c.runOnClient(m->{m.options.renderDistance().set(6);m.options.simulationDistance().set(5);m.options.pauseOnLostFocus=false;IntroClient.setQuickTestIntro(true);});
|
||||
ClientTickEvents.END_CLIENT_TICK.register(m->{if(intro.get()&&m.gui.screen() instanceof HelloWorldScreen screen){
|
||||
Starter039TestSupport.selectFirst(screen);
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getClass().getSimpleName().equals("ColorButton")).findFirst().orElseThrow().onPress(new KeyEvent(InputConstants.KEY_RETURN,0,0));
|
||||
screen.children().stream().filter(Button.class::isInstance).map(Button.class::cast).filter(b->b.getMessage().getContents() instanceof TranslatableContents t&&t.getKey().equals("sanctuary.progression.enter")).findFirst().orElseThrow().onPress(new KeyEvent(InputConstants.KEY_RETURN,0,0));intro.set(false);
|
||||
}});
|
||||
try(var world=c.worldBuilder().adjustSettings(s->{s.setName("Wrench123 "+UUID.randomUUID());s.setSeed("123");s.setAllowCommands(true);s.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);s.setWorldType(s.getNormalPresetList().stream().filter(e->e.preset()!=null&&e.preset().getRegisteredName().equals("sanctuary_test:flat")).findFirst().orElseThrow());}).create()){
|
||||
c.waitFor(m->ProgressionClient.active()&&m.player!=null&&m.gui.screen()==null&&!IntroSpawnFlash.active(),1200);var server=world.getServer();
|
||||
server.runOnServer(s->{var p=player(s);var l=p.level();for(int x=-5;x<=8;x++)for(int z=-4;z<=6;z++)l.setBlockAndUpdate(new BlockPos(x,0,z),Blocks.STONE.defaultBlockState());p.teleportTo(.5,1,3.2);equip(p,Multiblocks.WRENCH);
|
||||
l.setBlockAndUpdate(TARGET,Blocks.OAK_STAIRS.defaultBlockState());l.setBlockAndUpdate(CHEST,Blocks.CHEST.defaultBlockState());((ChestBlockEntity)l.getBlockEntity(CHEST)).setItem(0,new ItemStack(Items.DIAMOND,23));l.setBlockAndUpdate(DIRT,Blocks.DIRT.defaultBlockState());
|
||||
s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary time vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"time set noon");
|
||||
});
|
||||
c.waitFor(m->m.player.getMainHandItem().is(Multiblocks.WRENCH)&&m.player.distanceToSqr(.5,1,3.2)<.1&&m.level.getBlockState(TARGET).is(Blocks.OAK_STAIRS),150);
|
||||
var stairs=c.computeOnClient(m->m.level.getBlockState(TARGET));
|
||||
Wrench120ClientChecks.click(c,TARGET,false,false);server.runOnServer(s->check(player(s).level().getBlockState(TARGET).getValue(StairBlock.FACING)!=stairs.getValue(StairBlock.FACING),"Golden wrench changes native stair facing"));
|
||||
Wrench120ClientChecks.click(c,TARGET,false,true);server.waitFor(s->player(s).level().getBlockState(TARGET)==stairs,100);
|
||||
for(int i=0;i<5;i++){Wrench120ClientChecks.click(c,TARGET,true,false);Wrench120ClientChecks.click(c,TARGET,false,false);}
|
||||
server.runOnServer(s->{var state=player(s).level().getBlockState(TARGET);check(!state.getValue(StairBlock.WATERLOGGED)&&state.getValue(StairBlock.HALF)==Half.BOTTOM&&state.getValue(StairBlock.SHAPE)==StairsShape.STRAIGHT,"Repeated native clicks never select water, half or fake stair shapes");});
|
||||
for(int i=0;i<4;i++)Wrench120ClientChecks.click(c,CHEST,false,false);
|
||||
server.runOnServer(s->{var p=player(s);var be=(ChestBlockEntity)p.level().getBlockEntity(CHEST);check(be.getItem(0).getCount()==23&&be.getBlockState()==Blocks.CHEST.defaultBlockState(),"Single chest remains single, dry and filled after four rotations");check(p.containerMenu==p.inventoryMenu,"Ordinary rotation does not open chest");});
|
||||
Wrench120ClientChecks.click(c,DIRT,true,false);Wrench120ClientChecks.click(c,DIRT,false,false);
|
||||
server.runOnServer(s->{var l=player(s).level();check(WrenchTextures.rotation(l.getChunkAt(DIRT),DIRT)==0&&l.getBlockState(DIRT).is(Blocks.DIRT),"Golden wrench never adds a texture transform");regressions(player(s));});
|
||||
c.takeScreenshot("wrench123-golden-safe");
|
||||
// Finding Steve's wrench grants its full powers in ordinary survival, without operator status.
|
||||
server.runOnServer(s->{var p=player(s);p.setGameMode(GameType.SURVIVAL);s.getWorldData().setAllowCommands(false);equip(p,Multiblocks.STEVE_WRENCH);});
|
||||
c.waitFor(m->!m.player.isCreative()&&m.player.getMainHandItem().is(Multiblocks.STEVE_WRENCH),100);
|
||||
Wrench120ClientChecks.click(c,DIRT,true,false);Wrench120ClientChecks.click(c,DIRT,false,false);
|
||||
server.waitFor(s->WrenchTextures.rotation(player(s).level().getChunkAt(DIRT),DIRT)==1,100);c.waitFor(m->WrenchTextureModels.rotation(DIRT)==1,100);
|
||||
Wrench120ClientChecks.click(c,TARGET,false,false);Wrench120ClientChecks.click(c,TARGET,true,false);Wrench120ClientChecks.click(c,TARGET,false,false);
|
||||
server.runOnServer(s->{var p=player(s);check(p.level().getBlockState(TARGET).getValue(StairBlock.HALF)==Half.TOP,"Native Steve edit works for ordinary survival without commands");
|
||||
for(var hand:InteractionHand.values()){
|
||||
p.setItemInHand(hand,new ItemStack(Multiblocks.STEVE_WRENCH));check(GoldenWrench.allowed(p,TARGET,hand,Direction.UP),"Survival use allowed in both hands");
|
||||
GoldenWrench.change(p,DIRT,hand,Direction.UP);
|
||||
}
|
||||
check(WrenchTextures.rotation(p.level().getChunkAt(DIRT),DIRT)==3,"Both hands can freely edit textures in survival");
|
||||
p.setItemInHand(InteractionHand.OFF_HAND,ItemStack.EMPTY);p.setGameMode(GameType.CREATIVE);check(GoldenWrench.allowed(p,TARGET,InteractionHand.MAIN_HAND,Direction.UP),"Creative access without commands enabled");
|
||||
p.setGameMode(GameType.ADVENTURE);check(!GoldenWrench.allowed(p,TARGET,InteractionHand.MAIN_HAND,Direction.UP),"Adventure restrictions remain");p.setGameMode(GameType.SPECTATOR);check(!GoldenWrench.allowed(p,TARGET,InteractionHand.MAIN_HAND,Direction.UP),"Spectator cannot edit");p.setGameMode(GameType.CREATIVE);
|
||||
var steve=new ItemStack(Multiblocks.STEVE_WRENCH);check(Boolean.TRUE.equals(steve.get(DataComponents.ENCHANTMENT_GLINT_OVERRIDE)),"Distinct enchanted Steve item");
|
||||
});
|
||||
c.waitFor(m->m.player.isCreative(),100);c.takeScreenshot("wrench123-steve-texture");
|
||||
System.out.println("WRENCH123_SAFE_PASS native clicks, water/inventory preservation, linked blocks, real neighbour shapes, support checks, ordinary survival and creative use, adventure/spectator restrictions and both hands");
|
||||
}
|
||||
// Keep the full former debug-stick contract on Steve, including UVs/save/reload, and assembly on gold.
|
||||
new Wrench120ClientChecks().runTest(c);
|
||||
System.out.println("WRENCH123_PASS safe golden wrench and Steve wrench with native regression coverage");
|
||||
}
|
||||
private static void regressions(ServerPlayer p){
|
||||
var l=p.level();
|
||||
// Water stays present when rotating a legitimately waterlogged block.
|
||||
l.setBlock(TARGET,Blocks.OAK_STAIRS.defaultBlockState().setValue(StairBlock.WATERLOGGED,true),18);
|
||||
use(p,TARGET);check(l.getBlockState(TARGET).getValue(StairBlock.WATERLOGGED),"Existing water is preserved");
|
||||
l.setBlock(TARGET,Blocks.OAK_STAIRS.defaultBlockState().setValue(StairBlock.FACING,Direction.WEST).setValue(StairBlock.SHAPE,StairsShape.INNER_LEFT),18);
|
||||
use(p,TARGET);check(l.getBlockState(TARGET).getValue(StairBlock.SHAPE)==StairsShape.STRAIGHT&&!l.getBlockState(TARGET).getValue(StairBlock.WATERLOGGED),"Native shape recomputed against actual empty neighbours");
|
||||
var a=CHEST;var b=CHEST.east();var base=Blocks.CHEST.defaultBlockState().setValue(ChestBlock.FACING,Direction.NORTH);
|
||||
l.setBlock(a,base.setValue(ChestBlock.TYPE,ChestType.LEFT),18);l.setBlock(b,base.setValue(ChestBlock.TYPE,ChestType.RIGHT),18);
|
||||
var first=(ChestBlockEntity)l.getBlockEntity(a);var second=(ChestBlockEntity)l.getBlockEntity(b);first.setItem(0,new ItemStack(Items.DIAMOND,23));second.setItem(0,new ItemStack(Items.EMERALD,17));
|
||||
var left=l.getBlockState(a);var right=l.getBlockState(b);use(p,a);use(p,b);
|
||||
check(l.getBlockState(a)==left&&l.getBlockState(b)==right&&l.getBlockEntity(a)==first&&l.getBlockEntity(b)==second&&first.getItem(0).getCount()==23&&second.getItem(0).getCount()==17,"Double chest remains linked with both original inventories");
|
||||
var q=TARGET;var door=Blocks.OAK_DOOR.defaultBlockState();l.setBlock(q,door.setValue(DoorBlock.HALF,DoubleBlockHalf.LOWER),18);l.setBlock(q.above(),door.setValue(DoorBlock.HALF,DoubleBlockHalf.UPPER),18);
|
||||
var lower=l.getBlockState(q);var upper=l.getBlockState(q.above());use(p,q);use(p,q.above());check(l.getBlockState(q)==lower&&l.getBlockState(q.above())==upper,"Both door halves protected");l.setBlock(q.above(),Blocks.AIR.defaultBlockState(),18);
|
||||
var bed=Blocks.BED.red().defaultBlockState();l.setBlock(q,bed,18);use(p,q);check(l.getBlockState(q)==bed,"Bed half protected even if malformed already");
|
||||
var extended=Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.EXTENDED,true);l.setBlock(q,extended,18);use(p,q);check(l.getBlockState(q)==extended,"Extended piston protected");
|
||||
for(var block:List.of(Blocks.PISTON_HEAD,Blocks.MOVING_PISTON)){l.setBlock(q,block.defaultBlockState(),18);use(p,q);check(l.getBlockState(q)==block.defaultBlockState(),"Attached/moving piston part protected");}
|
||||
l.setBlock(q,Blocks.OAK_LOG.defaultBlockState(),18);var axes=EnumSet.noneOf(Direction.Axis.class);for(int i=0;i<3;i++){use(p,q);axes.add(l.getBlockState(q).getValue(RotatedPillarBlock.AXIS));}check(axes.size()==3,"All three native log axes supported");
|
||||
l.setBlock(q,Blocks.PISTON.defaultBlockState(),18);var facings=EnumSet.noneOf(Direction.class);for(int i=0;i<6;i++){use(p,q);facings.add(l.getBlockState(q).getValue(PistonBaseBlock.FACING));}check(facings.size()==6,"Isolated piston supports all six native orientations");
|
||||
// Turning a wall torch toward empty air must not break it or its support.
|
||||
l.setBlock(q.north(),Blocks.STONE.defaultBlockState(),18);var torch=Blocks.WALL_TORCH.defaultBlockState().setValue(WallTorchBlock.FACING,Direction.SOUTH);l.setBlock(q,torch,18);use(p,q);check(l.getBlockState(q)==torch,"Unsupported rotation leaves wall-mounted block intact");l.setBlock(q.north(),Blocks.AIR.defaultBlockState(),18);
|
||||
l.setBlock(q,Blocks.OAK_STAIRS.defaultBlockState(),18);
|
||||
var top=GoldenWrench.cycle(l.getBlockState(q),StairBlock.HALF,false);check(top.getValue(StairBlock.HALF)==Half.TOP,"Steve still has native debug property cycle");
|
||||
// Existing visual edits are preserved; the ordinary key cannot create or reset them.
|
||||
WrenchTextures.turn(l,q,1);use(p,q);check(WrenchTextures.rotation(l.getChunkAt(q),q)==1,"Golden rotation preserves saved Steve texture data");WrenchTextures.turn(l,q,-1);
|
||||
}
|
||||
private static void use(ServerPlayer p,BlockPos pos){UseBlockCallback.EVENT.invoker().interact(p,p.level(),InteractionHand.MAIN_HAND,new BlockHitResult(Vec3.atCenterOf(pos),Direction.UP,pos,false));}
|
||||
private static void equip(ServerPlayer p,Item item){p.getInventory().setItem(p.getInventory().getSelectedSlot(),new ItemStack(item));p.inventoryMenu.broadcastFullState();}
|
||||
private static ServerPlayer player(MinecraftServer s){return s.getPlayerList().getPlayers().getFirst();}
|
||||
private static void check(boolean ok,String message){if(!ok)throw new AssertionError(message);}
|
||||
}
|
||||
@@ -21,6 +21,8 @@ public final class ClayWorkshopScreen extends AbstractContainerScreen<ClayWorksh
|
||||
private static final Identifier SLOT=Identifier.withDefaultNamespace("container/slot");
|
||||
private static final Identifier SELECTION=fr.koka.sanctuary.SanctuaryMod.id("hud/hotbar_selection");
|
||||
private static final ExecutorService WORKER=Executors.newSingleThreadExecutor(r->{var t=new Thread(r,"Sanctuary clay models");t.setDaemon(true);return t;});
|
||||
private boolean imported;
|
||||
private List<net.minecraft.world.entity.EntityType<?>> animals=List.of();
|
||||
private List<Path> files=List.of();private int page,generation,ticks;private boolean busy,pending;
|
||||
private VoxelSculpture source,previewSource;private ItemStack preview=ItemStack.EMPTY,lastMaterial=ItemStack.EMPTY;
|
||||
private SculpturePalette palette;private Object sampledResources;
|
||||
@@ -38,12 +40,18 @@ public final class ClayWorkshopScreen extends AbstractContainerScreen<ClayWorksh
|
||||
@Override protected void init(){
|
||||
super.init();
|
||||
try{files=CreationLibrary.files(CreationLibrary.Kind.MODEL);}catch(Exception e){status=ModelImportErrors.message(e);}
|
||||
page=Math.min(page,Math.max(0,(files.size()-1)/4));
|
||||
for(int i=0;i<4;i++){int at=page*4+i;if(at>=files.size())break;var file=files.get(at);
|
||||
var label=Component.literal(file.getFileName().toString());var b=addRenderableWidget(Button.builder(label,p->load(file)).bounds(leftPos+10,topPos+32+i*18,128,17).build());b.setTooltip(Tooltip.create(label));}
|
||||
animals=menu.view.statues().stream().map(net.minecraft.resources.Identifier::tryParse).filter(Objects::nonNull)
|
||||
.<net.minecraft.world.entity.EntityType<?>>map(id->net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getValue(id)).filter(Objects::nonNull)
|
||||
.sorted(Comparator.comparing(t->t.getDescription().getString())).toList();
|
||||
int count=imported?files.size():animals.size();page=Math.min(page,Math.max(0,(count-1)/4));
|
||||
addRenderableWidget(Button.builder(text("animals"),b->{imported=false;page=0;rebuildWidgets();}).bounds(leftPos+10,topPos+19,62,16).build()).active=imported;
|
||||
addRenderableWidget(Button.builder(text("imports"),b->{imported=true;page=0;rebuildWidgets();}).bounds(leftPos+74,topPos+19,64,16).build()).active=!imported;
|
||||
for(int i=0;i<4;i++){int at=page*4+i;if(at>=count)break;
|
||||
var label=imported?Component.literal(files.get(at).getFileName().toString()):animals.get(at).getDescription();
|
||||
var b=addRenderableWidget(Button.builder(label,p->{if(imported)load(files.get(at));else load(animals.get(at));}).bounds(leftPos+10,topPos+36+i*17,128,17).build());b.setTooltip(Tooltip.create(label));}
|
||||
addRenderableWidget(Button.builder(Component.literal("←"),b->{page--;rebuildWidgets();}).bounds(leftPos+10,topPos+106,22,18).build()).active=page>0;
|
||||
addRenderableWidget(Button.builder(text("folder"),b->folder()).bounds(leftPos+35,topPos+106,78,18).build());
|
||||
addRenderableWidget(Button.builder(Component.literal("→"),b->{page++;rebuildWidgets();}).bounds(leftPos+116,topPos+106,22,18).build()).active=(page+1)*4<files.size();
|
||||
addRenderableWidget(Button.builder(Component.literal("→"),b->{page++;rebuildWidgets();}).bounds(leftPos+116,topPos+106,22,18).build()).active=(page+1)*4<count;
|
||||
addRenderableWidget(Button.builder(text("refresh"),b->rebuildWidgets()).bounds(leftPos+10,topPos+127,128,18).build());
|
||||
rotate=addRenderableWidget(Button.builder(text("rotate"),b->{if(source!=null){source=source.rotate();pending=true;}}).bounds(leftPos+148,topPos+127,152,18).build());rotate.active=source!=null&&!busy;
|
||||
rotate.setTooltip(Tooltip.create(text("placement")));
|
||||
@@ -58,6 +66,24 @@ public final class ClayWorkshopScreen extends AbstractContainerScreen<ClayWorksh
|
||||
source=sculpture;pending=true;status=text("ready",sculpture.name());
|
||||
}));
|
||||
}
|
||||
public void load(net.minecraft.world.entity.EntityType<?> type){
|
||||
var id=net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getKey(type).toString();
|
||||
if(busy||!menu.view.statues().contains(id))return;
|
||||
try{
|
||||
var entity=type.create(minecraft.level,net.minecraft.world.entity.EntitySpawnReason.MOB_SUMMONED);
|
||||
if(entity==null)throw new IllegalArgumentException("unsupported_model");
|
||||
entity.setId(Integer.MIN_VALUE+125);entity.setPos(minecraft.player.position());
|
||||
// Native renderers and textures are read on the client thread; only voxelization runs in the worker.
|
||||
var faces=StatueModels.capture(entity);String name=type.getDescription().getString();
|
||||
busy=true;status=text("working");int token=++generation;
|
||||
CompletableFuture.supplyAsync(()->VoxelSculpture.of(StatueDiscoveries.modelId(id),name,StatueVoxelizer.miniature(faces)),WORKER)
|
||||
.whenComplete((sculpture,error)->minecraft.execute(()->{
|
||||
if(token!=generation||minecraft.gui.screen()!=this||minecraft.player==null||minecraft.player.containerMenu!=menu)return;
|
||||
busy=false;if(error!=null){fr.koka.sanctuary.SanctuaryMod.LOGGER.warn("Unable to sculpt creature {}",id,error);status=text("animal_error");return;}
|
||||
source=sculpture;pending=true;status=text("ready",name);
|
||||
}));
|
||||
}catch(Exception e){fr.koka.sanctuary.SanctuaryMod.LOGGER.warn("Unable to capture creature {}",id,e);status=text("animal_error");}
|
||||
}
|
||||
@Override protected void containerTick(){
|
||||
super.containerTick();rotate.active=source!=null&&!busy;
|
||||
var material=menu.getSlot(0).getItem();var resources=minecraft.getModelManager().getBlockStateModelSet();
|
||||
@@ -94,10 +120,10 @@ public final class ClayWorkshopScreen extends AbstractContainerScreen<ClayWorksh
|
||||
g.text(font,Component.literal("→"),leftPos+254,topPos+111,0xFF404040,false);
|
||||
var detail=font.split(status,290);for(int i=0;i<Math.min(2,detail.size());i++)g.text(font,detail.get(i),leftPos+10,topPos+150+i*font.lineHeight,0xFF404040,false);
|
||||
if(detail.size()>2&&mx>=leftPos+10&&mx<leftPos+300&&my>=topPos+148&&my<topPos+174)g.setTooltipForNextFrame(font,status,mx,my);
|
||||
if(files.isEmpty())g.text(font,text("empty"),leftPos+10,topPos+32,0xFF404040,false);
|
||||
if(imported?files.isEmpty():animals.isEmpty()){var lines=font.split(text(imported?"empty":"no_animals"),128);for(int i=0;i<Math.min(6,lines.size());i++)g.text(font,lines.get(i),leftPos+10,topPos+38+i*font.lineHeight,0xFF404040,false);}
|
||||
}
|
||||
@Override protected void extractLabels(GuiGraphicsExtractor g,int mx,int my){
|
||||
g.text(font,title,10,8,0xFF303030,false);g.text(font,text("models"),10,22,0xFF404040,false);
|
||||
g.text(font,title,10,8,0xFF303030,false);
|
||||
g.text(font,text("input"),230-font.width(text("input"))/2,95,0xFF303030,false);g.text(font,text("output"),imageWidth-10-font.width(text("output")),95,0xFF303030,false);
|
||||
}
|
||||
ItemStack preview(){return preview;}
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import com.mojang.blaze3d.Blaze3D;
|
||||
import fr.koka.sanctuary.SanctuaryMod;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileAlreadyExistsException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.LinkOption;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Comparator;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.components.Tooltip;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.util.Util;
|
||||
|
||||
/** Explicit, one-time export. The player's copy is never a managed mod resource. */
|
||||
public final class ResourcePackTemplate {
|
||||
public static final String FOLDER = "Sanctuary-Custom";
|
||||
|
||||
private ResourcePackTemplate() {}
|
||||
|
||||
public static Button button(Path packDirectory) {
|
||||
Path target = packDirectory.resolve(FOLDER);
|
||||
return Button.builder(label(Files.isDirectory(target, LinkOption.NOFOLLOW_LINKS)
|
||||
? "open_copy" : "customize"), button -> {
|
||||
if (Files.isDirectory(target, LinkOption.NOFOLLOW_LINKS)) {
|
||||
Blaze3D.openPath(target);
|
||||
return;
|
||||
}
|
||||
button.active = false;
|
||||
button.setMessage(label("creating"));
|
||||
Util.ioPool().execute(() -> {
|
||||
try {
|
||||
create(packDirectory);
|
||||
Minecraft.getInstance().execute(() -> {
|
||||
button.active = true;
|
||||
button.setMessage(label("open_copy"));
|
||||
button.setTooltip(Tooltip.create(label("copy_ready")));
|
||||
});
|
||||
} catch (IOException | RuntimeException error) {
|
||||
SanctuaryMod.LOGGER.error("Could not create personal Sanctuary resource pack", error);
|
||||
Minecraft.getInstance().execute(() -> {
|
||||
button.active = true;
|
||||
button.setMessage(label("copy_failed"));
|
||||
button.setTooltip(Tooltip.create(label("copy_failed_help")));
|
||||
});
|
||||
}
|
||||
});
|
||||
}).width(308).tooltip(Tooltip.create(label("customize_help"))).build();
|
||||
}
|
||||
|
||||
/** Returns an existing personal directory untouched, including after mod upgrades. */
|
||||
public static synchronized Path create(Path packDirectory) throws IOException {
|
||||
Path directory = packDirectory.toAbsolutePath().normalize();
|
||||
Files.createDirectories(directory);
|
||||
Path target = directory.resolve(FOLDER);
|
||||
if (Files.exists(target, LinkOption.NOFOLLOW_LINKS)) return existing(target);
|
||||
var mod = FabricLoader.getInstance().getModContainer(SanctuaryMod.ID).orElseThrow();
|
||||
// Keep incomplete packs outside the directory watched by the native pack screen.
|
||||
Path staging = Files.createTempDirectory(directory.getParent(), ".sanctuary-template-");
|
||||
try {
|
||||
copyTree(mod.findPath("assets").orElseThrow(), staging.resolve("assets"));
|
||||
copyTree(mod.findPath("resourcepacks/textures/assets").orElseThrow(), staging.resolve("assets"));
|
||||
copyTree(mod.findPath("resourcepacks/template").orElseThrow(), staging);
|
||||
Files.copy(mod.findPath("resourcepacks/textures/pack.png").orElseThrow(), staging.resolve("pack.png"));
|
||||
try {
|
||||
Files.move(staging, target);
|
||||
} catch (FileAlreadyExistsException race) {
|
||||
return existing(target);
|
||||
}
|
||||
return target;
|
||||
} finally {
|
||||
if (Files.exists(staging)) {
|
||||
try (var files = Files.walk(staging)) {
|
||||
for (Path file : files.sorted(Comparator.reverseOrder()).toList()) Files.delete(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Path existing(Path target) throws IOException {
|
||||
if (!Files.isDirectory(target, LinkOption.NOFOLLOW_LINKS)) {
|
||||
throw new IOException("Personal pack path already exists and is not a directory: " + target);
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
private static void copyTree(Path source, Path destination) throws IOException {
|
||||
try (var files = Files.walk(source)) {
|
||||
for (Path file : files.toList()) {
|
||||
if (Files.isSymbolicLink(file)) throw new IOException("Unexpected asset symlink: " + file);
|
||||
// String paths also work when the mod is loaded from a ZIP filesystem.
|
||||
Path output = destination.resolve(source.relativize(file).toString()).normalize();
|
||||
if (!output.startsWith(destination)) throw new IOException("Invalid asset path: " + file);
|
||||
if (Files.isDirectory(file)) Files.createDirectories(output);
|
||||
else Files.copy(file, output, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Component label(String key) {
|
||||
return Component.translatable("sanctuary.resource_pack." + key);
|
||||
}
|
||||
}
|
||||
@@ -35,6 +35,7 @@ public final class SanctuaryKnowledgeClient implements ClientModInitializer {
|
||||
FoodKnowledgeClient.register();
|
||||
MultiblockScreen.register();
|
||||
FourneauModels.register();
|
||||
WrenchTextureModels.register();
|
||||
MetatableClient.register();
|
||||
ClayWorkshopScreen.register();
|
||||
GraveScreen.register();
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import fr.koka.sanctuary.SanctuaryMod;
|
||||
import fr.koka.sanctuary.plans.*;
|
||||
import java.util.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.client.particle.SingleQuadParticle;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.data.AtlasIds;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.phys.*;
|
||||
|
||||
/** Chips use the already-colored surface voxels, not the technical block's clay particle material. */
|
||||
public final class SculptureParticles {
|
||||
private record Removed(long tick,BlockState state,List<StatuaryRenderer.Quad> mesh){}
|
||||
// A break event can arrive after the block update. Keep a short, bounded snapshot in that world only.
|
||||
private static final Map<ClientLevel,LinkedHashMap<BlockPos,Removed>> REMOVED=new WeakHashMap<>();
|
||||
public static void remember(ClientLevel level,BlockPos pos){
|
||||
if(!(level.getBlockEntity(pos) instanceof StatuaryEntity e)||e.sculpture()==null)return;
|
||||
var cache=REMOVED.computeIfAbsent(level,l->new LinkedHashMap<>());
|
||||
var quads=mesh(e);var sample=new ArrayList<StatuaryRenderer.Quad>();int n=Math.min(64,quads.size());
|
||||
for(int i=0;i<n;i++)sample.add(quads.get((int)((i+.5)*quads.size()/n)));
|
||||
cache.put(pos.immutable(),new Removed(level.getGameTime(),e.getBlockState(),List.copyOf(sample)));
|
||||
while(cache.size()>128)cache.remove(cache.keySet().iterator().next());
|
||||
}
|
||||
private static List<StatuaryRenderer.Quad> mesh(StatuaryEntity e){var s=e.getBlockState();return StatuaryRenderer.mesh(e.sculpture(),s.getValue(Statuary.FACING),s.getValue(Statuary.ANCHOR),s.getValue(Statuary.HEIGHT));}
|
||||
public static boolean destroy(ClientLevel level,BlockPos pos,BlockState state){
|
||||
if(!state.is(Statuary.BLOCK))return false;
|
||||
List<StatuaryRenderer.Quad> quads=List.of();
|
||||
if(level.getBlockEntity(pos) instanceof StatuaryEntity e)quads=mesh(e);
|
||||
var cache=REMOVED.get(level);var old=cache==null?null:cache.remove(pos);
|
||||
if(quads.isEmpty()&&old!=null&&old.state==state&&level.getGameTime()-old.tick<=40)quads=old.mesh;
|
||||
int count=Math.min(64,quads.size());var random=level.getRandom();
|
||||
for(int i=0;i<count;i++){
|
||||
// Stratified surface sampling covers colors across the sculpture without 4096 particles.
|
||||
int start=i*quads.size()/count,end=(i+1)*quads.size()/count;
|
||||
var q=quads.get(start+random.nextInt(end-start));var point=center(q);
|
||||
spawn(level,pos,point,q.color(),(random.nextDouble()-.5)*.12,random.nextDouble()*.12,(random.nextDouble()-.5)*.12);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
public static boolean hit(ClientLevel level,BlockPos pos,Direction side,BlockState state){
|
||||
if(!state.is(Statuary.BLOCK))return false;
|
||||
if(!(level.getBlockEntity(pos) instanceof StatuaryEntity entity))return true;
|
||||
var quads=mesh(entity);if(quads.isEmpty())return true;
|
||||
var mc=Minecraft.getInstance();Vec3 aim=mc.hitResult instanceof BlockHitResult h&&h.getBlockPos().equals(pos)?h.getLocation().subtract(Vec3.atLowerCornerOf(pos)):new Vec3(.5,.5,.5);
|
||||
StatuaryRenderer.Quad nearest=null;double distance=Double.POSITIVE_INFINITY;
|
||||
// The selection box can cover a hole: use the nearest actual surface, never empty space.
|
||||
for(var q:quads){double d=center(q).distanceToSqr(aim);if(d<distance){distance=d;nearest=q;}}
|
||||
if(nearest!=null)spawn(level,pos,center(nearest),nearest.color(),side.getStepX()*.035,.03+side.getStepY()*.035,side.getStepZ()*.035);
|
||||
return true;
|
||||
}
|
||||
static Vec3 center(StatuaryRenderer.Quad q){
|
||||
double x=q.x()+1/32d,y=q.y()+1/32d,z=q.z()+1/32d;
|
||||
return switch(q.side()){case 0->new Vec3(x,y,q.z());case 1->new Vec3(x,y,q.z()+1/16d);case 2->new Vec3(q.x(),y,z);case 3->new Vec3(q.x()+1/16d,y,z);case 4->new Vec3(x,q.y()+1/16d,z);default->new Vec3(x,q.y(),z);};
|
||||
}
|
||||
private static void spawn(ClientLevel level,BlockPos pos,Vec3 point,int color,double dx,double dy,double dz){
|
||||
Minecraft.getInstance().particleEngine.add(new Fragment(level,Vec3.atLowerCornerOf(pos).add(point),color,dx,dy,dz));
|
||||
}
|
||||
static final class Fragment extends SingleQuadParticle {
|
||||
Fragment(ClientLevel level,Vec3 pos,int color,double dx,double dy,double dz){
|
||||
super(level,pos.x,pos.y,pos.z,Minecraft.getInstance().getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS).getSprite(SanctuaryMod.id("sculpture_particle")));
|
||||
setColor(((color>>16)&255)/255f,((color>>8)&255)/255f,(color&255)/255f);
|
||||
quadSize=1/32f;gravity=1;friction=.96f;lifetime=12+random.nextInt(12);setParticleSpeed(dx,dy,dz);
|
||||
}
|
||||
@Override protected Layer getLayer(){return Layer.OPAQUE_TERRAIN;}
|
||||
}
|
||||
private SculptureParticles(){}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import org.joml.Vector3fc;
|
||||
/** Shared block/item render geometry: opaque visible faces, generated once per cached sculpture. */
|
||||
public final class StatuaryRenderer implements BlockEntityRenderer<StatuaryEntity,StatuaryRenderer.State> {
|
||||
record Quad(float x,float y,float z,int side,int color){}
|
||||
private record Placement(VoxelSculpture sculpture,Direction facing,SculptureAnchor anchor){}
|
||||
private record Placement(VoxelSculpture sculpture,Direction facing,SculptureAnchor anchor,SculptureHeight height){}
|
||||
private static final Map<Placement,List<Quad>> MESHES=new LinkedHashMap<>(32,.75f,true);
|
||||
private static final Map<TypedEntityData<?>,VoxelSculpture> ITEMS=new LinkedHashMap<>(32,.75f,true);
|
||||
private static final float[][] FACES={
|
||||
@@ -40,27 +40,20 @@ public final class StatuaryRenderer implements BlockEntityRenderer<StatuaryEntit
|
||||
public State createRenderState(){return new State();}
|
||||
@Override public void extractRenderState(StatuaryEntity entity,State state,float delta,Vec3 camera,ModelFeatureRenderer.CrumblingOverlay breakProgress){
|
||||
BlockEntityRenderer.super.extractRenderState(entity,state,delta,camera,breakProgress);
|
||||
state.mesh=mesh(entity.sculpture(),entity.getBlockState().getValue(Statuary.FACING),entity.getBlockState().getValue(Statuary.ANCHOR));
|
||||
state.mesh=mesh(entity.sculpture(),entity.getBlockState().getValue(Statuary.FACING),entity.getBlockState().getValue(Statuary.ANCHOR),entity.getBlockState().getValue(Statuary.HEIGHT));
|
||||
}
|
||||
public void submit(State state,PoseStack pose,SubmitNodeCollector collector,CameraRenderState camera){
|
||||
draw(state.mesh,pose,collector,state.lightCoords,OverlayTexture.NO_OVERLAY);
|
||||
}
|
||||
private static List<Quad> mesh(VoxelSculpture sculpture,Direction facing,SculptureAnchor anchor){
|
||||
if(sculpture==null)return List.of();var key=new Placement(sculpture,facing,anchor);var cached=MESHES.get(key);if(cached!=null)return cached;
|
||||
// Rotate integer cells before anchoring: odd dimensions never introduce half-pixel offsets.
|
||||
int turns=switch(facing){case WEST -> 1;case NORTH -> 2;case EAST -> 3;default -> 0;};
|
||||
for(int i=0;i<turns;i++)sculpture=sculpture.rotate();
|
||||
static List<Quad> mesh(VoxelSculpture sculpture,Direction facing,SculptureAnchor anchor,SculptureHeight height){
|
||||
if(sculpture==null)return List.of();var key=new Placement(sculpture,facing,anchor,height);var cached=MESHES.get(key);if(cached!=null)return cached;
|
||||
var placed=SculptureGeometry.place(sculpture,facing,anchor,height);sculpture=placed.sculpture();
|
||||
var occupied=new BitSet(4096);for(var cell:sculpture.cells())occupied.set(cell.key());var quads=new ArrayList<Quad>();
|
||||
int minX=16,minZ=16,maxX=0,maxZ=0;
|
||||
for(var cell:sculpture.cells()){
|
||||
minX=Math.min(minX,cell.x());minZ=Math.min(minZ,cell.z());
|
||||
maxX=Math.max(maxX,cell.x()+1);maxZ=Math.max(maxZ,cell.z()+1);
|
||||
}
|
||||
float ox=(anchor.originX(maxX-minX)-minX)/16f,oz=(anchor.originZ(maxZ-minZ)-minZ)/16f;
|
||||
float ox=placed.offsetX()/16f,oy=placed.offsetY()/16f,oz=placed.offsetZ()/16f;
|
||||
for(var cell:sculpture.cells())for(int side=0;side<6;side++){
|
||||
var s=STEP[side];int x=cell.x()+s[0],y=cell.y()+s[1],z=cell.z()+s[2];
|
||||
if(x>=0&&x<16&&y>=0&&y<16&&z>=0&&z<16&&occupied.get(x|y<<4|z<<8))continue;
|
||||
quads.add(new Quad(ox+cell.x()/16f,cell.y()/16f,oz+cell.z()/16f,side,cell.color()));
|
||||
quads.add(new Quad(ox+cell.x()/16f,oy+cell.y()/16f,oz+cell.z()/16f,side,cell.color()));
|
||||
}
|
||||
cached=List.copyOf(quads);MESHES.put(key,cached);if(MESHES.size()>32)MESHES.remove(MESHES.keySet().iterator().next());return cached;
|
||||
}
|
||||
@@ -76,7 +69,7 @@ public final class StatuaryRenderer implements BlockEntityRenderer<StatuaryEntit
|
||||
var data=stack.get(DataComponents.BLOCK_ENTITY_DATA);if(data==null)return List.of();
|
||||
var sculpture=ITEMS.get(data);
|
||||
if(sculpture==null){sculpture=StatuaryEntity.sculpture(stack);if(sculpture==null)return List.of();ITEMS.put(data,sculpture);if(ITEMS.size()>64)ITEMS.remove(ITEMS.keySet().iterator().next());}
|
||||
return mesh(sculpture,Direction.SOUTH,SculptureAnchor.CENTER);
|
||||
return mesh(sculpture,Direction.SOUTH,SculptureAnchor.CENTER,SculptureHeight.ORIGINAL);
|
||||
}
|
||||
public void submit(List<Quad> mesh,PoseStack pose,SubmitNodeCollector collector,int light,int overlay,boolean foil,int outline){draw(mesh,pose,collector,light,overlay);}
|
||||
public void getExtents(java.util.function.Consumer<Vector3fc> out){out.accept(new Vector3f(0,0,0));out.accept(new Vector3f(1,1,1));}
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
package fr.koka.sanctuary.client;
|
||||
|
||||
import fr.koka.sanctuary.multiblock.WrenchTextures;
|
||||
import java.util.*;
|
||||
import java.util.function.Predicate;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.*;
|
||||
import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
|
||||
import net.fabricmc.fabric.api.client.model.loading.v1.wrapper.WrapperBlockStateModel;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.*;
|
||||
import net.fabricmc.fabric.api.client.renderer.v1.mesh.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.BlockAndTintGetter;
|
||||
import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.level.ChunkPos;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
/** Immutable visual snapshots, usable from mesh workers and rebuilt after resource reloads. */
|
||||
public final class WrenchTextureModels {
|
||||
private static volatile Map<Long,Map<BlockPos,Integer>> chunks=Map.of();
|
||||
public static int rotation(BlockPos pos){return chunks.getOrDefault(ChunkPos.pack(pos),Map.of()).getOrDefault(pos,0);}
|
||||
public static void register(){
|
||||
ClientPlayNetworking.registerGlobalReceiver(WrenchTextures.Update.TYPE,(packet,context)->context.client().execute(()->apply(packet)));
|
||||
ClientPlayConnectionEvents.DISCONNECT.register((handler,client)->chunks=Map.of());
|
||||
ClientLevelEvents.AFTER_CLIENT_LEVEL_CHANGE.register((client,level)->chunks=Map.of());
|
||||
ClientChunkEvents.CHUNK_UNLOAD.register((level,chunk)->{var next=new HashMap<>(chunks);next.remove(chunk.getPos().pack());chunks=Map.copyOf(next);});
|
||||
ModelLoadingPlugin.register(context->context.modifyBlockModelAfterBake().register((model,bake)->new Rotated(model)));
|
||||
}
|
||||
private static void apply(WrenchTextures.Update packet){
|
||||
var client=Minecraft.getInstance();if(client.level==null||!client.level.dimension().identifier().equals(packet.dimension()))return;
|
||||
long key=packet.chunk().pack();var old=chunks.getOrDefault(key,Map.of());var dirty=new HashSet<BlockPos>();
|
||||
var entries=packet.clear()?new HashMap<BlockPos,Integer>():new HashMap<>(old);if(packet.clear())dirty.addAll(old.keySet());
|
||||
for(var entry:packet.entries()){
|
||||
var before=entry.rotation()==0?entries.remove(entry.pos()):entries.put(entry.pos(),entry.rotation());
|
||||
if(!Objects.equals(before,entry.rotation()))dirty.add(entry.pos());
|
||||
}
|
||||
var next=new HashMap<>(chunks);if(entries.isEmpty())next.remove(key);else next.put(key,Map.copyOf(entries));chunks=Map.copyOf(next);
|
||||
var sections=new HashSet<SectionPos>();for(var pos:dirty)sections.add(SectionPos.of(pos));
|
||||
for(var section:sections)client.levelExtractor.setSectionDirty(section.x(),section.y(),section.z());
|
||||
}
|
||||
static boolean rotate(MutableQuadView quad,int turns){
|
||||
// Rotate texture coordinates only: geometry, light, tints and materials stay native.
|
||||
for(int turn=0;turn<turns;turn++){
|
||||
float u=quad.u(0),v=quad.v(0);
|
||||
for(int vertex=0;vertex<3;vertex++)quad.uv(vertex,quad.u(vertex+1),quad.v(vertex+1));
|
||||
quad.uv(3,u,v);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
private record Geometry(Object original,int rotation){}
|
||||
private static final class Rotated extends WrapperBlockStateModel {
|
||||
Rotated(BlockStateModel original){super(original);}
|
||||
@Override public void emitQuads(QuadEmitter emitter,BlockAndTintGetter view,BlockPos pos,BlockState state,RandomSource random,Predicate<Direction> cull){
|
||||
int turns=rotation(pos);if(turns==0){wrapped.emitQuads(emitter,view,pos,state,random,cull);return;}
|
||||
emitter.pushTransform(quad->rotate(quad,turns));
|
||||
try{wrapped.emitQuads(emitter,view,pos,state,random,cull);}finally{emitter.popTransform();}
|
||||
}
|
||||
@Override public Object createGeometryKey(BlockAndTintGetter view,BlockPos pos,BlockState state,RandomSource random){
|
||||
var key=wrapped.createGeometryKey(view,pos,state,random);int turns=rotation(pos);
|
||||
return turns==0||key==null?key:new Geometry(key,turns);
|
||||
}
|
||||
}
|
||||
private WrenchTextureModels(){}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package fr.koka.sanctuary.mixin;
|
||||
|
||||
import fr.koka.sanctuary.multiblock.WrenchTextures;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.*;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(LevelChunk.class)
|
||||
public abstract class WrenchTextureEditMixin {
|
||||
@Inject(method="setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Lnet/minecraft/world/level/block/state/BlockState;",at=@At("RETURN"))
|
||||
private void sanctuary$clearTexture(BlockPos pos,BlockState state,int flags,CallbackInfoReturnable<BlockState> ci){
|
||||
var before=ci.getReturnValue();
|
||||
if(before!=null&&!before.is(state.getBlock())&&((LevelChunk)(Object)this).getLevel() instanceof ServerLevel)
|
||||
WrenchTextures.forget((LevelChunk)(Object)this,pos);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package fr.koka.sanctuary.mixin;
|
||||
|
||||
import fr.koka.sanctuary.multiblock.WrenchTextures;
|
||||
import net.minecraft.server.network.*;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.*;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(PlayerChunkSender.class)
|
||||
public abstract class WrenchTextureSyncMixin {
|
||||
@Inject(method="sendChunk",at=@At("RETURN"))
|
||||
private static void sanctuary$textures(ServerGamePacketListenerImpl connection,ServerLevel level,LevelChunk chunk,CallbackInfo ci){
|
||||
WrenchTextures.sendChunk(connection.player,chunk);
|
||||
}
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package fr.koka.sanctuary.mixin.client;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import fr.koka.sanctuary.client.ResourcePackTemplate;
|
||||
import java.nio.file.Path;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
|
||||
import net.minecraft.client.gui.layouts.LayoutElement;
|
||||
import net.minecraft.client.gui.layouts.LinearLayout;
|
||||
import net.minecraft.client.gui.screens.packs.PackSelectionScreen;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
/** Extra footer row only in resource packs, never in the world datapack selector. */
|
||||
@Mixin(PackSelectionScreen.class)
|
||||
public abstract class PackSelectionScreenMixin {
|
||||
@Shadow @Final private Path packDir;
|
||||
|
||||
@WrapOperation(method = "init", at = @At(value = "INVOKE", target =
|
||||
"Lnet/minecraft/client/gui/layouts/HeaderAndFooterLayout;addToFooter(Lnet/minecraft/client/gui/layouts/LayoutElement;)Lnet/minecraft/client/gui/layouts/LayoutElement;"))
|
||||
private LayoutElement sanctuary$personalPack(HeaderAndFooterLayout layout, LayoutElement nativeButtons,
|
||||
Operation<LayoutElement> original) {
|
||||
if (!packDir.toAbsolutePath().normalize().equals(
|
||||
Minecraft.getInstance().getResourcePackDirectory().toAbsolutePath().normalize())) {
|
||||
return original.call(layout, nativeButtons);
|
||||
}
|
||||
layout.setFooterHeight(56);
|
||||
LinearLayout rows = LinearLayout.vertical().spacing(4);
|
||||
rows.addChild(ResourcePackTemplate.button(packDir));
|
||||
rows.addChild(nativeButtons);
|
||||
original.call(layout, rows);
|
||||
// Vanilla still adds its Open folder / Done buttons to the original horizontal row.
|
||||
return nativeButtons;
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package fr.koka.sanctuary.mixin.client;
|
||||
|
||||
import fr.koka.sanctuary.client.SculptureParticles;
|
||||
import fr.koka.sanctuary.plans.Statuary;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.*;
|
||||
import org.spongepowered.asm.mixin.injection.callback.*;
|
||||
|
||||
@Mixin(ClientLevel.class)
|
||||
public abstract class SculptureParticlesMixin {
|
||||
@Inject(method="setBlock",at=@At("HEAD"))
|
||||
private void sanctuary$remember(BlockPos pos,BlockState state,int flags,int recursion,CallbackInfoReturnable<Boolean> cir){
|
||||
if(!state.is(Statuary.BLOCK))SculptureParticles.remember((ClientLevel)(Object)this,pos);
|
||||
}
|
||||
@Inject(method="addDestroyBlockEffect",at=@At("HEAD"),cancellable=true)
|
||||
private void sanctuary$chips(BlockPos pos,BlockState state,CallbackInfo ci){
|
||||
if(SculptureParticles.destroy((ClientLevel)(Object)this,pos,state))ci.cancel();
|
||||
}
|
||||
@Inject(method="addBreakingParticles",at=@At("HEAD"),cancellable=true)
|
||||
private void sanctuary$chip(BlockPos pos,Direction side,BlockState state,CallbackInfo ci){
|
||||
if(SculptureParticles.hit((ClientLevel)(Object)this,pos,side,state))ci.cancel();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package fr.koka.sanctuary.multiblock;
|
||||
|
||||
import java.util.*;
|
||||
import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.*;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.Property;
|
||||
|
||||
/** Ordinary rotations and Steve debug gestures, both owned by the server. */
|
||||
public final class GoldenWrench {
|
||||
public static final String TEXTURE="sanctuary_texture";
|
||||
private static final Map<ServerPlayer,Map<Block,String>> SELECTED=new WeakHashMap<>();
|
||||
private static final Map<ServerPlayer,Integer> LAST_SELECTION=new WeakHashMap<>();
|
||||
public static final class Tool extends Item {
|
||||
public Tool(Properties properties){super(properties);}
|
||||
@Override public boolean canDestroyBlock(ItemStack stack,BlockState state,Level level,BlockPos pos,LivingEntity entity){return false;}
|
||||
}
|
||||
public static void register(){
|
||||
WrenchTextures.register();
|
||||
AttackBlockCallback.EVENT.register((player,level,hand,pos,face)->{
|
||||
if(!isWrench(player.getItemInHand(hand)))return InteractionResult.PASS;
|
||||
if(player.isSpectator())return InteractionResult.FAIL;
|
||||
if(player instanceof ServerPlayer p){if(!allowed(p,pos,hand,face))return InteractionResult.FAIL;
|
||||
if(p.getItemInHand(hand).is(Multiblocks.STEVE_WRENCH))select(p,pos);
|
||||
else p.sendSystemMessage(text("rotate_help"),true);}
|
||||
return InteractionResult.SUCCESS;
|
||||
});
|
||||
ServerPlayConnectionEvents.DISCONNECT.register((handler,server)->{SELECTED.remove(handler.player);LAST_SELECTION.remove(handler.player);});
|
||||
}
|
||||
public static boolean isWrench(ItemStack stack){return stack.is(Multiblocks.WRENCH)||stack.is(Multiblocks.STEVE_WRENCH);}
|
||||
public static boolean allowed(ServerPlayer p,BlockPos pos,InteractionHand hand,Direction face){
|
||||
var tool=p.getItemInHand(hand);
|
||||
if(!isWrench(tool))return false;
|
||||
return p.isAlive()&&!p.isSpectator()&&p.getAbilities().mayBuild&&p.level().hasChunkAt(pos)
|
||||
&&p.isWithinBlockInteractionRange(pos,0)&&p.level().mayInteract(p,pos)
|
||||
&&p.mayUseItemAt(pos,face,p.getItemInHand(hand))
|
||||
&&!p.blockActionRestricted(p.level(),pos,p.gameMode.getGameModeForPlayer())
|
||||
&&(!(p.level().getBlockEntity(pos) instanceof BaseContainerBlockEntity container)||container.canOpen(p));
|
||||
}
|
||||
private static boolean assembled(ServerPlayer p,BlockPos pos,BlockState state){
|
||||
return state.is(Metatable.BLOCK)||state.getBlock() instanceof SuperPistonBlocks.Base
|
||||
||state.getBlock() instanceof SuperPistonBlocks.Part||MultiblockData.get(p.level()).at(pos)!=null;
|
||||
}
|
||||
public static List<String> properties(BlockState state){
|
||||
var result=new ArrayList<>(state.getProperties().stream().map(Property::getName).sorted(Comparator.comparingInt(GoldenWrench::priority).thenComparing(s->s)).toList());
|
||||
result.add(TEXTURE);return List.copyOf(result);
|
||||
}
|
||||
private static int priority(String name){return switch(name){case "facing","axis","rotation","orientation"->0;case "half","type","shape"->1;default->2;};}
|
||||
public static String selected(ServerPlayer p,BlockState state){
|
||||
var choices=properties(state);var value=SELECTED.getOrDefault(p,Map.of()).get(state.getBlock());
|
||||
return value!=null&&choices.contains(value)?value:choices.getFirst();
|
||||
}
|
||||
private static void select(ServerPlayer p,BlockPos pos){
|
||||
var state=p.level().getBlockState(pos);if(state.isAir())return;
|
||||
if(assembled(p,pos,state)){p.sendSystemMessage(text("assembled"),true);return;}
|
||||
// Creative start/continue callbacks can describe the same click twice. Match its native 5-tick repeat cadence.
|
||||
int tick=p.level().getServer().getTickCount();var last=LAST_SELECTION.get(p);
|
||||
if(last!=null&&tick-last<5)return;LAST_SELECTION.put(p,tick);
|
||||
var choices=properties(state);var selected=SELECTED.computeIfAbsent(p,key->new HashMap<>());
|
||||
var before=selected.get(state.getBlock());int previous=before==null?-1:choices.indexOf(before);
|
||||
int next=previous<0?0:Math.floorMod(previous+(p.isShiftKeyDown()?-1:1),choices.size());
|
||||
var property=choices.get(next);selected.put(state.getBlock(),property);
|
||||
p.sendSystemMessage(text("selected",label(property),value(p,pos,state,property)),true);
|
||||
}
|
||||
public static void change(ServerPlayer p,BlockPos pos,InteractionHand hand,Direction face){
|
||||
if(!allowed(p,pos,hand,face))return;
|
||||
var state=p.level().getBlockState(pos);if(state.isAir()||assembled(p,pos,state))return;
|
||||
if(p.getItemInHand(hand).is(Multiblocks.WRENCH)){
|
||||
p.sendSystemMessage(text(WrenchRotation.turn(p.level(),pos,p.isShiftKeyDown())),true);return;
|
||||
}
|
||||
var name=selected(p,state);SELECTED.computeIfAbsent(p,key->new HashMap<>()).put(state.getBlock(),name);
|
||||
if(name.equals(TEXTURE))WrenchTextures.turn(p.level(),pos,p.isShiftKeyDown()?-1:1);
|
||||
else {
|
||||
var property=state.getBlock().getStateDefinition().getProperty(name);
|
||||
// Same flags as the vanilla debug stick: synchronize, preserve deliberately chosen shapes.
|
||||
p.level().setBlock(pos,cycle(state,property,p.isShiftKeyDown()),Block.UPDATE_CLIENTS|Block.UPDATE_KNOWN_SHAPE);
|
||||
}
|
||||
p.sendSystemMessage(text("changed",label(name),value(p,pos,p.level().getBlockState(pos),name)),true);
|
||||
}
|
||||
public static <T extends Comparable<T>> BlockState cycle(BlockState state,Property<T> property,boolean reverse){
|
||||
var values=new ArrayList<>(property.getPossibleValues());int index=values.indexOf(state.getValue(property));
|
||||
return state.setValue(property,values.get(Math.floorMod(index+(reverse?-1:1),values.size())));
|
||||
}
|
||||
private static Object value(ServerPlayer p,BlockPos pos,BlockState state,String name){
|
||||
return name.equals(TEXTURE)?(WrenchTextures.rotation(p.level().getChunkAt(pos),pos)*90)+"°":propertyValue(state,state.getBlock().getStateDefinition().getProperty(name));
|
||||
}
|
||||
private static <T extends Comparable<T>> String propertyValue(BlockState state,Property<T> property){return property.getName(state.getValue(property));}
|
||||
private static Component label(String name){return name.equals(TEXTURE)?text("texture"):Component.literal(name);}
|
||||
private static Component text(String name,Object...args){return Component.translatable("sanctuary.wrench."+name,args);}
|
||||
private GoldenWrench(){}
|
||||
}
|
||||
@@ -80,10 +80,11 @@ public final class Metatable {
|
||||
if(p.isShiftKeyDown()){dissolve(level,origin);p.sendSystemMessage(Multiblocks.text("separated"),true);}else open(p,origin);
|
||||
return true;
|
||||
}
|
||||
if(!s.is(Blocks.CRAFTING_TABLE))return false;
|
||||
if(!s.is(Blocks.CRAFTING_TABLE)||p.isShiftKeyDown())return false;
|
||||
var candidates=new ArrayList<BlockPos>();
|
||||
for(int z=0;z<3;z++)for(int x=0;x<3;x++){var o=pos.offset(-x,0,-z);if(state(level,o,false)==1)candidates.add(o);}
|
||||
if(candidates.size()!=1){previews.remove(p);p.sendSystemMessage(Multiblocks.text(candidates.isEmpty()?"incomplete":"ambiguous"),true);return true;}
|
||||
if(candidates.isEmpty()){previews.remove(p);return false;}
|
||||
if(candidates.size()!=1){previews.remove(p);p.sendSystemMessage(Multiblocks.text("ambiguous"),true);return true;}
|
||||
var origin=candidates.getFirst();var before=previews.remove(p);
|
||||
if(before!=null&&before.level==level&&before.origin.equals(origin)&&before.until>=level.getGameTime()){
|
||||
p.sendSystemMessage(Multiblocks.text(assemble(p,origin)?"assembled":"unavailable"),true);return true;
|
||||
|
||||
@@ -17,14 +17,21 @@ import net.minecraft.world.inventory.*;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.*;
|
||||
import net.minecraft.world.level.block.entity.*;
|
||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import java.util.*;
|
||||
import static fr.koka.sanctuary.multiblock.MultiblockData.Machine;
|
||||
|
||||
public final class Multiblocks {
|
||||
public static final Item WRENCH=Registry.register(BuiltInRegistries.ITEM,SanctuaryMod.id("golden_wrench"),
|
||||
new Item(new Item.Properties().stacksTo(1).setId(ResourceKey.create(Registries.ITEM,SanctuaryMod.id("golden_wrench")))));
|
||||
new GoldenWrench.Tool(new Item.Properties().stacksTo(1)
|
||||
.component(net.minecraft.core.component.DataComponents.LORE,new net.minecraft.world.item.component.ItemLore(List.of(Component.translatable("sanctuary.wrench.rotate_help"))))
|
||||
.setId(ResourceKey.create(Registries.ITEM,SanctuaryMod.id("golden_wrench")))));
|
||||
public static final Item STEVE_WRENCH=Registry.register(BuiltInRegistries.ITEM,SanctuaryMod.id("steve_wrench"),
|
||||
new GoldenWrench.Tool(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)
|
||||
.component(net.minecraft.core.component.DataComponents.ENCHANTMENT_GLINT_OVERRIDE,true)
|
||||
.component(net.minecraft.core.component.DataComponents.LORE,new net.minecraft.world.item.component.ItemLore(List.of(
|
||||
Component.translatable("sanctuary.wrench.steve_power"),Component.translatable("sanctuary.wrench.steve_help"))))
|
||||
.setId(ResourceKey.create(Registries.ITEM,SanctuaryMod.id("steve_wrench")))));
|
||||
public static final MenuType<MultiblockMenu> MENU=Registry.register(BuiltInRegistries.MENU,SanctuaryMod.id("multiblock"),
|
||||
new ExtendedMenuType<>(MultiblockMenu::new,MultiblockMenu.View.CODEC));
|
||||
private record Preview(ServerLevel level,BlockPos origin,boolean furnace,long until){}
|
||||
@@ -32,11 +39,12 @@ public final class Multiblocks {
|
||||
public static Component text(String key,Object...args){return Component.translatable("sanctuary.multiblock."+key,args);}
|
||||
public static void register(){
|
||||
FourneauAppearance.register();
|
||||
GoldenWrench.register();
|
||||
SuperPistons.register();
|
||||
Metatable.register();
|
||||
net.fabricmc.fabric.api.creativetab.v1.CreativeModeTabEvents.modifyOutputEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(out->out.accept(WRENCH));
|
||||
net.fabricmc.fabric.api.creativetab.v1.CreativeModeTabEvents.modifyOutputEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(out->{out.accept(WRENCH);out.accept(STEVE_WRENCH);});
|
||||
UseBlockCallback.EVENT.register((player,world,hand,hit)->{
|
||||
boolean wrench=player.getItemInHand(hand).is(WRENCH);
|
||||
boolean wrench=GoldenWrench.isWrench(player.getItemInHand(hand));
|
||||
if(world.isClientSide())return wrench?InteractionResult.SUCCESS:InteractionResult.PASS;
|
||||
if(!(player instanceof ServerPlayer p)||p.isSpectator())return InteractionResult.PASS;
|
||||
var level=p.level();var pos=hit.getBlockPos();var machine=MultiblockData.get(level).at(pos);
|
||||
@@ -44,7 +52,9 @@ public final class Multiblocks {
|
||||
// Preserve vanilla sneak-placement (for example, attaching a hopper to the facade).
|
||||
if(!wrench&&p.isShiftKeyDown()&&(!p.getMainHandItem().isEmpty()||!p.getOffhandItem().isEmpty()))return InteractionResult.PASS;
|
||||
if(!level.mayInteract(p,pos)||!p.mayUseItemAt(pos,hit.getDirection(),p.getItemInHand(hand)))return InteractionResult.FAIL;
|
||||
if(wrench){if(!Metatable.wrench(p,pos)&&!SuperPistons.wrench(p,pos,hit.getDirection()))useWrench(p,pos,hit.getDirection());return InteractionResult.SUCCESS;}
|
||||
if(wrench){if(!GoldenWrench.allowed(p,pos,hand,hit.getDirection()))return InteractionResult.FAIL;
|
||||
if(!Metatable.wrench(p,pos)&&!SuperPistons.wrench(p,pos,hit.getDirection())&&!useWrench(p,pos,hit.getDirection()))GoldenWrench.change(p,pos,hand,hit.getDirection());
|
||||
return InteractionResult.SUCCESS;}
|
||||
if(ready(level,machine)&&accessible(p,machine))open(p,machine,pos,0,"",0);
|
||||
else p.sendSystemMessage(text("unavailable"),true);
|
||||
return InteractionResult.SUCCESS;
|
||||
@@ -102,31 +112,28 @@ public final class Multiblocks {
|
||||
if(!MultiblockData.get(p.level()).add(m))return false;
|
||||
closeViewers(p.level(),m);FourneauAppearance.changed(p.level(),m,true);return true;
|
||||
}
|
||||
private static void useWrench(ServerPlayer p,BlockPos pos,Direction face){
|
||||
private static boolean useWrench(ServerPlayer p,BlockPos pos,Direction face){
|
||||
var level=p.level();var data=MultiblockData.get(level);var m=data.at(pos);
|
||||
if(m!=null){
|
||||
if(!ready(level,m)||!accessible(p,m)){p.sendSystemMessage(text("unavailable"),true);return;}
|
||||
if(!ready(level,m)||!accessible(p,m)){p.sendSystemMessage(text("unavailable"),true);return true;}
|
||||
if(p.isShiftKeyDown()){dissolve(level,m);p.sendSystemMessage(text("separated"),true);}
|
||||
else open(p,m,pos,0,"",0);
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
var state=level.getBlockState(pos);
|
||||
if(!state.is(Blocks.BARREL)&&!state.is(Blocks.FURNACE)){p.sendSystemMessage(text("hint"),true);return;}
|
||||
if(!(level.getBlockEntity(pos) instanceof BaseContainerBlockEntity be)||!be.canOpen(p))return;
|
||||
if(p.isShiftKeyDown()){
|
||||
var property=state.hasProperty(BlockStateProperties.HORIZONTAL_FACING)?BlockStateProperties.HORIZONTAL_FACING:BlockStateProperties.FACING;
|
||||
var current=state.getValue(property);var next=current.getAxis().isVertical()?p.getDirection():current.getClockWise();
|
||||
level.setBlockAndUpdate(pos,state.setValue(property,next));p.sendSystemMessage(text("rotated"),true);return;
|
||||
}
|
||||
if(!state.is(Blocks.BARREL)&&!state.is(Blocks.FURNACE))return false;
|
||||
if(!(level.getBlockEntity(pos) instanceof BaseContainerBlockEntity be)||!be.canOpen(p))return true;
|
||||
if(p.isShiftKeyDown())return false;
|
||||
boolean furnace=state.is(Blocks.FURNACE);var candidates=new ArrayList<Machine>();
|
||||
for(int y=0;y<3;y++)for(int z=0;z<3;z++)for(int x=0;x<3;x++){
|
||||
var candidate=new Machine(UUID.randomUUID(),pos.offset(-x,-y,-z),furnace,p.getDirection().getOpposite());
|
||||
if(state(level,candidate)==1&&candidate.members().stream().noneMatch(q->data.at(q)!=null))candidates.add(candidate);
|
||||
}
|
||||
if(candidates.size()!=1){PREVIEWS.remove(p);p.sendSystemMessage(text(candidates.isEmpty()?"incomplete":"ambiguous"),true);return;}
|
||||
if(candidates.isEmpty()){PREVIEWS.remove(p);return false;}
|
||||
if(candidates.size()!=1){PREVIEWS.remove(p);p.sendSystemMessage(text("ambiguous"),true);return true;}
|
||||
var candidate=candidates.getFirst();var previous=PREVIEWS.remove(p);
|
||||
if(previous!=null&&previous.level()==level&&previous.origin().equals(candidate.origin())&&previous.furnace()==furnace&&previous.until()>=level.getGameTime()){
|
||||
p.sendSystemMessage(text(assemble(p,candidate)?"assembled":"unavailable"),true);return;
|
||||
p.sendSystemMessage(text(assemble(p,candidate)?"assembled":"unavailable"),true);return true;
|
||||
}
|
||||
PREVIEWS.put(p,new Preview(level,candidate.origin(),furnace,level.getGameTime()+200));
|
||||
for(int axis=0;axis<3;axis++)for(int a=0;a<=3;a+=3)for(int b=0;b<=3;b+=3)for(int t=0;t<=6;t++){
|
||||
@@ -134,6 +141,7 @@ public final class Multiblocks {
|
||||
level.sendParticles(p,ParticleTypes.END_ROD,false,false,candidate.origin().getX()+px,candidate.origin().getY()+py,candidate.origin().getZ()+pz,1,0,0,0,0);
|
||||
}
|
||||
p.sendSystemMessage(text("confirm",text(furnace?"furnace":"barrel")),false);
|
||||
return true;
|
||||
}
|
||||
public static void open(ServerPlayer p,Machine m,BlockPos anchor,int page,String query,int section){
|
||||
open(p,m,anchor,page,query,section,new int[0]);
|
||||
|
||||
@@ -79,11 +79,10 @@ public final class SuperPistons {
|
||||
}
|
||||
if(!s.is(Blocks.PISTON)&&!s.is(Blocks.STICKY_PISTON))return false;
|
||||
var f=s.getValue(FACING);boolean sticky=s.is(Blocks.STICKY_PISTON);
|
||||
if(p.isShiftKeyDown()){
|
||||
if(!s.getValue(EXTENDED)&&!l.hasNeighborSignal(clicked))l.setBlockAndUpdate(clicked,s.setValue(FACING,face));return true;
|
||||
}
|
||||
if(p.isShiftKeyDown())return false;
|
||||
var found=new ArrayList<BlockPos>();for(int a=-1;a<=1;a++)for(int b=-1;b<=1;b++){var c=clicked.relative(u(f),a).relative(v(f),b);if(candidates(l,c,f,sticky))found.add(c);}
|
||||
if(found.size()!=1){previews.remove(p);message(p,found.isEmpty()?"incomplete":"ambiguous");return true;}
|
||||
if(found.isEmpty()){previews.remove(p);return false;}
|
||||
if(found.size()!=1){previews.remove(p);message(p,"ambiguous");return true;}
|
||||
var c=found.getFirst();for(var pos:tiles(c,f,0))if(!l.mayInteract(p,pos)||!p.mayUseItemAt(pos,face,p.getMainHandItem())){previews.remove(p);return true;}
|
||||
var old=previews.remove(p);
|
||||
if(old!=null&&old.level()==l&&old.center().equals(c)&&old.facing()==f&&old.sticky()==sticky&&old.until()>=l.getGameTime()){
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package fr.koka.sanctuary.multiblock;
|
||||
|
||||
import java.util.List;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.*;
|
||||
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.*;
|
||||
|
||||
/** Only native orientation properties; fluid, contents and gameplay state are never selectable. */
|
||||
public final class WrenchRotation {
|
||||
private static final List<Property<?>> ORIENTATIONS=List.of(HORIZONTAL_FACING,FACING,FACING_HOPPER,AXIS,HORIZONTAL_AXIS,ROTATION_16,ORIENTATION);
|
||||
|
||||
public static String turn(ServerLevel level,BlockPos pos,boolean reverse){
|
||||
var before=level.getBlockState(pos);
|
||||
if(linked(before))return "linked";
|
||||
var property=ORIENTATIONS.stream().filter(before::hasProperty).findFirst().orElse(null);
|
||||
if(property==null)return "no_rotation";
|
||||
var oriented=GoldenWrench.cycle(before,property,reverse);
|
||||
if(!oriented.canSurvive(level,pos))return "unsupported";
|
||||
// Stairs and connections must reflect their real neighbours, not a debug-stick shape.
|
||||
var after=Block.updateFromNeighbourShapes(oriented,level,pos);
|
||||
if(!after.is(before.getBlock())||linked(after)||after.getFluidState()!=before.getFluidState()
|
||||
||!after.canSurvive(level,pos))return "unsupported";
|
||||
level.setBlock(pos,after,Block.UPDATE_ALL);
|
||||
return "rotated";
|
||||
}
|
||||
private static boolean linked(BlockState state){
|
||||
// A single-block operation cannot rotate another half, an attached head or a joined inventory.
|
||||
return state.hasProperty(DOUBLE_BLOCK_HALF)||state.hasProperty(BED_PART)||state.hasProperty(SIDE_CHAIN_PART)&&state.getValue(SIDE_CHAIN_PART).isConnected()
|
||||
||state.hasProperty(PISTON_TYPE)||state.hasProperty(EXTENDED)&&state.getValue(EXTENDED)
|
||||
||state.hasProperty(CHEST_TYPE)&&state.getValue(CHEST_TYPE)!=ChestType.SINGLE;
|
||||
}
|
||||
private WrenchRotation(){}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package fr.koka.sanctuary.multiblock;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import fr.koka.sanctuary.SanctuaryMod;
|
||||
import java.util.*;
|
||||
import net.fabricmc.fabric.api.attachment.v1.*;
|
||||
import net.fabricmc.fabric.api.networking.v1.*;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.server.level.*;
|
||||
import net.minecraft.world.level.ChunkPos;
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
|
||||
/** Optional per-chunk presentation data. Absent means original vanilla textures. */
|
||||
public final class WrenchTextures {
|
||||
public static final AttachmentType<Map<String,Integer>> ROTATIONS=AttachmentRegistry.createPersistent(
|
||||
SanctuaryMod.id("wrench_textures_v1"),Codec.unboundedMap(Codec.STRING,Codec.intRange(1,3)).xmap(Map::copyOf,map->map));
|
||||
public record Entry(BlockPos pos,int rotation){}
|
||||
public record Update(Identifier dimension,ChunkPos chunk,boolean clear,List<Entry> entries) implements CustomPacketPayload {
|
||||
public Update{entries=List.copyOf(entries);if(entries.size()>1024)throw new IllegalArgumentException("Texture batch too large");}
|
||||
public static final Type<Update> TYPE=new Type<>(SanctuaryMod.id("wrench_textures_v1"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf,Update> CODEC=StreamCodec.of((b,p)->{
|
||||
b.writeIdentifier(p.dimension);b.writeChunkPos(p.chunk);b.writeBoolean(p.clear);b.writeVarInt(p.entries.size());
|
||||
for(var entry:p.entries){b.writeBlockPos(entry.pos);b.writeByte(entry.rotation);}
|
||||
},b->{
|
||||
var dimension=b.readIdentifier();var chunk=b.readChunkPos();boolean clear=b.readBoolean();int n=b.readVarInt();
|
||||
if(n<0||n>1024)throw new IllegalArgumentException("Texture batch size");var entries=new ArrayList<Entry>(n);
|
||||
for(int i=0;i<n;i++){var pos=b.readBlockPos();int rotation=b.readUnsignedByte();
|
||||
if(rotation>3||ChunkPos.pack(pos)!=chunk.pack())throw new IllegalArgumentException("Invalid texture entry");entries.add(new Entry(pos,rotation));}
|
||||
return new Update(dimension,chunk,clear,entries);
|
||||
});
|
||||
@Override public Type<? extends CustomPacketPayload> type(){return TYPE;}
|
||||
}
|
||||
public static void register(){PayloadTypeRegistry.clientboundPlay().register(Update.TYPE,Update.CODEC);}
|
||||
public static int rotation(LevelChunk chunk,BlockPos pos){var map=chunk.getAttached(ROTATIONS);return map==null?0:map.getOrDefault(Long.toString(pos.asLong()),0);}
|
||||
public static void turn(ServerLevel level,BlockPos pos,int delta){
|
||||
var chunk=level.getChunkAt(pos);set(chunk,pos,Math.floorMod(rotation(chunk,pos)+delta,4));
|
||||
}
|
||||
public static void forget(LevelChunk chunk,BlockPos pos){if(rotation(chunk,pos)!=0)set(chunk,pos,0);}
|
||||
private static void set(LevelChunk chunk,BlockPos pos,int value){
|
||||
if(!(chunk.getLevel() instanceof ServerLevel level))return;
|
||||
var old=chunk.getAttached(ROTATIONS);var next=old==null?new HashMap<String,Integer>():new HashMap<>(old);
|
||||
if(value==0)next.remove(Long.toString(pos.asLong()));else next.put(Long.toString(pos.asLong()),value);
|
||||
if(next.isEmpty())chunk.removeAttached(ROTATIONS);else chunk.setAttached(ROTATIONS,Map.copyOf(next));chunk.markUnsaved();
|
||||
var packet=new Update(level.dimension().identifier(),chunk.getPos(),false,List.of(new Entry(pos.immutable(),value)));
|
||||
for(var player:PlayerLookup.tracking(level,chunk.getPos()))send(player,packet);
|
||||
}
|
||||
public static void sendChunk(ServerPlayer player,LevelChunk chunk){
|
||||
var entries=chunk.getAttached(ROTATIONS);var batch=new ArrayList<Entry>(1024);boolean clear=true;
|
||||
if(entries!=null)for(var entry:entries.entrySet()){
|
||||
BlockPos pos;try{pos=BlockPos.of(Long.parseLong(entry.getKey()));}catch(NumberFormatException ignored){continue;}
|
||||
if(ChunkPos.pack(pos)!=chunk.getPos().pack()||chunk.getBlockState(pos).isAir())continue;
|
||||
batch.add(new Entry(pos,entry.getValue()));
|
||||
if(batch.size()==1024){send(player,new Update(player.level().dimension().identifier(),chunk.getPos(),clear,batch));clear=false;batch.clear();}
|
||||
}
|
||||
if(clear||!batch.isEmpty())send(player,new Update(player.level().dimension().identifier(),chunk.getPos(),clear,batch));
|
||||
}
|
||||
private static void send(ServerPlayer p,Update packet){if(ServerPlayNetworking.canSend(p,Update.TYPE))ServerPlayNetworking.send(p,packet);}
|
||||
private WrenchTextures(){}
|
||||
}
|
||||
@@ -20,8 +20,11 @@ import net.minecraft.world.phys.*;
|
||||
/** Native input/result slots. Server validates the material, applies the bounded palette and charges each take. */
|
||||
public final class ClayWorkshopMenu extends AbstractContainerMenu {
|
||||
public static final int HOTBAR_START=2,HOTBAR_END=HOTBAR_START+Inventory.SELECTION_SIZE,HOTBAR_X=75,HOTBAR_Y=176;
|
||||
public record View(BlockPos pos,UUID token){
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf,View> CODEC=StreamCodec.of((b,p)->{b.writeBlockPos(p.pos);b.writeUUID(p.token);},b->new View(b.readBlockPos(),b.readUUID()));
|
||||
public record View(BlockPos pos,UUID token,List<String> statues){
|
||||
public View { statues=List.copyOf(statues); }
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf,View> CODEC=StreamCodec.of((b,p)->{
|
||||
b.writeBlockPos(p.pos);b.writeUUID(p.token);b.writeVarInt(p.statues.size());for(var id:p.statues)b.writeUtf(id,128);
|
||||
},b->{var pos=b.readBlockPos();var token=b.readUUID();int n=b.readVarInt();if(n<0||n>1024)throw new IllegalArgumentException("statue_discoveries");var ids=new ArrayList<String>(n);for(int i=0;i<n;i++)ids.add(b.readUtf(128));return new View(pos,token,ids);});
|
||||
}
|
||||
/** At most 24 KiB of cells plus 256 palette colors in one atomic, bounded selection, scoped to one open menu. */
|
||||
public record Select(int menu,UUID token,VoxelSculpture sculpture,Item material,SculpturePalette palette) implements CustomPacketPayload {
|
||||
@@ -73,7 +76,7 @@ public final class ClayWorkshopMenu extends AbstractContainerMenu {
|
||||
var hit=new BlockHitResult(Vec3.atCenterOf(view.pos),Direction.UP,view.pos,false);
|
||||
if(UseBlockCallback.EVENT.invoker().interact(p,level,InteractionHand.MAIN_HAND,hit)!=InteractionResult.PASS||!stillValid(p))return;
|
||||
lastSelection=level.getGameTime();
|
||||
if(sculpture!=null&&(!material(input.getItem(0))||!input.getItem(0).is(material)||palette==null))return;
|
||||
if(sculpture!=null&&(!StatueDiscoveries.allowedModel(sculpture.modelId(),view.statues())||!material(input.getItem(0))||!input.getItem(0).is(material)||palette==null))return;
|
||||
if(!Objects.equals(selected,sculpture)||!Objects.equals(selectedPalette,palette))
|
||||
selectedResult=sculpture==null||palette==null?null:palette.apply(sculpture);
|
||||
selected=sculpture;selectedMaterial=material;selectedPalette=palette;refresh();broadcastChanges();
|
||||
|
||||
@@ -7,26 +7,29 @@ import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.block.Mirror;
|
||||
import net.minecraft.world.level.block.Rotation;
|
||||
|
||||
/** World-space edge of the occupied block; CENTER is the legacy placement. */
|
||||
/** World-space horizontal anchor; old names remain valid in saved blockstates. */
|
||||
public enum SculptureAnchor implements StringRepresentable {
|
||||
CENTER(null), NORTH(Direction.NORTH), SOUTH(Direction.SOUTH), EAST(Direction.EAST), WEST(Direction.WEST);
|
||||
CENTER(0,0), NORTH(0,-1), SOUTH(0,1), EAST(1,0), WEST(-1,0),
|
||||
NORTH_WEST(-1,-1), NORTH_EAST(1,-1), SOUTH_WEST(-1,1), SOUTH_EAST(1,1);
|
||||
|
||||
private final Direction direction;
|
||||
SculptureAnchor(Direction direction){this.direction=direction;}
|
||||
private final int x,z;
|
||||
SculptureAnchor(int x,int z){this.x=x;this.z=z;}
|
||||
public String getSerializedName(){return name().toLowerCase(Locale.ROOT);}
|
||||
public SculptureAnchor rotate(Rotation rotation){return direction==null?this:of(rotation.rotate(direction));}
|
||||
public SculptureAnchor mirror(Mirror mirror){return direction==null?this:of(mirror.mirror(direction));}
|
||||
public SculptureAnchor rotate(Rotation rotation){return switch(rotation){
|
||||
case NONE -> this;case CLOCKWISE_90 -> of(-z,x);case CLOCKWISE_180 -> of(-x,-z);case COUNTERCLOCKWISE_90 -> of(z,-x);
|
||||
};}
|
||||
public SculptureAnchor mirror(Mirror mirror){return switch(mirror){case NONE->this;case LEFT_RIGHT->of(x,-z);case FRONT_BACK->of(-x,z);};}
|
||||
public static SculptureAnchor of(Direction direction){return switch(direction){
|
||||
case NORTH -> NORTH;case SOUTH -> SOUTH;case EAST -> EAST;case WEST -> WEST;
|
||||
default -> throw new IllegalArgumentException("Horizontal anchor required");
|
||||
};}
|
||||
private static SculptureAnchor of(int x,int z){for(var anchor:values())if(anchor.x==x&&anchor.z==z)return anchor;throw new IllegalArgumentException("Anchor outside grid");}
|
||||
public static SculptureAnchor placement(BlockPlaceContext context){
|
||||
var pos=context.getClickedPos();var hit=context.getClickLocation();
|
||||
double x=hit.x-pos.getX()-.5,z=hit.z-pos.getZ()-.5;
|
||||
if(Math.abs(x)<1e-7&&Math.abs(z)<1e-7)return of(context.getHorizontalDirection().getOpposite());
|
||||
if(Math.abs(x)>Math.abs(z))return x<0?WEST:EAST;
|
||||
return z<0?NORTH:SOUTH;
|
||||
return of(band(hit.x-pos.getX()),band(hit.z-pos.getZ()));
|
||||
}
|
||||
public int originX(int width){return this==WEST?0:this==EAST?VoxelSculpture.EDGE-width:(VoxelSculpture.EDGE-width)/2;}
|
||||
public int originZ(int depth){return this==NORTH?0:this==SOUTH?VoxelSculpture.EDGE-depth:(VoxelSculpture.EDGE-depth)/2;}
|
||||
// The middle eight pixels, including the boundaries, keep the grid-aligned center.
|
||||
static int band(double value){return value<.25?-1:value>.75?1:0;}
|
||||
public int originX(int width){return x<0?0:x>0?VoxelSculpture.EDGE-width:(VoxelSculpture.EDGE-width)/2;}
|
||||
public int originZ(int depth){return z<0?0:z>0?VoxelSculpture.EDGE-depth:(VoxelSculpture.EDGE-depth)/2;}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package fr.koka.sanctuary.plans;
|
||||
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
/** Integer placement shared by rendering and tight, single-box selection/collision bounds. */
|
||||
public final class SculptureGeometry {
|
||||
public record Placement(VoxelSculpture sculpture, int offsetX, int offsetY, int offsetZ) {}
|
||||
|
||||
private SculptureGeometry() {}
|
||||
|
||||
public static Placement place(VoxelSculpture sculpture, Direction facing, SculptureAnchor anchor, SculptureHeight height) {
|
||||
int turns = switch (facing) { case WEST -> 1; case NORTH -> 2; case EAST -> 3; default -> 0; };
|
||||
for (int i = 0; i < turns; i++) sculpture = sculpture.rotate();
|
||||
int minX = 16, minY = 16, minZ = 16, maxX = 0, maxY = 0, maxZ = 0;
|
||||
for (var cell : sculpture.cells()) {
|
||||
minX = Math.min(minX, cell.x()); minZ = Math.min(minZ, cell.z()); minY = Math.min(minY, cell.y());
|
||||
maxX = Math.max(maxX, cell.x() + 1); maxZ = Math.max(maxZ, cell.z() + 1); maxY = Math.max(maxY, cell.y() + 1);
|
||||
}
|
||||
return new Placement(sculpture, anchor.originX(maxX - minX) - minX, height.originY(minY,maxY) - minY,
|
||||
anchor.originZ(maxZ - minZ) - minZ);
|
||||
}
|
||||
|
||||
/** Tight integer bounds, without rotating/copying cells or constructing a voxel grid. */
|
||||
public static VoxelShape shape(VoxelSculpture sculpture, Direction facing, SculptureAnchor anchor, SculptureHeight height) {
|
||||
int minX=16,minY=16,minZ=16,maxX=0,maxY=0,maxZ=0;
|
||||
for(var cell:sculpture.cells()) {
|
||||
minX=Math.min(minX,cell.x()); minY=Math.min(minY,cell.y()); minZ=Math.min(minZ,cell.z());
|
||||
maxX=Math.max(maxX,cell.x()+1); maxY=Math.max(maxY,cell.y()+1); maxZ=Math.max(maxZ,cell.z()+1);
|
||||
}
|
||||
int width=maxX-minX,depth=maxZ-minZ;
|
||||
if(facing.getAxis()==Direction.Axis.X){int swap=width;width=depth;depth=swap;}
|
||||
int x=anchor.originX(width),z=anchor.originZ(depth);
|
||||
int y=height.originY(minY,maxY);
|
||||
return Block.box(x,y,z,x+width,y+maxY-minY,z+depth);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package fr.koka.sanctuary.plans;
|
||||
|
||||
import java.util.Locale;
|
||||
import net.minecraft.util.StringRepresentable;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
|
||||
/** ORIGINAL is the missing-property default: pre-beta.125 sculptures retain their exact Y offsets. */
|
||||
public enum SculptureHeight implements StringRepresentable {
|
||||
ORIGINAL, BOTTOM, CENTER, TOP;
|
||||
public String getSerializedName(){return name().toLowerCase(Locale.ROOT);}
|
||||
public int originY(int minY,int maxY){return switch(this){
|
||||
case ORIGINAL -> minY;case BOTTOM -> 0;case CENTER -> (VoxelSculpture.EDGE-(maxY-minY))/2;case TOP -> VoxelSculpture.EDGE-(maxY-minY);
|
||||
};}
|
||||
public static SculptureHeight placement(BlockPlaceContext context){
|
||||
return switch(SculptureAnchor.band(context.getClickLocation().y-context.getClickedPos().getY())){
|
||||
case -1 -> BOTTOM;case 1 -> TOP;default -> CENTER;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -23,12 +23,14 @@ import net.minecraft.world.level.material.PushReaction;
|
||||
import net.minecraft.world.level.storage.loot.LootParams;
|
||||
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
|
||||
import net.minecraft.world.phys.*;
|
||||
import net.minecraft.world.phys.shapes.*;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
/** The clay workshop crafts portable sculptures; a placed sculpture is only a decoration. */
|
||||
public final class Statuary {
|
||||
public static final EnumProperty<Direction> FACING=BlockStateProperties.HORIZONTAL_FACING;
|
||||
public static final EnumProperty<SculptureAnchor> ANCHOR=EnumProperty.create("anchor",SculptureAnchor.class);
|
||||
public static final EnumProperty<SculptureHeight> HEIGHT=EnumProperty.create("vertical_anchor",SculptureHeight.class);
|
||||
public static final Block BLOCK=block("statuary",new SculptureBlock());
|
||||
public static final Item ITEM=blockItem("statuary",BLOCK);
|
||||
public static final Block WORKSHOP=block("clay_workshop",new WorkshopBlock());
|
||||
@@ -49,7 +51,7 @@ public final class Statuary {
|
||||
}
|
||||
public static void open(ServerPlayer p,BlockPos pos){
|
||||
if(!allowed(p,p.level(),pos))return;
|
||||
var view=new ClayWorkshopMenu.View(pos,UUID.randomUUID());var level=p.level();
|
||||
var view=new ClayWorkshopMenu.View(pos,UUID.randomUUID(),StatueDiscoveries.known(p));var level=p.level();
|
||||
p.openMenu(new ExtendedMenuProvider<ClayWorkshopMenu.View>(){
|
||||
public ClayWorkshopMenu.View getScreenOpeningData(ServerPlayer player){return view;}
|
||||
public Component getDisplayName(){return WORKSHOP.getName();}
|
||||
@@ -57,12 +59,33 @@ public final class Statuary {
|
||||
});
|
||||
}
|
||||
private static Block block(String name,Block block){return Registry.register(BuiltInRegistries.BLOCK,SanctuaryMod.id(name),block);}
|
||||
private static Item blockItem(String name,Block block){return Registry.register(BuiltInRegistries.ITEM,SanctuaryMod.id(name),new BlockItem(block,new Item.Properties().setId(ResourceKey.create(Registries.ITEM,SanctuaryMod.id(name))).useBlockDescriptionPrefix()));}
|
||||
private static Item blockItem(String name,Block block){
|
||||
var properties=new Item.Properties().setId(ResourceKey.create(Registries.ITEM,SanctuaryMod.id(name))).useBlockDescriptionPrefix();
|
||||
return Registry.register(BuiltInRegistries.ITEM,SanctuaryMod.id(name),block==BLOCK?new SculptureItem(block,properties):new BlockItem(block,properties));
|
||||
}
|
||||
private static BlockBehaviour.Properties properties(String id){return BlockBehaviour.Properties.of().strength(1.5f).noOcclusion().noLootTable().pushReaction(PushReaction.IMMOVEABLE).setId(ResourceKey.create(Registries.BLOCK,SanctuaryMod.id(id)));}
|
||||
private static final class SculptureItem extends BlockItem {
|
||||
SculptureItem(Block block,Item.Properties properties){super(block,properties);}
|
||||
@Override protected boolean canPlace(BlockPlaceContext context,BlockState state){
|
||||
if(!super.canPlace(context,state))return false;
|
||||
// The destination has no block entity yet: use the carried model for the native entity-overlap check.
|
||||
var model=StatuaryEntity.sculpture(context.getItemInHand());
|
||||
return model==null||context.getLevel().isUnobstructed(null,SculptureGeometry.shape(model,state.getValue(FACING),state.getValue(ANCHOR),state.getValue(HEIGHT)).move(context.getClickedPos()));
|
||||
}
|
||||
}
|
||||
private static final class SculptureBlock extends Block implements EntityBlock {
|
||||
SculptureBlock(){super(Statuary.properties("statuary"));registerDefaultState(stateDefinition.any().setValue(FACING,Direction.SOUTH).setValue(ANCHOR,SculptureAnchor.CENTER));}
|
||||
@Override protected void createBlockStateDefinition(StateDefinition.Builder<Block,BlockState> builder){builder.add(FACING,ANCHOR);}
|
||||
@Override public BlockState getStateForPlacement(BlockPlaceContext context){return defaultBlockState().setValue(FACING,context.getHorizontalDirection()).setValue(ANCHOR,SculptureAnchor.placement(context));}
|
||||
SculptureBlock(){super(Statuary.properties("statuary").dynamicShape().isSuffocating((s,l,p)->false).isViewBlocking((s,l,p,box)->false));registerDefaultState(stateDefinition.any().setValue(FACING,Direction.SOUTH).setValue(ANCHOR,SculptureAnchor.CENTER).setValue(HEIGHT,SculptureHeight.ORIGINAL));}
|
||||
@Override protected VoxelShape getShape(BlockState state,BlockGetter level,BlockPos pos,CollisionContext context){
|
||||
return level.getBlockEntity(pos) instanceof StatuaryEntity entity?entity.shape(state):Shapes.empty();
|
||||
}
|
||||
// Lighting metadata is cached per blockstate, so it cannot describe each block entity's voxels.
|
||||
// Decorative sculptures transmit light; their faces still receive ordinary world lighting.
|
||||
@Override protected VoxelShape getOcclusionShape(BlockState state){return Shapes.empty();}
|
||||
@Override protected boolean propagatesSkylightDown(BlockState state){return true;}
|
||||
@Override protected int getLightDampening(BlockState state){return 0;}
|
||||
@Override protected float getShadeBrightness(BlockState state,BlockGetter level,BlockPos pos){return 1;}
|
||||
@Override protected void createBlockStateDefinition(StateDefinition.Builder<Block,BlockState> builder){builder.add(FACING,ANCHOR,HEIGHT);}
|
||||
@Override public BlockState getStateForPlacement(BlockPlaceContext context){return defaultBlockState().setValue(FACING,context.getHorizontalDirection()).setValue(ANCHOR,SculptureAnchor.placement(context)).setValue(HEIGHT,SculptureHeight.placement(context));}
|
||||
@Override protected BlockState rotate(BlockState state,Rotation rotation){return state.setValue(FACING,rotation.rotate(state.getValue(FACING))).setValue(ANCHOR,state.getValue(ANCHOR).rotate(rotation));}
|
||||
@Override protected BlockState mirror(BlockState state,Mirror mirror){return state.setValue(FACING,mirror.mirror(state.getValue(FACING))).setValue(ANCHOR,state.getValue(ANCHOR).mirror(mirror));}
|
||||
public BlockEntity newBlockEntity(BlockPos pos,BlockState state){return new StatuaryEntity(pos,state);}
|
||||
|
||||
@@ -9,13 +9,26 @@ import net.minecraft.world.item.component.TypedEntityData;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.storage.*;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
/** New, additive block data only. No ticking or mutation of pre-existing world formats. */
|
||||
public final class StatuaryEntity extends BlockEntity {
|
||||
private VoxelSculpture sculpture;
|
||||
private CompoundTag opaque;
|
||||
private record ShapeCache(VoxelSculpture sculpture,BlockState state,VoxelShape shape){}
|
||||
private volatile ShapeCache shapeCache;
|
||||
// Keep unknown/future data recoverable by picking the small base, without a phantom full cube.
|
||||
private static final VoxelShape MISSING_SHAPE=Block.box(6,0,6,10,4,10);
|
||||
public StatuaryEntity(BlockPos pos,BlockState state){super(Statuary.TYPE,pos,state);}
|
||||
public VoxelSculpture sculpture(){return sculpture;}
|
||||
public VoxelShape shape(BlockState state){
|
||||
var model=sculpture;if(model==null)return MISSING_SHAPE;
|
||||
var cached=shapeCache;
|
||||
if(cached!=null&&cached.sculpture()==model&&cached.state()==state)return cached.shape();
|
||||
var shape=SculptureGeometry.shape(model,state.getValue(Statuary.FACING),state.getValue(Statuary.ANCHOR),state.getValue(Statuary.HEIGHT));
|
||||
shapeCache=new ShapeCache(model,state,shape);return shape;
|
||||
}
|
||||
@Override protected void saveAdditional(ValueOutput out){
|
||||
super.saveAdditional(out);
|
||||
if(opaque!=null){out.store("sculpture",CompoundTag.CODEC,opaque);return;}
|
||||
@@ -23,7 +36,7 @@ public final class StatuaryEntity extends BlockEntity {
|
||||
out.store("sculpture",CompoundTag.CODEC,encode(sculpture));
|
||||
}
|
||||
@Override protected void loadAdditional(ValueInput in){
|
||||
super.loadAdditional(in);sculpture=null;opaque=null;
|
||||
super.loadAdditional(in);sculpture=null;opaque=null;shapeCache=null;
|
||||
var data=in.read("sculpture",CompoundTag.CODEC).orElse(null);if(data==null)return;
|
||||
try{
|
||||
if(data.getIntOr("schema",-1)!=1)throw new IllegalArgumentException("schema");
|
||||
|
||||
@@ -18,5 +18,15 @@ public final class StatueDiscoveries {
|
||||
||player.getStats().getValue(Stats.ENTITY_KILLED,type)>0||player.getStats().getValue(Stats.ENTITY_KILLED_BY,type)>0;
|
||||
}).map(type->BuiltInRegistries.ENTITY_TYPE.getKey(type).toString()).sorted().toList();
|
||||
}
|
||||
/** Stable identifiers share the existing sculpture schema; imported models keep their content hash. */
|
||||
public static String modelId(String entityId){
|
||||
try{return "sanctuary:model/"+HexFormat.of().formatHex(java.security.MessageDigest.getInstance("SHA-256").digest(("sanctuary:statue/"+entityId).getBytes(java.nio.charset.StandardCharsets.UTF_8)));}
|
||||
catch(java.security.NoSuchAlgorithmException impossible){throw new AssertionError(impossible);}
|
||||
}
|
||||
private static final class Models {
|
||||
static final Map<String,String> IDS=BuiltInRegistries.ENTITY_TYPE.stream().filter(t->SpawnEggItem.byId(t).isPresent())
|
||||
.map(t->BuiltInRegistries.ENTITY_TYPE.getKey(t).toString()).collect(java.util.stream.Collectors.toUnmodifiableMap(StatueDiscoveries::modelId,id->id));
|
||||
}
|
||||
public static boolean allowedModel(String model,List<String> known){var entity=Models.IDS.get(model);return entity==null||known.contains(entity);}
|
||||
private StatueDiscoveries(){}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"sources": [
|
||||
{"type": "minecraft:single", "resource": "sanctuary:misc/sculpture_white", "sprite": "sanctuary:sculpture_particle"}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "sanctuary:item/steve_wrench"
|
||||
}
|
||||
}
|
||||
@@ -1753,6 +1753,14 @@
|
||||
"sanctuary.preload.cities": "Preparing settlements",
|
||||
"sanctuary.preload.cache_write": "Saving plans",
|
||||
"sanctuary.familiar.dragon.lift": "On your head: hold %s to rise, release to glide.",
|
||||
"sanctuary.resource_pack.customize": "Customize Sanctuary",
|
||||
"sanctuary.resource_pack.open_copy": "Open my copy",
|
||||
"sanctuary.resource_pack.creating": "Creating your copy…",
|
||||
"sanctuary.resource_pack.customize_help": "Create an editable copy of Sanctuary resources. Enable it and move it to the top of the list. Updates preserve your changes.",
|
||||
"sanctuary.resource_pack.copy_ready": "Copy ready! Enable Sanctuary-Custom and move it above other packs. Click to open its folder and guide.",
|
||||
"sanctuary.resource_pack.copy_failed": "Copy failed — retry",
|
||||
"sanctuary.resource_pack.copy_failed_help": "Check write permissions and the resourcepacks/Sanctuary-Custom path. See the game log for details.",
|
||||
"sanctuary.resource_pack.custom_description": "Sanctuary — your editable copy",
|
||||
"sanctuary.resource_pack.name": "Sanctuary textures",
|
||||
"sanctuary.resource_pack.description": "Sanctuary textures — %s",
|
||||
"sanctuary.familiar.personality": "Personality: %s",
|
||||
@@ -1979,7 +1987,7 @@
|
||||
"sanctuary.multiblock.outputs": "Results",
|
||||
"sanctuary.multiblock.heat": "Reserve: %s s",
|
||||
"sanctuary.multiblock.progress": "Cooking: %s %%",
|
||||
"sanctuary.multiblock.hint": "Right click: assemble / open. Sneak: rotate / separate.",
|
||||
"sanctuary.multiblock.hint": "Left click: select a property. Right click: change its value. Sneak: reverse. Complete multiblock: assemble / open; sneak: separate.",
|
||||
"sanctuary.multiblock.unavailable": "Machine inaccessible, incomplete or partly unloaded.",
|
||||
"sanctuary.multiblock.separated": "Machine separated. Components retain their contents.",
|
||||
"sanctuary.multiblock.rotated": "Component rotated.",
|
||||
@@ -2162,7 +2170,7 @@
|
||||
"sanctuary.statuary.folder": "Shared folder",
|
||||
"sanctuary.statuary.refresh": "Refresh",
|
||||
"sanctuary.statuary.models": "GLB models",
|
||||
"sanctuary.statuary.placement": "The sculpture faces your gaze and snaps to the aimed block edge, on the pixel grid. Rotate adjusts the model before crafting.",
|
||||
"sanctuary.statuary.placement": "Aim at the middle of the block to center the sculpture, or at an edge to snap to it. It faces your gaze and stays on the pixel grid. Rotate adjusts the model before crafting.",
|
||||
"sanctuary.statuary.rotate": "Rotate",
|
||||
"sanctuary.statuary.working": "Voxelizing to 16 × 16 × 16…",
|
||||
"sanctuary.statuary.ready": "1 block = 1 sculpture. Shades come from your material’s texture.",
|
||||
@@ -2221,5 +2229,21 @@
|
||||
"block.sanctuary.brown_brick_wall": "Brown Brick Wall",
|
||||
"block.sanctuary.green_brick_wall": "Green Brick Wall",
|
||||
"block.sanctuary.red_brick_wall": "Red Brick Wall",
|
||||
"block.sanctuary.black_brick_wall": "Black Brick Wall"
|
||||
"block.sanctuary.black_brick_wall": "Black Brick Wall",
|
||||
"sanctuary.wrench.selected": "Selected property: %s = %s · right click to change",
|
||||
"sanctuary.wrench.changed": "%s = %s",
|
||||
"sanctuary.wrench.texture": "Texture rotation",
|
||||
"sanctuary.wrench.assembled": "Assembled multiblock: right click to open, sneak-right click to separate before editing its components.",
|
||||
"item.sanctuary.steve_wrench": "Steve’s Wrench",
|
||||
"sanctuary.wrench.rotate_help": "Right click: orient · Sneak: reverse · Multiblocks: assemble/separate",
|
||||
"sanctuary.wrench.steve_help": "Left click: select property · Right click: change · Sneak: reverse",
|
||||
"sanctuary.wrench.rotated": "Orientation changed",
|
||||
"sanctuary.wrench.no_rotation": "This block has no vanilla orientation.",
|
||||
"sanctuary.wrench.linked": "This block has linked parts: separate or retract it before rotating.",
|
||||
"sanctuary.wrench.unsupported": "This orientation does not fit the neighbouring blocks or support.",
|
||||
"sanctuary.wrench.steve_power": "Free editing of block states and textures",
|
||||
"sanctuary.statuary.animals": "Animals",
|
||||
"sanctuary.statuary.imports": "Imports",
|
||||
"sanctuary.statuary.no_animals": "Encounter creatures to unlock their sculptures.",
|
||||
"sanctuary.statuary.animal_error": "This creature’s model could not be sculpted."
|
||||
}
|
||||
|
||||
@@ -1753,6 +1753,14 @@
|
||||
"sanctuary.preload.cities": "Préparation des implantations",
|
||||
"sanctuary.preload.cache_write": "Enregistrement des plans",
|
||||
"sanctuary.familiar.dragon.lift": "Sur la tête : maintenir %s pour monter, relâcher pour planer.",
|
||||
"sanctuary.resource_pack.customize": "Personnaliser Sanctuary",
|
||||
"sanctuary.resource_pack.open_copy": "Ouvrir ma copie",
|
||||
"sanctuary.resource_pack.creating": "Création de la copie…",
|
||||
"sanctuary.resource_pack.customize_help": "Crée une copie modifiable des ressources de Sanctuary. Activez-la et placez-la en haut de la liste. Vos modifications sont conservées lors des mises à jour.",
|
||||
"sanctuary.resource_pack.copy_ready": "Copie prête ! Activez Sanctuary-Custom et placez-le au-dessus des autres packs. Cliquez pour ouvrir son dossier et son guide.",
|
||||
"sanctuary.resource_pack.copy_failed": "Copie impossible — réessayer",
|
||||
"sanctuary.resource_pack.copy_failed_help": "Vérifiez les droits d’écriture et le chemin resourcepacks/Sanctuary-Custom. Les détails sont dans le journal du jeu.",
|
||||
"sanctuary.resource_pack.custom_description": "Sanctuary — votre copie modifiable",
|
||||
"sanctuary.resource_pack.name": "Textures Sanctuary",
|
||||
"sanctuary.resource_pack.description": "Textures Sanctuary — %s",
|
||||
"sanctuary.familiar.personality": "Personnalité : %s",
|
||||
@@ -1979,7 +1987,7 @@
|
||||
"sanctuary.multiblock.outputs": "Résultats",
|
||||
"sanctuary.multiblock.heat": "Réserve : %s s",
|
||||
"sanctuary.multiblock.progress": "Cuisson : %s %%",
|
||||
"sanctuary.multiblock.hint": "Clic droit : assembler / ouvrir. Maj : tourner / dissocier.",
|
||||
"sanctuary.multiblock.hint": "Clic gauche : choisir un état. Clic droit : changer sa valeur. Maj : sens inverse. Multibloc complet : assembler / ouvrir ; Maj : dissocier.",
|
||||
"sanctuary.multiblock.unavailable": "Machine inaccessible, incomplète ou partiellement déchargée.",
|
||||
"sanctuary.multiblock.separated": "Machine dissociée. Les composants conservent leur contenu.",
|
||||
"sanctuary.multiblock.rotated": "Composant tourné.",
|
||||
@@ -2162,7 +2170,7 @@
|
||||
"sanctuary.statuary.folder": "Dossier commun",
|
||||
"sanctuary.statuary.refresh": "Actualiser",
|
||||
"sanctuary.statuary.models": "Modèles GLB",
|
||||
"sanctuary.statuary.placement": "La sculpture suit votre regard et se cale contre le bord visé du bloc, sur la grille de pixels. Tourner ajuste le modèle avant fabrication.",
|
||||
"sanctuary.statuary.placement": "Visez le milieu du bloc pour centrer la sculpture, ou un bord pour l’y caler. Elle suit votre regard et reste sur la grille de pixels. Tourner ajuste le modèle avant fabrication.",
|
||||
"sanctuary.statuary.rotate": "Tourner",
|
||||
"sanctuary.statuary.working": "Voxelisation en 16 × 16 × 16…",
|
||||
"sanctuary.statuary.ready": "1 bloc = 1 sculpture. Les nuances viennent de la texture de votre matière.",
|
||||
@@ -2221,5 +2229,21 @@
|
||||
"block.sanctuary.brown_brick_wall": "Muret de briques marron",
|
||||
"block.sanctuary.green_brick_wall": "Muret de briques vertes",
|
||||
"block.sanctuary.red_brick_wall": "Muret de briques rouges",
|
||||
"block.sanctuary.black_brick_wall": "Muret de briques noires"
|
||||
"block.sanctuary.black_brick_wall": "Muret de briques noires",
|
||||
"sanctuary.wrench.selected": "État choisi : %s = %s · clic droit pour modifier",
|
||||
"sanctuary.wrench.changed": "%s = %s",
|
||||
"sanctuary.wrench.texture": "Rotation des textures",
|
||||
"sanctuary.wrench.assembled": "Multibloc assemblé : clic droit pour ouvrir, Maj-clic droit pour dissocier avant de modifier ses composants.",
|
||||
"item.sanctuary.steve_wrench": "Clé à molette de Steve",
|
||||
"sanctuary.wrench.rotate_help": "Clic droit : orienter · Maj : sens inverse · Multiblocs : assembler/dissocier",
|
||||
"sanctuary.wrench.steve_help": "Clic gauche : choisir un état · Clic droit : modifier · Maj : sens inverse",
|
||||
"sanctuary.wrench.rotated": "Orientation modifiée",
|
||||
"sanctuary.wrench.no_rotation": "Ce bloc ne possède pas d’orientation vanilla.",
|
||||
"sanctuary.wrench.linked": "Bloc lié à une autre partie : dissocie-le ou rétracte-le avant de le tourner.",
|
||||
"sanctuary.wrench.unsupported": "Cette orientation ne convient pas aux blocs voisins ou au support.",
|
||||
"sanctuary.wrench.steve_power": "Édition libre des états et des textures",
|
||||
"sanctuary.statuary.animals": "Animaux",
|
||||
"sanctuary.statuary.imports": "Imports",
|
||||
"sanctuary.statuary.no_animals": "Rencontrez des créatures pour débloquer leurs sculptures.",
|
||||
"sanctuary.statuary.animal_error": "Impossible de sculpter le modèle de cette créature."
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"parent": "minecraft:item/handheld",
|
||||
"textures": {"layer0": "sanctuary:item/steve_wrench"}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 196 B |
Binary file not shown.
|
After Width: | Height: | Size: 323 B |
@@ -3,6 +3,8 @@
|
||||
"package": "fr.koka.sanctuary.mixin",
|
||||
"compatibilityLevel": "JAVA_25",
|
||||
"mixins": [
|
||||
"WrenchTextureEditMixin",
|
||||
"WrenchTextureSyncMixin",
|
||||
"SuperPistonPickMixin",
|
||||
"SuperPistonPickDataMixin",
|
||||
"BoatPassengerRotationMixin",
|
||||
@@ -182,6 +184,7 @@
|
||||
"NaturalSnowEditMixin"
|
||||
],
|
||||
"client": [
|
||||
"client.PackSelectionScreenMixin",
|
||||
"client.FourneauFireMixin",
|
||||
"client.BoatPassengerPickMixin",
|
||||
"client.PreloadScreenMixin",
|
||||
@@ -270,7 +273,8 @@
|
||||
"client.SuperPistonRenderMixin",
|
||||
"client.SuperPistonSyncMixin",
|
||||
"client.SeasonalPrecipitationMixin",
|
||||
"client.SpecialModelsAccess"
|
||||
"client.SpecialModelsAccess",
|
||||
"client.SculptureParticlesMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
name = "Sanctuary"
|
||||
author = "KOKA99CAB"
|
||||
version = "beta.118"
|
||||
version = "beta.125"
|
||||
pack-format = "packwiz:1.1.0"
|
||||
|
||||
[index]
|
||||
|
||||
@@ -3,11 +3,18 @@
|
||||
Sources des resource packs propres à Sanctuary. Le nom de ce dossier existant
|
||||
est conservé ; le dossier installé dans Minecraft s'appelle `resourcepacks/`.
|
||||
|
||||
Le bouton **Personnaliser Sanctuary**, dans Options → Packs de ressources,
|
||||
crée maintenant une copie personnelle complète `resourcepacks/Sanctuary-Custom/`.
|
||||
Elle réunit les assets du mod et ceux du pack intégré ; les mises à jour ne
|
||||
l'écrasent jamais. Le [guide du template](template/README.md) détaille les chemins
|
||||
à modifier. `./gradlew assembleResourceTemplate` produit le ZIP complet.
|
||||
Voir le [ticket beta.121](../docs/resourcepack-template-beta121.md).
|
||||
|
||||
Les exports ZIP à la racine restent locaux et ignorés par Git. Les dossiers
|
||||
décompressés contiennent les sources versionnées.
|
||||
|
||||
[`sanctuary/`](sanctuary/README.md) est la base modifiable pour Minecraft
|
||||
26.3 : pack beta.090 versionné, embarqué et activé par défaut dans le mod.
|
||||
26.3 : pack beta.121 versionné, embarqué et activé par défaut dans le mod.
|
||||
Il comprend les menus, 47 cœurs vanilla et les nouveaux dessins de faim et
|
||||
de saturation fournis par le créateur. Les manifests `sanctuary/releases/`
|
||||
fixent les empreintes de chaque révision.
|
||||
|
||||
@@ -5,7 +5,15 @@ Le manifeste déclare le format de ressources **97.1**, relevé dans le client
|
||||
exact utilisé par Sanctuary. Les menus, le panorama et les textures Sanctuary
|
||||
déjà présents sont conservés.
|
||||
|
||||
## Version beta.090
|
||||
## Version beta.121
|
||||
|
||||
La révision [beta.121](releases/beta.121.json) ajoute la clé dorée fournie par
|
||||
le créateur, octet pour octet. Les autres textures et le format 97.1 restent
|
||||
identiques. Le [template personnel](../template/README.md) exporte également
|
||||
les ressources récentes du mod : blocs, items, modèles, sons et traductions.
|
||||
Il se crée depuis l'écran des packs ou avec `assembleResourceTemplate`.
|
||||
|
||||
## Version beta.090 (historique)
|
||||
|
||||
La révision [beta.090](releases/beta.090.json) déclare Minecraft 26.3 finale,
|
||||
sans changer le format 97.1 ni les images. Le manifeste beta.070 et son
|
||||
@@ -26,7 +34,7 @@ bulles de respiration proviennent du jeu.
|
||||
|
||||
La source unique est ce dossier. Gradle le copie dans le mod sous
|
||||
`resourcepacks/textures/` et produit le même contenu dans
|
||||
`build/Sanctuary-Resource-Pack-beta.090.zip`. L’identifiant stable du pack
|
||||
`build/Sanctuary-Resource-Pack-beta.121.zip`. L’identifiant stable du pack
|
||||
est `sanctuary:textures`. Son numéro graphique est indépendant des correctifs
|
||||
de code : `resource_pack_version` dans `gradle.properties` ne change qu’avec
|
||||
une nouvelle révision du pack.
|
||||
@@ -41,7 +49,7 @@ de `pack.mcmeta` et `resource_pack_version`. Ne pas réécrire un ancien manifes
|
||||
Le contrôle refuse un fichier ajouté, oublié ou modifié sans mise à jour de
|
||||
révision. Ne pas éditer les copies générées dans `build/`.
|
||||
|
||||
**English:** This source is the beta.090 built-in pack for Minecraft 26.3, enabled by default and
|
||||
**English:** This source is the beta.121 built-in pack for Minecraft 26.3, enabled by default and
|
||||
still user-disableable. Incoming PNGs are preserved exactly. `releases/` tracks
|
||||
immutable file hashes; the mod and standalone ZIP consume this same source.
|
||||
Keep a new release manifest whenever changing the graphics.
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 196 B |
@@ -3,7 +3,7 @@
|
||||
"description": {
|
||||
"translate": "sanctuary.resource_pack.description",
|
||||
"with": [
|
||||
"beta.090"
|
||||
"beta.121"
|
||||
],
|
||||
"fallback": "Sanctuary textures — %s"
|
||||
},
|
||||
|
||||
@@ -0,0 +1,287 @@
|
||||
{
|
||||
"version": "beta.121",
|
||||
"minecraft": "26.3",
|
||||
"format": [
|
||||
97,
|
||||
1
|
||||
],
|
||||
"builtinId": "sanctuary:textures",
|
||||
"activation": "DEFAULT_ENABLED",
|
||||
"files": {
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_empty.png": "80ea14a291330f3253fa4ba3c7aa5eeea73ac3df71c85eec649ae75762574cd2",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png": "f9f725d5f76f09c9284ec8ef3eab3bab714b04306ea5b88d2774c6d96c65e525",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_full.png": "29f5cddd23a6383973690101b3d1d7ab10e421b8bff8c5359e8d2623576e2f14",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png": "1c1969632df22e5c3be196ace904174e7797222b4d6514f442fcce0cc9fb2361",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_half.png": "e5eda03de917caca665dc5ac5210fdf90af745cad0ee17ddccddc4365a7ee55a",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png": "51be68df64c4d01c2dff3c300f9e1833bccbc19007d7a18b567a42160740fa8e",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full.png": "4afb2035139c659ff7ed2fbf16bb4c4cc12158c664e422cbb964d4c926f40844",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_full_blinking.png": "4afb2035139c659ff7ed2fbf16bb4c4cc12158c664e422cbb964d4c926f40844",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half.png": "ab37c9a7b3ded346b5ab125a6a87045ff6b599a8e1f1796290aae344d8f6189b",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_half_blinking.png": "ab37c9a7b3ded346b5ab125a6a87045ff6b599a8e1f1796290aae344d8f6189b",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full.png": "aa4a51a65cf6fd6b76dbc040f68b7a90ee70b8b23298d2628a8e0a2ea54d924d",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_full_blinking.png": "aa4a51a65cf6fd6b76dbc040f68b7a90ee70b8b23298d2628a8e0a2ea54d924d",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half.png": "f88b24663f7c14e58490e1a8a60f44339f05c284fb89dbbf6da6bd9890291e06",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/absorbing_hardcore_half_blinking.png": "f88b24663f7c14e58490e1a8a60f44339f05c284fb89dbbf6da6bd9890291e06",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/container.png": "b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/container_blinking.png": "1b1094514a73d8673110595050003fff6a7da1d33e6457ceeae004634c2c0963",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore.png": "b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/container_hardcore_blinking.png": "1b1094514a73d8673110595050003fff6a7da1d33e6457ceeae004634c2c0963",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png": "66a22e5a9c1be724078bf6392970917ce74548a75242cb9a8694a8cc788893ed",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_full_blinking.png": "66a22e5a9c1be724078bf6392970917ce74548a75242cb9a8694a8cc788893ed",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png": "dda4ed21c8f12f4c5f28fea52d19fda8e09451adbb568bdc5aa4b4243cad9795",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_half_blinking.png": "dda4ed21c8f12f4c5f28fea52d19fda8e09451adbb568bdc5aa4b4243cad9795",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full.png": "8b6d31ee17b3eacbbfe69a6c8cf165d5efee9af12aae763a073818bfcc47d2fd",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_full_blinking.png": "8b6d31ee17b3eacbbfe69a6c8cf165d5efee9af12aae763a073818bfcc47d2fd",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half.png": "55448c040468dab90f48e03392e90b7f4f635109349c1524619babeb875177ac",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/frozen_hardcore_half_blinking.png": "55448c040468dab90f48e03392e90b7f4f635109349c1524619babeb875177ac",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/full.png": "acb11da7611dc8239d4da2fe500cca2fe88a2c4facccf42fa7207c0e9dba4a16",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/full_blinking.png": "d43889d4c676a6e2498b0510bf4f77c0050b792884952c67475f4bff097a498b",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/half.png": "98d1fca665a309879c19c06b0658ba5407520f13a02d4bf7321b060534491efc",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/half_blinking.png": "f63cf9331c3087e5e403b96e2456721cbbbc4be05b86c3443b863efda40b6c88",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full.png": "0a7788d62fb70523880ca26120add4fb397a35ea70e7deca036c8fc2afcbada7",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/hardcore_full_blinking.png": "d66cf76e587d7bbd435d05d4c8a4f3835a90dbfdd63a5e825066e0cf2de53d52",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half.png": "92dd5fe2e4b355b627cf1340a569923d3cd5d6c3c7963e60e6abee207a1abed5",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/hardcore_half_blinking.png": "380da417eeefbaccf0f9f9bf03efd6d2ae713567ddcd47dfbf2c7298d0c2203b",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full.png": "5c47760c8770cbed12392e65fdd2a3acd33836a6a8275f6abd4ce9f56ac01e9f",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_full_blinking.png": "bb427c5811d0eaa255f124076e4609333f8301cd5c7094fb344c5480cbb4a995",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half.png": "7e0d0118a3e3a3d4a11dc1b65a4c66af0abdded95d227e3e2fbd97364b4c7ca6",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_half_blinking.png": "0b90d19c270047be3b1d502c3f2def99f5899ef430ed6bfff45cc35911e75076",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full.png": "8900928082f3ca73c312b8bc78357f283d4101f7dc147f563a09a3ad4c3b8937",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_full_blinking.png": "354b9975971caf7f3ac28162b4ced0adc9edf9c11e82797bc13e4d9c5bc566bb",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half.png": "a3462b71265ef37c0bacff741d106c23f341696ab922049933aaa7751e24c33d",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/poisoned_hardcore_half_blinking.png": "b705fe0b9811ded037b08d4a639710e8829a03d373b5e86087323c811f9654e3",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/vehicle_container.png": "b92355b32f566dd5ec209dcf6f25ddd239fdf967a70af42308ef9607aab3b194",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png": "7d676dd277663d3d87bdbe52632235946e484301fb47b6f8b27633d2d4efe1e3",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png": "e2171726715fba71f86b6fee9714ec8e3e3c08e75beda62bf411b1d363363ae9",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_full.png": "5c5475bdb3a917b6414c1a1ea6400c1f00bdc1e5906d6781d6abbb9411747fa6",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_full_blinking.png": "8d8f5c897fdd6e3f6e9ca1b7c4e55abbf3af9437ea24d094b80ce9e134a1b27d",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_half.png": "a368bc604caa0aab258d1f9d4313db6031c5462361c41578dd718fae3f677a76",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_half_blinking.png": "758ee154d7879a64c6903e0a0ecb9dd068ca16aef225a9ca8055f68d79ff8e17",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full.png": "a6b4b53b39e85e5758b3ed99e4303f4f7f24d530e0f27510daa5b6c456ab725d",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_full_blinking.png": "0fd9f717cbad4111e10c0f848af41e7e66c92d3225fd2ef0b0df48fdf397306c",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half.png": "3e069dcbca3a61492c6480a60c985f21ce39bf851ad870f69f8612689e2efd6b",
|
||||
"assets/minecraft/textures/gui/sprites/hud/heart/withered_hardcore_half_blinking.png": "c9bf1f18f28aad32777dacd1b38ff93263592648bd0a7b9cc2e6633597c625a7",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/join.png": "cdf278b928ac6ecf32b4c28304dcace1ef9d1df017d6bf22610896a41b71f39e",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png": "e92353fbd181db587f3c5c4e688638709e69487e9c9eae076918489ef8d2f99e",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_down.png": "5443d2f341d7f6ecf00d24759d21b9f11d3c00b6b3464cf3209aad1893fbec35",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png": "8bc3722212402866e0b83e30893e5681e0173843140d51d54d0381d81fda0923",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_up.png": "12a353f27c85943b9e6f78b0534ad2f0315f8fc76af8fbdf25f6ddad674566e1",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png": "6e0632d7b5cde7be54035ef65a2976f38a960b834ee36e0c7c5450d6f9ffaa4b",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_down.png": "829a14cbe49c70284572ba3f6a7fc812b401ed4bac910d46a4b37fa048dc4a0e",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_down_highlighted.png": "f0621fda65ad07e989776b554458e941adff9ca7b9f48a64f18840a04e104567",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_up.png": "63ffe9417b1ca97d27e6da8bc1d0817b8b282f1489c47a64cba90e9cd6601e81",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_up_highlighted.png": "6b7f7ea182728d8ddacd9930f97aa4b6ab69897008eaf655cb4ab00f1b094498",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/select.png": "77979b167e05e92423c35cc3ee72458710e5573833cbdc943ba11d8d50b1b294",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/select_highlighted.png": "2e7fefa4299a08ea3b21d08c23e0fdaa669b25ae24cdce519206abf59e0d68b3",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/unselect.png": "a0b5817ea41b15f72f725101d25581cf1ed5f78069d791d8f679f451e992e840",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/unselect_highlighted.png": "f49ff96621c3e997ef3582a23f8bd727d65d2483e7854545ee87c1ed4d3c3232",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button.png": "79fbfe504e72598ba5f61a8c8e5fe6dbc3ec6c8a530fd6089efee17f89fb7b10",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button.png.mcmeta": "ebdf3a9e4f6dfd37d72ad6af4213d9f61fe8f8342e8f12f00bb6888f3ae28acb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_disabled.png": "55f92a6efea542d73ea19ed26147b4ce3aabe405b56e37db0d3cc75dc18a1f47",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_highlighted.png": "b658d1c9b38057aee2c63f49e19a734763eba720bd88be703ef9835c7f5f7f84",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta": "ebdf3a9e4f6dfd37d72ad6af4213d9f61fe8f8342e8f12f00bb6888f3ae28acb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox.png": "af426f3d1e5b32f74efc0aa522db6472a18ee4f2d87608acea04d3960168b5d9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png": "57ec86b031c3a480140a60799bde4ca1ba7ab9c14d8a7a37eb48ff64f01e29c6",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png": "6d70776447e4ad66d6606b9f7d670d4aa18238429f9c68db51c7f10be01c12ec",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png": "96875351b998a1e7f730c6231ff4638c7df7a80986d7be94511878ec89c8fbfe",
|
||||
"assets/minecraft/textures/gui/sprites/widget/cross_button.png": "922c64fb3c504e39cbcdf874a0a91ce20b84041724dd8a5ddf318af7d24ca539",
|
||||
"assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png": "016e049e726b24fad10fc9d40c85873af92ef02eec5b4ec9793665b80347e02d",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button.png": "9bf2c84eed89da70f7757aee27973834ab421d782ee60ea017e833eeceb46f93",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button_disabled.png": "e77079180fc95b0e75adc280ee0c916f2d315276103a8b88b7440b81e3ea3772",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button_highlighted.png": "9163318a63b1f5c31b115d644020fbeae5fc3e6fd231f877f4c35a82c4a3c414",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_backward.png": "af6220ed0297e43365a402b2e524ca4ce92f3e8f1b7e746e7f23a4ddf7a7b738",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png": "ff927d1fd93dbbb226c1693cebd6510ca6a0a1cea526dbf67a7b59c60313af0c",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_forward.png": "8a2c12ad9dd5877a764e968aa3015f5a69e31bc55585edd788eac9c15bbaf4b9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png": "eb983beae120839fbb3c8c96c862beb24f97ccd172d1f31b7e44f3a9fa483fe2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller.png": "066af6679ba68b0e67335cb6ce48ca3e1a058c9b074411573d7ec0418bdea600",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller.png.mcmeta": "f6a77d3537ff679b691e3d4b7bab0a1e076f71d1dec602bd65fa16a505092c53",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller_background.png": "be03c9e0fcabe74d352539157353497497845669491fb5b2ac07ad27116df7f9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller_background.png.mcmeta": "f6a77d3537ff679b691e3d4b7bab0a1e076f71d1dec602bd65fa16a505092c53",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider.png": "55f92a6efea542d73ea19ed26147b4ce3aabe405b56e37db0d3cc75dc18a1f47",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle.png": "3b22d9afcea59fd265a75ef8ba547b8f56ae8d53ca7675ccb9bc963abfa3cccb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle.png.mcmeta": "9ecf324f340ac117631939372d93ec59043f22d6caec7b7ea7c140b4d8d77c22",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png": "a89e733c03068dad39c642738508b1e41f7c263e56b32939ff26f72db2fedcd6",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png.mcmeta": "9ecf324f340ac117631939372d93ec59043f22d6caec7b7ea7c140b4d8d77c22",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_highlighted.png": "ba0d5d1e9b3bbb1af5311457a45372d2c89b5dac32a74de40815db945b45d2a5",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_highlighted.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slot_frame.png": "8428676f5a55c8fb1f68d693b8b4e8809f03dfa00b062fd1005a307cff9c0a75",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button.png": "c4b7b0d01cc458e8d623af1b7cab971f98f5fc5f239cb0d1b0e90b7428406688",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button_disabled.png": "0e4e936c191d125ad2abc4d5e253fb9bab7a36d290abd998d752224a70cbff13",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button_highlighted.png": "36c81bc881f23d3d377128022c47e43403fe9848690c430ae8427198be0d6e1d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/error.png": "e4e219517e9b8db2b018efc532f08de50b65019eb094aea0a8814f7d5358433d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png": "37ac98fc99850c78f65ad3dc1b759777db030ca859c8047ffeb453491107b65e",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/join.png": "cb437430e8122c0f791d9834491e7cee11b3c514b25e809ae7f9578879be1e84",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png": "e92353fbd181db587f3c5c4e688638709e69487e9c9eae076918489ef8d2f99e",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/marked_join.png": "8732a1c1419bd4046ca8eec12d6c9fdc6ddbd764cce373e12e17a334aed039ed",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png": "23c4e5b123be8b555ba8f130a03acde63e2a6fb48f1c1180a031fb077687b631",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/warning.png": "e4e219517e9b8db2b018efc532f08de50b65019eb094aea0a8814f7d5358433d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png": "49fee0502fab6ea38031664916ba328a1e4d68d8507761ba260efb67e640adde",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_0.png": "af5f25cd7db1b878806cacfc6eabb6a896e37f41340787db0de79d222ec1dbea",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_0.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_1.png": "3323296b81ce46d3dff93abc11289657cacaf9183b0f0663a8fa56d38ae436c8",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_1.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_2.png": "751f2aacfcb382dff3c57be00ece8e3a3cdfe0479374451ecbf70aa95d915b4d",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_2.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_3.png": "bffc916a16c3709d01e10870c329e8b915807177166f271e91ed72aa591d4f70",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_3.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_4.png": "d750f000ff1df1680e30c3c2c4e6921bdd5b69911e1d4e8aec527ef58841edce",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_4.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_5.png": "26f967071cde84299ba747dba7aa2db73784e3d89b158fb9092d0cddd45d215c",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_5.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/edition.png": "44d032976ac08bb01847de99d62cfea98298825fd75a36dbec319eba76081cbb",
|
||||
"assets/minecraft/textures/gui/title/minecraft.png": "efee73a6c812c89b2900d41f6446c0f906ccf85136b6c226daf42870a41a5157",
|
||||
"assets/sanctuary/items/zero_cape.json": "dcdcb599fe8f645ea27429da1c45ac5925b4672578f01cb6b93b2cd03f1f8b7f",
|
||||
"assets/sanctuary/models/item/zero_cape.json": "2e1c1b1030fd054d60cbc2544041bd80a44ac3f2ea89d098958666b97251b56a",
|
||||
"assets/sanctuary/textures/entity/cape/zero_cape.png": "f9a76537647989f9a0b6d001e320dac591c359e9e61a31f4ce11c88f207f0ad4",
|
||||
"assets/sanctuary/textures/gui/aptitudes/familiar.png": "c855f9cddb68cdb4a7110e70af60afbe068bc0176b9b6c69f38e052fcdbfda6c",
|
||||
"assets/sanctuary/textures/gui/aptitudes/familiarpower.png": "9ee75fd66f68bb2ce7b4158d2511ef3a9cd7a20f2b105520c4a4fcec2fee378b",
|
||||
"assets/sanctuary/textures/gui/aptitudes/hungerknown.png": "1e5cd57d12592f03dc2d2071a8c2873a30939f07b0db021fcb7fc34468709acc",
|
||||
"assets/sanctuary/textures/gui/aptitudes/names.png": "77dcea1c72970f87043b551c3506bfec64290b478a4d2981f280079d98158628",
|
||||
"assets/sanctuary/textures/gui/aptitudes/recipes.png": "88ec437776844c15104e0856af8fd768f511b951c79802a151d6ce4ffbbb4357",
|
||||
"assets/sanctuary/textures/gui/aptitudes/rest.png": "f343fd835ed20b9feb5195cd3727c0a3882090b33caf08c3f43120b250c8786e",
|
||||
"assets/sanctuary/textures/gui/aptitudes/sorting.png": "fa6689f4ffdac7ffa58900afc8b264e8106cde7a992167ada7e8debda4d09618",
|
||||
"assets/sanctuary/textures/gui/aptitudes/swim.png": "1e98150e08f2f47208ac0b14517760bddb55be4c013bfc3693dc474d951a9f9a",
|
||||
"assets/sanctuary/textures/gui/aptitudes/worldmap.png": "a413da0a34110d4b7d4422ca2f59defc1c6394184186068974a5ff6c68a4e4b0",
|
||||
"assets/sanctuary/textures/gui/aptitudes/zoom.png": "07e1c2dc51ff86e5f6903a5fc058603a886876600b01d124770336deefffa19f",
|
||||
"assets/sanctuary/textures/gui/food_details.png": "1ebc30ae7394393b5b7b8a0383102bcd035e5e92a602b89db05eeab66d2ef134",
|
||||
"assets/sanctuary/textures/gui/inventory/cape.png": "cd32c5f61d088740a11da8dd2767fda11f8db6b1fe65587a7c5b043177befb17",
|
||||
"assets/sanctuary/textures/gui/inventory/cosmetics.png": "fcb2bca5f01a6fa6028cf6748d06320acb02011d7a7a93103d5ee24be13dca4b",
|
||||
"assets/sanctuary/textures/gui/inventory/egg.png": "344a8624bd03b45472acb045fa607172d00dae603594bfa5e411d5f126fc0975",
|
||||
"assets/sanctuary/textures/gui/progression/breathing.png": "2b1bfe8e0a33ae957f87dc4086b848ac26e209a4b90998fce153b2f394201157",
|
||||
"assets/sanctuary/textures/gui/progression/building.png": "2d143ca35c5eac3d2a07943fe440b6893e189ff2389fd1b300d4f08bd98309ec",
|
||||
"assets/sanctuary/textures/gui/progression/heart.png": "224b4162d500a632fe6861613026941a7dcd0eee97987e0c92483733f2fa0a1e",
|
||||
"assets/sanctuary/textures/gui/progression/hunger.png": "9b3cb1e8206e7d17306fd461660b8ba154d729325f17181f6a045c175674ea97",
|
||||
"assets/sanctuary/textures/gui/progression/inventory.png": "d66b68dda35538639f956d670b3ff25e064b00ab022a6292ce8c0d3e3ab473a3",
|
||||
"assets/sanctuary/textures/gui/progression/mining.png": "c0134e182d63031ba2b53ab4477f8e1c96352375998c1c0bc54fc452816d2599",
|
||||
"assets/sanctuary/textures/item/cape/zero_cape.png": "d3386907d5cc90cdf1911c911faa26dbcb6ea16ce0dc7321abb482f3322255fb",
|
||||
"assets/sanctuary/textures/item/golden_wrench.png": "a97570908db75caf8e6fc2f5ecabf12c54fd99bfea7be634df66c4310dca22af",
|
||||
"pack.mcmeta": "70189fadacaa715704105dd1adea84bd4b4bd2ec650cf048644ab379707afeaf",
|
||||
"pack.png": "33adb8f689d55b7bf8d0824b02942ea3823f128b27fab458713ab9582061a1a0"
|
||||
},
|
||||
"import": {
|
||||
"folder": "Sanctuary-Resource-Pack-base-26-3",
|
||||
"files": {
|
||||
"FOOD.md": "e271c13d8044ee54b7bd9f0e34627480dab14df3f91a17e2a6fcb87e8cba0424",
|
||||
"HUD-SOURCES.json": "40b74fe75a581abdf7c621fbccd44a2acf1a8d2526266bb0b36ff703c404dd3c",
|
||||
"HUD.md": "300eb32ece21171818d97078cc16e9c341fbf19d84d70d33edc898c8479d7b7b",
|
||||
"README.md": "8ce801201583de8ac330e64973d61a4eaed4ecb89d58e31318c5d76883f1cc98",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_empty.png": "80ea14a291330f3253fa4ba3c7aa5eeea73ac3df71c85eec649ae75762574cd2",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png": "f9f725d5f76f09c9284ec8ef3eab3bab714b04306ea5b88d2774c6d96c65e525",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_full.png": "29f5cddd23a6383973690101b3d1d7ab10e421b8bff8c5359e8d2623576e2f14",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png": "1c1969632df22e5c3be196ace904174e7797222b4d6514f442fcce0cc9fb2361",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_half.png": "e5eda03de917caca665dc5ac5210fdf90af745cad0ee17ddccddc4365a7ee55a",
|
||||
"assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png": "51be68df64c4d01c2dff3c300f9e1833bccbc19007d7a18b567a42160740fa8e",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/join.png": "cdf278b928ac6ecf32b4c28304dcace1ef9d1df017d6bf22610896a41b71f39e",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/join_highlighted.png": "e92353fbd181db587f3c5c4e688638709e69487e9c9eae076918489ef8d2f99e",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_down.png": "5443d2f341d7f6ecf00d24759d21b9f11d3c00b6b3464cf3209aad1893fbec35",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_down_highlighted.png": "8bc3722212402866e0b83e30893e5681e0173843140d51d54d0381d81fda0923",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_up.png": "12a353f27c85943b9e6f78b0534ad2f0315f8fc76af8fbdf25f6ddad674566e1",
|
||||
"assets/minecraft/textures/gui/sprites/server_list/move_up_highlighted.png": "6e0632d7b5cde7be54035ef65a2976f38a960b834ee36e0c7c5450d6f9ffaa4b",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_down.png": "829a14cbe49c70284572ba3f6a7fc812b401ed4bac910d46a4b37fa048dc4a0e",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_down_highlighted.png": "f0621fda65ad07e989776b554458e941adff9ca7b9f48a64f18840a04e104567",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_up.png": "63ffe9417b1ca97d27e6da8bc1d0817b8b282f1489c47a64cba90e9cd6601e81",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/move_up_highlighted.png": "6b7f7ea182728d8ddacd9930f97aa4b6ab69897008eaf655cb4ab00f1b094498",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/select.png": "77979b167e05e92423c35cc3ee72458710e5573833cbdc943ba11d8d50b1b294",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/select_highlighted.png": "2e7fefa4299a08ea3b21d08c23e0fdaa669b25ae24cdce519206abf59e0d68b3",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/unselect.png": "a0b5817ea41b15f72f725101d25581cf1ed5f78069d791d8f679f451e992e840",
|
||||
"assets/minecraft/textures/gui/sprites/transferable_list/unselect_highlighted.png": "f49ff96621c3e997ef3582a23f8bd727d65d2483e7854545ee87c1ed4d3c3232",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button.png": "79fbfe504e72598ba5f61a8c8e5fe6dbc3ec6c8a530fd6089efee17f89fb7b10",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button.png.mcmeta": "ebdf3a9e4f6dfd37d72ad6af4213d9f61fe8f8342e8f12f00bb6888f3ae28acb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_disabled.png": "55f92a6efea542d73ea19ed26147b4ce3aabe405b56e37db0d3cc75dc18a1f47",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_disabled.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_highlighted.png": "b658d1c9b38057aee2c63f49e19a734763eba720bd88be703ef9835c7f5f7f84",
|
||||
"assets/minecraft/textures/gui/sprites/widget/button_highlighted.png.mcmeta": "ebdf3a9e4f6dfd37d72ad6af4213d9f61fe8f8342e8f12f00bb6888f3ae28acb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox.png": "af426f3d1e5b32f74efc0aa522db6472a18ee4f2d87608acea04d3960168b5d9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_highlighted.png": "57ec86b031c3a480140a60799bde4ca1ba7ab9c14d8a7a37eb48ff64f01e29c6",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png": "6d70776447e4ad66d6606b9f7d670d4aa18238429f9c68db51c7f10be01c12ec",
|
||||
"assets/minecraft/textures/gui/sprites/widget/checkbox_selected_highlighted.png": "96875351b998a1e7f730c6231ff4638c7df7a80986d7be94511878ec89c8fbfe",
|
||||
"assets/minecraft/textures/gui/sprites/widget/cross_button.png": "922c64fb3c504e39cbcdf874a0a91ce20b84041724dd8a5ddf318af7d24ca539",
|
||||
"assets/minecraft/textures/gui/sprites/widget/cross_button_highlighted.png": "016e049e726b24fad10fc9d40c85873af92ef02eec5b4ec9793665b80347e02d",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button.png": "9bf2c84eed89da70f7757aee27973834ab421d782ee60ea017e833eeceb46f93",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button_disabled.png": "e77079180fc95b0e75adc280ee0c916f2d315276103a8b88b7440b81e3ea3772",
|
||||
"assets/minecraft/textures/gui/sprites/widget/locked_button_highlighted.png": "9163318a63b1f5c31b115d644020fbeae5fc3e6fd231f877f4c35a82c4a3c414",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_backward.png": "af6220ed0297e43365a402b2e524ca4ce92f3e8f1b7e746e7f23a4ddf7a7b738",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_backward_highlighted.png": "ff927d1fd93dbbb226c1693cebd6510ca6a0a1cea526dbf67a7b59c60313af0c",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_forward.png": "8a2c12ad9dd5877a764e968aa3015f5a69e31bc55585edd788eac9c15bbaf4b9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/page_forward_highlighted.png": "eb983beae120839fbb3c8c96c862beb24f97ccd172d1f31b7e44f3a9fa483fe2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller.png": "066af6679ba68b0e67335cb6ce48ca3e1a058c9b074411573d7ec0418bdea600",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller.png.mcmeta": "f6a77d3537ff679b691e3d4b7bab0a1e076f71d1dec602bd65fa16a505092c53",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller_background.png": "be03c9e0fcabe74d352539157353497497845669491fb5b2ac07ad27116df7f9",
|
||||
"assets/minecraft/textures/gui/sprites/widget/scroller_background.png.mcmeta": "f6a77d3537ff679b691e3d4b7bab0a1e076f71d1dec602bd65fa16a505092c53",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider.png": "55f92a6efea542d73ea19ed26147b4ce3aabe405b56e37db0d3cc75dc18a1f47",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle.png": "3b22d9afcea59fd265a75ef8ba547b8f56ae8d53ca7675ccb9bc963abfa3cccb",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle.png.mcmeta": "9ecf324f340ac117631939372d93ec59043f22d6caec7b7ea7c140b4d8d77c22",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png": "a89e733c03068dad39c642738508b1e41f7c263e56b32939ff26f72db2fedcd6",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_handle_highlighted.png.mcmeta": "9ecf324f340ac117631939372d93ec59043f22d6caec7b7ea7c140b4d8d77c22",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_highlighted.png": "ba0d5d1e9b3bbb1af5311457a45372d2c89b5dac32a74de40815db945b45d2a5",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slider_highlighted.png.mcmeta": "979a3e114ffb0213932b71873db149c32a8c1c8ba65a4cbe5d30a1f677564fa2",
|
||||
"assets/minecraft/textures/gui/sprites/widget/slot_frame.png": "8428676f5a55c8fb1f68d693b8b4e8809f03dfa00b062fd1005a307cff9c0a75",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button.png": "c4b7b0d01cc458e8d623af1b7cab971f98f5fc5f239cb0d1b0e90b7428406688",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button_disabled.png": "0e4e936c191d125ad2abc4d5e253fb9bab7a36d290abd998d752224a70cbff13",
|
||||
"assets/minecraft/textures/gui/sprites/widget/unlocked_button_highlighted.png": "36c81bc881f23d3d377128022c47e43403fe9848690c430ae8427198be0d6e1d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/error.png": "e4e219517e9b8db2b018efc532f08de50b65019eb094aea0a8814f7d5358433d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/error_highlighted.png": "37ac98fc99850c78f65ad3dc1b759777db030ca859c8047ffeb453491107b65e",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/join.png": "cb437430e8122c0f791d9834491e7cee11b3c514b25e809ae7f9578879be1e84",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/join_highlighted.png": "e92353fbd181db587f3c5c4e688638709e69487e9c9eae076918489ef8d2f99e",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/marked_join.png": "8732a1c1419bd4046ca8eec12d6c9fdc6ddbd764cce373e12e17a334aed039ed",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/marked_join_highlighted.png": "23c4e5b123be8b555ba8f130a03acde63e2a6fb48f1c1180a031fb077687b631",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/warning.png": "e4e219517e9b8db2b018efc532f08de50b65019eb094aea0a8814f7d5358433d",
|
||||
"assets/minecraft/textures/gui/sprites/world_list/warning_highlighted.png": "49fee0502fab6ea38031664916ba328a1e4d68d8507761ba260efb67e640adde",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_0.png": "af5f25cd7db1b878806cacfc6eabb6a896e37f41340787db0de79d222ec1dbea",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_0.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_1.png": "3323296b81ce46d3dff93abc11289657cacaf9183b0f0663a8fa56d38ae436c8",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_1.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_2.png": "751f2aacfcb382dff3c57be00ece8e3a3cdfe0479374451ecbf70aa95d915b4d",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_2.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_3.png": "bffc916a16c3709d01e10870c329e8b915807177166f271e91ed72aa591d4f70",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_3.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_4.png": "d750f000ff1df1680e30c3c2c4e6921bdd5b69911e1d4e8aec527ef58841edce",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_4.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_5.png": "26f967071cde84299ba747dba7aa2db73784e3d89b158fb9092d0cddd45d215c",
|
||||
"assets/minecraft/textures/gui/title/background/panorama_5.png.mcmeta": "6de2cb00c45ccc7edc47a8ebac73b003af81877efa31c755e2ee89adb97e0f0f",
|
||||
"assets/minecraft/textures/gui/title/edition.png": "44d032976ac08bb01847de99d62cfea98298825fd75a36dbec319eba76081cbb",
|
||||
"assets/minecraft/textures/gui/title/minecraft.png": "efee73a6c812c89b2900d41f6446c0f906ccf85136b6c226daf42870a41a5157",
|
||||
"assets/sanctuary/items/zero_cape.json": "dcdcb599fe8f645ea27429da1c45ac5925b4672578f01cb6b93b2cd03f1f8b7f",
|
||||
"assets/sanctuary/models/item/zero_cape.json": "2e1c1b1030fd054d60cbc2544041bd80a44ac3f2ea89d098958666b97251b56a",
|
||||
"assets/sanctuary/textures/entity/cape/zero_cape.png": "f9a76537647989f9a0b6d001e320dac591c359e9e61a31f4ce11c88f207f0ad4",
|
||||
"assets/sanctuary/textures/gui/aptitudes/familiar.png": "c855f9cddb68cdb4a7110e70af60afbe068bc0176b9b6c69f38e052fcdbfda6c",
|
||||
"assets/sanctuary/textures/gui/aptitudes/familiarpower.png": "9ee75fd66f68bb2ce7b4158d2511ef3a9cd7a20f2b105520c4a4fcec2fee378b",
|
||||
"assets/sanctuary/textures/gui/aptitudes/hungerknown.png": "1e5cd57d12592f03dc2d2071a8c2873a30939f07b0db021fcb7fc34468709acc",
|
||||
"assets/sanctuary/textures/gui/aptitudes/names.png": "77dcea1c72970f87043b551c3506bfec64290b478a4d2981f280079d98158628",
|
||||
"assets/sanctuary/textures/gui/aptitudes/recipes.png": "88ec437776844c15104e0856af8fd768f511b951c79802a151d6ce4ffbbb4357",
|
||||
"assets/sanctuary/textures/gui/aptitudes/rest.png": "f343fd835ed20b9feb5195cd3727c0a3882090b33caf08c3f43120b250c8786e",
|
||||
"assets/sanctuary/textures/gui/aptitudes/sorting.png": "fa6689f4ffdac7ffa58900afc8b264e8106cde7a992167ada7e8debda4d09618",
|
||||
"assets/sanctuary/textures/gui/aptitudes/swim.png": "1e98150e08f2f47208ac0b14517760bddb55be4c013bfc3693dc474d951a9f9a",
|
||||
"assets/sanctuary/textures/gui/aptitudes/worldmap.png": "a413da0a34110d4b7d4422ca2f59defc1c6394184186068974a5ff6c68a4e4b0",
|
||||
"assets/sanctuary/textures/gui/aptitudes/zoom.png": "07e1c2dc51ff86e5f6903a5fc058603a886876600b01d124770336deefffa19f",
|
||||
"assets/sanctuary/textures/gui/food_details.png": "1ebc30ae7394393b5b7b8a0383102bcd035e5e92a602b89db05eeab66d2ef134",
|
||||
"assets/sanctuary/textures/gui/inventory/cape.png": "cd32c5f61d088740a11da8dd2767fda11f8db6b1fe65587a7c5b043177befb17",
|
||||
"assets/sanctuary/textures/gui/inventory/cosmetics.png": "fcb2bca5f01a6fa6028cf6748d06320acb02011d7a7a93103d5ee24be13dca4b",
|
||||
"assets/sanctuary/textures/gui/inventory/egg.png": "344a8624bd03b45472acb045fa607172d00dae603594bfa5e411d5f126fc0975",
|
||||
"assets/sanctuary/textures/gui/progression/breathing.png": "2b1bfe8e0a33ae957f87dc4086b848ac26e209a4b90998fce153b2f394201157",
|
||||
"assets/sanctuary/textures/gui/progression/building.png": "2d143ca35c5eac3d2a07943fe440b6893e189ff2389fd1b300d4f08bd98309ec",
|
||||
"assets/sanctuary/textures/gui/progression/heart.png": "224b4162d500a632fe6861613026941a7dcd0eee97987e0c92483733f2fa0a1e",
|
||||
"assets/sanctuary/textures/gui/progression/hunger.png": "9b3cb1e8206e7d17306fd461660b8ba154d729325f17181f6a045c175674ea97",
|
||||
"assets/sanctuary/textures/gui/progression/inventory.png": "d66b68dda35538639f956d670b3ff25e064b00ab022a6292ce8c0d3e3ab473a3",
|
||||
"assets/sanctuary/textures/gui/progression/mining.png": "c0134e182d63031ba2b53ab4477f8e1c96352375998c1c0bc54fc452816d2599",
|
||||
"assets/sanctuary/textures/item/cape/zero_cape.png": "d3386907d5cc90cdf1911c911faa26dbcb6ea16ce0dc7321abb482f3322255fb",
|
||||
"pack.mcmeta": "62d437b8b38a48162b3602b37d4492e239575099bdd22998ff6930afa41e5f1a",
|
||||
"pack.png": "33adb8f689d55b7bf8d0824b02942ea3823f128b27fab458713ab9582061a1a0"
|
||||
}
|
||||
},
|
||||
"changes": [
|
||||
"Golden wrench: original creator PNG, unchanged bytes.",
|
||||
"Editable personal template exports current Sanctuary assets overlaid by the built-in pack."
|
||||
],
|
||||
"golden_wrench_source": {
|
||||
"file": "golden_wrench.png",
|
||||
"sha256": "a97570908db75caf8e6fc2f5ecabf12c54fd99bfea7be634df66c4310dca22af",
|
||||
"size": [
|
||||
16,
|
||||
16
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
# Sanctuary — votre pack personnel / your personal pack
|
||||
|
||||
Cette copie est à vous : Sanctuary ne la réécrit jamais lors d'une mise à jour.
|
||||
Dans Options → Packs de ressources, activez **Sanctuary-Custom** et placez-le
|
||||
au-dessus de « Textures Sanctuary » et des autres packs à remplacer.
|
||||
|
||||
1. Modifiez les fichiers dans `assets/`, en gardant leurs noms et chemins.
|
||||
2. Rechargez avec F3 + T (ou désactivez puis réactivez le pack).
|
||||
3. Pour revenir à l'apparence fournie par Sanctuary, désactivez votre pack.
|
||||
|
||||
Quelques points de départ :
|
||||
|
||||
| Ressource | Chemin |
|
||||
| --- | --- |
|
||||
| Clé dorée | `assets/sanctuary/textures/item/golden_wrench.png` |
|
||||
| Briques et argiles colorées | `assets/sanctuary/textures/block/` |
|
||||
| Menus et icônes Sanctuary | `assets/sanctuary/textures/gui/` |
|
||||
| Vie et faim | `assets/minecraft/textures/gui/sprites/hud/` |
|
||||
| Modèles des objets | `assets/sanctuary/models/item/` et `assets/sanctuary/items/` |
|
||||
| Traductions | `assets/sanctuary/lang/fr_fr.json` et `en_us.json` |
|
||||
|
||||
Les PNG peuvent garder la transparence. Préservez les dimensions des atlas de
|
||||
menus et les découpes utilisées par le jeu. Vous pouvez également ajouter
|
||||
des remplacements Minecraft dans `assets/minecraft/` ; cette base ne contient
|
||||
pas toutes les ressources du jeu ni celles des autres mods.
|
||||
|
||||
Cette copie est un instantané complet des ressources Sanctuary à sa création.
|
||||
**Supprimez de votre copie les fichiers que vous ne personnalisez pas** pour
|
||||
laisser les prochaines mises à jour du mod s'appliquer à ces ressources.
|
||||
Pour repartir d'une base récente, renommez votre dossier personnel puis
|
||||
cliquez de nouveau sur « Personnaliser Sanctuary » : l'ancien reste intact.
|
||||
Le bouton devient « Ouvrir ma copie » tant que `Sanctuary-Custom` existe.
|
||||
N'éditez pas directement le JAR du mod.
|
||||
|
||||
Le pack modifie l'apparence, les modèles, les sons et les textes disponibles
|
||||
dans `assets/` ; les règles de jeu, sauvegardes et recettes côté serveur restent
|
||||
dans le mod. Les crédits figurent dans `THIRD_PARTY_NOTICES.md`.
|
||||
|
||||
## English
|
||||
|
||||
This is your editable copy. Sanctuary updates never overwrite it. Enable
|
||||
**Sanctuary-Custom** in Options → Resource Packs and move it above Sanctuary
|
||||
textures and any other pack you want to override. Edit files under `assets/`
|
||||
without renaming their resource paths, then reload with F3 + T or toggle the
|
||||
pack off and on. Disable this pack to return to Sanctuary's supplied appearance.
|
||||
|
||||
The table above lists useful starting paths. Keep GUI atlas dimensions and
|
||||
sprite layouts intact. You can add Minecraft overrides under `assets/minecraft/`;
|
||||
this template does not include every vanilla asset or other mods' resources.
|
||||
|
||||
This is a full snapshot of Sanctuary's assets when created. **Delete any files
|
||||
you do not customize** so future mod updates can supply them. To start a fresh
|
||||
copy later, rename your existing folder and click “Customize Sanctuary” again.
|
||||
“Open my copy” opens the existing folder without changing it. Do not edit the
|
||||
mod JAR. This pack changes client resources, not server gameplay or save data.
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"pack": {
|
||||
"description": {
|
||||
"translate": "sanctuary.resource_pack.custom_description",
|
||||
"fallback": "Sanctuary — your editable copy"
|
||||
},
|
||||
"min_format": [97, 1],
|
||||
"max_format": [97, 1]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user