Compare commits

..
Author SHA1 Message Date
koka ddaf71c7cd release: prepare Sanctuary 26.2.0-alpha.232
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-03 02:22:46 +02:00
koka 7e1ed85307 Merge pull request 'Corriger la cape, le terminal et le panneau de trophées d’alpha.231' (#152) from fix/alpha231-cape-terminal-trophy-panel into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #152
2026-09-02 23:37:50 +00:00
koka 5840621acf fix: correct alpha231 cape terminal and trophy panel
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-03 01:35:09 +02:00
koka 974cea20b5 Merge pull request 'release: Sanctuary 26.2.0-alpha.231' (#151) from release/26.2.0-alpha.231 into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #151
2026-09-02 22:44:12 +00:00
koka 81a98ed197 release: include readable trophy panels in alpha.231
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-02 18:42:33 +02:00
koka b022be5739 Merge pull request 'fix(redstoner): rendre les panneaux de trophées lisibles' (#150) from fix/trophy-panel-display into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #150
2026-09-02 16:29:25 +00:00
koka 27b29c1340 Merge remote-tracking branch 'origin/main' into fix/trophy-panel-display
Verification 26.2 / check (pull_request) Canceled after 0s
# Conflicts:
#	CHANGELOG.md
#	build.gradle
2026-09-02 17:35:58 +02:00
koka 274d4c1ffa release: prepare Sanctuary 26.2.0-alpha.231 2026-09-02 15:16:01 +02:00
koka f217bb3661 Merge pull request 'feat(sanctuary): rendre les coffres et lits Backroom trouvables' (#149) from feature/backroom-visible-loot into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #149
2026-09-02 12:52:54 +00:00
koka 5100091b17 fix(sanctuary): rendre les lits Backroom trouvables
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-02 14:36:04 +02:00
koka 398d94e7d1 feat(sanctuary): densifier le butin des Backrooms 2026-09-02 14:26:51 +02:00
koka 0743ff33a6 fix(redstoner): rendre les panneaux de trophées lisibles
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-02 14:18:20 +02:00
koka bfda90f4f4 Merge pull request 'release: prepare Sanctuary 26.2.0-alpha.230' (#148) from release/26.2.0-alpha.230 into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #148
2026-09-02 07:18:29 +00:00
koka a698140963 release: prepare Sanctuary 26.2.0-alpha.230
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-02 09:14:55 +02:00
koka 88ec91e9f4 Merge pull request 'feat(sanctuary): corriger les capes et armer les poules' (#147) from feature/final-sanctuary-tickets into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #147
2026-09-02 06:57:22 +00:00
koka e1d48e9017 feat(sanctuary): resolve final cape and chicken tickets
Verification 26.2 / check (pull_request) Canceled after 0s
2026-09-02 08:52:53 +02:00
koka cce58c27c8 Merge pull request 'feat(ranking): ajouter les panneaux de trophées automatiques' (#144) from feature/automatic-trophy-panel into main
Verification 26.2 / check (push) Canceled after 0s
Reviewed-on: #144
2026-09-02 06:28:41 +00:00
61 changed files with 1915 additions and 500 deletions
+33 -1
View File
@@ -8,7 +8,36 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve
## Non publié
Modules modifiés : **Sanctuary `0.0.0-alpha.135`** et **Red-Stoner `0.0.0-alpha.17`**.
Aucun changement non publié.
## `26.2.0-alpha.232`
Modules modifiés : **Another World `0.0.0-alpha.58`**, **Sanctuary `0.0.0-alpha.138`** et **Red-Stoner `0.0.0-alpha.19`**.
- ferme le ticket #146 en enregistrant chaque cliché pris avec un appareil Canon dans le dossier `screenshots` de linstance, à côté des captures F2 ;
- exporte le carré cadré à sa résolution native avec le filtre de la pellicule, sans le réduire aux 128 × 128 pixels de la carte en jeu ;
- écrit le PNG hors du thread de rendu et réserve un nom horodaté unique afin d’éviter les freezes comme les écrasements lors de plusieurs clichés rapprochés ;
- remplace le volume de la cape à motifs par les deux faces opposées de l’îlot UV exact du bouclier, redimensionnées aux proportions 10 × 16 de la cape, afin de corriger la projection et le culling sans afficher le manche ni l’épaisseur du bouclier ;
- laisse la touche dinventaire fermer le terminal tant que la recherche nest pas focalisée, mais la traite comme du texte dans le champ de recherche afin que la lettre `E` ne ferme plus l’écran ;
- utilise les huit lignes du panneau de trophées pour afficher le titre et jusqu’à sept rangs, avec une page de noms suivie dune page de valeurs pour chaque statistique afin que les longues durées de jeu restent lisibles ;
- fait configurer par un œuf dapparition le classement vanilla des créatures correspondantes tuées, par exemple les zombies tués avec l’œuf de zombie ;
- conserve les IDs et les sauvegardes Sanctuary v15/Red-Stoner v4 ; le snapshot client du panneau passant de trois à sept entrées, le protocole Red-Stoner passe de 7 à 8 et exige la mise à jour du client et du serveur.
## `26.2.0-alpha.231`
Modules modifiés : **Sanctuary `0.0.0-alpha.137`** et **Red-Stoner `0.0.0-alpha.18`**.
- transforme le panneau de trophées en plaque verticale de chêne, corrige le texte auparavant masqué et utilise les quatre lignes pour le titre paginé ainsi que les trois places du podium ;
- permet de passer à la page suivante dun clic droit et de revenir à la précédente avec `Maj` + clic droit, sans changer les IDs, les sauvegardes Red-Stoner v4 ni le protocole réseau 7.
- garantit sur chaque niveau de la Backroom un coffre par cellule de 3 × 3 chunks dans les nouveaux chunks, au lieu dun coffre aléatoire réparti entre les cinq niveaux ;
- resserre aussi la grille des lits de sortie de 10 × 10 à 3 × 3 chunks sur chacun des cinq niveaux afin quils soient réellement trouvables ;
- actualise JEI vers la bêta Fabric `30.29.0.201`, qui corrige un crash avec les mods utilisant latlas de textures ;
- ne change ni le butin ordinaire des coffres, ni les données Sanctuary v15/Red-Stoner v4, ni leurs protocoles réseau 24/7 ; les nouveaux coffres et lits apparaissent dans les chunks qui nont pas encore été générés.
## `26.2.0-alpha.230`
Modules modifiés : **Sanctuary `0.0.0-alpha.136`** et **Red-Stoner `0.0.0-alpha.17`**.
- attribue les demandes de quêtes personnalisées terminées à leur preneur directement sur le panneau et dans les détails au clic, avec son pseudonyme et sa couleur conservés ;
- répartit les lits de sortie rares sur chacun des cinq niveaux de la Backroom, avec exactement un lit par cellule de 10 × 10 chunks et par niveau dans les nouveaux chunks ;
@@ -16,6 +45,9 @@ Modules modifiés : **Sanctuary `0.0.0-alpha.135`** et **Red-Stoner `0.0.0-alpha
- ajoute lAPI publique Sanctuary de métriques et de classements persistants par UUID, avec import monotone des statistiques vanilla, podium borné et exclusion des actions créatives, spectateur ou simulées ;
- ajoute `redstoner:trophy_panel`, panneau mural configurable par son propriétaire avec un item non consommé, pages publiques, rendu en monde et rafraîchissement serveur limité à une fois par seconde ;
- passe Sanctuary aux données v15 et Red-Stoner aux données v4 sans nouveau payload ni changement de leurs protocoles réseau 24 et 7.
- corrige la cape blanche décorée en projetant sa couleur et ses motifs avec les sprites de bouclier, aux proportions exactes de la cape ;
- permet d’équiper une poule adulte avec larmure de loup vanilla en écailles de tatou, de la réparer avec des écailles et de la retirer aux cisailles ; larmure absorbe les dégâts et conserve son usure, ses teintures et ses enchantements ;
- conserve les sauvegardes Sanctuary v15 et le protocole réseau 24 : larmure utilise exclusivement le slot d’équipement vanilla de la poule.
## `26.2.0-alpha.229`
+5 -3
View File
@@ -22,11 +22,13 @@ Licence : **GNU GPL 3.0 or Later** (`GPL-3.0-or-later`)
Les descriptions FR/EN/RU sont déclarées dans chaque `fabric.mod.json` et dans les fichiers de langue. Les images fournies servent d'icônes Fabric de leur module.
Version courante du pack distribué : **`26.2.0-alpha.229`**. Cette release distribue Red-Stoner **`0.0.0-alpha.16`** ; les neuf autres modules conservent leur version issue de l'alpha.228.
Version courante du pack distribué : **`26.2.0-alpha.232`**. Cette release distribue Another World **`0.0.0-alpha.58`**, Sanctuary **`0.0.0-alpha.138`** et Red-Stoner **`0.0.0-alpha.19`** ; les sept autres modules conservent leur version issue de l'alpha.231.
Le prochain module Sanctuary **`0.0.0-alpha.134`** attribue les quêtes communautaires terminées à leur preneur et répartit les lits de sortie rares sur chacun des cinq niveaux de la Backroom. Chaque niveau garantitsormais un lit par cellule de 10 × 10 chunks dans les nouveaux chunks, sans modifier les sauvegardes, les données v14 ni le protocole réseau 24.
Lalpha.232 enregistre automatiquement chaque cliché Canon dans le dossier `screenshots` de linstance, à côté des captures F2. Le PNG conserve le carré réellement cadré, sa résolution et le filtre de la pellicule ; l’écriture asynchrone et les noms uniques évitent les freezes et les écrasements. Cette release corrige aussi la cape blanchecorée, la touche `E` du terminal et étend le panneau de trophées à huit lignes. Chaque statistique y possède une page de noms puis une page de valeurs ; un œuf dapparition ajoute directement le classement des créatures correspondantes tuées. Les sauvegardes restent en données Another World v5, Sanctuary v15 et Red-Stoner v4 ; le snapshot du panneau passant à sept entrées, le protocole Red-Stoner passe à 8.
Sanctuary **`0.0.0-alpha.135`** et Red-Stoner **`0.0.0-alpha.17`** ajoutent les classements publics et le panneau mural `redstoner:trophy_panel`. Les statistiques vanilla des anciens joueurs sont importées une fois, les scores restent dans Sanctuary et le panneau ne reçoit que sa page visible ainsi quun podium de trois noms maximum. Les données passent respectivement à v15 et v4 sans changer les protocoles réseau 24 et 7.
Lalpha.231 rend les sorties et le butin de la Backroom réellement trouvables sur ses cinq niveaux. Chaque niveau garantit désormais un coffre et un lit de sortie par cellule de 3 × 3 chunks dans les nouveaux chunks, sans ajouter de livres au butin. Le panneau de trophées devient une plaque verticale de chêne avec quatre lignes lisibles : titre et numéro de page, puis les trois places du podium. Un clic droit avance dune page et `Maj` + clic droit revient à la précédente. JEI passe à la bêta Fabric `30.29.0.201`, qui corrige un crash lié à latlas de textures. Les sauvegardes et les chunks déjà générés restent compatibles ; Sanctuary conserve les données v15/protocole 24 et Red-Stoner les données v4/protocole 7.
Lalpha.230 attribue les quêtes communautaires terminées à leur preneur et répartit les lits de sortie rares sur chacun des cinq niveaux de la Backroom. Elle ajoute aussi les classements publics et le panneau mural `redstoner:trophy_panel`, corrige la projection des couleurs et motifs de la cape blanche avec les sprites de bouclier, et permet d’équiper une poule adulte avec larmure de loup vanilla en écailles de tatou. Les sauvegardes restent compatibles ; Sanctuary passe aux données v15 et Red-Stoner aux données v4 sans changer leurs protocoles réseau 24 et 7.
Lalpha.229 ajoute au terminal les tris alphabétique, par quantité croissante et par quantité décroissante. Le tri ne change que sur demande explicite et les rafraîchissements périodiques conservent lordre ainsi que les objets sous le curseur. Les sauvegardes, les données Red-Stoner v3 et le protocole réseau 7 restent compatibles.
+12 -3
View File
@@ -15,6 +15,14 @@ tasks.register("vaultRulesSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.anotherworld.vault.VaultRulesSmoke"
}
tasks.register("canonScreenshotFilesSmoke", JavaExec) {
group = "verification"
description = "Checks Canon photo exports use the vanilla screenshots directory and collision-safe names."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.canon.client.CanonScreenshotFilesSmoke"
}
tasks.named("test") {
failOnNoDiscoveredTests = false
}
@@ -1956,7 +1964,7 @@ tasks.register("verifyAnotherWorldCatalog") {
"src/main/resources/assets/redstoner/textures/item/weather_gauge.png",
"src/main/resources/data/redstoner/recipe/weather_gauge.json"
]
if (project.version.toString() != "0.0.0-alpha.57"
if (project.version.toString() != "0.0.0-alpha.58"
|| sulfurMigration.target?.modules?.anotherworld != "0.0.0-alpha.44"
|| sulfurMigration.sulfur_caves?.sanctuary?.dripstone_cell_period != 2
|| !javaText.contains('Identifier.parse("sanctuary:sulfur_caves")')
@@ -3261,6 +3269,7 @@ tasks.register("verifyAnotherWorldCatalog") {
tasks.named("check") {
dependsOn tasks.named("verifyAnotherWorldCatalog")
dependsOn tasks.named("vaultRulesSmoke")
dependsOn tasks.named("canonScreenshotFilesSmoke")
}
tasks.register("verifyClimateBiomeMixer") {
@@ -3273,7 +3282,7 @@ tasks.register("verifyClimateBiomeMixer") {
"pack/migrations/26.2.0-alpha.188-beta-climate-provinces-to-alpha.189.json"))
def mixer = file(
"src/main/java/fr/koka99cab/sanctuary26/anotherworld/mixin/MultiNoiseBiomeSourceParameterListPresetMixin.java").text
if (project.version.toString() != "0.0.0-alpha.57"
if (project.version.toString() != "0.0.0-alpha.58"
|| migration.source?.pack_version != "26.2.0-alpha.188"
|| migration.target?.pack_version != "26.2.0-alpha.189"
|| migration.target?.modules?.anotherworld != "0.0.0-alpha.48"
@@ -3315,7 +3324,7 @@ tasks.register("verifyBackroomMaterialIntegration") {
"sanctuary/src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/backroom/BackroomMaterialApi.java").text
def rootBuild = rootProject.file("build.gradle").text
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
if (project.version.toString() != "0.0.0-alpha.57"
if (project.version.toString() != "0.0.0-alpha.58"
|| !initializer.contains("BackroomMaterialApi.registerAnomalyMaterial(AnotherWorldBlocks.TURQUOISE_MOSS)")
|| !blocks.contains('"turquoise_moss"')
|| !api.contains("public static void registerAnomalyMaterial")
@@ -0,0 +1,38 @@
package fr.koka99cab.canon.client;
import java.io.IOException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.Path;
final class CanonScreenshotFiles {
private static final String SCREENSHOT_DIRECTORY = "screenshots";
private static final int MAX_SUFFIX = 10_000;
private CanonScreenshotFiles() {
}
static Path reserve(Path gameDirectory, String timestamp) throws IOException {
Path screenshots = gameDirectory.resolve(SCREENSHOT_DIRECTORY);
Files.createDirectories(screenshots);
for (int suffix = 1; suffix <= MAX_SUFFIX; suffix++) {
Path candidate = screenshots.resolve(fileName(timestamp, suffix));
try {
return Files.createFile(candidate);
} catch (FileAlreadyExistsException ignored) {
// Keep the vanilla timestamp readable while avoiding same-second collisions.
}
}
throw new IOException("Could not reserve a unique Canon screenshot filename");
}
static String fileName(String timestamp, int suffix) {
if (timestamp == null || timestamp.isBlank()) {
throw new IllegalArgumentException("timestamp must not be blank");
}
if (suffix < 1) {
throw new IllegalArgumentException("suffix must be positive");
}
return timestamp + "-canon" + (suffix == 1 ? "" : "_" + suffix) + ".png";
}
}
@@ -8,12 +8,15 @@ import fr.koka99cab.canon.network.CapturePhotoPayload;
import fr.koka99cab.canon.photo.PhotoMapPalette;
import com.mojang.blaze3d.platform.NativeImage;
import com.mojang.blaze3d.platform.Window;
import java.nio.file.Files;
import java.nio.file.Path;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.client.Minecraft;
import net.minecraft.client.Screenshot;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.ARGB;
import net.minecraft.util.Util;
import net.minecraft.world.item.ItemStack;
public final class ClientPhotoCapture {
@@ -65,6 +68,7 @@ public final class ClientPhotoCapture {
ClientPlayNetworking.send(new CapturePhotoPayload(colors));
client.player.getCooldowns().addCooldown(capture.cameraStack(), CanonConstants.CAMERA_COOLDOWN_TICKS);
client.player.playSound(SoundEvents.SPYGLASS_USE, 0.7F, 1.35F);
exportScreenshot(client, screenshot, capture.style(), offsetX, offsetY, cropWidth, cropHeight);
} catch (Exception exception) {
CanonMod.LOGGER.warn("Failed to capture photo", exception);
if (client.player != null) {
@@ -74,6 +78,72 @@ public final class ClientPhotoCapture {
});
}
private static void exportScreenshot(
Minecraft client,
NativeImage screenshot,
PhotoStyle style,
int offsetX,
int offsetY,
int cropWidth,
int cropHeight
) {
NativeImage exported = null;
Path target = null;
try {
exported = new NativeImage(cropWidth, cropHeight, false);
screenshot.copyRect(exported, offsetX, offsetY, 0, 0, cropWidth, cropHeight, false, false);
target = CanonScreenshotFiles.reserve(client.gameDirectory.toPath(), Util.getFilenameFormattedDateTime());
} catch (Exception exception) {
if (exported != null) exported.close();
if (target != null) deleteReservedFile(target);
notifyScreenshotFailure(client, exception);
return;
}
NativeImage image = exported;
Path output = target;
Util.ioPool().execute(() -> {
try (image) {
applyStyle(image, style);
image.writeToFile(output);
client.execute(() -> {
if (client.player != null) {
client.player.sendSystemMessage(Component.translatable(
"message.canon.camera.screenshot_saved", output.getFileName().toString()));
}
});
} catch (Exception exception) {
deleteReservedFile(output);
notifyScreenshotFailure(client, exception);
}
});
}
private static void applyStyle(NativeImage image, PhotoStyle style) {
for (int y = 0; y < image.getHeight(); y++) {
for (int x = 0; x < image.getWidth(); x++) {
image.setPixel(x, y, style.applyFilter(image.getPixel(x, y)));
}
}
}
private static void notifyScreenshotFailure(Minecraft client, Exception exception) {
CanonMod.LOGGER.warn("Failed to save Canon photo in the screenshots directory", exception);
client.execute(() -> {
if (client.player != null) {
client.player.sendSystemMessage(Component.translatable("message.canon.camera.screenshot_failed"));
}
});
}
private static void deleteReservedFile(Path target) {
try {
Files.deleteIfExists(target);
} catch (Exception cleanupException) {
CanonMod.LOGGER.debug("Could not remove incomplete Canon screenshot {}", target, cleanupException);
}
}
private static int clamp(int value, int min, int max) {
return Math.max(min, Math.min(max, value));
}
@@ -24,6 +24,8 @@
"message.canon.camera.full": "The camera is already full.",
"message.canon.camera.captured": "Photo captured.",
"message.canon.camera.capture_failed": "Could not capture the current frame.",
"message.canon.camera.screenshot_saved": "Photo saved to screenshots: %s",
"message.canon.camera.screenshot_failed": "The in-game photo was captured, but its PNG could not be saved to screenshots.",
"style.canon.white": "Neutral",
"style.canon.white.effect": "Neutral stock with soft paper whites.",
"style.canon.light_gray": "Matte",
@@ -24,6 +24,8 @@
"message.canon.camera.full": "L'appareil photo est deja plein.",
"message.canon.camera.captured": "Photo prise.",
"message.canon.camera.capture_failed": "Impossible de capturer l'image actuelle.",
"message.canon.camera.screenshot_saved": "Photo sauvegardee dans screenshots : %s",
"message.canon.camera.screenshot_failed": "La photo en jeu est prise, mais son PNG n'a pas pu etre sauvegarde dans screenshots.",
"style.canon.white": "Neutre",
"style.canon.white.effect": "Rendu neutre avec des blancs doux.",
"style.canon.light_gray": "Mat",
@@ -24,6 +24,8 @@
"message.canon.camera.full": "Фотоаппарат уже полностью заряжен.",
"message.canon.camera.captured": "Фотография сделана.",
"message.canon.camera.capture_failed": "Не удалось снять текущий кадр.",
"message.canon.camera.screenshot_saved": "Фотография сохранена в screenshots: %s",
"message.canon.camera.screenshot_failed": "Снимок в игре сделан, но PNG не удалось сохранить в screenshots.",
"style.canon.white": "Нейтральный",
"style.canon.white.effect": "Нейтральная плёнка с мягкими белыми тонами.",
"style.canon.light_gray": "Матовый",
@@ -0,0 +1,33 @@
package fr.koka99cab.canon.client;
import java.nio.file.Files;
import java.nio.file.Path;
public final class CanonScreenshotFilesSmoke {
private CanonScreenshotFilesSmoke() {
}
public static void main(String[] args) throws Exception {
String timestamp = "2026-09-03_01.23.45";
require(CanonScreenshotFiles.fileName(timestamp, 1).equals("2026-09-03_01.23.45-canon.png"),
"first screenshot filename");
require(CanonScreenshotFiles.fileName(timestamp, 2).equals("2026-09-03_01.23.45-canon_2.png"),
"same-second screenshot filename");
Path gameDirectory = Files.createTempDirectory("canon-screenshot-smoke-");
Path first = CanonScreenshotFiles.reserve(gameDirectory, timestamp);
Path second = CanonScreenshotFiles.reserve(gameDirectory, timestamp);
require(first.getParent().equals(gameDirectory.resolve("screenshots")),
"screenshots directory");
require(first.getFileName().toString().equals("2026-09-03_01.23.45-canon.png"),
"first reserved screenshot");
require(second.getFileName().toString().equals("2026-09-03_01.23.45-canon_2.png"),
"collision-safe screenshot");
require(Files.isRegularFile(first) && Files.isRegularFile(second),
"reserved screenshot files");
}
private static void require(boolean condition, String contract) {
if (!condition) throw new IllegalStateException("Invalid Canon screenshot contract: " + contract);
}
}
+697 -297
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -14,9 +14,9 @@ mod_version=0.0.0-alpha.0
module_lifecycle=standby
ambiance_version=0.0.0-alpha.22
ambiance_lifecycle=active
redstoner_version=0.0.0-alpha.17
redstoner_version=0.0.0-alpha.19
redstoner_lifecycle=active
anotherworld_version=0.0.0-alpha.57
anotherworld_version=0.0.0-alpha.58
anotherworld_lifecycle=active
itsalive_version=0.0.0-alpha.38
itsalive_lifecycle=active
@@ -28,7 +28,7 @@ iliketomoveit_version=0.0.0-alpha.18
iliketomoveit_lifecycle=active
onlyfun_version=0.0.0-alpha.27
onlyfun_lifecycle=active
sanctuary_version=0.0.0-alpha.135
sanctuary_version=0.0.0-alpha.138
sanctuary_lifecycle=active
pack_version=26.2.0-alpha.229
pack_version=26.2.0-alpha.232
maven_group=fr.koka99cab.sanctuary26
@@ -0,0 +1,44 @@
{
"schema_version": 1,
"status": "released",
"source": {
"pack_version": "26.2.0-alpha.229",
"modules": {
"sanctuary": "0.0.0-alpha.132",
"redstoner": "0.0.0-alpha.16"
}
},
"target": {
"pack_version": "26.2.0-alpha.230",
"modules": {
"sanctuary": "0.0.0-alpha.136",
"redstoner": "0.0.0-alpha.17"
}
},
"sanctuary_polish": {
"quest_completion_attribution": true,
"backroom_exit_beds_on_every_level": true,
"persistent_public_rankings": true,
"redstoner_trophy_panel": true,
"white_cape_shield_pattern_projection": true,
"adult_chicken_wolf_armor": true
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"persistent_data_formats_changed": true,
"network_protocols_changed": false,
"sanctuary_data_version": 15,
"sanctuary_network_protocol": 24,
"redstoner_data_version": 4,
"redstoner_network_protocol": 7,
"client_server_update_required": true
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true
}
}
@@ -0,0 +1,56 @@
{
"schema_version": 1,
"status": "released",
"source": {
"pack_version": "26.2.0-alpha.230",
"modules": {
"sanctuary": "0.0.0-alpha.136",
"redstoner": "0.0.0-alpha.17"
}
},
"target": {
"pack_version": "26.2.0-alpha.231",
"modules": {
"sanctuary": "0.0.0-alpha.137",
"redstoner": "0.0.0-alpha.18"
}
},
"backroom_landmarks": {
"level_count": 5,
"loot_chest_cell_size_chunks": 3,
"exit_bed_source_cell_size_chunks": 10,
"exit_bed_target_cell_size_chunks": 3,
"books_added_to_loot": false,
"new_chunks_only": true
},
"trophy_panel": {
"wall_plate_model": "oak",
"readable_line_count": 4,
"page_title_and_three_podium_rows": true,
"right_click_next_page": true,
"sneak_right_click_previous_page": true
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"persistent_data_formats_changed": false,
"network_protocols_changed": false,
"sanctuary_data_version": 15,
"sanctuary_network_protocol": 24,
"redstoner_data_version": 4,
"redstoner_network_protocol": 7,
"client_server_update_required": true
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true,
"jei": {
"source": "30.29.0.199",
"target": "30.29.0.201",
"packwiz_and_prism_synchronized": true
}
}
}
@@ -0,0 +1,58 @@
{
"schema_version": 1,
"status": "released",
"source": {
"pack_version": "26.2.0-alpha.231",
"modules": {
"anotherworld": "0.0.0-alpha.57",
"sanctuary": "0.0.0-alpha.137",
"redstoner": "0.0.0-alpha.18"
}
},
"target": {
"pack_version": "26.2.0-alpha.232",
"modules": {
"anotherworld": "0.0.0-alpha.58",
"sanctuary": "0.0.0-alpha.138",
"redstoner": "0.0.0-alpha.19"
}
},
"fixed_issues": [146],
"canon_photo_screenshots": {
"directory": "screenshots",
"viewfinder_crop_only": true,
"film_filter_preserved": true,
"full_crop_resolution": true,
"asynchronous_png_write": true,
"collision_safe_names": true
},
"alpha231_follow_up": {
"migration": "alpha231-follow-up-cape-terminal-trophy.json",
"banner_cape_fixed": true,
"terminal_inventory_key_fixed": true,
"trophy_panel_visible_lines": 8,
"trophy_panel_entries_per_view": 7,
"spawn_egg_kill_ranking": true
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"persistent_data_formats_changed": false,
"network_protocols_changed": true,
"anotherworld_data_version": 5,
"anotherworld_network_protocol": 2,
"sanctuary_data_version": 15,
"sanctuary_network_protocol": 24,
"redstoner_data_version": 4,
"redstoner_source_network_protocol": 7,
"redstoner_target_network_protocol": 8,
"client_server_update_required": true
},
"distribution": {
"pack_release_updated": true,
"packwiz_index_refreshed": true,
"prism_modrinth_index_updated": true,
"shared_client_server_mrpack": true
}
}
@@ -0,0 +1,37 @@
{
"schema_version": 1,
"status": "released",
"released_in": "26.2.0-alpha.232",
"modules": {
"sanctuary": {
"source_module_version": "0.0.0-alpha.137",
"target_module_version": "0.0.0-alpha.138",
"data_version": 15,
"network_protocol": 24
},
"redstoner": {
"source_module_version": "0.0.0-alpha.18",
"target_module_version": "0.0.0-alpha.19",
"data_version": 4,
"source_network_protocol": 7,
"target_network_protocol": 8
}
},
"fixes": {
"banner_cape_flat_shield_uv_faces": true,
"banner_cape_double_sided_culling": true,
"terminal_inventory_key_captured_while_searching": true,
"trophy_panel_visible_lines": 8,
"trophy_panel_entries_per_view": 7,
"trophy_panel_names_then_values": true,
"spawn_egg_maps_to_entity_killed_statistic": true
},
"compatibility": {
"existing_saves_supported": true,
"new_world_required": false,
"save_reset_required": false,
"persistent_data_formats_changed": false,
"network_protocols_changed": true,
"client_server_update_required": true
}
}
+14 -14
View File
@@ -14,15 +14,15 @@ hash = "41f4f4c88c71d0a23446d5014f7407d55ad477441847099cad24492b032335a0"
[[files]]
file = "mods/ambiance-0.0.0-alpha.22.jar"
hash = "b4ba14b9ada5b4c1d97b039ee632a158ae266eba2faefee690e710cc5f0f993e"
hash = "0e25a85502da59ff111485d47223a6e653db4466cf59f84e7abf8c6b1405aa6a"
[[files]]
file = "mods/anotherworld-0.0.0-alpha.57.jar"
hash = "4c8a3315ba9db6799fb0f046b45d702d56fba65173abccbd81ab995f56690407"
file = "mods/anotherworld-0.0.0-alpha.58.jar"
hash = "c28aaeedc1fb6c8fb8613ba0f12af9a1327edc2ef0eeb20cb73f685c52a29034"
[[files]]
file = "mods/events-0.0.0-alpha.0.jar"
hash = "e7304da48379eb39737b126431316644250ecbc5b6ec8a439cc12e96a9477fa4"
hash = "4dd9eeccc4f9d2ab2804339320a1a2a24174706cc8a4ac2853b16765b8b2a050"
[[files]]
file = "mods/fabric-api.pw.toml"
@@ -31,7 +31,7 @@ metafile = true
[[files]]
file = "mods/iliketomoveit-0.0.0-alpha.18.jar"
hash = "bd0467d186737b59996a8b1589a7c1837c990890f1b21154aaca614fb042c556"
hash = "a445606ebd5f1a35efdc205de87e4b6b83720d31b06787ae67cc21bc19df9e26"
[[files]]
file = "mods/iris.pw.toml"
@@ -40,32 +40,32 @@ metafile = true
[[files]]
file = "mods/itsalive-0.0.0-alpha.38.jar"
hash = "dd1869166cfeeb36b19b7e243e7ece32c925d362aa80782076d493decc6e2871"
hash = "d4605837e99bcbf86bbb46a1a71931a39b8e3087cdb0bee648b61996360b942e"
[[files]]
file = "mods/jei.pw.toml"
hash = "9cc4a91f57effc48b94f6acc1f43067bb8eb99fd1df3397612c55761de9ec2c2"
hash = "80d0fa55c1bbc0659e792b047c2bb64c446c2bf92557d9d74777333a8a68a318"
metafile = true
[[files]]
file = "mods/masterkey-0.0.0-alpha.9.jar"
hash = "46ef9947e82368fbe60d696174b3a3c99960be29432f3ccd7daf2714927b5c12"
hash = "d36b860a0bae9a4e52d2093146a1aeca8e7882b72462bd2cb8575fff262ebf23"
[[files]]
file = "mods/onlyfun-0.0.0-alpha.27.jar"
hash = "d01271cbccef9c3c5f66e3d56748cd69d953f9eb53d21c8a1575523d40e77c56"
hash = "a77aafb200faaf1162f6f5c0f047bfb5672702ca9d32d0e16e176f3f2455e24c"
[[files]]
file = "mods/ouch-0.0.0-alpha.11.jar"
hash = "ca612f8e660744af81d5a2612f78f8ad61dacf746a22474837e8b52a22bb3204"
hash = "d234613542669e2eddf6e393d3451b2a2786f18ae5a01a61940611199f5e16ef"
[[files]]
file = "mods/redstoner-0.0.0-alpha.16.jar"
hash = "e273042c0f7b12ed0a13da3f75f41903a741a29399da353ecd5144e67dcb680e"
file = "mods/redstoner-0.0.0-alpha.19.jar"
hash = "0891d96adb71c3843028dfe704ab33cac8470712277cef8f9527131f9c02e471"
[[files]]
file = "mods/sanctuary-0.0.0-alpha.132.jar"
hash = "72a946358be6039c706cf52563ffe61ec70477ffb4e7db80e71116758f5bd519"
file = "mods/sanctuary-0.0.0-alpha.138.jar"
hash = "233c84a9ba7ffb172618e541ab3635f3b675a858bacf80c4712feb329069c99c"
[[files]]
file = "mods/simple-voice-chat.pw.toml"
+4 -4
View File
@@ -1,14 +1,14 @@
name = "Just Enough Items (JEI)"
filename = "jei-26.2-fabric-30.29.0.199.jar"
filename = "jei-26.2-fabric-30.29.0.201.jar"
side = "both"
pin = true
[download]
url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/astSvyl6/jei-26.2-fabric-30.29.0.199.jar"
url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/d3HeviSL/jei-26.2-fabric-30.29.0.201.jar"
hash-format = "sha512"
hash = "2849ff6a4cc91822798f0c70e7749c298b911c1037fc74e9ab0881734b8d5cb6507fb3169b4a240ef6c37eb6f7c573794c46073ff352f160feee245233b2abe5"
hash = "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a"
[update]
[update.modrinth]
mod-id = "u6dRKJwZ"
version = "astSvyl6"
version = "d3HeviSL"
+2 -2
View File
@@ -1,12 +1,12 @@
name = "Sanctuary 26.2"
author = "KOKA99CAB"
version = "26.2.0-alpha.229"
version = "26.2.0-alpha.232"
pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "6a5b1811c2dd2b905a67cd817b8e377a8b68589431650775e1d8aabe04ff32e9"
hash = "0a35e9686a1c272ed05694b8509273334bf7770951349465c0280428b2c06338"
[versions]
fabric = "0.19.3"
+6 -6
View File
@@ -3,7 +3,7 @@
"game": "minecraft",
"name": "Sanctuary 26.2",
"summary": "Sanctuary 26.2 — progression, exploration, worldgen and multiplayer systems by KOKA99CAB.",
"versionId": "26.2.0-alpha.229",
"versionId": "26.2.0-alpha.232",
"files": [
{
"path": "mods/fabric-api-0.159.0+26.2.jar",
@@ -21,19 +21,19 @@
"fileSize": 2535793
},
{
"path": "mods/jei-26.2-fabric-30.29.0.199.jar",
"path": "mods/jei-26.2-fabric-30.29.0.201.jar",
"hashes": {
"sha1": "1d6ab9269be16f85fb13a34a36b34ad07a9b32a7",
"sha512": "2849ff6a4cc91822798f0c70e7749c298b911c1037fc74e9ab0881734b8d5cb6507fb3169b4a240ef6c37eb6f7c573794c46073ff352f160feee245233b2abe5"
"sha1": "e82447aff07e87a372cf817bc9c28b0d77b6f55c",
"sha512": "2279cb0ec4e41d9eebad80c2ecac76d19c8bc8e5aac69ba13f35b77494625c70d66edc74d59959116012bfb2f464b55806dd69fbf6387f25679b1553953e329a"
},
"env": {
"client": "required",
"server": "required"
},
"downloads": [
"https://cdn.modrinth.com/data/u6dRKJwZ/versions/astSvyl6/jei-26.2-fabric-30.29.0.199.jar"
"https://cdn.modrinth.com/data/u6dRKJwZ/versions/d3HeviSL/jei-26.2-fabric-30.29.0.201.jar"
],
"fileSize": 1849188
"fileSize": 1860103
},
{
"path": "mods/voicechat-fabric-2.6.22+26.2.jar",
+2 -2
View File
@@ -1,6 +1,6 @@
{
"schema_version": 1,
"pack_version": "26.2.0-alpha.229",
"pack_version": "26.2.0-alpha.232",
"release_channel": "alpha",
"minecraft_version": "26.2",
"fabric_loader_version": "0.19.3",
@@ -9,7 +9,7 @@
"project_id": "FgOqyAXd",
"project_slug": "sanctuary-koka99",
"project_url": "https://modrinth.com/modpack/sanctuary-koka99",
"primary_file": "sanctuary-26.2.0-alpha.229.mrpack",
"primary_file": "sanctuary-26.2.0-alpha.232.mrpack",
"shared_client_server_pack": true,
"update_owner": "packwiz-installer",
"check_on_launch": true,
@@ -3,7 +3,6 @@ package fr.koka99cab.sanctuary26.redstoner.block;
import com.mojang.serialization.MapCodec;
import fr.koka99cab.sanctuary26.redstoner.block.entity.TrophyPanelBlockEntity;
import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerRegistries;
import fr.koka99cab.sanctuary26.sanctuary.api.ranking.RankingUnit;
import java.util.Map;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -45,10 +44,10 @@ public final class TrophyPanelBlock extends BaseEntityBlock {
public static final MapCodec<TrophyPanelBlock> CODEC = simpleCodec(TrophyPanelBlock::new);
public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
private static final Map<Direction, VoxelShape> SHAPES = Map.of(
Direction.NORTH, Block.box(0.0D, 0.0D, 13.0D, 16.0D, 16.0D, 16.0D),
Direction.SOUTH, Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 3.0D),
Direction.WEST, Block.box(13.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D),
Direction.EAST, Block.box(0.0D, 0.0D, 0.0D, 3.0D, 16.0D, 16.0D)
Direction.NORTH, Block.box(0.0D, 0.0D, 14.0D, 16.0D, 16.0D, 16.0D),
Direction.SOUTH, Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 2.0D),
Direction.WEST, Block.box(14.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D),
Direction.EAST, Block.box(0.0D, 0.0D, 0.0D, 2.0D, 16.0D, 16.0D)
);
public TrophyPanelBlock(BlockBehaviour.Properties properties) {
@@ -120,18 +119,20 @@ public final class TrophyPanelBlock extends BaseEntityBlock {
if (level.isClientSide()) return InteractionResult.SUCCESS;
if (!(player instanceof ServerPlayer serverPlayer)
|| !(level.getBlockEntity(pos) instanceof TrophyPanelBlockEntity panel)) return InteractionResult.CONSUME;
if (player.isSecondaryUseActive()) return cycle(panel, serverPlayer);
if (player.isSecondaryUseActive()) return cycle(panel, serverPlayer, true);
boolean operator = serverPlayer.createCommandSourceStack().permissions()
.hasPermission(Permissions.COMMANDS_GAMEMASTER);
if (!panel.canConfigure(serverPlayer, operator)) {
serverPlayer.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.not_owner"));
return InteractionResult.CONSUME;
return cycle(panel, serverPlayer, false);
}
TrophyPanelBlockEntity.ConfigureResult result = panel.configure(serverPlayer, stack);
if (result == TrophyPanelBlockEntity.ConfigureResult.NO_METRIC) {
return cycle(panel, serverPlayer, false);
}
String key = switch (result) {
case SUCCESS -> "configured";
case NO_METRIC -> "no_metric";
case NO_METRIC -> throw new IllegalStateException("Handled above");
case NEWER_DATA -> "newer_data";
};
serverPlayer.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel." + key));
@@ -144,9 +145,7 @@ public final class TrophyPanelBlock extends BaseEntityBlock {
if (level.isClientSide()) return InteractionResult.SUCCESS;
if (!(player instanceof ServerPlayer serverPlayer)
|| !(level.getBlockEntity(pos) instanceof TrophyPanelBlockEntity panel)) return InteractionResult.CONSUME;
if (player.isSecondaryUseActive()) return cycle(panel, serverPlayer);
showDetails(panel, serverPlayer);
return InteractionResult.SUCCESS_SERVER;
return cycle(panel, serverPlayer, player.isSecondaryUseActive());
}
@Override
@@ -164,8 +163,9 @@ public final class TrophyPanelBlock extends BaseEntityBlock {
return state.rotate(mirror.getRotation(state.getValue(FACING)));
}
private static InteractionResult cycle(TrophyPanelBlockEntity panel, ServerPlayer player) {
if (!panel.cyclePage()) {
private static InteractionResult cycle(TrophyPanelBlockEntity panel, ServerPlayer player, boolean backwards) {
boolean changed = backwards ? panel.previousPage() : panel.nextPage();
if (!changed) {
player.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.newer_data"));
return InteractionResult.CONSUME;
}
@@ -173,25 +173,4 @@ public final class TrophyPanelBlock extends BaseEntityBlock {
panel.pageNumber(), panel.pageCount()));
return InteractionResult.SUCCESS_SERVER;
}
private static void showDetails(TrophyPanelBlockEntity panel, ServerPlayer player) {
TrophyPanelBlockEntity.ClientSnapshot snapshot = panel.visibleSnapshot();
RankingUnit unit = snapshot.unit();
ItemStack icon = panel.currentPage().icon();
Component metric = icon.isEmpty() ? Component.translatable(snapshot.translationKey())
: Component.translatable(snapshot.translationKey(), icon.getHoverName());
player.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.header", metric,
panel.pageNumber(), panel.pageCount()));
for (TrophyPanelBlockEntity.ClientEntry entry : snapshot.podium()) {
player.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.podium",
entry.rank(), entry.name(), unit.format(entry.value())));
}
if (snapshot.ownerRank() > 0) {
player.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.owner_rank",
panel.ownerName(), snapshot.ownerRank(), unit.format(snapshot.ownerValue())));
} else {
player.sendSystemMessage(Component.translatable("message.redstoner.trophy_panel.owner_unranked",
panel.ownerName()));
}
}
}
@@ -36,6 +36,7 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
private static final int DATA_VERSION = 1;
private static final int REFRESH_INTERVAL_TICKS = 20;
private static final String CLIENT_SNAPSHOT_TAG = "VisibleSnapshot";
private static final String CLIENT_VALUES_VIEW_TAG = "ValuesView";
private static final Codec<Page> PAGE_CODEC = RecordCodecBuilder.create(instance -> instance.group(
Identifier.CODEC.fieldOf("metric").forGetter(Page::metricId),
ItemStack.OPTIONAL_CODEC.fieldOf("icon").forGetter(Page::icon)
@@ -60,6 +61,7 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
private String ownerName = "?";
private List<Page> pages = List.of(defaultPage());
private int currentPage;
private boolean valuesView;
private long lastRefreshTick = Long.MIN_VALUE;
private ClientSnapshot visibleSnapshot = ClientSnapshot.empty(SanctuaryRankingApi.defaultMetric());
@@ -104,15 +106,27 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
currentPage = Math.max(0, pages.indexOf(pages.stream()
.filter(page -> offered.stream().anyMatch(metric -> metric.id().equals(page.metricId())))
.findFirst().orElse(pages.getFirst())));
valuesView = false;
ownerName = cleanName(player.getGameProfile().name());
syncPersistent();
if (level instanceof ServerLevel serverLevel) refresh(serverLevel);
return ConfigureResult.SUCCESS;
}
public boolean cyclePage() {
public boolean nextPage() {
return movePage(1);
}
public boolean previousPage() {
return movePage(-1);
}
private boolean movePage(int offset) {
if (!writable() || pages.isEmpty()) return false;
currentPage = TrophyPanelRules.nextPage(currentPage, pages.size());
TrophyPanelRules.DisplayPage displayPage = TrophyPanelRules.displayPageByOffset(
currentPage, valuesView, pages.size(), offset);
currentPage = displayPage.metricPage();
valuesView = displayPage.valuesView();
syncPersistent();
if (level instanceof ServerLevel serverLevel) refresh(serverLevel);
return true;
@@ -123,11 +137,15 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
}
public int pageNumber() {
return currentPage + 1;
return TrophyPanelRules.displayPageNumber(currentPage, valuesView, pages.size());
}
public int pageCount() {
return pages.size();
return TrophyPanelRules.displayPageCount(pages.size());
}
public boolean valuesView() {
return valuesView;
}
public String ownerName() {
@@ -166,6 +184,7 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
pages = input.read("Pages", PAGE_CODEC.listOf(0, TrophyPanelRules.MAX_PAGES))
.map(TrophyPanelBlockEntity::sanitizePages).orElseGet(() -> List.of(defaultPage()));
currentPage = Math.clamp(input.getIntOr("CurrentPage", 0), 0, pages.size() - 1);
valuesView = input.getBooleanOr(CLIENT_VALUES_VIEW_TAG, false);
visibleSnapshot = input.read(CLIENT_SNAPSHOT_TAG, CLIENT_SNAPSHOT_CODEC)
.orElseGet(() -> ClientSnapshot.empty(metricFor(currentPage().metricId())));
}
@@ -179,6 +198,7 @@ public final class TrophyPanelBlockEntity extends BlockEntity implements ItemOwn
public CompoundTag getUpdateTag(HolderLookup.Provider lookup) {
CompoundTag tag = saveCustomOnly(lookup);
tag.store(CLIENT_SNAPSHOT_TAG, CLIENT_SNAPSHOT_CODEC, visibleSnapshot);
tag.putBoolean(CLIENT_VALUES_VIEW_TAG, valuesView);
return tag;
}
@@ -1,5 +1,6 @@
package fr.koka99cab.sanctuary26.redstoner.client.gui;
import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalKeyRules;
import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalMenu;
import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalRules;
import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalSort;
@@ -139,10 +140,9 @@ public final class StorageTerminalScreen extends AbstractContainerScreen<Storage
@Override
public boolean keyPressed(KeyEvent event) {
if (searchBox != null && searchBox.isFocused() && minecraft != null
&& minecraft.options.keyInventory.matches(event)) {
clearSearchFocus();
}
if (StorageTerminalKeyRules.capturesInventoryKey(
searchBox != null && searchBox.isFocused(), minecraft != null
&& minecraft.options.keyInventory.matches(event))) return true;
return super.keyPressed(event);
}
@@ -5,28 +5,31 @@ import com.mojang.math.Axis;
import fr.koka99cab.sanctuary26.redstoner.block.TrophyPanelBlock;
import fr.koka99cab.sanctuary26.redstoner.block.entity.TrophyPanelBlockEntity;
import fr.koka99cab.sanctuary26.redstoner.client.renderer.state.TrophyPanelRenderState;
import fr.koka99cab.sanctuary26.redstoner.trophy.TrophyPanelRules;
import fr.koka99cab.sanctuary26.sanctuary.api.ranking.RankingMetric;
import fr.koka99cab.sanctuary26.sanctuary.api.ranking.RankingUnit;
import fr.koka99cab.sanctuary26.sanctuary.api.ranking.SanctuaryRankingApi;
import java.util.Arrays;
import net.minecraft.client.gui.Font;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
import net.minecraft.client.renderer.item.ItemModelResolver;
import net.minecraft.client.renderer.state.level.CameraRenderState;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.network.chat.Component;
import net.minecraft.util.FormattedCharSequence;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.Vec3;
public final class TrophyPanelBlockEntityRenderer
implements BlockEntityRenderer<TrophyPanelBlockEntity, TrophyPanelRenderState> {
private final ItemModelResolver itemModelResolver;
private static final int MAX_TEXT_WIDTH = 90;
private static final float TEXT_SCALE = 0.010416667F;
private static final float[] LINE_HEIGHTS = {0.86F, 0.75F, 0.64F, 0.53F, 0.42F, 0.31F, 0.20F, 0.09F};
private static final int TEXT_COLOR = 0xFF3D281A;
private final Font font;
public TrophyPanelBlockEntityRenderer(BlockEntityRendererProvider.Context context) {
itemModelResolver = context.itemModelResolver();
font = context.font();
}
@@ -40,65 +43,52 @@ public final class TrophyPanelBlockEntityRenderer
float tickProgress, Vec3 cameraPos, ModelFeatureRenderer.CrumblingOverlay crumblingOverlay) {
BlockEntityRenderer.super.extractRenderState(panel, state, tickProgress, cameraPos, crumblingOverlay);
state.facing = panel.getBlockState().getValue(TrophyPanelBlock.FACING);
state.icon.clear();
Arrays.fill(state.lines, Component.empty());
ItemStack icon = panel.currentPage().icon();
state.hasIcon = !icon.isEmpty();
if (state.hasIcon) {
itemModelResolver.updateForTopItem(state.icon, icon, ItemDisplayContext.FIXED,
panel.level(), panel, (int) panel.getBlockPos().asLong());
}
TrophyPanelBlockEntity.ClientSnapshot snapshot = panel.visibleSnapshot();
RankingUnit unit = snapshot.unit();
state.metric = state.hasIcon ? Component.translatable(snapshot.translationKey(), icon.getHoverName())
: Component.translatable(snapshot.translationKey());
Component metric = SanctuaryRankingApi.displayName(
new RankingMetric(snapshot.metricId(), snapshot.translationKey(), unit), icon);
state.lines[0] = Component.translatable("block.redstoner.trophy_panel.page_title",
panel.pageNumber(), panel.pageCount(), metric);
if (snapshot.podium().isEmpty()) {
state.champion = Component.translatable("block.redstoner.trophy_panel.no_score");
state.lines[1] = Component.translatable("block.redstoner.trophy_panel.no_score");
} else {
TrophyPanelBlockEntity.ClientEntry champion = snapshot.podium().getFirst();
state.champion = Component.translatable("block.redstoner.trophy_panel.champion",
champion.name(), unit.format(champion.value()));
for (int index = 0; index < TrophyPanelRules.ENTRIES_PER_VIEW; index++) {
if (index >= snapshot.podium().size()) {
break;
}
TrophyPanelBlockEntity.ClientEntry entry = snapshot.podium().get(index);
state.lines[index + 1] = panel.valuesView()
? Component.translatable("block.redstoner.trophy_panel.value",
entry.rank(), unit.format(entry.value()))
: Component.translatable("block.redstoner.trophy_panel.player",
entry.rank(), entry.name());
}
}
state.owner = snapshot.ownerRank() > 0
? Component.translatable("block.redstoner.trophy_panel.owner_rank", panel.ownerName(),
snapshot.ownerRank(), unit.format(snapshot.ownerValue()))
: Component.translatable("block.redstoner.trophy_panel.owner_unranked", panel.ownerName());
state.page = Component.literal(panel.pageNumber() + "/" + panel.pageCount());
}
@Override
public void submit(TrophyPanelRenderState state, PoseStack poseStack,
SubmitNodeCollector submitNodeCollector, CameraRenderState cameraRenderState) {
float yRotation = -state.facing.toYRot();
if (state.hasIcon) submitIcon(state, poseStack, submitNodeCollector, yRotation);
submitText(state.metric, 0.72F, 0.0065F, state, poseStack, submitNodeCollector, yRotation, 0xFFE8B4);
submitText(state.champion, 0.52F, 0.0060F, state, poseStack, submitNodeCollector, yRotation, 0xFFFFFF);
submitText(state.owner, 0.36F, 0.0055F, state, poseStack, submitNodeCollector, yRotation, 0xB8D9FF);
submitText(state.page, 0.20F, 0.0050F, state, poseStack, submitNodeCollector, yRotation, 0xA0A0A0);
for (int index = 0; index < TrophyPanelRenderState.LINE_COUNT; index++) {
submitText(state.lines[index], LINE_HEIGHTS[index], state, poseStack, submitNodeCollector, yRotation);
}
}
private void submitIcon(TrophyPanelRenderState state, PoseStack poseStack,
SubmitNodeCollector submitNodeCollector, float yRotation) {
poseStack.pushPose();
poseStack.translate(0.5F, 0.89F, 0.5F);
poseStack.mulPose(Axis.YP.rotationDegrees(yRotation));
poseStack.translate(0.0F, 0.0F, -0.33F);
poseStack.scale(0.18F, 0.18F, 0.18F);
state.icon.submit(poseStack, submitNodeCollector, state.lightCoords, OverlayTexture.NO_OVERLAY, 0);
poseStack.popPose();
}
private void submitText(Component component, float y, float scale, TrophyPanelRenderState state,
PoseStack poseStack, SubmitNodeCollector submitNodeCollector, float yRotation, int color) {
FormattedCharSequence text = component.getVisualOrderText();
private void submitText(Component component, float y, TrophyPanelRenderState state,
PoseStack poseStack, SubmitNodeCollector submitNodeCollector, float yRotation) {
FormattedCharSequence text = font.split(component, MAX_TEXT_WIDTH).stream().findFirst()
.orElse(FormattedCharSequence.EMPTY);
float x = -font.width(text) / 2.0F;
poseStack.pushPose();
poseStack.translate(0.5F, y, 0.5F);
poseStack.mulPose(Axis.YP.rotationDegrees(yRotation));
poseStack.translate(0.0F, 0.0F, -0.331F);
poseStack.scale(scale, -scale, scale);
poseStack.scale(TEXT_SCALE, -TEXT_SCALE, TEXT_SCALE);
submitNodeCollector.submitText(poseStack, x, 0.0F, text, false, Font.DisplayMode.POLYGON_OFFSET,
color, state.lightCoords, 0, 0x30181818);
state.lightCoords, TEXT_COLOR, 0, 0);
poseStack.popPose();
}
}
@@ -1,16 +1,16 @@
package fr.koka99cab.sanctuary26.redstoner.client.renderer.state;
import fr.koka99cab.sanctuary26.redstoner.trophy.TrophyPanelRules;
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
import net.minecraft.client.renderer.item.ItemStackRenderState;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
public final class TrophyPanelRenderState extends BlockEntityRenderState {
public final ItemStackRenderState icon = new ItemStackRenderState();
public static final int LINE_COUNT = TrophyPanelRules.LINE_COUNT;
public final Component[] lines = new Component[LINE_COUNT];
public Direction facing = Direction.NORTH;
public boolean hasIcon;
public Component metric = Component.empty();
public Component champion = Component.empty();
public Component owner = Component.empty();
public Component page = Component.empty();
public TrophyPanelRenderState() {
java.util.Arrays.fill(lines, Component.empty());
}
}
@@ -12,7 +12,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.phys.Vec3;
public final class RedStonerNetworking {
public static final int PROTOCOL_VERSION = 7;
public static final int PROTOCOL_VERSION = 8;
private static boolean initialized;
private RedStonerNetworking() {
@@ -0,0 +1,10 @@
package fr.koka99cab.sanctuary26.redstoner.storage;
/** Keyboard routing shared by the terminal screen and its deterministic smoke test. */
public final class StorageTerminalKeyRules {
private StorageTerminalKeyRules() {}
public static boolean capturesInventoryKey(boolean searchFocused, boolean inventoryKey) {
return searchFocused && inventoryKey;
}
}
@@ -9,6 +9,9 @@ import net.minecraft.resources.Identifier;
/** Pure bounded rules shared by the trophy panel and its smoke tests. */
public final class TrophyPanelRules {
public static final int MAX_PAGES = 16;
public static final int LINE_COUNT = 8;
public static final int ENTRIES_PER_VIEW = LINE_COUNT - 1;
private static final int VIEWS_PER_METRIC = 2;
private TrophyPanelRules() {}
@@ -17,7 +20,36 @@ public final class TrophyPanelRules {
}
public static int nextPage(int currentPage, int pageCount) {
return pageCount <= 0 ? 0 : Math.floorMod(currentPage + 1, pageCount);
return pageByOffset(currentPage, pageCount, 1);
}
public static int previousPage(int currentPage, int pageCount) {
return pageByOffset(currentPage, pageCount, -1);
}
public static int pageByOffset(int currentPage, int pageCount, int offset) {
return pageCount <= 0 ? 0 : Math.floorMod(currentPage + offset, pageCount);
}
public static DisplayPage displayPageByOffset(int metricPage, boolean valuesView,
int metricCount, int offset) {
int safeMetricCount = Math.max(1, metricCount);
int safeMetricPage = Math.clamp(metricPage, 0, safeMetricCount - 1);
int currentDisplayPage = safeMetricPage * VIEWS_PER_METRIC + (valuesView ? 1 : 0);
int displayPage = Math.floorMod(currentDisplayPage + offset,
safeMetricCount * VIEWS_PER_METRIC);
return new DisplayPage(displayPage / VIEWS_PER_METRIC,
displayPage % VIEWS_PER_METRIC == 1);
}
public static int displayPageNumber(int metricPage, boolean valuesView, int metricCount) {
int safeMetricCount = Math.max(1, metricCount);
return Math.clamp(metricPage, 0, safeMetricCount - 1) * VIEWS_PER_METRIC
+ (valuesView ? 2 : 1);
}
public static int displayPageCount(int metricCount) {
return Math.max(1, metricCount) * VIEWS_PER_METRIC;
}
public static List<Identifier> mergeMetricIds(List<Identifier> current, List<Identifier> offered) {
@@ -26,4 +58,6 @@ public final class TrophyPanelRules {
if (offered != null) merged.addAll(offered);
return List.copyOf(new ArrayList<>(merged).subList(0, Math.min(MAX_PAGES, merged.size())));
}
public record DisplayPage(int metricPage, boolean valuesView) {}
}
@@ -64,6 +64,10 @@
"screen.redstoner.storage_terminal.error.too_large": "Network too large (maximum 128 storage blocks).",
"screen.redstoner.storage_terminal.error.locked": "The network contains a locked storage block.",
"block.redstoner.trophy_panel": "Trophy Panel",
"block.redstoner.trophy_panel.page_title": "[%s/%s] %s",
"block.redstoner.trophy_panel.podium": "#%s %s · %s",
"block.redstoner.trophy_panel.player": "#%s %s",
"block.redstoner.trophy_panel.value": "#%s %s",
"block.redstoner.trophy_panel.no_score": "No score yet",
"block.redstoner.trophy_panel.champion": "#1 %s · %s",
"block.redstoner.trophy_panel.owner_rank": "%s · #%s · %s",
@@ -64,6 +64,10 @@
"screen.redstoner.storage_terminal.error.too_large": "Réseau trop grand (128 stockages maximum).",
"screen.redstoner.storage_terminal.error.locked": "Le réseau contient un stockage verrouillé.",
"block.redstoner.trophy_panel": "Panneau de trophées",
"block.redstoner.trophy_panel.page_title": "[%s/%s] %s",
"block.redstoner.trophy_panel.podium": "#%s %s · %s",
"block.redstoner.trophy_panel.player": "#%s %s",
"block.redstoner.trophy_panel.value": "#%s %s",
"block.redstoner.trophy_panel.no_score": "Aucun score",
"block.redstoner.trophy_panel.champion": "#1 %s · %s",
"block.redstoner.trophy_panel.owner_rank": "%s · #%s · %s",
@@ -64,6 +64,10 @@
"screen.redstoner.storage_terminal.error.too_large": "Сеть слишком велика (не более 128 хранилищ).",
"screen.redstoner.storage_terminal.error.locked": "В сети есть запертое хранилище.",
"block.redstoner.trophy_panel": "Панель трофеев",
"block.redstoner.trophy_panel.page_title": "[%s/%s] %s",
"block.redstoner.trophy_panel.podium": "#%s %s · %s",
"block.redstoner.trophy_panel.player": "#%s %s",
"block.redstoner.trophy_panel.value": "#%s %s",
"block.redstoner.trophy_panel.no_score": "Результатов пока нет",
"block.redstoner.trophy_panel.champion": "#1 %s · %s",
"block.redstoner.trophy_panel.owner_rank": "%s · #%s · %s",
@@ -1,14 +1,12 @@
{
"parent": "minecraft:block/block",
"textures": {
"particle": "minecraft:block/dark_oak_planks",
"wood": "minecraft:block/dark_oak_planks",
"frame": "minecraft:block/gold_block",
"screen": "minecraft:block/black_concrete"
"particle": "minecraft:block/oak_planks",
"wood": "minecraft:block/oak_planks"
},
"elements": [
{
"from": [0, 0, 13],
"from": [0, 0, 14],
"to": [16, 16, 16],
"faces": {
"north": { "texture": "#wood" },
@@ -18,31 +16,6 @@
"up": { "texture": "#wood" },
"down": { "texture": "#wood" }
}
},
{
"from": [1.5, 1.5, 12.5],
"to": [14.5, 14.5, 13],
"faces": { "north": { "texture": "#screen" } }
},
{
"from": [0.5, 0.5, 12.25],
"to": [15.5, 1.5, 13],
"faces": { "north": { "texture": "#frame" } }
},
{
"from": [0.5, 14.5, 12.25],
"to": [15.5, 15.5, 13],
"faces": { "north": { "texture": "#frame" } }
},
{
"from": [0.5, 1.5, 12.25],
"to": [1.5, 14.5, 13],
"faces": { "north": { "texture": "#frame" } }
},
{
"from": [14.5, 1.5, 12.25],
"to": [15.5, 14.5, 13],
"faces": { "north": { "texture": "#frame" } }
}
]
}
+1 -1
View File
@@ -31,7 +31,7 @@
"system_type": "gameplay-system",
"namespace": "redstoner",
"data_version": 4,
"network_protocol": 7,
"network_protocol": 8,
"lifecycle": "${lifecycle}",
"pack_version": "${pack_version}",
"descriptions": {
@@ -27,6 +27,7 @@ public final class StorageTerminalSmoke {
verifyPagination();
verifyAggregationAndTransfers();
verifySearch();
verifySearchKeyboardRouting();
verifySorting();
verifyStableLayout();
}
@@ -145,6 +146,15 @@ public final class StorageTerminalSmoke {
"Terminal search retained an unrelated item");
}
private static void verifySearchKeyboardRouting() {
require(StorageTerminalKeyRules.capturesInventoryKey(true, true),
"The inventory key escaped the focused terminal search field");
require(!StorageTerminalKeyRules.capturesInventoryKey(false, true),
"The inventory key no longer closes an unfocused terminal");
require(!StorageTerminalKeyRules.capturesInventoryKey(true, false),
"The terminal captured an unrelated search-field key");
}
private static Holder<Item> stackable(Item item) {
return new Holder.Direct<>(item, DataComponentMap.builder()
.set(DataComponents.MAX_STACK_SIZE, 64).build());
@@ -15,6 +15,22 @@ public final class TrophyPanelRulesSmoke {
require(TrophyPanelRules.canConfigure(owner, visitor, true), "An operator cannot repair a panel");
require(TrophyPanelRules.nextPage(0, 3) == 1 && TrophyPanelRules.nextPage(2, 3) == 0,
"Public page cycling does not wrap");
require(TrophyPanelRules.previousPage(0, 3) == 2 && TrophyPanelRules.previousPage(2, 3) == 1,
"Reverse public page cycling does not wrap");
require(TrophyPanelRules.pageByOffset(4, 0, 1) == 0,
"An empty panel produced an invalid page index");
TrophyPanelRules.DisplayPage values = TrophyPanelRules.displayPageByOffset(0, false, 2, 1);
TrophyPanelRules.DisplayPage secondMetric = TrophyPanelRules.displayPageByOffset(
values.metricPage(), values.valuesView(), 2, 1);
TrophyPanelRules.DisplayPage wrapped = TrophyPanelRules.displayPageByOffset(0, false, 2, -1);
require(values.metricPage() == 0 && values.valuesView()
&& secondMetric.metricPage() == 1 && !secondMetric.valuesView()
&& wrapped.metricPage() == 1 && wrapped.valuesView(),
"Name and value views do not cycle as consecutive public pages");
require(TrophyPanelRules.LINE_COUNT == 8 && TrophyPanelRules.ENTRIES_PER_VIEW == 7
&& TrophyPanelRules.displayPageNumber(1, true, 2) == 4
&& TrophyPanelRules.displayPageCount(2) == 4,
"The panel does not use eight lines or number both metric views correctly");
Identifier first = Identifier.parse("sanctuary:first");
Identifier second = Identifier.parse("sanctuary:second");
+4 -3
View File
@@ -35,6 +35,7 @@ réelle matérialisée reçoit un identifiant persistant : elle peut passer du r
Une perte associée à un joueur lui reste réservée pendant 24 000 ticks avant de pouvoir rejoindre
les tirages historiques partagés ; une perte sans propriétaire est immédiatement partagée.
Chaque niveau génère exactement un coffre par cellule de 3 × 3 chunks dans les nouveaux chunks.
Tous les coffres vanilla de la Backroom, générés ou posés, deviennent des nœuds de butin renouvelés
toutes les 12 000 ticks lors de leur prochaine ouverture. Le renouvellement rend au registre les
objets perdus non pris, efface le contenu ordinaire et produit le plus souvent du vide ou des
@@ -75,9 +76,9 @@ numérotés de haut en bas afin quune chute fasse toujours avancer vers le ni
Les ouvertures entre deux niveaux sont calculées une seule fois puis appliquées à la fois au sol
supérieur et au plafond inférieur : une chute annoncée ne débouche donc pas sur un bloc fermé. Les
imperfections, morceaux suspendus et raccords volontairement cassés font partie de lesthétique,
mais les portes des couloirs restent traversables. Les lits de sortie restent rares, mais chacun
des cinq niveaux en génère exactement un par cellule de 10 × 10 chunks, sur un plancher praticable
propre à sa zone. Il nest donc plus nécessaire de remonter jusquaux Archives pour ressortir.
mais les portes des couloirs restent traversables. Chacun des cinq niveaux génère exactement un lit
de sortie par cellule de 3 × 3 chunks, sur un plancher praticable propre à sa zone. Il nest donc
plus nécessaire de parcourir une centaine de chunks ou de remonter jusquaux Archives pour ressortir.
La Backroom ne possède ni ciel, ni soleil, ni lune, ni étoiles, ni lumière ambiante. Son biome ne
déclare aucune créature et le serveur retire aussi toute entité de catégorie monstre qui y serait
+85 -14
View File
@@ -124,6 +124,22 @@ tasks.register("capeSyncPayloadSmoke", JavaExec) {
mainClass = "fr.koka99cab.sanctuary26.sanctuary.network.CapeSyncPayloadSmoke"
}
tasks.register("capeModelSmoke", JavaExec) {
group = "verification"
description = "Checks the double-sided shield-pattern plane used by banner capes."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryBannerCapeModelSmoke"
}
tasks.register("chickenArmorSmoke", JavaExec) {
group = "verification"
description = "Checks that only adult unarmored chickens accept armadillo-scute armor."
dependsOn tasks.named("testClasses")
classpath = sourceSets.test.runtimeClasspath
mainClass = "fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryChickenArmorSmoke"
}
tasks.register("inventorySortSmoke", JavaExec) {
group = "verification"
description = "Checks that storage stacks merge and sort while the hotbar row stays out of the sort."
@@ -199,7 +215,7 @@ tasks.register("verifyBlackMarket") {
def questData = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardData.java").text
def quests = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardService.java").text
def inventoryView = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/inventory/SanctuaryPlayerInventoryView.java").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| !data.contains('SAVE_KEY = "black_market"') || !data.contains("DATA_VERSION = 2")
|| !data.contains("ItemStack.CODEC.fieldOf(\"item\")") || !data.contains("replaceListing")
|| !service.contains("LISTING_FEE_RUBIES = 1") || !service.contains("COMMISSION_PERCENT = 5")
@@ -2915,7 +2931,7 @@ tasks.register("verifyShopCurrencyRowsRelease") {
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketService.java").text
def shop = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopService.java").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.117"
|| migration.shop_currency_inventory?.all_unlocked_rows_counted != true
|| migration.shop_currency_inventory?.overflow_rows_counted != true
@@ -3081,7 +3097,7 @@ tasks.register("verifyProgressivePauseMenu") {
"pack/migrations/26.2.0-alpha.190-progressive-pause-menu-to-alpha.191.json"))
def pauseMenu = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/PauseScreenMixin.java").text
def costs = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/progression/SanctuaryProgressionCosts.java").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.pack_version != "26.2.0-alpha.191"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.109"
|| migration.pause_menu?.progression_full_width != true
@@ -3119,7 +3135,7 @@ tasks.register("verifyShopPricingLayout") {
"pack/migrations/26.2.0-alpha.192-shop-pricing-layout-to-alpha.193.json"))
def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryShopScreen.java").text
def progression = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopProgression.java").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.110"
|| migration.shop_layout?.locked_offer_buttons != 6
|| migration.shop_layout?.button_slots != [4, 5, 6, 7, 8, 9]
@@ -3150,7 +3166,7 @@ tasks.register("verifyShopCsvBossGates") {
"pack/migrations/26.2.0-alpha.194-shop-csv-boss-gates-to-alpha.195.json"))
def provider = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopCatalogProvider.java").text
def catalog = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopOfferCatalog.java").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.pack_version != "26.2.0-alpha.195"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
|| migration.compatibility?.sanctuary_data_version != 11
@@ -3181,7 +3197,7 @@ tasks.register("verifyDeliveryBoxOrientation") {
def blockstate = new JsonSlurper().parse(
file("src/main/resources/assets/sanctuary/blockstates/delivery_box.json"))
def expectedVariants = ["facing=north", "facing=east", "facing=south", "facing=west"].toSet()
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
|| migration.mailbox?.id != "sanctuary:delivery_box"
|| migration.mailbox?.horizontal_facing != true
@@ -3209,7 +3225,7 @@ tasks.register("verifyInventoryShiftClick") {
def mixin = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/AbstractContainerMenuMixin.java").text
def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/AbstractContainerScreenMixin.java").text
def gui = file("INVENTORY_GUI.md").text
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| !transfer.contains("shouldAppendOverflow")
|| !transfer.contains("isVanillaStorageRange")
|| !transfer.contains("hotbarStart")
@@ -3255,7 +3271,7 @@ tasks.register("verifyQuestRequests") {
new JsonSlurper().parse(file("src/main/resources/data/sanctuary/loot_table/blocks/${path}.json"))
.pools[0].entries[0].name
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
|| migration.quest_requests?.save_key != "quest_requests"
|| migration.quest_requests?.data_version != 1
@@ -3317,7 +3333,7 @@ tasks.register("verifyQuestRequestContracts") {
def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.source?.pack_version != "26.2.0-alpha.198"
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.114"
|| migration.target?.pack_version != "26.2.0-alpha.199"
@@ -3386,7 +3402,7 @@ tasks.register("verifyQuestRequestEscrow") {
def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.source?.pack_version != "26.2.0-alpha.200"
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.115"
|| migration.target?.pack_version != "26.2.0-alpha.201"
@@ -3465,7 +3481,7 @@ tasks.register("verifyCraftableBannerCape") {
def locales = ["fr_fr", "en_us", "ru_ru"].collect {
new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.130"
|| migration.white_cape?.crafting_material_count != 6
|| migration.white_cape?.maximum_pattern_layers != 6
@@ -3493,6 +3509,57 @@ tasks.named("verifySanctuary") {
dependsOn tasks.named("verifyCraftableBannerCape")
}
tasks.register("verifyFinalSanctuaryTickets") {
group = "verification"
description = "Checks the shield-mapped banner cape and armadillo-scute chicken armor contracts."
inputs.files(
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryBannerCapeLayer.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryChickenArmorLayer.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/gameplay/SanctuaryChickenArmor.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/AnimalChickenArmorMixin.java"),
file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/LivingEntityChickenArmorMixin.java"),
file("src/main/resources/sanctuary.mixins.json"))
inputs.files(fileTree("src/main/resources/assets/sanctuary/lang") { include "*.json" })
doLast {
def capeRenderer = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryBannerCapeLayer.java").text
def armorLayer = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryChickenArmorLayer.java").text
def armorRules = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/gameplay/SanctuaryChickenArmor.java").text
def armorDamage = file(
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/LivingEntityChickenArmorMixin.java").text
def mixins = new JsonSlurper().parse(file("src/main/resources/sanctuary.mixins.json"))
def locales = ["fr_fr", "en_us", "ru_ru"].collect {
new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
}
if (project.version.toString() != "0.0.0-alpha.138"
|| !capeRenderer.contains("SHIELD_FACE_WIDTH = 12.0F")
|| !capeRenderer.contains("SHIELD_FACE_HEIGHT = 22.0F")
|| !capeRenderer.contains("CAPE_WIDTH / SHIELD_FACE_WIDTH")
|| !capeRenderer.contains("CAPE_HEIGHT / SHIELD_FACE_HEIGHT")
|| !capeRenderer.contains('addOrReplaceChild("front"')
|| !capeRenderer.contains('addOrReplaceChild("back"')
|| !capeRenderer.contains("Set.of(Direction.NORTH)")
|| !capeRenderer.contains("model, state, false, appearance.baseColor()")
|| !armorLayer.contains("EquipmentClientInfo.LayerType.WOLF_BODY")
|| !armorRules.contains("held.is(Items.WOLF_ARMOR)")
|| !armorRules.contains("DamageTypeTags.BYPASSES_WOLF_ARMOR")
|| !armorDamage.contains("armor.hurtAndBreak")
|| !mixins.mixins.contains("AnimalChickenArmorMixin")
|| !mixins.mixins.contains("LivingEntityChickenArmorMixin")
|| !mixins.client.contains("client.ChickenRendererMixin")
|| !mixins.client.contains("client.ChickenRenderStateMixin")
|| locales.any { !it.containsKey("tooltip.sanctuary.chicken_armor") }) {
throw new GradleException("Sanctuary alpha.136 final-ticket contract is incomplete")
}
}
}
tasks.named("verifySanctuary") {
dependsOn tasks.named("verifyFinalSanctuaryTickets")
}
tasks.register("verifyAlphaIndev") {
group = "verification"
description = "Checks the alpha.122 finite Indev world, migration and attribution contract."
@@ -3520,7 +3587,7 @@ tasks.register("verifyAlphaIndev") {
def locales = ["fr_fr", "en_us", "ru_ru"].collect {
new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.122"
|| migration.alpha_world?.dimension != "sanctuary:alpha"
|| migration.alpha_world?.legacy_dimension != "portals:alpha"
@@ -3580,7 +3647,7 @@ tasks.register("verifyBackroom") {
def locales = ["fr_fr", "en_us", "ru_ru"].collect {
new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${it}.json"))
}
if (project.version.toString() != "0.0.0-alpha.135"
if (project.version.toString() != "0.0.0-alpha.138"
|| migration.source_data_version != 13 || migration.target_data_version != 14
|| migration.integration_modules?.anotherworld?.source != "0.0.0-alpha.56"
|| migration.integration_modules?.anotherworld?.target != "0.0.0-alpha.57"
@@ -3606,10 +3673,12 @@ tasks.register("verifyBackroom") {
|| !chest.contains("REFRESH_TICKS = 12_000L") || !chest.contains("ordinal == 3")
|| !architecture.contains("PLAYABLE_RADIUS = 2_000")
|| !architecture.contains("BackroomMaterialApi.anomalyMaterial()")
|| !architecture.contains("placeLootLandmark")
|| !layout.contains("WORLD_MIN_Y = -64") || !layout.contains("WORLD_MAX_Y_EXCLUSIVE = 384")
|| !layout.contains("LEVEL_0(295, 383)") || !layout.contains("LEVEL_4(-64, 27)")
|| !layout.contains("mazeConnected") || !layout.contains("RoomCorner")
|| !layout.contains("EXIT_BED_CELL_SIZE_CHUNKS = 10")
|| !layout.contains("LOOT_CHEST_CELL_SIZE_CHUNKS = 3") || !layout.contains("lootChestChunk")
|| !layout.contains("EXIT_BED_CELL_SIZE_CHUNKS = 3")
|| !layout.contains("exitBedChunk") || !layout.contains("exitBedFloor")
|| !materialApi.contains("registerAnomalyMaterial")
|| locales.any { !it.containsKey("dimension.sanctuary.backroom")
@@ -3640,6 +3709,8 @@ tasks.named("check") {
dependsOn tasks.named("alphaIndevGeneratorSmoke")
dependsOn tasks.named("capeJoinSyncSmoke")
dependsOn tasks.named("capeSyncPayloadSmoke")
dependsOn tasks.named("capeModelSmoke")
dependsOn tasks.named("chickenArmorSmoke")
dependsOn tasks.named("inventorySortSmoke")
dependsOn tasks.named("entityPolicySmoke")
dependsOn tasks.named("verifyAlphaIndev")
@@ -4,9 +4,9 @@ import java.util.List;
import java.util.UUID;
import net.minecraft.resources.Identifier;
/** Server snapshot intentionally bounded to one visible metric and three podium entries. */
/** Server snapshot intentionally bounded to one visible metric and seven panel rows. */
public record RankingSnapshot(RankingMetric metric, List<Entry> podium, Placement owner) {
public static final int MAX_PODIUM_SIZE = 3;
public static final int MAX_PODIUM_SIZE = 7;
public RankingSnapshot {
podium = podium == null ? List.of() : List.copyOf(podium.stream().limit(MAX_PODIUM_SIZE).toList());
@@ -8,6 +8,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
@@ -66,6 +67,11 @@ public final class SanctuaryRankingApi {
return metrics;
}
/** Localized label for a metric configured from its representative item. */
public static Component displayName(RankingMetric metric, ItemStack icon) {
return VanillaRankingMetric.displayName(metric, icon);
}
public static boolean eligible(ServerPlayer player) {
return isRealOnlinePlayer(player) && !player.isCreative() && !player.isSpectator();
}
@@ -5,12 +5,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.stats.Stats;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.SpawnEggItem;
/** Stable encoding and server reader for persisted vanilla statistic identifiers. */
final class VanillaRankingMetric {
@@ -43,6 +45,13 @@ final class VanillaRankingMetric {
static List<RankingMetric> itemMetrics(ItemStack icon) {
if (icon == null || icon.isEmpty()) return List.of();
Item item = icon.getItem();
if (item instanceof SpawnEggItem) {
var entityType = SpawnEggItem.getType(icon);
if (entityType == null) return List.of();
Identifier entityId = BuiltInRegistries.ENTITY_TYPE.getKey(entityType);
return List.of(new RankingMetric(id(Identifier.withDefaultNamespace("killed"), entityId),
"metric.sanctuary.ranking.killed", RankingUnit.COUNT));
}
Identifier itemId = BuiltInRegistries.ITEM.getKey(item);
List<RankingMetric> metrics = new ArrayList<>();
for (String family : ITEM_FAMILIES) {
@@ -53,6 +62,18 @@ final class VanillaRankingMetric {
return List.copyOf(metrics);
}
static Component displayName(RankingMetric metric, ItemStack icon) {
Source source = parse(metric.id()).orElse(null);
if (source != null && source.type().getPath().equals("killed")) {
Component target = BuiltInRegistries.ENTITY_TYPE.getOptional(source.target())
.map(type -> type.getDescription()).orElseGet(() -> iconName(icon));
return Component.translatable(metric.translationKey(), target);
}
return icon == null || icon.isEmpty()
? Component.translatable(metric.translationKey())
: Component.translatable(metric.translationKey(), icon.getHoverName());
}
static Optional<Source> parse(Identifier metricId) {
if (!metricId.getNamespace().equals(SanctuaryMod.MOD_ID)
|| !metricId.getPath().startsWith(PREFIX)) return Optional.empty();
@@ -79,10 +100,16 @@ final class VanillaRankingMetric {
.map(item -> (long) player.getStats().getValue(Stats.ITEM_PICKED_UP, item)).orElse(0L);
case "dropped" -> BuiltInRegistries.ITEM.getOptional(target)
.map(item -> (long) player.getStats().getValue(Stats.ITEM_DROPPED, item)).orElse(0L);
case "killed" -> BuiltInRegistries.ENTITY_TYPE.getOptional(target)
.map(type -> (long) player.getStats().getValue(Stats.ENTITY_KILLED, type)).orElse(0L);
case "custom" -> (long) player.getStats().getValue(Stats.CUSTOM, target);
default -> 0L;
};
}
private static Component iconName(ItemStack icon) {
return icon == null || icon.isEmpty() ? Component.literal("?") : icon.getHoverName();
}
record Source(Identifier type, Identifier target) {}
}
@@ -2,6 +2,7 @@ package fr.koka99cab.sanctuary26.sanctuary.client;
import com.mojang.blaze3d.vertex.PoseStack;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import java.util.Set;
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityRenderLayerRegistrationCallback;
import net.fabricmc.fabric.api.client.rendering.v1.ModelLayerRegistry;
import net.minecraft.client.model.geom.ModelLayerLocation;
@@ -23,6 +24,7 @@ import net.minecraft.client.renderer.entity.state.AvatarRenderState;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.client.resources.model.EquipmentAssetManager;
import net.minecraft.client.resources.model.EquipmentClientInfo;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.item.ItemStack;
@@ -30,6 +32,10 @@ import net.minecraft.world.item.equipment.Equippable;
/** Renders a banner-decorated cape with vanilla cape physics and banner pattern sprites. */
public final class SanctuaryBannerCapeLayer extends RenderLayer<AvatarRenderState, PlayerModel> {
private static final float SHIELD_FACE_WIDTH = 12.0F;
private static final float SHIELD_FACE_HEIGHT = 22.0F;
private static final float CAPE_WIDTH = 10.0F;
private static final float CAPE_HEIGHT = 16.0F;
private static final ModelLayerLocation MODEL_LAYER =
new ModelLayerLocation(SanctuaryMod.id("banner_cape"), "main");
private final PlayerCapeModel model;
@@ -61,17 +67,27 @@ public final class SanctuaryBannerCapeLayer extends RenderLayer<AvatarRenderStat
helper.register(new SanctuaryBannerCapeLayer(parent, context));
}
private static LayerDefinition createLayer() {
static LayerDefinition createLayer() {
MeshDefinition mesh = PlayerModel.createMesh(CubeDeformation.NONE, false);
PartDefinition root = mesh.getRoot().clearRecursively();
PartDefinition body = root.getChild("body");
body.addOrReplaceChild("cape", CubeListBuilder.create().texOffs(0, 0)
.addBox(-5.0F, 0.0F, -1.0F, 10.0F, 16.0F, 1.0F,
CubeDeformation.NONE, 2.0F, 2.5F),
PartPose.offsetAndRotation(0.0F, 0.0F, 2.0F, 0.0F, (float) Math.PI, 0.0F));
PartDefinition cape = body.addOrReplaceChild("cape", CubeListBuilder.create(),
PartPose.offsetAndRotation(0.0F, 0.0F, 2.0F, 0.0F, (float) Math.PI, 0.0F)
.scaled(CAPE_WIDTH / SHIELD_FACE_WIDTH, CAPE_HEIGHT / SHIELD_FACE_HEIGHT, 1.0F));
cape.addOrReplaceChild("front", shieldPatternFace(), PartPose.offset(0.0F, 0.0F, -1.0F));
cape.addOrReplaceChild("back", shieldPatternFace(),
PartPose.offsetAndRotation(0.0F, 0.0F, -1.0F, 0.0F, (float) Math.PI, 0.0F));
return LayerDefinition.create(mesh, 64, 64);
}
private static CubeListBuilder shieldPatternFace() {
// Shield patterns paint this exact 12x22 UV island. Two opposed planes keep
// the cloth visible from both sides without rendering the shield thickness or handle.
return CubeListBuilder.create().texOffs(1, 1)
.addBox(-6.0F, 0.0F, 0.0F, SHIELD_FACE_WIDTH, SHIELD_FACE_HEIGHT, 0.0F,
Set.of(Direction.NORTH));
}
@Override
public void submit(PoseStack poseStack, SubmitNodeCollector collector, int packedLight,
AvatarRenderState state, float yRot, float xRot) {
@@ -85,7 +101,7 @@ public final class SanctuaryBannerCapeLayer extends RenderLayer<AvatarRenderStat
poseStack.translate(0.0F, -0.053125F, 0.06875F);
}
BannerRenderer.submitPatterns(context.getSprites(), poseStack, collector, packedLight,
OverlayTexture.NO_OVERLAY, model, state, true, appearance.baseColor(),
OverlayTexture.NO_OVERLAY, model, state, false, appearance.baseColor(),
appearance.patterns(), null);
poseStack.popPose();
}
@@ -0,0 +1,64 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
import com.mojang.blaze3d.vertex.PoseStack;
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityRenderLayerRegistrationCallback;
import net.fabricmc.fabric.api.client.rendering.v1.ModelLayerRegistry;
import net.minecraft.client.model.animal.chicken.ChickenModel;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.entity.ChickenRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.client.renderer.entity.RenderLayerParent;
import net.minecraft.client.renderer.entity.layers.EquipmentLayerRenderer;
import net.minecraft.client.renderer.entity.layers.RenderLayer;
import net.minecraft.client.renderer.entity.state.ChickenRenderState;
import net.minecraft.client.resources.model.EquipmentClientInfo;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.equipment.Equippable;
/** Renders vanilla armadillo-scute equipment around an adult chicken's torso. */
public final class SanctuaryChickenArmorLayer extends RenderLayer<ChickenRenderState, ChickenModel> {
private static final ModelLayerLocation MODEL_LAYER =
new ModelLayerLocation(SanctuaryMod.id("chicken_armor"), "main");
private final SanctuaryChickenArmorModel model;
private final EquipmentLayerRenderer equipmentRenderer;
private SanctuaryChickenArmorLayer(RenderLayerParent<ChickenRenderState, ChickenModel> parent,
EntityRendererProvider.Context context) {
super(parent);
model = SanctuaryChickenArmorModel.bake(context.bakeLayer(MODEL_LAYER));
equipmentRenderer = context.getEquipmentRenderer();
}
public static void initialize() {
ModelLayerRegistry.registerModelLayer(MODEL_LAYER, SanctuaryChickenArmorModel::createLayer);
LivingEntityRenderLayerRegistrationCallback.EVENT.register((entityType, renderer, helper, context) -> {
if (entityType == EntityTypes.CHICKEN && renderer instanceof ChickenRenderer chickenRenderer) {
register(helper, chickenRenderer, context);
}
});
}
@SuppressWarnings({"unchecked", "rawtypes"})
private static void register(LivingEntityRenderLayerRegistrationCallback.RegistrationHelper helper,
ChickenRenderer renderer, EntityRendererProvider.Context context) {
RenderLayerParent<ChickenRenderState, ChickenModel> parent =
(RenderLayerParent<ChickenRenderState, ChickenModel>) (RenderLayerParent) renderer;
helper.register(new SanctuaryChickenArmorLayer(parent, context));
}
@Override
public void submit(PoseStack poseStack, SubmitNodeCollector collector, int packedLight,
ChickenRenderState state, float yRot, float xRot) {
if (state.isBaby || state.isInvisibleToPlayer) return;
ItemStack armor = ((SanctuaryChickenArmorRenderState) state).sanctuary$chickenArmor();
Equippable equippable = armor.get(DataComponents.EQUIPPABLE);
if (equippable == null || equippable.assetId().isEmpty()) return;
equipmentRenderer.renderLayers(EquipmentClientInfo.LayerType.WOLF_BODY,
equippable.assetId().get(), model, state, armor, poseStack, collector,
packedLight, state.outlineColor);
}
}
@@ -0,0 +1,32 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.model.geom.PartPose;
import net.minecraft.client.model.geom.builders.CubeDeformation;
import net.minecraft.client.model.geom.builders.CubeListBuilder;
import net.minecraft.client.model.geom.builders.LayerDefinition;
import net.minecraft.client.model.geom.builders.MeshDefinition;
import net.minecraft.client.renderer.entity.state.ChickenRenderState;
/** A thin torso shell using the vanilla armadillo-scute equipment UVs. */
public final class SanctuaryChickenArmorModel extends EntityModel<ChickenRenderState> {
private SanctuaryChickenArmorModel(ModelPart root) {
super(root);
}
public static SanctuaryChickenArmorModel bake(ModelPart root) {
return new SanctuaryChickenArmorModel(root);
}
public static LayerDefinition createLayer() {
MeshDefinition mesh = new MeshDefinition();
mesh.getRoot().addOrReplaceChild("body",
CubeListBuilder.create().texOffs(18, 14)
.addBox(-3.0F, -4.0F, -3.0F, 6.0F, 8.0F, 6.0F,
new CubeDeformation(0.45F)),
PartPose.offsetAndRotation(0.0F, 16.0F, 0.0F,
(float) (Math.PI / 2.0D), 0.0F, 0.0F));
return LayerDefinition.create(mesh, 64, 32);
}
}
@@ -0,0 +1,10 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
import net.minecraft.world.item.ItemStack;
/** Mixin-backed bridge carrying chicken body armor into the extracted render state. */
public interface SanctuaryChickenArmorRenderState {
ItemStack sanctuary$chickenArmor();
void sanctuary$setChickenArmor(ItemStack armor);
}
@@ -120,6 +120,7 @@ public final class SanctuaryClient implements ClientModInitializer {
SanctuaryHealthPreview.register();
CelestialSpyglassSelection.register();
SanctuaryBannerCapeLayer.initialize();
SanctuaryChickenArmorLayer.initialize();
EntityRendererRegistry.register(SanctuaryRegistries.SEAT, NoopRenderer::new);
ClientTickEvents.END_CLIENT_TICK.register(SanctuaryClient::tick);
ClientPlayNetworking.registerGlobalReceiver(ProgressionSnapshotPayload.ID, (payload, context) ->
@@ -0,0 +1,25 @@
package fr.koka99cab.sanctuary26.sanctuary.gameplay;
import net.minecraft.tags.DamageTypeTags;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
/** Shared server rules for fitting vanilla armadillo-scute armor to adult chickens. */
public final class SanctuaryChickenArmor {
private SanctuaryChickenArmor() {
}
public static boolean canEquip(ItemStack equipped, ItemStack held, boolean baby) {
return !baby && equipped.isEmpty() && held.is(Items.WOLF_ARMOR);
}
public static boolean canRepair(ItemStack equipped, ItemStack held) {
return equipped.is(Items.WOLF_ARMOR) && equipped.isDamaged()
&& equipped.isValidRepairItem(held);
}
public static boolean absorbs(ItemStack equipped, DamageSource source) {
return equipped.is(Items.WOLF_ARMOR) && !source.is(DamageTypeTags.BYPASSES_WOLF_ARMOR);
}
}
@@ -0,0 +1,43 @@
package fr.koka99cab.sanctuary26.sanctuary.mixin;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryChickenArmor;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.animal.Animal;
import net.minecraft.world.entity.animal.chicken.Chicken;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
/** Lets adult chickens wear and repair the vanilla armadillo-scute wolf armor. */
@Mixin(Animal.class)
abstract class AnimalChickenArmorMixin {
@Inject(method = "mobInteract", at = @At("HEAD"), cancellable = true)
private void sanctuary$handleChickenArmor(Player player, InteractionHand hand,
CallbackInfoReturnable<InteractionResult> cir) {
if (!((Object) this instanceof Chicken chicken)) return;
ItemStack held = player.getItemInHand(hand);
ItemStack equipped = chicken.getItemBySlot(EquipmentSlot.BODY);
if (SanctuaryChickenArmor.canEquip(equipped, held, chicken.isBaby())) {
chicken.setItemSlot(EquipmentSlot.BODY, held.copyWithCount(1));
chicken.setGuaranteedDrop(EquipmentSlot.BODY);
held.consume(1, player);
chicken.playSound(SoundEvents.ARMOR_EQUIP_WOLF.value());
cir.setReturnValue(InteractionResult.SUCCESS);
return;
}
if (SanctuaryChickenArmor.canRepair(equipped, held)) {
held.consume(1, player);
int repairUnit = Mth.ceil(equipped.getMaxDamage() * 0.125F);
equipped.setDamageValue(Math.max(0, equipped.getDamageValue() - repairUnit));
chicken.playSound(SoundEvents.WOLF_ARMOR_REPAIR);
cir.setReturnValue(InteractionResult.SUCCESS);
}
}
}
@@ -2,9 +2,11 @@ package fr.koka99cab.sanctuary26.sanctuary.mixin;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanionPowers;
import java.util.function.Consumer;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.SpawnEggItem;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.TooltipDisplay;
@@ -21,5 +23,9 @@ abstract class ItemTooltipMixin {
if (stack.getItem() instanceof SpawnEggItem) {
SanctuaryCompanionPowers.appendPowerTooltip(stack, tooltip);
}
if (stack.is(Items.WOLF_ARMOR)) {
tooltip.accept(Component.translatable("tooltip.sanctuary.chicken_armor")
.withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,44 @@
package fr.koka99cab.sanctuary26.sanctuary.mixin;
import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryChickenArmor;
import net.minecraft.core.particles.ItemParticleOption;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.Mth;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Crackiness;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.animal.chicken.Chicken;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Gives armored chickens the same damage-absorption contract as armored wolves. */
@Mixin(LivingEntity.class)
abstract class LivingEntityChickenArmorMixin {
@Inject(method = "actuallyHurt", at = @At("HEAD"), cancellable = true)
private void sanctuary$absorbChickenDamage(ServerLevel level, DamageSource source,
float damage, CallbackInfo ci) {
if (!((Object) this instanceof Chicken chicken)) return;
ItemStack armor = chicken.getItemBySlot(EquipmentSlot.BODY);
if (!SanctuaryChickenArmor.absorbs(armor, source)) return;
int damageBefore = armor.getDamageValue();
int maxDamage = armor.getMaxDamage();
armor.hurtAndBreak(Mth.ceil(damage), chicken, EquipmentSlot.BODY);
chicken.playSound(SoundEvents.WOLF_ARMOR_DAMAGE);
if (Crackiness.WOLF_ARMOR.byDamage(damageBefore, maxDamage)
!= Crackiness.WOLF_ARMOR.byDamage(chicken.getItemBySlot(EquipmentSlot.BODY))) {
chicken.playSound(SoundEvents.WOLF_ARMOR_CRACK);
level.sendParticles(new ItemParticleOption(ParticleTypes.ITEM,
Items.ARMADILLO_SCUTE), chicken.getX(), chicken.getY() + 0.5D,
chicken.getZ(), 12, 0.2D, 0.15D, 0.2D, 0.08D);
}
ci.cancel();
}
}
@@ -0,0 +1,23 @@
package fr.koka99cab.sanctuary26.sanctuary.mixin.client;
import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryChickenArmorRenderState;
import net.minecraft.client.renderer.entity.state.ChickenRenderState;
import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
/** Stores synchronized chicken body armor on the client render state. */
@Mixin(ChickenRenderState.class)
abstract class ChickenRenderStateMixin implements SanctuaryChickenArmorRenderState {
@Unique private ItemStack sanctuary$chickenArmor = ItemStack.EMPTY;
@Override
public ItemStack sanctuary$chickenArmor() {
return sanctuary$chickenArmor;
}
@Override
public void sanctuary$setChickenArmor(ItemStack armor) {
sanctuary$chickenArmor = armor == null ? ItemStack.EMPTY : armor;
}
}
@@ -0,0 +1,22 @@
package fr.koka99cab.sanctuary26.sanctuary.mixin.client;
import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryChickenArmorRenderState;
import net.minecraft.client.renderer.entity.ChickenRenderer;
import net.minecraft.client.renderer.entity.state.ChickenRenderState;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.animal.chicken.Chicken;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Copies vanilla-synchronized body equipment into each chicken render state. */
@Mixin(ChickenRenderer.class)
abstract class ChickenRendererMixin {
@Inject(method = "extractRenderState", at = @At("TAIL"))
private void sanctuary$extractChickenArmor(Chicken chicken, ChickenRenderState state,
float partialTick, CallbackInfo ci) {
((SanctuaryChickenArmorRenderState) state).sanctuary$setChickenArmor(
chicken.getItemBySlot(EquipmentSlot.BODY).copy());
}
}
@@ -77,7 +77,7 @@ public final class BackroomArchitectureFeature extends Feature<NoneFeatureConfig
buildCity(level, worldSeed, startX, startZ, chunkX, chunkZ);
buildUtilities(level, worldSeed, startX, startZ);
buildGlitchMaze(level, worldSeed, startX, startZ);
placeLootLandmarks(level, worldSeed, startX, startZ, chunkX, chunkZ, random);
placeLootLandmarks(level, worldSeed, startX, startZ, chunkX, chunkZ);
placeRareAnomaly(level, startX, startZ, random);
return true;
}
@@ -416,14 +416,11 @@ public final class BackroomArchitectureFeature extends Feature<NoneFeatureConfig
}
private static void placeLootLandmarks(WorldGenLevel level, long seed, int x0, int z0,
int chunkX, int chunkZ, Random random) {
if (random.nextInt(5) == 0) {
BackroomLevel zone = BackroomLevel.values()[random.nextInt(BackroomLevel.values().length)];
int floorY = BackroomLayout.exitBedFloor(zone);
int x = x0 + 7, y = floorY + 1, z = z0 + 7;
set(level, x, floorY, z, floorMaterial(zone));
set(level, x, y, z, Blocks.CHEST.defaultBlockState());
set(level, x, y + 1, z, Blocks.AIR.defaultBlockState());
int chunkX, int chunkZ) {
for (BackroomLevel zone : BackroomLevel.values()) {
if (BackroomLayout.lootChestChunk(seed, zone, chunkX, chunkZ)) {
placeLootLandmark(level, zone, x0 + 7, z0 + 7);
}
}
for (BackroomLevel zone : BackroomLevel.values()) {
if (!BackroomLayout.exitBedChunk(seed, zone, chunkX, chunkZ)) continue;
@@ -438,6 +435,16 @@ public final class BackroomArchitectureFeature extends Feature<NoneFeatureConfig
}
}
private static void placeLootLandmark(WorldGenLevel level, BackroomLevel zone, int x, int z) {
int floorY = BackroomLayout.exitBedFloor(zone);
for (int dx = -1; dx <= 1; dx++) for (int dz = -1; dz <= 1; dz++) {
set(level, x + dx, floorY, z + dz, floorMaterial(zone));
for (int dy = 1; dy <= 2; dy++) set(level, x + dx, floorY + dy, z + dz,
Blocks.AIR.defaultBlockState());
}
set(level, x, floorY + 1, z, Blocks.CHEST.defaultBlockState());
}
private static void placeRareAnomaly(WorldGenLevel level, int x0, int z0, Random random) {
if (random.nextInt(96) == 0) {
Block anomaly = BackroomMaterialApi.anomalyMaterial();
@@ -13,7 +13,8 @@ public final class BackroomLayout {
public static final int ROOM_SIZE = 16;
public static final int MAZE_FLOOR_Y = 8;
public static final int MAZE_ROOF_Y = 18;
public static final int EXIT_BED_CELL_SIZE_CHUNKS = 10;
public static final int EXIT_BED_CELL_SIZE_CHUNKS = 3;
public static final int LOOT_CHEST_CELL_SIZE_CHUNKS = 3;
private static final int HOLE_CELL_SIZE = 64;
private BackroomLayout() {}
@@ -91,7 +92,21 @@ public final class BackroomLayout {
return Math.floorMod((int) mix(seed ^ 0x43c2a1769f0e85bdL, chunkX, chunkZ), 11) == 0;
}
/** One deterministic, rare exit-bed chunk per grid cell and per vertical level. */
/** One easy-to-find loot landmark per three-by-three chunk cell and per vertical level. */
public static boolean lootChestChunk(long seed, BackroomLevel level, int chunkX, int chunkZ) {
Objects.requireNonNull(level, "level");
int cellX = Math.floorDiv(chunkX, LOOT_CHEST_CELL_SIZE_CHUNKS);
int cellZ = Math.floorDiv(chunkZ, LOOT_CHEST_CELL_SIZE_CHUNKS);
long hash = mix(seed ^ 0x354c6f3a82d9e107L ^ (long) level.ordinal() * 0x9e3779b97f4a7c15L,
cellX, cellZ);
int targetX = cellX * LOOT_CHEST_CELL_SIZE_CHUNKS
+ Math.floorMod((int) hash, LOOT_CHEST_CELL_SIZE_CHUNKS);
int targetZ = cellZ * LOOT_CHEST_CELL_SIZE_CHUNKS
+ Math.floorMod((int) (hash >>> 32), LOOT_CHEST_CELL_SIZE_CHUNKS);
return chunkX == targetX && chunkZ == targetZ;
}
/** One deterministic exit-bed chunk per three-by-three grid cell and per vertical level. */
public static boolean exitBedChunk(long seed, BackroomLevel level, int chunkX, int chunkZ) {
Objects.requireNonNull(level, "level");
int cellX = Math.floorDiv(chunkX, EXIT_BED_CELL_SIZE_CHUNKS);
@@ -517,6 +517,7 @@
"item.sanctuary.mojang_classic_cape": "Mojang Classic Cape",
"item.sanctuary.blue_scroll_cape": "Blue Scroll Cape",
"item.sanctuary.white_cape": "White Cape",
"tooltip.sanctuary.chicken_armor": "Can also equip and protect an adult chicken.",
"dimension.sanctuary.alpha": "Alpha / Indev Island",
"dimension.sanctuary.backroom": "Backroom",
"message.sanctuary.backroom.unavailable": "The Backroom is unavailable in this world.",
@@ -537,6 +538,7 @@
"metric.sanctuary.ranking.broken": "%s broken",
"metric.sanctuary.ranking.picked_up": "%s picked up",
"metric.sanctuary.ranking.dropped": "%s dropped",
"metric.sanctuary.ranking.killed": "Killed: %s",
"metric.sanctuary.ranking.custom": "Custom statistic",
"metric.sanctuary.ranking.unknown": "Unknown statistic"
}
@@ -517,6 +517,7 @@
"item.sanctuary.mojang_classic_cape": "Cape Mojang classique",
"item.sanctuary.blue_scroll_cape": "Cape parchemin bleu",
"item.sanctuary.white_cape": "Cape blanche",
"tooltip.sanctuary.chicken_armor": "Peut aussi équiper et protéger une poule adulte.",
"dimension.sanctuary.alpha": "Île Alpha / Indev",
"dimension.sanctuary.backroom": "Backroom",
"message.sanctuary.backroom.unavailable": "La Backroom nest pas disponible dans ce monde.",
@@ -537,6 +538,7 @@
"metric.sanctuary.ranking.broken": "%s cassé",
"metric.sanctuary.ranking.picked_up": "%s ramassé",
"metric.sanctuary.ranking.dropped": "%s jeté",
"metric.sanctuary.ranking.killed": "Tués : %s",
"metric.sanctuary.ranking.custom": "Statistique personnalisée",
"metric.sanctuary.ranking.unknown": "Statistique inconnue"
}
@@ -473,6 +473,7 @@
"item.sanctuary.mojang_classic_cape": "Классический плащ Mojang",
"item.sanctuary.blue_scroll_cape": "Плащ синего свитка",
"item.sanctuary.white_cape": "Белый плащ",
"tooltip.sanctuary.chicken_armor": "Также надевается на взрослую курицу и защищает её.",
"dimension.sanctuary.alpha": "Остров Альфа / Indev",
"dimension.sanctuary.backroom": "Бэкрум",
"message.sanctuary.backroom.unavailable": "Бэкрум недоступен в этом мире.",
@@ -493,6 +494,7 @@
"metric.sanctuary.ranking.broken": "Сломано: %s",
"metric.sanctuary.ranking.picked_up": "Подобрано: %s",
"metric.sanctuary.ranking.dropped": "Выброшено: %s",
"metric.sanctuary.ranking.killed": "Убито: %s",
"metric.sanctuary.ranking.custom": "Пользовательская статистика",
"metric.sanctuary.ranking.unknown": "Неизвестная статистика"
}
@@ -4,6 +4,7 @@
"compatibilityLevel": "JAVA_25",
"mixins": [
"AbstractContainerMenuMixin",
"AnimalChickenArmorMixin",
"BedBlockMixin",
"ChestBlockEntityMixin",
"ConsumableMixin",
@@ -15,6 +16,7 @@
"ItemEntityMixin",
"ItemTooltipMixin",
"LivingEntityCompanionMixin",
"LivingEntityChickenArmorMixin",
"PlayerOverflowMixin",
"SlotMixin",
"ServerGamePacketListenerMixin",
@@ -28,6 +30,8 @@
"client.AbstractContainerScreenMixin",
"client.AbstractRecipeBookScreenMixin",
"client.CameraMixin",
"client.ChickenRendererMixin",
"client.ChickenRenderStateMixin",
"client.CreativeModeInventoryScreenMixin",
"client.CreativeSlotWrapperAccessor",
"client.CreateWorldScreenWorldTabMixin",
@@ -3,12 +3,22 @@ package fr.koka99cab.sanctuary26.sanctuary.api.ranking;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import net.minecraft.SharedConstants;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentMap;
import net.minecraft.core.component.DataComponents;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.Identifier;
import net.minecraft.server.Bootstrap;
import net.minecraft.stats.Stats;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.TypedEntityData;
/** Pure ranking smoke for ordering, tied ranks, saturation and newer-save protection. */
public final class SanctuaryRankingModelSmoke {
@@ -36,6 +46,12 @@ public final class SanctuaryRankingModelSmoke {
&& tied.podium().get(2).rank() == 3, "Equal values must retain the same competition rank");
require(tied.owner().rank() == 1 && tied.owner().value() == 10L,
"Panel owner placement must reflect the real tied rank");
for (int index = 4; index <= 9; index++) {
UUID player = UUID.fromString("00000000-0000-0000-0000-" + String.format("%012d", index));
data.recordValue(player, "Player" + index, metricId, 10L - index);
}
require(data.snapshot(metric, bob).podium().size() == RankingSnapshot.MAX_PODIUM_SIZE,
"The eight-line panel must expose exactly seven bounded ranking rows");
data.increment(chris, "Chris", metricId, Long.MAX_VALUE);
require(data.score(chris, metricId) == SanctuaryRankingData.MAX_VALUE,
@@ -57,6 +73,16 @@ public final class SanctuaryRankingModelSmoke {
require(VanillaRankingMetric.parse(vanillaId).orElseThrow().target().equals(Stats.PLAY_TIME)
&& VanillaRankingMetric.descriptor(vanillaId).unit() == RankingUnit.TICKS,
"Vanilla metric IDs and units must round-trip stably");
List<RankingMetric> zombieMetrics = VanillaRankingMetric.itemMetrics(
new ItemStack(new Holder.Direct<Item>(Items.ZOMBIE_SPAWN_EGG, DataComponentMap.builder()
.set(DataComponents.MAX_STACK_SIZE, 64)
.set(DataComponents.ENTITY_DATA, TypedEntityData.of(EntityTypes.ZOMBIE, new CompoundTag()))
.build())));
VanillaRankingMetric.Source zombieSource = VanillaRankingMetric.parse(
zombieMetrics.getFirst().id()).orElseThrow();
require(zombieMetrics.size() == 1 && zombieSource.type().getPath().equals("killed")
&& zombieSource.target().equals(Identifier.withDefaultNamespace("zombie")),
"A zombie spawn egg must configure the zombies-killed ranking");
Path temporary = Files.createTempDirectory("sanctuary-ranking-migration-");
Path oldStats = temporary.resolve(alex + ".json");
@@ -25,6 +25,7 @@ public final class BackroomModelSmoke {
personalRecoveryIsPrioritized();
recentLossesRemainPersonal();
architectureIsDeterministicAndStacked();
lootLandmarksCoverEveryLevel();
exitBedsCoverEveryLevel();
roomCornersReachEveryVariant();
mazeDoorsStayConnected();
@@ -130,6 +131,7 @@ public final class BackroomModelSmoke {
private static void exitBedsCoverEveryLevel() {
long seed = 26_200_133L;
int cellSize = BackroomLayout.EXIT_BED_CELL_SIZE_CHUNKS;
require(cellSize == 3, "Backroom exit beds are no longer spaced three chunks apart");
for (BackroomLevel level : BackroomLevel.values()) {
int floorY = BackroomLayout.exitBedFloor(level);
require(BackroomLayout.levelAt(floorY) == level,
@@ -142,7 +144,25 @@ public final class BackroomModelSmoke {
}
}
require(candidates == 1,
"A Backroom level lost its single rare exit bed in a generation cell: " + level);
"A Backroom level lost its exit bed in a three-by-three chunk cell: " + level);
}
}
}
private static void lootLandmarksCoverEveryLevel() {
long seed = 26_200_137L;
int cellSize = BackroomLayout.LOOT_CHEST_CELL_SIZE_CHUNKS;
require(cellSize == 3, "Backroom loot landmarks are no longer spaced three chunks apart");
for (BackroomLevel level : BackroomLevel.values()) {
for (int cellX = -4; cellX <= 4; cellX++) for (int cellZ = -4; cellZ <= 4; cellZ++) {
int candidates = 0;
for (int chunkX = cellX * cellSize; chunkX < (cellX + 1) * cellSize; chunkX++) {
for (int chunkZ = cellZ * cellSize; chunkZ < (cellZ + 1) * cellSize; chunkZ++) {
if (BackroomLayout.lootChestChunk(seed, level, chunkX, chunkZ)) candidates++;
}
}
require(candidates == 1,
"A Backroom level lost its loot landmark in a three-by-three chunk cell: " + level);
}
}
}
@@ -0,0 +1,80 @@
package fr.koka99cab.sanctuary26.sanctuary.client;
import com.mojang.blaze3d.vertex.PoseStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.model.geom.ModelPart;
import org.joml.Vector3f;
import org.joml.Vector3fc;
/** Verifies the shield-pattern UV island, cape proportions and double-sided plane. */
public final class SanctuaryBannerCapeModelSmoke {
private static final float EPSILON = 0.0001F;
private SanctuaryBannerCapeModelSmoke() {}
public static void main(String[] args) {
ModelPart cape = SanctuaryBannerCapeLayer.createLayer().bakeRoot()
.getChild("body").getChild("cape");
List<Float> normalZ = new ArrayList<>();
List<ModelPart.Vertex> vertices = new ArrayList<>();
cape.visit(new PoseStack(), (pose, path, cubeIndex, cube) -> {
for (ModelPart.Polygon polygon : cube.polygons) {
normalZ.add(pose.transformNormal(polygon.normal(), new Vector3f()).z());
vertices.addAll(List.of(polygon.vertices()));
}
});
require(normalZ.size() == 2 && normalZ.stream().anyMatch(value -> value < -0.99F)
&& normalZ.stream().anyMatch(value -> value > 0.99F),
"The banner cape must contain one visible plane for each culling direction");
require(close(minU(vertices), 1.0F / 64.0F) && close(maxU(vertices), 13.0F / 64.0F)
&& close(minV(vertices), 1.0F / 64.0F) && close(maxV(vertices), 23.0F / 64.0F),
"The cape no longer samples the shield plate's exact pattern UV island");
List<Vector3fc> extents = new ArrayList<>();
cape.getExtentsForGui(new PoseStack(), extents::add);
require(close(minX(extents), -5.0F / 16.0F) && close(maxX(extents), 5.0F / 16.0F)
&& close(minY(extents), 0.0F) && close(maxY(extents), 1.0F),
"The shield-pattern plane does not retain the vanilla 10x16 cape proportions");
}
private static float minU(List<ModelPart.Vertex> vertices) {
return (float) vertices.stream().mapToDouble(ModelPart.Vertex::u).min().orElseThrow();
}
private static float maxU(List<ModelPart.Vertex> vertices) {
return (float) vertices.stream().mapToDouble(ModelPart.Vertex::u).max().orElseThrow();
}
private static float minV(List<ModelPart.Vertex> vertices) {
return (float) vertices.stream().mapToDouble(ModelPart.Vertex::v).min().orElseThrow();
}
private static float maxV(List<ModelPart.Vertex> vertices) {
return (float) vertices.stream().mapToDouble(ModelPart.Vertex::v).max().orElseThrow();
}
private static float minX(List<Vector3fc> vertices) {
return (float) vertices.stream().mapToDouble(Vector3fc::x).min().orElseThrow();
}
private static float maxX(List<Vector3fc> vertices) {
return (float) vertices.stream().mapToDouble(Vector3fc::x).max().orElseThrow();
}
private static float minY(List<Vector3fc> vertices) {
return (float) vertices.stream().mapToDouble(Vector3fc::y).min().orElseThrow();
}
private static float maxY(List<Vector3fc> vertices) {
return (float) vertices.stream().mapToDouble(Vector3fc::y).max().orElseThrow();
}
private static boolean close(float actual, float expected) {
return Math.abs(actual - expected) <= EPSILON;
}
private static void require(boolean condition, String message) {
if (!condition) throw new AssertionError(message);
}
}
@@ -0,0 +1,37 @@
package fr.koka99cab.sanctuary26.sanctuary.gameplay;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.server.Bootstrap;
import net.minecraft.SharedConstants;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentMap;
/** Executable coverage for the bounded adult-chicken armor equip policy. */
public final class SanctuaryChickenArmorSmoke {
private SanctuaryChickenArmorSmoke() {
}
public static void main(String[] args) {
SharedConstants.tryDetectVersion();
Bootstrap.bootStrap();
ItemStack armor = stack(Items.WOLF_ARMOR);
require(SanctuaryChickenArmor.canEquip(ItemStack.EMPTY, armor, false),
"Adult chickens must accept unused armadillo-scute armor");
require(!SanctuaryChickenArmor.canEquip(ItemStack.EMPTY, armor, true),
"Baby chickens must not accept body armor");
require(!SanctuaryChickenArmor.canEquip(armor.copy(), armor, false),
"Equipping must not replace an existing chicken armor stack");
require(!SanctuaryChickenArmor.canEquip(ItemStack.EMPTY,
stack(Items.IRON_CHESTPLATE), false),
"Chicken armor must stay limited to the armadillo-scute item");
}
private static ItemStack stack(net.minecraft.world.item.Item item) {
return new ItemStack(new Holder.Direct<>(item, DataComponentMap.EMPTY), 1);
}
private static void require(boolean condition, String message) {
if (!condition) throw new IllegalStateException(message);
}
}