feat: add Notch Alpha encounter

Merge pull request 'release: tester les dernières PR dans Packwiz alpha.223' (#117 ) from release/26.2.0-alpha.223 into main
Reviewed-on: #117
2026-08-31 05:42:19 +02:00 · 2026-08-31 03:15:43 +00:00 · 2026-08-31 05:13:46 +02:00 · 2026-08-31 03:02:03 +00:00 · 2026-08-31 03:01:13 +00:00 · 2026-08-31 04:20:33 +02:00
113 changed files with 5170 additions and 851 deletions
@@ -6,6 +6,67 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve
 - Depuis `26.2.0-alpha.6`, le pack et les modules ont des versions indépendantes. I Like To Move It et Only Fun deviennent les cinquième et sixième modules actifs dans l'alpha 46.
 - Les versions ci-dessous ont été reconstituées à partir des JAR archivés, des packs locaux et du code source actuel. Les dates n'étant pas enregistrées de manière fiable, elles ne sont pas inventées.

+## Non distribué
+
+Modules modifiés : **It's Alive `0.0.0-alpha.37`**, **Ouch `0.0.0-alpha.11`**, **Sanctuary `0.0.0-alpha.126`** et **MasterKey `0.0.0-alpha.9`**. Le pack public reste temporairement en `26.2.0-alpha.223` jusqu'à la publication.
+
+- ajoute Notch comme résident unique et persistant de la maison Indev, avec restauration automatique, déduplication et lecture des anciennes entités `portals:notch` ;
+- transforme Notch en Titan au premier coup volontaire, avec santé bornée selon les participants, poursuite, attaques télégraphiées, boules de feu renvoyables et réinitialisation si le combat est abandonné ;
+- limite la destruction de blocs à l'explosion initiale de transformation ; les attaques suivantes utilisent uniquement dégâts, poussée, particules et explosions non destructrices ;
+- enregistre la première victoire comme jalon mondial monotone, crédite les participants, inscrit un marqueur de boss dans leur Atlas déjà découvert et réserve un drapeau de récompense unique pour la suite ;
+- ajoute les diagnostics `/masterkey notch inspect` et `/masterkey notch restore`, les traductions FR/EN/RU et les contrats de test déterministes associés ;
+- migre les données It's Alive de v3 à v4 et Sanctuary de v11 à v12, sans changer les protocoles réseau ni le pack public.
+
+## `26.2.0-alpha.223`
+
+Module modifié : **Sanctuary `0.0.0-alpha.125`**. Les neuf autres modules conservent leur version issue de l'alpha.222.
+
+- ajoute un tri natif de l’inventaire par clic molette configurable, uniquement sur les rangées de stockage débloquées ;
+- fusionne et range les piles depuis le haut sans déplacer la hotbar, l’armure, la main secondaire, le craft ni les emplacements spéciaux ;
+- garde le tri sous autorité serveur, avec un délai de huit ticks, et l’ignore en créatif ou pendant la saisie dans un champ texte ;
+- ajoute un style configurable au suivi des quêtes (`N` par défaut), entre le texte transparent et le panneau original de Chris ;
+- place automatiquement le style texte sous la hauteur réelle de la colonne gauche du F3 permanent afin que les deux affichages ne se recouvrent pas ;
+- nomme et ordonne les contrats suivis par niveau de récompense, rubis puis saphir puis émeraude/autres, au lieu du libellé générique « Contrat du jour » ;
+- actualise JEI vers la bêta Fabric 26.2 `30.29.0.198` et synchronise ses empreintes entre Packwiz et Prism ;
+- conserve les données Sanctuary v11, le protocole réseau 22, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation n’est nécessaire.
+
+## `26.2.0-alpha.222`
+
+Modules modifiés : **Red-Stoner `0.0.0-alpha.13`** et **Sanctuary `0.0.0-alpha.124`**. Les huit autres modules conservent leur version issue de l'alpha.221.
+
+- ajoute au terminal de stockage une recherche clavier focalisée à l'ouverture, compatible avec les noms affichés, les IDs, les traductions, les accents et Unicode ;
+- affiche les grandes quantités du terminal sous forme compacte (`1K`, `1.2K`, `12K`, `1.2M`) tout en conservant la valeur exacte dans l'infobulle ;
+- stabilise les emplacements du terminal lorsqu'une pile est vidée afin que les ressources suivantes ne glissent plus sous le curseur, puis recompacte volontairement lors d'une nouvelle recherche ou à la réouverture ;
+- ajoute un suivi d'avancement des quêtes, affichable ou masquable par une touche configurable (`J` par défaut) ;
+- affiche chaque quête active comme un simple texte ombré en haut à gauche, sans panneau, bordure, titre, message vide ni barre de progression ;
+- synchronise un snapshot borné des quêtes acceptées et des contrats réservés, sans les demandes que le joueur a lui-même créées, ni changer les données Sanctuary v11 ni le protocole réseau 22 ;
+- propose une saisie assistée des IDs d'item et de mob dans l'éditeur de demande, avec icône et noms proches.
+- actualise JEI vers la bêta Fabric 26.2 `30.29.0.196` et synchronise Packwiz avec l'index Prism/Modrinth ;
+- conserve Red-Stoner data v3/protocole 7, Sanctuary data v11/protocole 22, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation n'est nécessaire.
+
+## `26.2.0-alpha.221`
+
+Module modifié : **Ambiance `0.0.0-alpha.22`**. Les neuf autres modules conservent leur version issue de l'alpha.220.
+
+- corrige la cause réelle du disque blanc ralenti et trop grave : la piste AAC YouTube reste décodée en stéréo native à 48 kHz, puis chaque paire gauche/droite est explicitement moyennée en un échantillon mono positionnel ;
+- supprime la compensation OpenAL approximative à `4/3` et restitue la musique à sa hauteur et sa vitesse originales avec une hauteur `1.0` ;
+- conserve un flux PCM mono signé 16 bits little-endian pour l'audio positionnel du jukebox, sans silence ajouté ni changement de durée ;
+- ajoute un test déterministe du downmix stéréo et valide le lien signalé sur quatre secondes : 4 000 ms de source donnent 4 000 ms de PCM à 48 kHz ;
+- conserve les données Ambiance v2, le protocole réseau 6, les IDs et les sauvegardes existantes ; aucun nouveau monde ni réinitialisation n'est nécessaire.
+
+## `26.2.0-alpha.220`
+
+Module modifié : **Red-Stoner `0.0.0-alpha.12`**. Les neuf autres modules conservent leur version issue de l'alpha.219.
+
+- remplace l’écran propriétaire du terminal par un véritable menu de conteneur inspiré des coffres vanilla et composé avec le panneau d’inventaire Sanctuary ;
+- supprime le bouton de fermeture dédié : Échap et la touche d’inventaire suivent désormais le comportement normal du jeu ;
+- affiche et synchronise toutes les rangées d’inventaire débloquées par Sanctuary, d’une à six, y compris les deux rangées persistantes supplémentaires ;
+- permet le retrait par clic gauche, le retrait unitaire par clic droit et le retrait vers l’inventaire par shift-clic ; un clic avec une pile portée ou un shift-clic depuis l’inventaire dépose dans le réseau ;
+- conserve les 54 cases comme une vue agrégée non réorganisable et affiche les quantités exactes sans créer de stockage virtuel ;
+- dépose dans le premier coffre ou baril disponible selon l’ordre déterministe de découverte, remplit d’abord ses piles compatibles puis ses cases vides et ne passe au stockage suivant qu’en cas de besoin ;
+- supprime les anciens payloads spécifiques au terminal au profit de la synchronisation native des menus, tout en gardant la distance, la topologie et les transferts sous autorité serveur ;
+- conserve les données Red-Stoner v3 et les sauvegardes existantes ; le protocole réseau Red-Stoner passe de 6 à 7, sans nouveau monde ni réinitialisation.
+
 ## `26.2.0-alpha.219`

 Modules modifiés : **Sanctuary `0.0.0-alpha.122`**, **I Like To Move It `0.0.0-alpha.16`** et **Ambiance `0.0.0-alpha.21`**. Les sept autres modules conservent leur version issue de l'alpha.218.
@@ -22,15 +22,25 @@ 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.219`**. Cette release distribue Sanctuary **`0.0.0-alpha.122`**, I Like To Move It **`0.0.0-alpha.16`** et Ambiance **`0.0.0-alpha.21`** ; les sept autres modules conservent leur version issue de l'alpha.218.
+Version courante du pack distribué : **`26.2.0-alpha.223`**. Cette release distribue Sanctuary **`0.0.0-alpha.125`** ; les neuf autres modules conservent leur version issue de l'alpha.222.

 La migration [CANA-01 à CANA-09](CANAPLIA.md) porte Canaplia vers Minecraft 26.2. It's Alive **`0.0.0-alpha.35`** enregistre les seize familles, les découvertes, hybridations, résines, effets serveur et le Livre interdit personnel, partageable temporairement sur un pupitre. Ambiance **`0.0.0-alpha.14`** compose les profils visuels bornés avec ses réglages d'accessibilité, et Only Fun **`0.0.0-alpha.21`** exclut explicitement Canaplia et les raccourcis de progression du Shop.

+L’alpha.223 ajoute le tri natif des rangées de stockage par clic molette sans déplacer la hotbar ni les emplacements spéciaux. Le suivi des quêtes propose désormais le texte transparent aligné sous la colonne gauche du F3 ou le panneau original de Chris, avec bascule configurable sur `N` et contrats ordonnés par récompense. JEI passe à la bêta Fabric 26.2 `30.29.0.198`.
+
+L’alpha.222 améliore le terminal de stockage avec une recherche Unicode, des quantités compactes et des emplacements qui ne glissent plus lorsqu'une pile est vidée. Elle ajoute aussi le suivi textuel des quêtes actives en haut à gauche, masquable avec une touche configurable, ainsi que des suggestions d’IDs d’items et de mobs dans l’éditeur de demandes. JEI passe à la bêta Fabric 26.2 `30.29.0.196`.
+
+Le lot non distribué ajoute Notch comme résident unique de la maison Indev et son combat de Titan. It's Alive possède l'entité persistante, Ouch les attaques et dégâts, Sanctuary le jalon mondial de victoire et l'Atlas, tandis que MasterKey fournit les commandes d'inspection et de restauration. Les anciennes entités `portals:notch` restent chargeables.
+
+L’alpha.221 corrige la cause réelle du disque blanc ralenti et trop grave : Ambiance décode désormais la source AAC en stéréo native à 48 kHz, puis moyenne explicitement chaque paire gauche/droite vers le flux mono positionnel de Minecraft. OpenAL reste à sa hauteur normale `1.0`, sans compensation artificielle ni changement de durée.
+
+L’alpha.220 transforme le terminal de stockage en véritable menu de conteneur, sans bouton de fermeture propriétaire. Les clics gauche/droit et shift-clic permettent maintenant de retirer ou déposer des piles depuis toutes les rangées d’inventaire débloquées par Sanctuary, jusqu’à six ; la grille agrégée reste non réorganisable et remplit chaque coffre ou baril dans l’ordre de découverte avant de passer au suivant.
+
 L’alpha.219 porte l'île finie Minecraft Indev dans `sanctuary:alpha` : 128 × 128 × 64 blocs déterministes, plages, cavernes, minerais, fluides, végétation et maison historique, le tout borné sans chunks parasites. Le cadre 4 × 5 en cobblestone moussue est maintenant actif et crée une paire persistante à une arrivée sûre hors de la maison. Ambiance peut enfin composer localement Golden Days Base puis Alpha uniquement dans cette dimension, sans redistribuer leurs textures et en restaurant exactement la pile précédente. Voir le [contrat Alpha](sanctuary/ALPHA.md), le [contrat des portails](iliketomoveit/PORTALS.md) et le [guide Golden Days](ambiance/GOLDEN_DAYS.md).

 L’alpha.218 ajoute le terminal de stockage Red-Stoner : cette demi-dalle verticale se fixe sur un coffre, un coffre piégé ou un baril et donne accès, par pages défilantes de 54 types, à un réseau contigu borné à 128 conteneurs chargés. Les retraits et dépôts sont validés par le serveur, les composants d’items restent strictement séparés et le terminal endgame est exclu du Shop, du Black Market et des récompenses Only Fun.

-L’alpha.217 corrige définitivement la hauteur trop grave du disque blanc : la cadence AAC mesurée sur la vidéo signalée est compensée par un facteur OpenAL exact de 4/3, maintenu pendant toute la lecture.
+L’alpha.217 tentait de compenser la hauteur trop grave du disque blanc par un facteur OpenAL de `4/3`. Cette compensation est retirée par l’alpha.221, qui corrige directement la conversion stéréo vers mono.

 L’alpha.216 corrige la lecture lente et dégradée du disque blanc : les quatre tampons PCM initiaux de Minecraft sont maintenant remplis continûment à 48 kHz, avec une vitesse OpenAL normale, au lieu d’être majoritairement complétés par du silence. Les packs Modrinth, Prism et Packwiz sont mis à jour sans exiger de nouveau monde ni réinitialiser les sauvegardes.

@@ -16,8 +16,12 @@ jukebox vanilla.
  libre ; il est envoyé uniquement aux clients qui suivent le chunk et annoncent le canal ;
 - chaque client ouvre lui-même la source YouTube, refuse les directs et les vidéos de plus de
  trente minutes, et limite les lectures simultanées à quatre ;
- la lecture utilise le canal `RECORDS`, un flux PCM mono positionnel et une atténuation à
-  64 blocs. Elle s’arrête lorsque le disque est éjecté, le chunk disparaît ou la session se ferme.
+- la source AAC stéréo est décodée à 48 kHz (48 000 Hz) puis convertie explicitement en PCM mono 16 bits
+  little-endian, échantillon gauche/droite par échantillon gauche/droite, afin de conserver la
+  vitesse et la hauteur originales tout en restant positionnelle ;
+- OpenAL lit ce PCM à sa hauteur native `1.0` sur le canal `RECORDS`, avec une atténuation à
+  64 blocs. La lecture s’arrête lorsque le disque est éjecté, le chunk disparaît ou la session se
+  ferme.

 Le disque ne crée aucune donnée persistante et ne demande aucune migration de sauvegarde.
 Ambiance conserve ses données v2 ; son protocole passe de 5 à 6.
@@ -102,7 +102,7 @@ tasks.named("test") {

 tasks.register("verifyAmbiance") {
 	group = "verification"
-	description = "Checks Ambiance alpha.21, including corrected white-disc pitch and Alpha textures."
+	description = "Checks Ambiance alpha.22, including native-rate white-disc audio and Alpha textures."
 	inputs.files(fileTree("src/main/java"))
 	inputs.files(fileTree("src/main/resources"))
 	inputs.file(file("src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java"))
@@ -161,7 +161,7 @@ tasks.register("verifyAmbiance") {
 		def whiteDiscPlaybackSmoke = file(
 			"src/test/java/fr/koka99cab/sanctuary26/ambiance/client/audio/WhiteDiscPlaybackSmoke.java").text

-		if (project.version.toString() != "0.0.0-alpha.21"
+		if (project.version.toString() != "0.0.0-alpha.22"
 			|| migration.source?.pack_version != "26.2.0-alpha.125"
 			|| migration.target?.pack_version != "26.2.0-alpha.126"
 			|| migration.target?.modules?.ambiance != "0.0.0-alpha.1"
@@ -364,15 +364,18 @@ tasks.register("verifyAmbiance") {
 			|| !javaText.contains('tickPendingStarts(client)')
 			|| !javaText.contains('client.level.dimension().equals(playback.dimension())')
 			|| !javaText.contains('MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L')
-			|| !javaText.contains('new Pcm16AudioDataFormat(1, LavaplayerAudioStream.SAMPLE_RATE')
+			|| !javaText.contains('new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,')
 			|| !javaText.contains('new YoutubeAudioSourceManager(false, new Ios())')
 			|| !javaText.contains('player.addListener(new AudioEventAdapter()')
 			|| !javaText.contains('failPlayback(client, key, failedPlayer)')
 			|| !javaText.contains('initialWaitAttempted')
 			|| !javaText.contains('CONTINUATION_FRAME_WAIT_MILLIS = 250L')
 			|| !javaText.contains('player.provide(waitMillis, TimeUnit.MILLISECONDS)')
-			|| !whiteDiscAudioPlayer.contains('PLAYBACK_PITCH = 4.0F / 3.0F')
+			|| !whiteDiscAudioPlayer.contains('PLAYBACK_PITCH = 1.0F')
 			|| whiteDiscAudioPlayer.count('channel.setPitch(PLAYBACK_PITCH)') != 2
+			|| !javaText.contains('SOURCE_CHANNELS = 2')
+			|| !javaText.contains('downmixStereoFrame(frame.getData())')
+			|| !javaText.contains('short mixed = (short) (((int) left + right) / SOURCE_CHANNELS)')
 			|| !whiteDiscAudioPlayer.contains('handle.execute(channel -> channel.stop())')
 			|| whiteDiscAudioPlayer.contains('.release()')
 			|| !whiteDiscPlaybackSmoke.contains('https://www.youtube.com/watch?v=Ue5ZBe-GzSM')
@@ -472,7 +475,7 @@ tasks.register("verifyAlphaTextures") {
 			include "**/*golden*days*.zip", "**/*golden*days*.jar"
 			exclude "**/build/**", "**/.gradle/**", "**/.git/**"
 		}.files
-		if (project.version.toString() != "0.0.0-alpha.21"
+		if (project.version.toString() != "0.0.0-alpha.22"
 			|| migration.alpha_textures?.destination != "sanctuary:alpha"
 			|| migration.alpha_textures?.client_only != true
 			|| migration.alpha_textures?.bundled_assets != false
@@ -9,9 +9,13 @@ import java.util.concurrent.TimeoutException;
 import javax.sound.sampled.AudioFormat;
 import net.minecraft.client.sounds.AudioStream;

-/** Adapts bounded mono PCM frames from Lavaplayer to Minecraft's streaming OpenAL channel. */
+/** Downmixes bounded stereo PCM frames from Lavaplayer for Minecraft's mono OpenAL stream. */
 final class LavaplayerAudioStream implements AudioStream {
 	static final int SAMPLE_RATE = 48_000;
+	static final int SOURCE_CHANNELS = 2;
+	static final int FRAME_SAMPLES = 960;
+	private static final int BYTES_PER_SAMPLE = Short.BYTES;
+	private static final int SOURCE_FRAME_SIZE = SOURCE_CHANNELS * BYTES_PER_SAMPLE;
 	private static final long INITIAL_FRAME_WAIT_MILLIS = 2_000L;
 	private static final long CONTINUATION_FRAME_WAIT_MILLIS = 250L;
 	private static final AudioFormat FORMAT =
@@ -65,7 +69,7 @@ final class LavaplayerAudioStream implements AudioStream {
 			if (firstFrameTimecode < 0L) firstFrameTimecode = frame.getTimecode();
 			lastFrameTimecode = frame.getTimecode();
 			decodedFrames++;
-			pending = frame.getData();
+			pending = downmixStereoFrame(frame.getData());
 			pendingOffset = 0;
 		}
 		if (output.position() == 0 && ended) return null;
@@ -73,6 +77,27 @@ final class LavaplayerAudioStream implements AudioStream {
 		return output;
 	}

+	private static byte[] downmixStereoFrame(byte[] stereo) throws IOException {
+		if (stereo.length == 0 || stereo.length % SOURCE_FRAME_SIZE != 0) {
+			throw new IOException("Invalid stereo PCM frame length: " + stereo.length);
+		}
+		byte[] mono = new byte[stereo.length / SOURCE_CHANNELS];
+		for (int sourceOffset = 0, targetOffset = 0;
+			sourceOffset < stereo.length;
+			sourceOffset += SOURCE_FRAME_SIZE, targetOffset += BYTES_PER_SAMPLE) {
+			short left = littleEndianSample(stereo, sourceOffset);
+			short right = littleEndianSample(stereo, sourceOffset + BYTES_PER_SAMPLE);
+			short mixed = (short) (((int) left + right) / SOURCE_CHANNELS);
+			mono[targetOffset] = (byte) mixed;
+			mono[targetOffset + 1] = (byte) (mixed >>> 8);
+		}
+		return mono;
+	}
+
+	private static short littleEndianSample(byte[] pcm, int offset) {
+		return (short) (Byte.toUnsignedInt(pcm[offset]) | pcm[offset + 1] << 8);
+	}
+
 	private AudioFrame nextFrame() throws IOException {
 		try {
 			long waitMillis = initialWaitAttempted
@@ -36,8 +36,8 @@ public final class WhiteDiscAudioPlayer {
 	private static final long MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L;
 	private static final long FINISHED_GRACE_NANOS = 5_000_000_000L;
 	private static final float ATTENUATION_DISTANCE = 64.0F;
-	/** Compensates Lavaplayer's low AAC cadence before PCM reaches OpenAL. */
-	static final float PLAYBACK_PITCH = 4.0F / 3.0F;
+	/** OpenAL must preserve the decoded music's native speed and pitch. */
+	static final float PLAYBACK_PITCH = 1.0F;
 	private static final DefaultAudioPlayerManager MANAGER = createManager();
 	private static final Map<Long, PendingStart> PENDING_STARTS = new HashMap<>();
 	private static final Map<Long, Long> REQUESTS = new HashMap<>();
@@ -237,7 +237,8 @@ public final class WhiteDiscAudioPlayer {
 	private static DefaultAudioPlayerManager createManager() {
 		DefaultAudioPlayerManager manager = new DefaultAudioPlayerManager();
 		manager.getConfiguration().setOutputFormat(
-			new Pcm16AudioDataFormat(1, LavaplayerAudioStream.SAMPLE_RATE, 960, false));
+			new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,
+				LavaplayerAudioStream.SAMPLE_RATE, LavaplayerAudioStream.FRAME_SAMPLES, false));
 		manager.setFrameBufferDuration(5_000);
 		manager.setItemLoaderThreadPoolSize(2);
 		manager.registerSourceManager(new YoutubeAudioSourceManager(false, new Ios()));
@@ -7,7 +7,6 @@ import com.sedmelluq.discord.lavaplayer.track.playback.ImmutableAudioFrame;
 import java.lang.reflect.Proxy;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
-import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -15,22 +14,27 @@ import java.util.concurrent.atomic.AtomicInteger;
 /** Deterministic check for Minecraft's four one-second streaming buffers. */
 public final class LavaplayerAudioStreamSmoke {
 	private static final int FRAME_SAMPLES = 960;
-	private static final int FRAME_BYTES = FRAME_SAMPLES * 2;
+	private static final int SOURCE_FRAME_BYTES = FRAME_SAMPLES
+		* LavaplayerAudioStream.SOURCE_CHANNELS * Short.BYTES;
 	private static final int FRAMES_PER_SECOND = LavaplayerAudioStream.SAMPLE_RATE / FRAME_SAMPLES;

 	private LavaplayerAudioStreamSmoke() {
 	}

 	public static void main(String[] args) throws Exception {
-		if (Math.abs(WhiteDiscAudioPlayer.PLAYBACK_PITCH - 4.0F / 3.0F) > 0.0001F) {
-			throw new IllegalStateException("The white-disc AAC pitch compensation changed");
+		if (Math.abs(WhiteDiscAudioPlayer.PLAYBACK_PITCH - 1.0F) > 0.0001F) {
+			throw new IllegalStateException("The white-disc playback pitch is not native");
 		}
 		Queue<AudioFrame> frames = new ArrayDeque<>();
 		Pcm16AudioDataFormat format = new Pcm16AudioDataFormat(
-			1, LavaplayerAudioStream.SAMPLE_RATE, FRAME_SAMPLES, false);
+			LavaplayerAudioStream.SOURCE_CHANNELS, LavaplayerAudioStream.SAMPLE_RATE,
+			FRAME_SAMPLES, false);
 		for (int index = 0; index < FRAMES_PER_SECOND; index++) {
-			byte[] data = new byte[FRAME_BYTES];
-			Arrays.fill(data, (byte) (index + 1));
+			byte[] data = new byte[SOURCE_FRAME_BYTES];
+			for (int offset = 0; offset < data.length; offset += 4) {
+				putLittleEndian(data, offset, (short) (1_000 + index));
+				putLittleEndian(data, offset + 2, (short) (3_000 + index));
+			}
 			frames.add(new ImmutableAudioFrame(index * 20L, data, 100, format));
 		}

@@ -63,9 +67,14 @@ public final class LavaplayerAudioStreamSmoke {
 		if (pcm == null || pcm.remaining() != LavaplayerAudioStream.SAMPLE_RATE * 2) {
 			throw new IllegalStateException("The stream did not fill Minecraft's one-second buffer");
 		}
-		while (pcm.hasRemaining()) {
-			if (pcm.get() == 0) {
-				throw new IllegalStateException("The stream padded available PCM with silence");
+		for (int frame = 0; frame < FRAMES_PER_SECOND; frame++) {
+			short expected = (short) (2_000 + frame);
+			for (int sample = 0; sample < FRAME_SAMPLES; sample++) {
+				int low = Byte.toUnsignedInt(pcm.get());
+				short actual = (short) (low | pcm.get() << 8);
+				if (actual != expected) {
+					throw new IllegalStateException("Stereo PCM was not downmixed in sample order");
+				}
 			}
 		}
 		if (timedProvides.get() != FRAMES_PER_SECOND || nonBlockingProvides.get() != 0) {
@@ -80,4 +89,9 @@ public final class LavaplayerAudioStreamSmoke {
 			throw new IllegalStateException("Closing the stream did not destroy its player");
 		}
 	}
+
+	private static void putLittleEndian(byte[] data, int offset, short sample) {
+		data[offset] = (byte) sample;
+		data[offset + 1] = (byte) (sample >>> 8);
+	}
 }
@@ -23,7 +23,8 @@ public final class WhiteDiscPlaybackSmoke {
 	public static void main(String[] args) throws Exception {
 		DefaultAudioPlayerManager manager = new DefaultAudioPlayerManager();
 		manager.getConfiguration().setOutputFormat(
-			new Pcm16AudioDataFormat(1, LavaplayerAudioStream.SAMPLE_RATE, 960, false));
+			new Pcm16AudioDataFormat(LavaplayerAudioStream.SOURCE_CHANNELS,
+				LavaplayerAudioStream.SAMPLE_RATE, LavaplayerAudioStream.FRAME_SAMPLES, false));
 		manager.registerSourceManager(new YoutubeAudioSourceManager(false, new Ios()));
 		try {
 			AudioTrack track = load(manager).get(30, TimeUnit.SECONDS);
@@ -12,23 +12,23 @@ fabric_api_version=0.158.0+26.2
 # Standby modules stay at zero until their migration really begins.
 mod_version=0.0.0-alpha.0
 module_lifecycle=standby
-ambiance_version=0.0.0-alpha.21
+ambiance_version=0.0.0-alpha.22
 ambiance_lifecycle=active
-redstoner_version=0.0.0-alpha.11
+redstoner_version=0.0.0-alpha.13
 redstoner_lifecycle=active
 anotherworld_version=0.0.0-alpha.55
 anotherworld_lifecycle=active
-itsalive_version=0.0.0-alpha.36
+itsalive_version=0.0.0-alpha.37
 itsalive_lifecycle=active
-ouch_version=0.0.0-alpha.10
+ouch_version=0.0.0-alpha.11
 ouch_lifecycle=active
-masterkey_version=0.0.0-alpha.8
+masterkey_version=0.0.0-alpha.9
 masterkey_lifecycle=active
 iliketomoveit_version=0.0.0-alpha.16
 iliketomoveit_lifecycle=active
 onlyfun_version=0.0.0-alpha.25
 onlyfun_lifecycle=active
-sanctuary_version=0.0.0-alpha.122
+sanctuary_version=0.0.0-alpha.126
 sanctuary_lifecycle=active
-pack_version=26.2.0-alpha.219
+pack_version=26.2.0-alpha.223
 maven_group=fr.koka99cab.sanctuary26
@@ -2,7 +2,15 @@

 It's Alive possède le vivant de Sanctuary. Il enrichit directement le Creeper vanilla et accueille désormais les papillons de Pipallon, les Mooblooms fleuries et les créatures de Real Ghost — baleine volante comprise — sous un référencement unifié `itsalive:*`.

-## Version courante — `0.0.0-alpha.36`
+## Version courante — `0.0.0-alpha.37`
+
+## Résident Notch
+
+- `itsalive:notch` est l'unique résident persistant de la maison Indev dans `sanctuary:alpha` ; il n'apparaît jamais naturellement et ne peut pas être invoqué par les commandes génériques.
+- Son UUID canonique est sauvegardé, les doublons sont supprimés et le service le recrée au domicile s'il manque. L'alias caché `portals:notch` charge les anciennes entités du prototype sans dupliquer les règles.
+- Le premier coup volontaire d'un joueur transforme l'humain en Titan. Le nombre de participants est borné à huit, la santé va de 360 à 600 et un combat abandonné se réinitialise après quinze secondes sans participant actif.
+- It's Alive possède l'entité et son cycle de vie ; les attaques passent exclusivement par l'API publique `NotchCombatApi`, implémentée par Ouch.
+- Diagnostics : `/masterkey notch inspect` et `/masterkey notch restore`.

 ## Creepers

@@ -35,6 +35,14 @@ tasks.register("culinaryPartialMatchingSmoke", JavaExec) {
 	mainClass = "fr.koka99cab.sanctuary26.itsalive.culinary.recipe.CulinaryPartialMatchingSmoke"
 }

+tasks.register("notchFightRulesSmoke", JavaExec) {
+	group = "verification"
+	description = "Checks bounded Notch Titan scaling, reset timing and reflected-fireball damage."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchFightRulesSmoke"
+}
+
 tasks.named("test") {
 	// Quantity contracts are executable smoke tasks, not JUnit engine tests.
 	failOnNoDiscoveredTests = false
@@ -43,6 +51,7 @@ tasks.named("test") {
 tasks.named("check") {
 	dependsOn tasks.named("canapliaFoundationSmoke")
 	dependsOn tasks.named("canapliaGameplaySmoke")
+	dependsOn tasks.named("notchFightRulesSmoke")
 }

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

 import fr.koka99cab.sanctuary26.itsalive.canaplia.CanapliaFoundation;
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchResidentService;
 import fr.koka99cab.sanctuary26.itsalive.network.ItsAliveNetworking;
 import fr.koka99cab.sanctuary26.itsalive.culinary.knowledge.CulinaryRecipeKnowledge;
 import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveRegistries;
@@ -13,7 +14,7 @@ import org.slf4j.LoggerFactory;
 public final class ItsAliveMod implements ModInitializer {
 	public static final String MOD_ID = "itsalive";
 	public static final String DISPLAY_NAME = "It's Alive !";
-	public static final int CURRENT_DATA_VERSION = 3;
+	public static final int CURRENT_DATA_VERSION = 4;
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);

 	public ItsAliveMod() {
@@ -27,6 +28,7 @@ public final class ItsAliveMod implements ModInitializer {
 	public void onInitialize() {
 		CanapliaFoundation.initialize();
 		ItsAliveRegistries.initialize();
+		NotchResidentService.initialize();
 		ItsAliveNetworking.initialize();
 		CulinaryRecipeKnowledge.initialize();
 		ProceduralVillagerNames.initialize();
@@ -0,0 +1,46 @@
+package fr.koka99cab.sanctuary26.itsalive.api.notch;
+
+import java.util.Objects;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.LivingEntity;
+
+/** Public bridge allowing the combat-owning Ouch module to drive Notch attacks. */
+public final class NotchCombatApi {
+	private static Engine engine = Engine.NOOP;
+	private static boolean registered;
+
+	private NotchCombatApi() {
+	}
+
+	public static synchronized void register(Engine implementation) {
+		Objects.requireNonNull(implementation, "implementation");
+		if (registered) throw new IllegalStateException("A Notch combat engine is already registered");
+		engine = implementation;
+		registered = true;
+	}
+
+	public static void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) {
+		engine.telegraph(level, boss, target, attack);
+	}
+
+	public static void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) {
+		engine.execute(level, boss, target, attack);
+	}
+
+	public enum Attack {
+		MELEE,
+		FIREBALL,
+		LIGHTNING
+	}
+
+	public interface Engine {
+		Engine NOOP = new Engine() {
+			@Override public void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) { }
+			@Override public void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack) { }
+		};
+
+		void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack);
+
+		void execute(ServerLevel level, LivingEntity boss, LivingEntity target, Attack attack);
+	}
+}
@@ -5,6 +5,7 @@ import fr.koka99cab.sanctuary26.itsalive.client.model.ButterflyModel;
 import fr.koka99cab.sanctuary26.itsalive.client.model.GhostModel;
 import fr.koka99cab.sanctuary26.itsalive.client.model.FlyingWhaleModel;
 import fr.koka99cab.sanctuary26.itsalive.client.model.StandingCowModel;
+import fr.koka99cab.sanctuary26.itsalive.client.model.NotchModel;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.BrackenRenderer;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.ButterflyRenderer;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.GhostRenderer;
@@ -12,6 +13,7 @@ import fr.koka99cab.sanctuary26.itsalive.client.renderer.GemChickenRenderer;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.FlyingWhaleRenderer;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.InfectedRenderer;
 import fr.koka99cab.sanctuary26.itsalive.client.renderer.MoobloomRenderer;
+import fr.koka99cab.sanctuary26.itsalive.client.renderer.NotchRenderer;
 import fr.koka99cab.sanctuary26.itsalive.culinary.client.renderer.FryingPanBlockEntityRenderer;
 import fr.koka99cab.sanctuary26.itsalive.culinary.client.renderer.FermentationBarrelBlockEntityRenderer;
 import fr.koka99cab.sanctuary26.itsalive.culinary.client.FermentationBarrelHud;
@@ -62,6 +64,7 @@ public final class ItsAliveClient implements ClientModInitializer {
 		ModelLayerRegistry.registerModelLayer(StandingCowModel.TEMPERATE_LAYER, StandingCowModel::createTemperateLayer);
 		ModelLayerRegistry.registerModelLayer(StandingCowModel.COLD_LAYER, StandingCowModel::createColdLayer);
 		ModelLayerRegistry.registerModelLayer(StandingCowModel.WARM_LAYER, StandingCowModel::createWarmLayer);
+		ModelLayerRegistry.registerModelLayer(NotchModel.LAYER_LOCATION, NotchModel::createBodyLayer);
 		EntityRendererRegistry.register(ItsAliveEntityTypes.BUTTERFLY, ButterflyRenderer::new);
 		EntityRendererRegistry.register(ItsAliveEntityTypes.GHOST, GhostRenderer::new);
 		EntityRendererRegistry.register(ItsAliveEntityTypes.BRACKEN, BrackenRenderer::new);
@@ -70,6 +73,8 @@ public final class ItsAliveClient implements ClientModInitializer {
 		EntityRendererRegistry.register(ItsAliveEntityTypes.MOOBLOOM, MoobloomRenderer::new);
 		EntityRendererRegistry.register(ItsAliveEntityTypes.GEM_CHICKEN, GemChickenRenderer::new);
 		EntityRendererRegistry.register(ItsAliveEntityTypes.ACID_GLOB, ThrownItemRenderer::new);
+		EntityRendererRegistry.register(ItsAliveEntityTypes.NOTCH, NotchRenderer::new);
+		EntityRendererRegistry.register(ItsAliveEntityTypes.LEGACY_NOTCH, NotchRenderer::new);
 		BlockEntityRendererRegistry.register(
 			ItsAliveFoodProcessing.FRYING_PAN_BLOCK_ENTITY,
 			FryingPanBlockEntityRenderer::new
@@ -0,0 +1,21 @@
+package fr.koka99cab.sanctuary26.itsalive.client.model;
+
+import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
+import fr.koka99cab.sanctuary26.itsalive.client.renderer.state.NotchRenderState;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.model.geom.ModelLayerLocation;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.builders.CubeDeformation;
+import net.minecraft.client.model.geom.builders.LayerDefinition;
+
+public final class NotchModel extends HumanoidModel<NotchRenderState> {
+	public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(ItsAliveMod.id("notch"), "main");
+
+	public NotchModel(ModelPart root) {
+		super(root);
+	}
+
+	public static LayerDefinition createBodyLayer() {
+		return LayerDefinition.create(HumanoidModel.createMesh(CubeDeformation.NONE, 0.0F), 64, 64);
+	}
+}
@@ -0,0 +1,45 @@
+package fr.koka99cab.sanctuary26.itsalive.client.renderer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
+import fr.koka99cab.sanctuary26.itsalive.client.model.NotchModel;
+import fr.koka99cab.sanctuary26.itsalive.client.renderer.state.NotchRenderState;
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.HumanoidMobRenderer;
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.Mth;
+
+public final class NotchRenderer extends HumanoidMobRenderer<NotchEntity, NotchRenderState, NotchModel> {
+	private static final Identifier TEXTURE = ItsAliveMod.id("textures/entity/notch.png");
+
+	public NotchRenderer(EntityRendererProvider.Context context) {
+		super(context, new NotchModel(context.bakeLayer(NotchModel.LAYER_LOCATION)), 0.5F);
+	}
+
+	@Override
+	public Identifier getTextureLocation(NotchRenderState state) {
+		return TEXTURE;
+	}
+
+	@Override
+	public NotchRenderState createRenderState() {
+		return new NotchRenderState();
+	}
+
+	@Override
+	public void extractRenderState(NotchEntity notch, NotchRenderState state, float partialTick) {
+		super.extractRenderState(notch, state, partialTick);
+		state.titan = notch.isTitan();
+		state.titanTransformationProgress = notch.titanTransformationProgress(partialTick);
+	}
+
+	@Override
+	protected void scale(NotchRenderState state, PoseStack poseStack) {
+		super.scale(state, poseStack);
+		float scale = state.titan
+			? Mth.lerp(state.titanTransformationProgress, 1.0F, NotchEntity.TITAN_RENDER_SCALE)
+			: 1.0F;
+		poseStack.scale(scale, scale, scale);
+	}
+}
@@ -0,0 +1,8 @@
+package fr.koka99cab.sanctuary26.itsalive.client.renderer.state;
+
+import net.minecraft.client.renderer.entity.state.HumanoidRenderState;
+
+public final class NotchRenderState extends HumanoidRenderState {
+	public boolean titan;
+	public float titanTransformationProgress;
+}
@@ -0,0 +1,495 @@
+package fr.koka99cab.sanctuary26.itsalive.entity.notch;
+
+import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
+import fr.koka99cab.sanctuary26.itsalive.api.notch.NotchCombatApi;
+import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
+import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
+import java.util.EnumSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.network.syncher.EntityDataSerializers;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.server.level.ServerBossEvent;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.util.Mth;
+import net.minecraft.world.BossEvent;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityDimensions;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.ai.goal.FloatGoal;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
+import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
+import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal;
+import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.Projectile;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
+import net.minecraft.world.phys.Vec3;
+
+/** The unique human resident of Alpha and his server-authoritative Titan phase. */
+public final class NotchEntity extends PathfinderMob {
+	private static final EntityDataAccessor<Byte> PHASE = SynchedEntityData.defineId(
+		NotchEntity.class, EntityDataSerializers.BYTE);
+	private static final EntityDataAccessor<Integer> PHASE_STARTED_TICK = SynchedEntityData.defineId(
+		NotchEntity.class, EntityDataSerializers.INT);
+	public static final float TITAN_RENDER_SCALE = 8.0F;
+	private static final float TITAN_HITBOX_SCALE = 5.0F;
+	private static final double HUMAN_HOME_RADIUS = 9.0D;
+	private static final double TITAN_HOME_RADIUS = 54.0D;
+	private static final double PARTICIPANT_RADIUS = 64.0D;
+	private static final String DATA_VERSION_KEY = "ItsAliveDataVersion";
+	private static final String PARTICIPANTS_KEY = "NotchParticipants";
+	private static final String LEGACY_REWARD_KEY = "NotchRewardGranted";
+	private final ServerBossEvent bossEvent = new ServerBossEvent(UUID.randomUUID(),
+		Component.translatable("boss.itsalive.notch_titan"), BossEvent.BossBarColor.RED,
+		BossEvent.BossBarOverlay.NOTCHED_20);
+	private final LinkedHashSet<UUID> participants = new LinkedHashSet<>();
+	private BlockPos home;
+	private int ticksWithoutParticipant;
+	private float titanMaximumHealth = NotchFightRules.MIN_TITAN_HEALTH;
+	private boolean legacyRewardGranted;
+
+	public NotchEntity(net.minecraft.world.entity.EntityType<? extends NotchEntity> type, Level level) {
+		super(type, level);
+		this.xpReward = 0;
+		this.setCustomName(Component.translatable("entity.itsalive.notch"));
+		this.setCustomNameVisible(true);
+		this.setPersistenceRequired();
+		this.bossEvent.setDarkenScreen(true);
+		this.bossEvent.setCreateWorldFog(true);
+		this.bossEvent.setVisible(false);
+		this.applyPhaseAttributes(true);
+	}
+
+	public static AttributeSupplier.Builder createAttributes() {
+		return Mob.createMobAttributes()
+			.add(Attributes.MAX_HEALTH, NotchFightRules.HUMAN_HEALTH)
+			.add(Attributes.ATTACK_DAMAGE, 1.0D)
+			.add(Attributes.FOLLOW_RANGE, 96.0D)
+			.add(Attributes.MOVEMENT_SPEED, 0.16D)
+			.add(Attributes.KNOCKBACK_RESISTANCE, 1.0D)
+			.add(Attributes.ARMOR, 0.0D)
+			.add(Attributes.ARMOR_TOUGHNESS, 0.0D)
+			.add(Attributes.STEP_HEIGHT, 2.0D);
+	}
+
+	@Override
+	protected void defineSynchedData(SynchedEntityData.Builder builder) {
+		super.defineSynchedData(builder);
+		builder.define(PHASE, (byte)NotchFightRules.Phase.HUMAN.id());
+		builder.define(PHASE_STARTED_TICK, 0);
+	}
+
+	@Override
+	protected void registerGoals() {
+		this.goalSelector.addGoal(0, new FloatGoal(this));
+		this.goalSelector.addGoal(1, new TitanCombatGoal());
+		this.goalSelector.addGoal(5, new BoundedStrollGoal());
+		this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 24.0F));
+		this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
+		this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10,
+			true, false, (target, level) -> this.isTitan() && target instanceof Player player
+				&& this.canParticipate(player)));
+	}
+
+	@Override
+	protected void customServerAiStep(ServerLevel level) {
+		super.customServerAiStep(level);
+		this.ensureHome(level);
+		this.bossEvent.setVisible(this.isTitan());
+		if (this.isTitan()) {
+			this.collectParticipants(level);
+			this.bossEvent.setProgress(Mth.clamp(this.getHealth() / this.getMaxHealth(), 0.0F, 1.0F));
+			if (this.hasActiveParticipant(level)) {
+				this.ticksWithoutParticipant = 0;
+			} else if (NotchFightRules.shouldReset(++this.ticksWithoutParticipant)) {
+				this.resetInterruptedFight(level);
+				return;
+			}
+			this.returnInsideBoundary(TITAN_HOME_RADIUS);
+		} else {
+			this.bossEvent.setProgress(1.0F);
+			this.ticksWithoutParticipant = 0;
+			if (this.getTarget() != null) this.setTarget(null);
+			this.returnInsideBoundary(HUMAN_HOME_RADIUS + 4.0D);
+		}
+	}
+
+	@Override
+	public boolean hurtServer(ServerLevel level, DamageSource source, float damage) {
+		if (this.isDefeated()) return false;
+		Entity attacker = source.getEntity();
+		if (this.isHuman()) {
+			if (attacker instanceof ServerPlayer player) {
+				this.beginFight(level, player);
+				return true;
+			}
+			return false;
+		}
+		if (attacker == this) return false;
+		if (source.getDirectEntity() instanceof Projectile projectile && projectile.getOwner() == this) return false;
+		if (attacker instanceof ServerPlayer player) this.addParticipant(player);
+		boolean hurt = super.hurtServer(level, source, Math.max(0.0F, damage));
+		if (hurt && attacker instanceof LivingEntity living && this.canAttack(living)) this.setTarget(living);
+		return hurt;
+	}
+
+	@Override
+	public void die(DamageSource source) {
+		if (this.isTitan() && this.level() instanceof ServerLevel level) {
+			this.completeFight(level);
+			return;
+		}
+		super.die(source);
+	}
+
+	@Override
+	public boolean canAttack(LivingEntity target) {
+		return this.isTitan() && super.canAttack(target);
+	}
+
+	@Override
+	protected void checkFallDamage(double distance, boolean landed, BlockState state, BlockPos pos) {
+	}
+
+	public void initializeAtHome(BlockPos home, boolean defeated) {
+		this.home = home.immutable();
+		this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, 180.0F, 0.0F);
+		this.setYHeadRot(180.0F);
+		this.setPhase(defeated ? NotchFightRules.Phase.DEFEATED : NotchFightRules.Phase.HUMAN, true);
+	}
+
+	public void restoreAtHome(BlockPos home, boolean defeated) {
+		this.participants.clear();
+		this.ticksWithoutParticipant = 0;
+		this.setTarget(null);
+		this.getNavigation().stop();
+		this.setDeltaMovement(Vec3.ZERO);
+		this.initializeAtHome(home, defeated);
+	}
+
+	public NotchFightRules.Phase phase() {
+		return NotchFightRules.Phase.byId(this.entityData.get(PHASE));
+	}
+
+	public boolean isHuman() {
+		return phase() == NotchFightRules.Phase.HUMAN;
+	}
+
+	public boolean isTitan() {
+		return phase() == NotchFightRules.Phase.TITAN;
+	}
+
+	public boolean isDefeated() {
+		return phase() == NotchFightRules.Phase.DEFEATED;
+	}
+
+	public float titanTransformationProgress(float partialTick) {
+		if (!isTitan()) return 0.0F;
+		return Mth.clamp((this.tickCount + partialTick - this.entityData.get(PHASE_STARTED_TICK)) / 30.0F,
+			0.0F, 1.0F);
+	}
+
+	public boolean legacyRewardGranted() {
+		return legacyRewardGranted;
+	}
+
+	public Set<UUID> participantIds() {
+		return Set.copyOf(participants);
+	}
+
+	private void beginFight(ServerLevel level, ServerPlayer attacker) {
+		this.participants.clear();
+		this.addParticipant(attacker);
+		level.players().stream()
+			.filter(this::canParticipate)
+			.sorted(java.util.Comparator.comparingDouble(this::distanceToSqr))
+			.forEach(this::addParticipant);
+		this.titanMaximumHealth = NotchFightRules.titanHealth(participants.size());
+		this.setPhase(NotchFightRules.Phase.TITAN, true);
+		this.setTarget(attacker);
+		this.bossEvent.setVisible(true);
+		this.spawnLightningRing(level, 4);
+		level.explode(this, this.getX(), this.getY() + 1.0D, this.getZ(), 4.0F,
+			Level.ExplosionInteraction.BLOCK);
+		this.playSound(SoundEvents.WITHER_SPAWN, 1.4F, 0.72F);
+	}
+
+	private void completeFight(ServerLevel level) {
+		this.collectParticipants(level);
+		this.setPhase(NotchFightRules.Phase.DEFEATED, true);
+		this.setTarget(null);
+		this.getNavigation().stop();
+		this.setDeltaMovement(Vec3.ZERO);
+		this.deathTime = 0;
+		this.bossEvent.setVisible(false);
+		this.spawnLightningRing(level, 3);
+		level.sendParticles(ParticleTypes.EXPLOSION_EMITTER, this.getX(), this.getY() + 1.0D,
+			this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
+		this.playSound(SoundEvents.WITHER_DEATH, 1.25F, 1.15F);
+		SanctuaryNotchMilestone.recordVictory(level, participants);
+	}
+
+	private void resetInterruptedFight(ServerLevel level) {
+		this.setPhase(NotchFightRules.Phase.HUMAN, true);
+		this.participants.clear();
+		this.setTarget(null);
+		this.getNavigation().stop();
+		this.setDeltaMovement(Vec3.ZERO);
+		this.bossEvent.setVisible(false);
+		if (home != null) this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, 180.0F, 0.0F);
+		level.sendParticles(ParticleTypes.SMOKE, this.getX(), this.getY() + 1.0D, this.getZ(),
+			18, 0.8D, 1.0D, 0.8D, 0.04D);
+	}
+
+	private void setPhase(NotchFightRules.Phase phase, boolean heal) {
+		this.entityData.set(PHASE, (byte)phase.id());
+		this.entityData.set(PHASE_STARTED_TICK, this.tickCount);
+		this.applyPhaseAttributes(heal);
+		this.refreshDimensions();
+	}
+
+	private void applyPhaseAttributes(boolean heal) {
+		boolean titan = isTitan();
+		setBaseValue(Attributes.MAX_HEALTH, titan ? titanMaximumHealth : NotchFightRules.HUMAN_HEALTH);
+		setBaseValue(Attributes.ATTACK_DAMAGE, titan ? 18.0D : 1.0D);
+		setBaseValue(Attributes.MOVEMENT_SPEED, titan ? 0.235D : 0.16D);
+		setBaseValue(Attributes.ARMOR, titan ? 10.0D : 0.0D);
+		setBaseValue(Attributes.ARMOR_TOUGHNESS, titan ? 8.0D : 0.0D);
+		if (heal) this.setHealth(this.getMaxHealth());
+	}
+
+	private void setBaseValue(net.minecraft.core.Holder<net.minecraft.world.entity.ai.attributes.Attribute> attribute,
+		double value) {
+		AttributeInstance instance = this.getAttribute(attribute);
+		if (instance != null) instance.setBaseValue(value);
+	}
+
+	private void ensureHome(ServerLevel level) {
+		if (home == null) home = SanctuaryAlphaWorld.residence(level.getSeed());
+	}
+
+	private void returnInsideBoundary(double radius) {
+		if (home == null || this.distanceToSqr(Vec3.atCenterOf(home)) <= radius * radius) return;
+		this.getNavigation().stop();
+		this.snapTo(home.getX() + 0.5D, home.getY(), home.getZ() + 0.5D, this.getYRot(), this.getXRot());
+	}
+
+	private boolean canParticipate(Player player) {
+		return player.isAlive() && !player.isSpectator() && player.level() == this.level()
+			&& this.distanceToSqr(player) <= PARTICIPANT_RADIUS * PARTICIPANT_RADIUS;
+	}
+
+	private void addParticipant(Player player) {
+		if (participants.size() < NotchFightRules.MAX_PARTICIPANTS && canParticipate(player)) {
+			participants.add(player.getUUID());
+		}
+	}
+
+	private void collectParticipants(ServerLevel level) {
+		level.players().stream().filter(this::canParticipate)
+			.sorted(java.util.Comparator.comparingDouble(this::distanceToSqr))
+			.forEach(this::addParticipant);
+	}
+
+	private boolean hasActiveParticipant(ServerLevel level) {
+		return participants.stream().map(level.getServer().getPlayerList()::getPlayer)
+			.anyMatch(player -> player != null && canParticipate(player));
+	}
+
+	private void spawnLightningRing(ServerLevel level, int strikes) {
+		for (int index = 0; index < strikes; index++) {
+			double angle = Math.PI * 2.0D * index / Math.max(1, strikes);
+			net.minecraft.world.entity.LightningBolt lightning = net.minecraft.world.entity.EntityTypes.LIGHTNING_BOLT
+				.create(level, net.minecraft.world.entity.EntitySpawnReason.TRIGGERED);
+			if (lightning == null) continue;
+			lightning.setVisualOnly(true);
+			lightning.setPos(this.getX() + Math.cos(angle) * 2.4D, this.getY(),
+				this.getZ() + Math.sin(angle) * 2.4D);
+			level.addFreshEntity(lightning);
+		}
+	}
+
+	@Override
+	protected EntityDimensions getDefaultDimensions(Pose pose) {
+		EntityDimensions dimensions = super.getDefaultDimensions(pose);
+		return isTitan() ? dimensions.scale(TITAN_HITBOX_SCALE) : dimensions;
+	}
+
+	@Override
+	public void onSyncedDataUpdated(EntityDataAccessor<?> key) {
+		super.onSyncedDataUpdated(key);
+		if (PHASE.equals(key)) this.refreshDimensions();
+	}
+
+	@Override
+	protected void addAdditionalSaveData(ValueOutput output) {
+		super.addAdditionalSaveData(output);
+		output.putInt(DATA_VERSION_KEY, ItsAliveMod.CURRENT_DATA_VERSION);
+		output.putByte("NotchPhase", this.entityData.get(PHASE));
+		output.putInt("NotchPhaseStartedTick", this.entityData.get(PHASE_STARTED_TICK));
+		output.putFloat("NotchStoredHealth", this.getHealth());
+		output.putFloat("NotchTitanMaximumHealth", this.titanMaximumHealth);
+		output.putString(PARTICIPANTS_KEY, participants.stream().map(UUID::toString).collect(Collectors.joining(",")));
+		output.putBoolean(LEGACY_REWARD_KEY, legacyRewardGranted);
+		if (home != null) {
+			output.putInt("NotchHomeX", home.getX());
+			output.putInt("NotchHomeY", home.getY());
+			output.putInt("NotchHomeZ", home.getZ());
+		}
+	}
+
+	@Override
+	protected void readAdditionalSaveData(ValueInput input) {
+		super.readAdditionalSaveData(input);
+		NotchFightRules.Phase phase = NotchFightRules.Phase.byId(input.getByteOr("NotchPhase", (byte)0));
+		this.entityData.set(PHASE, (byte)phase.id());
+		this.entityData.set(PHASE_STARTED_TICK, input.getIntOr("NotchPhaseStartedTick", 0));
+		this.titanMaximumHealth = Mth.clamp(input.getFloatOr("NotchTitanMaximumHealth",
+			NotchFightRules.MIN_TITAN_HEALTH), NotchFightRules.MIN_TITAN_HEALTH,
+			NotchFightRules.MAX_TITAN_HEALTH);
+		this.participants.clear();
+		input.getString(PARTICIPANTS_KEY).ifPresent(value -> {
+			for (String token : value.split(",")) {
+				if (participants.size() >= NotchFightRules.MAX_PARTICIPANTS) break;
+				try { participants.add(UUID.fromString(token)); } catch (IllegalArgumentException ignored) { }
+			}
+		});
+		this.legacyRewardGranted = input.getBooleanOr(LEGACY_REWARD_KEY, false);
+		if (input.getInt("NotchHomeX").isPresent() && input.getInt("NotchHomeY").isPresent()
+			&& input.getInt("NotchHomeZ").isPresent()) {
+			this.home = new BlockPos(input.getIntOr("NotchHomeX", 0), input.getIntOr("NotchHomeY", 0),
+				input.getIntOr("NotchHomeZ", 0));
+		}
+		this.applyPhaseAttributes(false);
+		this.setHealth(Mth.clamp(input.getFloatOr("NotchStoredHealth", this.getMaxHealth()),
+			1.0F, this.getMaxHealth()));
+		this.refreshDimensions();
+		this.bossEvent.setVisible(isTitan());
+	}
+
+	@Override
+	public void startSeenByPlayer(ServerPlayer player) {
+		super.startSeenByPlayer(player);
+		this.bossEvent.addPlayer(player);
+	}
+
+	@Override
+	public void stopSeenByPlayer(ServerPlayer player) {
+		super.stopSeenByPlayer(player);
+		this.bossEvent.removePlayer(player);
+	}
+
+	@Override
+	public boolean removeWhenFarAway(double distance) {
+		return false;
+	}
+
+	@Override
+	public int getMaxSpawnClusterSize() {
+		return 1;
+	}
+
+	private final class BoundedStrollGoal extends WaterAvoidingRandomStrollGoal {
+		private BoundedStrollGoal() {
+			super(NotchEntity.this, 0.72D, 0.008F);
+		}
+
+		@Override public boolean canUse() { return !NotchEntity.this.isTitan() && super.canUse(); }
+		@Override public boolean canContinueToUse() { return !NotchEntity.this.isTitan() && super.canContinueToUse(); }
+	}
+
+	private final class TitanCombatGoal extends Goal {
+		private static final double STRAFE_DISTANCE_SQUARED = 18.0D * 18.0D;
+		private int rangedCooldown;
+		private int meleeCooldown;
+		private int attackIndex;
+		private int windup;
+		private NotchCombatApi.Attack pendingAttack;
+		private boolean clockwise;
+		private int strafeTicks;
+
+		private TitanCombatGoal() {
+			this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
+		}
+
+		@Override public boolean canUse() {
+			LivingEntity target = NotchEntity.this.getTarget();
+			return NotchEntity.this.isTitan() && target != null && target.isAlive();
+		}
+
+		@Override public boolean canContinueToUse() { return canUse(); }
+
+		@Override public void start() {
+			rangedCooldown = 45;
+			meleeCooldown = 0;
+			attackIndex = 0;
+			windup = 0;
+			pendingAttack = null;
+			clockwise = NotchEntity.this.getRandom().nextBoolean();
+		}
+
+		@Override public void stop() {
+			NotchEntity.this.getNavigation().stop();
+			pendingAttack = null;
+		}
+
+		@Override public boolean requiresUpdateEveryTick() { return true; }
+
+		@Override public void tick() {
+			LivingEntity target = NotchEntity.this.getTarget();
+			if (target == null || !(NotchEntity.this.level() instanceof ServerLevel level)) return;
+			double distanceSquared = NotchEntity.this.distanceToSqr(target);
+			boolean canSee = NotchEntity.this.getSensing().hasLineOfSight(target);
+			NotchEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F);
+			if (!canSee || distanceSquared > STRAFE_DISTANCE_SQUARED) {
+				NotchEntity.this.getNavigation().moveTo(target, 1.12D);
+			} else {
+				NotchEntity.this.getNavigation().stop();
+				if (++strafeTicks >= 45) { strafeTicks = 0; clockwise = !clockwise; }
+				NotchEntity.this.getMoveControl().strafe(distanceSquared < 100.0D ? -0.45F : 0.28F,
+					clockwise ? 0.7F : -0.7F);
+			}
+			if (meleeCooldown > 0) meleeCooldown--;
+			if (distanceSquared <= 64.0D && meleeCooldown == 0) {
+				NotchCombatApi.execute(level, NotchEntity.this, target, NotchCombatApi.Attack.MELEE);
+				meleeCooldown = 24;
+			}
+			if (pendingAttack != null) {
+				if (--windup <= 0) {
+					NotchCombatApi.execute(level, NotchEntity.this, target, pendingAttack);
+					pendingAttack = null;
+					rangedCooldown = 65 + NotchEntity.this.getRandom().nextInt(32);
+				}
+				return;
+			}
+			if (rangedCooldown > 0) rangedCooldown--;
+			if (canSee && rangedCooldown == 0) {
+				pendingAttack = attackIndex++ % 5 == 4
+					? NotchCombatApi.Attack.LIGHTNING : NotchCombatApi.Attack.FIREBALL;
+				windup = pendingAttack == NotchCombatApi.Attack.LIGHTNING ? 24 : 14;
+				NotchCombatApi.telegraph(level, NotchEntity.this, target, pendingAttack);
+			}
+		}
+	}
+}
@@ -0,0 +1,49 @@
+package fr.koka99cab.sanctuary26.itsalive.entity.notch;
+
+import net.minecraft.util.Mth;
+
+/** Pure bounded rules shared by the live Notch entity and deterministic tests. */
+public final class NotchFightRules {
+	public static final int MAX_PARTICIPANTS = 8;
+	public static final int RESET_AFTER_EMPTY_TICKS = 20 * 15;
+	public static final float HUMAN_HEALTH = 20.0F;
+	public static final float MIN_TITAN_HEALTH = 360.0F;
+	public static final float MAX_TITAN_HEALTH = 600.0F;
+	public static final float RETURNED_FIREBALL_DAMAGE = 40.0F;
+
+	private NotchFightRules() {
+	}
+
+	public static float titanHealth(int participantCount) {
+		int bounded = Mth.clamp(participantCount, 1, MAX_PARTICIPANTS);
+		return Math.min(MAX_TITAN_HEALTH, MIN_TITAN_HEALTH + (bounded - 1) * 40.0F);
+	}
+
+	public static boolean shouldReset(int ticksWithoutParticipant) {
+		return ticksWithoutParticipant >= RESET_AFTER_EMPTY_TICKS;
+	}
+
+	public enum Phase {
+		HUMAN(0),
+		TITAN(1),
+		DEFEATED(2);
+
+		private final int id;
+
+		Phase(int id) {
+			this.id = id;
+		}
+
+		public int id() {
+			return id;
+		}
+
+		public static Phase byId(int id) {
+			return switch (id) {
+				case 1 -> TITAN;
+				case 2 -> DEFEATED;
+				default -> HUMAN;
+			};
+		}
+	}
+}
@@ -0,0 +1,156 @@
+package fr.koka99cab.sanctuary26.itsalive.entity.notch;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import fr.koka99cab.sanctuary26.itsalive.ItsAliveMod;
+import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveEntityTypes;
+import fr.koka99cab.sanctuary26.sanctuary.api.notch.SanctuaryNotchMilestone;
+import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
+import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.datafix.DataFixTypes;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.level.saveddata.SavedData;
+import net.minecraft.world.level.saveddata.SavedDataType;
+
+/** Maintains exactly one persistent Notch resident in the finite Alpha world. */
+public final class NotchResidentService {
+	private static final int CHECK_INTERVAL = 40;
+	private static boolean initialized;
+
+	private NotchResidentService() {
+	}
+
+	public static void initialize() {
+		if (initialized) return;
+		initialized = true;
+		ServerTickEvents.END_LEVEL_TICK.register(NotchResidentService::tick);
+		ItsAliveMod.LOGGER.debug("[{}] Registered the unique Alpha resident service.",
+			ItsAliveMod.DISPLAY_NAME);
+	}
+
+	public static Inspection inspect(MinecraftServer server) {
+		ServerLevel level = server.getLevel(SanctuaryDimensions.ALPHA);
+		if (level == null) return Inspection.unavailable();
+		SpawnState state = level.getDataStorage().computeIfAbsent(SpawnState.TYPE);
+		List<NotchEntity> residents = loadedResidents(level);
+		NotchEntity canonical = selectCanonical(residents, state.canonicalUuid()).orElse(null);
+		return new Inspection(true, residents.size(), canonical == null ? null : canonical.getUUID(),
+			canonical == null ? null : canonical.phase(), canonical == null ? null : canonical.blockPosition(),
+			SanctuaryNotchMilestone.isDefeated(server));
+	}
+
+	/** Force-loads the house chunk, removes duplicates and restores the canonical resident. */
+	public static Inspection restore(MinecraftServer server) {
+		ServerLevel level = server.getLevel(SanctuaryDimensions.ALPHA);
+		if (level == null) return Inspection.unavailable();
+		BlockPos home = SanctuaryAlphaWorld.residence(level.getSeed());
+		level.getChunkAt(home);
+		reconcile(level, true);
+		return inspect(server);
+	}
+
+	private static void tick(ServerLevel level) {
+		if (!level.dimension().equals(SanctuaryDimensions.ALPHA)
+				|| level.players().isEmpty()
+				|| level.getGameTime() % CHECK_INTERVAL != 0) return;
+		reconcile(level, false);
+	}
+
+	private static void reconcile(ServerLevel level, boolean forceHome) {
+		BlockPos home = SanctuaryAlphaWorld.residence(level.getSeed());
+		if (!forceHome && !level.isLoaded(home)) return;
+		SpawnState state = level.getDataStorage().computeIfAbsent(SpawnState.TYPE);
+		List<NotchEntity> residents = loadedResidents(level);
+		NotchEntity canonical = selectCanonical(residents, state.canonicalUuid()).orElse(null);
+		if (canonical == null) {
+			canonical = ItsAliveEntityTypes.NOTCH.create(level, EntitySpawnReason.EVENT);
+			if (canonical == null) return;
+			canonical.initializeAtHome(home, SanctuaryNotchMilestone.isDefeated(level.getServer()));
+			if (!level.addFreshEntity(canonical)) return;
+			residents = List.of(canonical);
+			ItsAliveMod.LOGGER.info("[{}] Placed Notch in the Alpha residence at {}.",
+				ItsAliveMod.DISPLAY_NAME, home);
+		}
+		for (NotchEntity resident : residents) {
+			if (resident != canonical) resident.discard();
+		}
+		state.setCanonicalUuid(canonical.getUUID());
+		if (canonical.isDefeated() && !SanctuaryNotchMilestone.isDefeated(level.getServer())) {
+			SanctuaryNotchMilestone.migrateLegacyVictory(level, canonical.legacyRewardGranted());
+		}
+		boolean defeated = SanctuaryNotchMilestone.isDefeated(level.getServer());
+		if (forceHome || defeated != canonical.isDefeated()) canonical.restoreAtHome(home, defeated);
+	}
+
+	private static List<NotchEntity> loadedResidents(ServerLevel level) {
+		List<NotchEntity> residents = new ArrayList<>();
+		for (Entity entity : level.getAllEntities()) {
+			if (entity instanceof NotchEntity notch && !notch.isRemoved()) residents.add(notch);
+		}
+		return residents;
+	}
+
+	private static Optional<NotchEntity> selectCanonical(List<NotchEntity> residents, UUID storedUuid) {
+		return residents.stream().min(Comparator
+			.comparing((NotchEntity notch) -> !notch.getUUID().equals(storedUuid))
+			.thenComparing(notch -> notch.getType() != ItsAliveEntityTypes.NOTCH)
+			.thenComparing(notch -> notch.getUUID().toString()));
+	}
+
+	public record Inspection(boolean alphaAvailable, int loadedResidents, UUID canonicalUuid,
+		NotchFightRules.Phase phase, BlockPos position, boolean worldDefeated) {
+		private static Inspection unavailable() {
+			return new Inspection(false, 0, null, null, null, false);
+		}
+	}
+
+	private static final class SpawnState extends SavedData {
+		private static final Codec<SpawnState> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+			Codec.INT.optionalFieldOf("data_version", ItsAliveMod.CURRENT_DATA_VERSION)
+				.forGetter(state -> state.dataVersion),
+			Codec.STRING.optionalFieldOf("canonical_uuid", "").forGetter(state -> state.canonicalUuid)
+		).apply(instance, SpawnState::new));
+		private static final SavedDataType<SpawnState> TYPE = new SavedDataType<>(
+			ItsAliveMod.id("alpha_notch_resident"), SpawnState::new, CODEC, DataFixTypes.LEVEL);
+		private int dataVersion;
+		private String canonicalUuid;
+
+		private SpawnState() {
+			this(ItsAliveMod.CURRENT_DATA_VERSION, "");
+		}
+
+		private SpawnState(int dataVersion, String canonicalUuid) {
+			this.dataVersion = Math.max(1, dataVersion);
+			this.canonicalUuid = canonicalUuid == null ? "" : canonicalUuid;
+			if (this.dataVersion < ItsAliveMod.CURRENT_DATA_VERSION) {
+				this.dataVersion = ItsAliveMod.CURRENT_DATA_VERSION;
+				setDirty();
+			}
+		}
+
+		private UUID canonicalUuid() {
+			try {
+				return UUID.fromString(canonicalUuid);
+			} catch (IllegalArgumentException ignored) {
+				return new UUID(0L, 0L);
+			}
+		}
+
+		private void setCanonicalUuid(UUID uuid) {
+			String value = uuid.toString();
+			if (value.equals(canonicalUuid)) return;
+			canonicalUuid = value;
+			setDirty();
+		}
+	}
+}
@@ -9,6 +9,7 @@ import fr.koka99cab.sanctuary26.itsalive.entity.FlyingWhaleEntity;
 import fr.koka99cab.sanctuary26.itsalive.entity.GemChickenEntity;
 import fr.koka99cab.sanctuary26.itsalive.entity.InfectedEntity;
 import fr.koka99cab.sanctuary26.itsalive.entity.MoobloomEntity;
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
 import java.util.function.Predicate;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext;
@@ -44,6 +45,8 @@ public final class ItsAliveEntityTypes {
 	public static final Identifier ACID_GLOB_ID = ItsAliveMod.id("acid_glob");
 	public static final Identifier MOOBLOOM_ID = ItsAliveMod.id("moobloom");
 	public static final Identifier GEM_CHICKEN_ID = ItsAliveMod.id("gem_chicken");
+	public static final Identifier NOTCH_ID = ItsAliveMod.id("notch");
+	public static final Identifier LEGACY_NOTCH_ID = Identifier.fromNamespaceAndPath("portals", "notch");

 	public static final EntityType<ButterflyEntity> BUTTERFLY = Registry.register(
 		BuiltInRegistries.ENTITY_TYPE,
@@ -167,6 +170,10 @@ public final class ItsAliveEntityTypes {
 			.build(ResourceKey.create(Registries.ENTITY_TYPE, GEM_CHICKEN_ID))
 	);

+	public static final EntityType<NotchEntity> NOTCH = registerNotch(NOTCH_ID);
+	/** Hidden alias used only to deserialize Notch entities written by the historical Portals prototype. */
+	public static final EntityType<NotchEntity> LEGACY_NOTCH = registerNotch(LEGACY_NOTCH_ID);
+
 	private ItsAliveEntityTypes() {
 	}

@@ -192,7 +199,19 @@ public final class ItsAliveEntityTypes {
 				entity.discard();
 			}
 		});
-		ItsAliveMod.LOGGER.info("[{}] Registered papillon, 16-variant moobloom, three gem chickens, ghost, bracken, flying whale and five-role infected; vanilla phantoms disabled.",
+		ItsAliveMod.LOGGER.info("[{}] Registered papillon, 16-variant moobloom, three gem chickens, ghost, bracken, flying whale, five-role infected and the unique Alpha resident; vanilla phantoms disabled.",
 			ItsAliveMod.DISPLAY_NAME);
 	}
+
+	private static EntityType<NotchEntity> registerNotch(Identifier id) {
+		return Registry.register(BuiltInRegistries.ENTITY_TYPE, id,
+			FabricEntityType.Builder.createMob(NotchEntity::new, MobCategory.CREATURE,
+				mob -> mob.defaultAttributes(NotchEntity::createAttributes))
+				.sized(0.6F, 1.8F)
+				.clientTrackingRange(96)
+				.updateInterval(2)
+				.noSummon()
+				.noLootTable()
+				.build(ResourceKey.create(Registries.ENTITY_TYPE, id)));
+	}
 }
@@ -288,5 +288,7 @@
 	"hud.itsalive.cooking_cauldron.assembly": "Mixture incomplete: %s",
 	"hud.itsalive.cooking_cauldron.cooking": "Cooking: %s",
 	"hud.itsalive.cooking_cauldron.expired": "Mixture failed — collect the failed dish",
-	"hud.itsalive.cooking_cauldron.ready": "Dish ready"
+	"hud.itsalive.cooking_cauldron.ready": "Dish ready",
+	"entity.itsalive.notch": "Notch",
+	"boss.itsalive.notch_titan": "Notch Titan"
 }
@@ -288,5 +288,7 @@
 	"hud.itsalive.cooking_cauldron.assembly": "Mélange incomplet : %s",
 	"hud.itsalive.cooking_cauldron.cooking": "Cuisson : %s",
 	"hud.itsalive.cooking_cauldron.expired": "Plat raté — récupère le résultat",
-	"hud.itsalive.cooking_cauldron.ready": "Plat prêt"
+	"hud.itsalive.cooking_cauldron.ready": "Plat prêt",
+	"entity.itsalive.notch": "Notch",
+	"boss.itsalive.notch_titan": "Notch Titan"
 }
@@ -288,5 +288,7 @@
 	"hud.itsalive.cooking_cauldron.assembly": "Mixture incomplete: %s",
 	"hud.itsalive.cooking_cauldron.cooking": "Cooking: %s",
 	"hud.itsalive.cooking_cauldron.expired": "Mixture failed — collect the failed dish",
-	"hud.itsalive.cooking_cauldron.ready": "Dish ready"
+	"hud.itsalive.cooking_cauldron.ready": "Dish ready",
+	"entity.itsalive.notch": "Нотч",
+	"boss.itsalive.notch_titan": "Нотч-Титан"
 }
@@ -38,13 +38,13 @@
 		"fabric-api": ">=0.154.2+26.2",
 		"anotherworld": "*",
 		"ambiance": ">=0.0.0-alpha.14",
-		"sanctuary": ">=0.0.0-alpha.117"
+		"sanctuary": ">=0.0.0-alpha.126"
 	},
 	"custom": {
 		"sanctuary26": {
 			"system_type": "gameplay-system",
 			"namespace": "itsalive",
-			"data_version": 3,
+			"data_version": 4,
 			"network_protocol": 4,
 			"lifecycle": "${lifecycle}",
 			"pack_version": "${pack_version}",
@@ -0,0 +1,34 @@
+package fr.koka99cab.sanctuary26.itsalive.entity.notch;
+
+public final class NotchFightRulesSmoke {
+	private NotchFightRulesSmoke() {
+	}
+
+	public static void main(String[] args) {
+		assertFloat(NotchFightRules.MIN_TITAN_HEALTH, NotchFightRules.titanHealth(-20),
+			"health below one participant");
+		assertFloat(400.0F, NotchFightRules.titanHealth(2), "two participant scaling");
+		assertFloat(NotchFightRules.MAX_TITAN_HEALTH,
+			NotchFightRules.titanHealth(NotchFightRules.MAX_PARTICIPANTS), "maximum scaling");
+		assertFloat(NotchFightRules.MAX_TITAN_HEALTH, NotchFightRules.titanHealth(200),
+			"participant bound");
+		if (NotchFightRules.shouldReset(NotchFightRules.RESET_AFTER_EMPTY_TICKS - 1)) {
+			throw new AssertionError("Fight reset one tick too early");
+		}
+		if (!NotchFightRules.shouldReset(NotchFightRules.RESET_AFTER_EMPTY_TICKS)) {
+			throw new AssertionError("Fight did not reset at the documented threshold");
+		}
+		if (NotchFightRules.RETURNED_FIREBALL_DAMAGE != 40.0F
+				|| NotchFightRules.Phase.byId(-1) != NotchFightRules.Phase.HUMAN
+				|| NotchFightRules.Phase.byId(1) != NotchFightRules.Phase.TITAN
+				|| NotchFightRules.Phase.byId(2) != NotchFightRules.Phase.DEFEATED) {
+			throw new AssertionError("Notch phase or reflected-fireball contract changed");
+		}
+	}
+
+	private static void assertFloat(float expected, float actual, String label) {
+		if (Float.compare(expected, actual) != 0) {
+			throw new AssertionError(label + ": expected " + expected + ", got " + actual);
+		}
+	}
+}
@@ -16,6 +16,7 @@ import fr.koka99cab.sanctuary26.itsalive.creeper.ItsAliveCreeper;
 import fr.koka99cab.sanctuary26.itsalive.creeper.ItsAliveCreepers;
 import fr.koka99cab.sanctuary26.itsalive.entity.InfectedEntity;
 import fr.koka99cab.sanctuary26.itsalive.entity.InfectedVariant;
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchResidentService;
 import fr.koka99cab.sanctuary26.itsalive.registry.ItsAliveEntityTypes;
 import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceDailyWeather;
 import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceEnvironmentController;
@@ -94,6 +95,7 @@ public final class MasterKeyCommands {
 				.then(creeperCommand())
 				.then(infectedCommand())
 				.then(ambianceCommand())
+				.then(notchCommand())
 				.then(SanctuaryProgressionCommands.command())
 				.then(panoramaCommand())
 				.then(teleportCommand())
@@ -113,6 +115,42 @@ public final class MasterKeyCommands {
 		);
 	}

+	private static com.mojang.brigadier.builder.ArgumentBuilder<CommandSourceStack, ?> notchCommand() {
+		return Commands.literal("notch")
+			.executes(context -> inspectNotch(context.getSource()))
+			.then(Commands.literal("inspect")
+				.executes(context -> inspectNotch(context.getSource())))
+			.then(Commands.literal("restore")
+				.executes(context -> restoreNotch(context.getSource())));
+	}
+
+	private static int inspectNotch(CommandSourceStack source) {
+		NotchResidentService.Inspection inspection = NotchResidentService.inspect(source.getServer());
+		if (!inspection.alphaAvailable()) {
+			source.sendFailure(Component.translatable("command.masterkey.notch.alpha_unavailable"));
+			return 0;
+		}
+		source.sendSuccess(() -> Component.translatable("command.masterkey.notch.inspect",
+			inspection.loadedResidents(),
+			inspection.canonicalUuid() == null ? "-" : inspection.canonicalUuid().toString(),
+			inspection.phase() == null ? "-" : inspection.phase().name().toLowerCase(java.util.Locale.ROOT),
+			inspection.position() == null ? "-" : inspection.position().toShortString(),
+			inspection.worldDefeated()), false);
+		return Command.SINGLE_SUCCESS;
+	}
+
+	private static int restoreNotch(CommandSourceStack source) {
+		NotchResidentService.Inspection inspection = NotchResidentService.restore(source.getServer());
+		if (!inspection.alphaAvailable() || inspection.canonicalUuid() == null) {
+			source.sendFailure(Component.translatable("command.masterkey.notch.restore.failure"));
+			return 0;
+		}
+		source.sendSuccess(() -> Component.translatable("command.masterkey.notch.restore.success",
+			inspection.canonicalUuid().toString(), inspection.loadedResidents(),
+			inspection.phase().name().toLowerCase(java.util.Locale.ROOT)), true);
+		return Command.SINGLE_SUCCESS;
+	}
+
 	private static com.mojang.brigadier.builder.ArgumentBuilder<CommandSourceStack, ?> ambianceCommand() {
 		var root = Commands.literal("ambiance")
 			.executes(context -> ambianceStatus(context.getSource()))
@@ -1,6 +1,10 @@
 {
 	"mod.masterkey.description": "Owns administration, diagnostics and developer tools.",
-	"command.masterkey.help": "MasterKey lab: give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.help": "MasterKey lab: give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.notch.alpha_unavailable": "The Alpha dimension is not loaded.",
+	"command.masterkey.notch.inspect": "Notch: %1$s loaded resident(s), UUID %2$s, phase %3$s, position %4$s, world victory: %5$s.",
+	"command.masterkey.notch.restore.success": "Notch restored: UUID %1$s, %2$s loaded resident, phase %3$s.",
+	"command.masterkey.notch.restore.failure": "Notch could not be restored in Alpha.",
 	"command.masterkey.ambiance.status": "Weather: %1$s; lunar night: %2$s (%3$s).",
 	"command.masterkey.ambiance.mode.auto": "automatic",
 	"command.masterkey.ambiance.mode.forced": "forced",
@@ -1,6 +1,10 @@
 {
 	"mod.masterkey.description": "Possède l'administration, les diagnostics et les outils de développement.",
-	"command.masterkey.help": "Laboratoire MasterKey : give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.help": "Laboratoire MasterKey : give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.notch.alpha_unavailable": "La dimension Alpha n'est pas chargée.",
+	"command.masterkey.notch.inspect": "Notch : %1$s résident(s) chargé(s), UUID %2$s, phase %3$s, position %4$s, victoire mondiale : %5$s.",
+	"command.masterkey.notch.restore.success": "Notch restauré : UUID %1$s, %2$s résident chargé, phase %3$s.",
+	"command.masterkey.notch.restore.failure": "Impossible de restaurer Notch dans Alpha.",
 	"command.masterkey.ambiance.status": "Météo : %1$s ; nuit lunaire : %2$s (%3$s).",
 	"command.masterkey.ambiance.mode.auto": "automatique",
 	"command.masterkey.ambiance.mode.forced": "forcée",
@@ -1,6 +1,10 @@
 {
 	"mod.masterkey.description": "Отвечает за администрирование, диагностику и инструменты разработчика.",
-	"command.masterkey.help": "Лаборатория MasterKey: give, spawn, creeper, infected, ambiance, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.help": "Лаборатория MasterKey: give, spawn, creeper, infected, ambiance, notch, progression, panorama, teleport, dump, debug.",
+	"command.masterkey.notch.alpha_unavailable": "Измерение Alpha не загружено.",
+	"command.masterkey.notch.inspect": "Notch: загружено жителей — %1$s, UUID %2$s, фаза %3$s, позиция %4$s, мировая победа: %5$s.",
+	"command.masterkey.notch.restore.success": "Notch восстановлен: UUID %1$s, загружено жителей — %2$s, фаза %3$s.",
+	"command.masterkey.notch.restore.failure": "Не удалось восстановить Notch в Alpha.",
 	"command.masterkey.ambiance.status": "Погода: %1$s; лунная ночь: %2$s (%3$s).",
 	"command.masterkey.ambiance.mode.auto": "автоматически",
 	"command.masterkey.ambiance.mode.forced": "принудительно",
@@ -23,8 +23,8 @@
 		"minecraft": "~26.2",
 		"java": ">=25",
 		"fabric-api": ">=0.154.2+26.2",
-		"itsalive": ">=0.0.0-alpha.1",
-		"sanctuary": ">=0.0.0-alpha.17",
+		"itsalive": ">=0.0.0-alpha.37",
+		"sanctuary": ">=0.0.0-alpha.126",
 		"ambiance": "*"
 	},
 	"custom": {
@@ -2,7 +2,7 @@

 Ouch possède le combat, les dégâts et la destruction dans Sanctuary 26.2.

-## Version courante — `0.0.0-alpha.5`
+## Version courante — `0.0.0-alpha.11`

 La première version active migre les quatre objets du mod historique Gunz dans
 le namespace unique `ouch:*` et les rassemble dans l’onglet créatif
@@ -79,6 +79,15 @@ n’ajoutent ni payload réseau, ni donnée persistante, ni munition enregistré
 L’Arc bêta réutilise volontairement l’apparence statique du bow vanilla et se
 fabrique sans forme avec un arc, une redstone et une ficelle.

+## Combat de Notch Titan
+
+Ouch implémente le pont public de combat exposé par It's Alive. Le Titan poursuit
+ses participants, annonce visuellement ses attaques puis alterne mêlée, boules de
+feu renvoyables et éclairs visuels avec dégâts serveur. Une boule renvoyée par un
+joueur inflige 40 dégâts au Titan. Les explosions de projectiles utilisent
+`ExplosionInteraction.NONE` et les autres attaques ne modifient aucun bloc ;
+seule la transformation initiale, pilotée par l'entité, peut endommager le décor.
+
 ## Compatibilité

 Les anciens IDs `gunz:*` ne sont pas réenregistrés. Le contrat
@@ -118,7 +118,7 @@ tasks.register("verifyOuch") {
 		def creeperlockRecipe = new JsonSlurper().parse(file("src/main/resources/data/ouch/recipe/creeperlock.json"))
 		def silverEngineeringMigration = new JsonSlurper().parse(rootProject.file(
 			"pack/migrations/26.2.0-alpha.184-silver-engineering-to-alpha.185.json"))
-		if (project.version.toString() != "0.0.0-alpha.10"
+		if (project.version.toString() != "0.0.0-alpha.11"
 			|| mitrailletteRecipe.pattern != ["RRP", "IGI", " B "]
 			|| mitrailletteRecipe.key != [B: "minecraft:stone_button", G: "minecraft:redstone",
 				I: "anotherworld:silver_ingot", P: "anotherworld:silver_plate", R: "anotherworld:silver_rod"]
@@ -4,6 +4,7 @@ import fr.koka99cab.sanctuary26.ouch.OuchMod;
 import fr.koka99cab.sanctuary26.ouch.entity.WeatherTntEntity;
 import fr.koka99cab.sanctuary26.ouch.registry.OuchAbjectionProjectiles;
 import fr.koka99cab.sanctuary26.ouch.registry.OuchWeatherTnt;
+import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -16,6 +17,8 @@ public final class OuchClient implements ClientModInitializer {
 	public void onInitializeClient() {
 		EntityRendererRegistry.register(OuchAbjectionProjectiles.ENTITY,
 			context -> new ThrownItemRenderer<>(context));
+		EntityRendererRegistry.register(OuchNotchCombat.FIREBALL,
+			context -> new ThrownItemRenderer<>(context, 3.0F, true));
 		registerWeatherRenderer(OuchWeatherTnt.ENTITY);
 		registerWeatherRenderer(OuchWeatherTnt.REDSTONER_COMPAT_ENTITY);
 		registerWeatherRenderer(OuchWeatherTnt.LEGACY_ENTITY);
@@ -0,0 +1,61 @@
+package fr.koka99cab.sanctuary26.ouch.entity;
+
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchEntity;
+import fr.koka99cab.sanctuary26.itsalive.entity.notch.NotchFightRules;
+import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.hurtingprojectile.Fireball;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.EntityHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
+
+/** Large, reflectable Titan fireball whose explosion never changes blocks. */
+public final class NotchFireballEntity extends Fireball {
+	private static final int MAX_LIFETIME_TICKS = 200;
+	private static final float DIRECT_HIT_DAMAGE = 10.0F;
+	private static final float EXPLOSION_POWER = 2.0F;
+
+	public NotchFireballEntity(EntityType<? extends NotchFireballEntity> type, Level level) {
+		super(type, level);
+	}
+
+	public NotchFireballEntity(ServerLevel level, LivingEntity owner, Vec3 direction) {
+		super(OuchNotchCombat.FIREBALL, owner, direction, level);
+	}
+
+	@Override
+	public void tick() {
+		super.tick();
+		if (this.tickCount > MAX_LIFETIME_TICKS) this.discard();
+	}
+
+	@Override
+	protected void onHit(HitResult hitResult) {
+		super.onHit(hitResult);
+		if (!(this.level() instanceof ServerLevel level)) return;
+		level.explode(this, this.getX(), this.getY(), this.getZ(), EXPLOSION_POWER, false,
+			Level.ExplosionInteraction.NONE);
+		this.discard();
+	}
+
+	@Override
+	protected void onHitEntity(EntityHitResult hitResult) {
+		super.onHitEntity(hitResult);
+		if (!(this.level() instanceof ServerLevel level)) return;
+		Entity target = hitResult.getEntity();
+		Entity owner = this.getOwner();
+		if (target instanceof NotchEntity && owner instanceof NotchEntity) return;
+		var source = this.damageSources().fireball(this, owner);
+		float damage = target instanceof NotchEntity && owner instanceof Player
+			? NotchFightRules.RETURNED_FIREBALL_DAMAGE : DIRECT_HIT_DAMAGE;
+		if (target.hurtServer(level, source, damage)) {
+			EnchantmentHelper.doPostAttackEffects(level, target, source);
+		}
+	}
+}
@@ -0,0 +1,111 @@
+package fr.koka99cab.sanctuary26.ouch.notch;
+
+import fr.koka99cab.sanctuary26.itsalive.api.notch.NotchCombatApi;
+import fr.koka99cab.sanctuary26.ouch.OuchMod;
+import fr.koka99cab.sanctuary26.ouch.entity.NotchFireballEntity;
+import net.minecraft.core.Registry;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
+import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+
+/** Ouch-owned implementation of the server-authoritative Notch attack bridge. */
+public final class OuchNotchCombat implements NotchCombatApi.Engine {
+	private static final Identifier FIREBALL_ID = OuchMod.id("notch_fireball");
+	private static final ResourceKey<EntityType<?>> FIREBALL_KEY = ResourceKey.create(
+		Registries.ENTITY_TYPE, FIREBALL_ID);
+	public static final EntityType<NotchFireballEntity> FIREBALL = Registry.register(
+		BuiltInRegistries.ENTITY_TYPE, FIREBALL_ID,
+		EntityType.Builder.<NotchFireballEntity>of(NotchFireballEntity::new, MobCategory.MISC)
+			.sized(1.0F, 1.0F)
+			.clientTrackingRange(64)
+			.updateInterval(1)
+			.noSave()
+			.noLootTable()
+			.build(FIREBALL_KEY));
+	private static boolean initialized;
+
+	private OuchNotchCombat() {
+	}
+
+	public static void initialize() {
+		if (initialized) return;
+		initialized = true;
+		NotchCombatApi.register(new OuchNotchCombat());
+		OuchMod.LOGGER.debug("[{}] Registered the Notch Titan combat engine.", OuchMod.DISPLAY_NAME);
+	}
+
+	@Override
+	public void telegraph(ServerLevel level, LivingEntity boss, LivingEntity target,
+		NotchCombatApi.Attack attack) {
+		if (attack == NotchCombatApi.Attack.FIREBALL) {
+			level.sendParticles(ParticleTypes.FLAME, boss.getX(), boss.getEyeY(), boss.getZ(),
+				28, 0.7D, 1.0D, 0.7D, 0.035D);
+			level.playSound(null, boss.blockPosition(), SoundEvents.BLAZE_SHOOT, SoundSource.HOSTILE,
+				0.9F, 0.55F);
+		} else if (attack == NotchCombatApi.Attack.LIGHTNING) {
+			level.sendParticles(ParticleTypes.ELECTRIC_SPARK, target.getX(), target.getY() + 0.1D,
+				target.getZ(), 42, 1.25D, 0.06D, 1.25D, 0.08D);
+			level.playSound(null, target.blockPosition(), SoundEvents.TRIDENT_THUNDER.value(),
+				SoundSource.HOSTILE, 1.0F, 1.35F);
+		}
+	}
+
+	@Override
+	public void execute(ServerLevel level, LivingEntity boss, LivingEntity target,
+		NotchCombatApi.Attack attack) {
+		switch (attack) {
+			case MELEE -> melee(level, boss, target);
+			case FIREBALL -> fireball(level, boss, target);
+			case LIGHTNING -> lightning(level, boss, target);
+		}
+	}
+
+	private static void melee(ServerLevel level, LivingEntity boss, LivingEntity target) {
+		boss.swing(InteractionHand.MAIN_HAND);
+		if (!target.hurtServer(level, level.damageSources().mobAttack(boss), 18.0F)) return;
+		pushAway(boss, target, 1.4D, 0.48D);
+		level.sendParticles(ParticleTypes.EXPLOSION, target.getX(), target.getY() + 1.0D,
+			target.getZ(), 4, 0.35D, 0.55D, 0.35D, 0.02D);
+	}
+
+	private static void fireball(ServerLevel level, LivingEntity boss, LivingEntity target) {
+		Vec3 origin = boss.getEyePosition().add(boss.getLookAngle().scale(1.5D));
+		Vec3 aim = target.getEyePosition().subtract(origin).normalize();
+		NotchFireballEntity projectile = new NotchFireballEntity(level, boss, aim);
+		projectile.setPos(origin);
+		level.addFreshEntity(projectile);
+	}
+
+	private static void lightning(ServerLevel level, LivingEntity boss, LivingEntity target) {
+		LightningBolt lightning = EntityTypes.LIGHTNING_BOLT.create(level, EntitySpawnReason.TRIGGERED);
+		if (lightning != null) {
+			lightning.setVisualOnly(true);
+			lightning.setPos(target.position());
+			level.addFreshEntity(lightning);
+		}
+		if (target.hurtServer(level, level.damageSources().lightningBolt(), 7.0F)) {
+			pushAway(boss, target, 1.0D, 0.35D);
+		}
+	}
+
+	private static void pushAway(LivingEntity boss, LivingEntity target, double strength, double lift) {
+		Vec3 horizontal = target.position().subtract(boss.position()).multiply(1.0D, 0.0D, 1.0D);
+		if (horizontal.lengthSqr() < 1.0E-6D) horizontal = boss.getLookAngle().multiply(1.0D, 0.0D, 1.0D);
+		horizontal = horizontal.normalize().scale(strength);
+		target.push(horizontal.x, lift, horizontal.z);
+	}
+}
@@ -1,6 +1,7 @@
 package fr.koka99cab.sanctuary26.ouch.registry;

 import fr.koka99cab.sanctuary26.ouch.OuchMod;
+import fr.koka99cab.sanctuary26.ouch.notch.OuchNotchCombat;

 /**
 * Single registration entry point for the Ouch namespace.
@@ -20,6 +21,7 @@ public final class OuchRegistries {
 		OuchItems.initialize();
 		OuchWeatherTnt.initialize();
 		OuchAbjectionProjectiles.initialize();
+		OuchNotchCombat.initialize();
 		OuchCreativeTab.initialize();
 		OuchMod.LOGGER.debug("[{}] Weapon registry hub initialized.", OuchMod.DISPLAY_NAME);
 	}
@@ -26,7 +26,8 @@
 		"anotherworld": ">=0.0.0-alpha.46",
 		"ambiance": ">=0.0.0-alpha.12",
 		"onlyfun": ">=0.0.0-alpha.23",
-		"sanctuary": ">=0.0.0-alpha.110"
+		"itsalive": ">=0.0.0-alpha.37",
+		"sanctuary": ">=0.0.0-alpha.126"
 	},
 	"custom": {
 		"sanctuary26": {
@@ -0,0 +1,54 @@
+{
+  "schema_version": 1,
+  "source": {
+    "pack_version": "26.2.0-alpha.219",
+    "modules": {
+      "redstoner": "0.0.0-alpha.11"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.220",
+    "modules": {
+      "redstoner": "0.0.0-alpha.12"
+    }
+  },
+  "storage_terminal_menu": {
+    "owner": "redstoner",
+    "id": "redstoner:storage_terminal",
+    "menu_type": "redstoner:storage_terminal",
+    "native_container_menu": true,
+    "dedicated_close_button": false,
+    "terminal_slots": 54,
+    "terminal_slots_reorderable": false,
+    "quantity_data_words_per_slot": 2,
+    "minimum_player_inventory_rows": 1,
+    "maximum_player_inventory_rows": 6,
+    "inventory_rows_authority": "sanctuary_progression",
+    "left_click_with_empty_cursor": "take_stack",
+    "right_click_with_empty_cursor": "take_one",
+    "click_with_carried_stack": "deposit",
+    "shift_click_from_terminal": "take_to_unlocked_inventory",
+    "shift_click_from_player": "deposit",
+    "deposit_order": "first_discovered_container",
+    "per_container_order": ["compatible_stacks", "empty_slots"],
+    "spill_to_next_container_when_required": true,
+    "strict_item_component_aggregation": true,
+    "server_authoritative_transfers": true,
+    "vanilla_menu_synchronization": true,
+    "legacy_terminal_payloads_removed": true
+  },
+  "compatibility": {
+    "new_world_required": false,
+    "save_reset_required": false,
+    "existing_saves_supported": true,
+    "redstoner_data_version": 3,
+    "redstoner_source_network_protocol": 6,
+    "redstoner_target_network_protocol": 7
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true
+  }
+}
@@ -0,0 +1,46 @@
+{
+  "schema_version": 1,
+  "source": {
+    "pack_version": "26.2.0-alpha.220",
+    "modules": {
+      "ambiance": "0.0.0-alpha.21"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.221",
+    "modules": {
+      "ambiance": "0.0.0-alpha.22"
+    }
+  },
+  "white_disc_native_rate": {
+    "owner": "ambiance",
+    "reference_video_id": "Ue5ZBe-GzSM",
+    "source_format": "MP4_AAC_LC",
+    "decoded_sample_rate_hz": 48000,
+    "decoded_source_channels": 2,
+    "openal_output_channels": 1,
+    "sample_size_bits": 16,
+    "byte_order": "little_endian",
+    "stereo_to_mono": "average_left_right_per_sample",
+    "openal_pitch": 1.0,
+    "decoded_timeline_millis": 4000,
+    "openal_timeline_millis": 4000,
+    "padded_silence_bytes": 0,
+    "positional_audio_preserved": true,
+    "previous_pitch_compensation_removed": true
+  },
+  "compatibility": {
+    "new_world_required": false,
+    "save_reset_required": false,
+    "existing_saves_supported": true,
+    "registry_ids_changed": false,
+    "ambiance_data_version": 2,
+    "ambiance_network_protocol": 6
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true
+  }
+}
@@ -0,0 +1,60 @@
+{
+  "schema_version": 1,
+  "source": {
+    "pack_version": "26.2.0-alpha.221",
+    "modules": {
+      "redstoner": "0.0.0-alpha.12",
+      "sanctuary": "0.0.0-alpha.122"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.222",
+    "modules": {
+      "redstoner": "0.0.0-alpha.13",
+      "sanctuary": "0.0.0-alpha.124"
+    }
+  },
+  "storage_terminal_search": {
+    "owner": "redstoner",
+    "maximum_search_length": 32,
+    "searches_display_name_item_id_and_translation": true,
+    "accent_and_unicode_folding": true,
+    "compact_quantity_labels": true,
+    "exact_quantity_tooltip": true,
+    "empty_slots_remain_stable_until_new_search_or_reopen": true,
+    "server_authoritative_transfers": true
+  },
+  "quest_tracker": {
+    "owner": "sanctuary",
+    "default_key": "J",
+    "maximum_entries": 8,
+    "accepted_quests_only": true,
+    "reserved_contracts_included": true,
+    "own_published_requests_excluded": true,
+    "transparent_text_only_hud": true,
+    "item_and_mob_id_suggestions": true,
+    "server_authoritative_snapshot": true
+  },
+  "compatibility": {
+    "new_world_required": false,
+    "save_reset_required": false,
+    "existing_saves_supported": true,
+    "registry_ids_changed": false,
+    "redstoner_data_version": 3,
+    "redstoner_network_protocol": 7,
+    "sanctuary_data_version": 11,
+    "sanctuary_network_protocol": 22
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true,
+    "jei": {
+      "source": "30.28.0.193",
+      "target": "30.29.0.196",
+      "modrinth_version_id": "vvwsu2BR",
+      "packwiz_and_prism_synchronized": true
+    }
+  }
+}
@@ -0,0 +1,60 @@
+{
+  "schema_version": 1,
+  "source": {
+    "pack_version": "26.2.0-alpha.222",
+    "modules": {
+      "sanctuary": "0.0.0-alpha.124"
+    }
+  },
+  "target": {
+    "pack_version": "26.2.0-alpha.223",
+    "modules": {
+      "sanctuary": "0.0.0-alpha.125"
+    }
+  },
+  "inventory_sort": {
+    "owner": "sanctuary",
+    "default_binding": "middle_mouse",
+    "unlocked_storage_rows_only": true,
+    "packs_from_top": true,
+    "merges_identical_stacks": true,
+    "hotbar_armor_offhand_crafting_and_special_slots_unchanged": true,
+    "server_authoritative": true,
+    "server_cooldown_ticks": 8,
+    "ignored_in_creative": true,
+    "ignored_while_typing": true
+  },
+  "quest_tracker_display": {
+    "owner": "sanctuary",
+    "default_mode": "transparent_text",
+    "mode_toggle_default_key": "N",
+    "original_chris_panel_available": true,
+    "transparent_text_below_f3_left_column": true,
+    "contracts_named_and_sorted_by_reward_tier": true,
+    "reward_order": [
+      "ruby",
+      "sapphire",
+      "emerald_or_other"
+    ]
+  },
+  "compatibility": {
+    "new_world_required": false,
+    "save_reset_required": false,
+    "existing_saves_supported": true,
+    "registry_ids_changed": false,
+    "sanctuary_data_version": 11,
+    "sanctuary_network_protocol": 22
+  },
+  "distribution": {
+    "pack_release_updated": true,
+    "packwiz_index_refreshed": true,
+    "prism_modrinth_index_updated": true,
+    "shared_client_server_mrpack": true,
+    "jei": {
+      "source": "30.29.0.196",
+      "target": "30.29.0.198",
+      "modrinth_version_id": "67Dvn8sL",
+      "packwiz_and_prism_synchronized": true
+    }
+  }
+}
@@ -13,16 +13,16 @@ file = "instance-icon.png"
 hash = "41f4f4c88c71d0a23446d5014f7407d55ad477441847099cad24492b032335a0"

 [[files]]
-file = "mods/ambiance-0.0.0-alpha.21.jar"
-hash = "c9dfd6ed13d1fdd2277e62d9bd2faa18c008d621bbcf8ef605736eefc3378663"
+file = "mods/ambiance-0.0.0-alpha.22.jar"
+hash = "34aa79ab54ba2506b0ffef062662917de8b29f6f3f9b8d7a920a664d01185641"

 [[files]]
 file = "mods/anotherworld-0.0.0-alpha.55.jar"
-hash = "0137f9a8109438c659c7a126ecde2e28982e063ee95f1991603a9ea81bbe7501"
+hash = "2c93c364af7f617a488a8ef5c64d584041eeb24b93e4ea727570c042bd73fe2d"

 [[files]]
 file = "mods/events-0.0.0-alpha.0.jar"
-hash = "3a666f7b7bdb9cbf7181eff3e49455768ac76905a482577990fdc1eb018e78d7"
+hash = "6c94ba89f6daf64d7144e9ea2283a98a609a01a20b7913bd51821034ee8a26fd"

 [[files]]
 file = "mods/fabric-api.pw.toml"
@@ -31,7 +31,7 @@ metafile = true

 [[files]]
 file = "mods/iliketomoveit-0.0.0-alpha.16.jar"
-hash = "f42ed4fe37cbf3422e3b2493db562e82da3f2ba04568cea6ae304862e64e54df"
+hash = "f0f54b9746977b085abb74fea61e8cd230f3dda905cc337866e7950fb2ee9293"

 [[files]]
 file = "mods/iris.pw.toml"
@@ -40,32 +40,32 @@ metafile = true

 [[files]]
 file = "mods/itsalive-0.0.0-alpha.36.jar"
-hash = "71c9d893fd0862610f203b854d1af19e0e6e4b2bc9e06f6da38d057e23a54ebd"
+hash = "ae2201e91e4ab2eaf09f32ea41c920d460cf3cf426e71bd76be5241b7e81e1a0"

 [[files]]
 file = "mods/jei.pw.toml"
-hash = "a213ae237f9b3934bdcd0d282119d4166d0ccbb7c7223daa8d7ed956c69a0e3f"
+hash = "cffb13bae33cd8df605c62e7fa66089428dc684e0ab973f662a8a710c45c306d"
 metafile = true

 [[files]]
 file = "mods/masterkey-0.0.0-alpha.8.jar"
-hash = "75ae764c2b86d2f4479f576d9a1cd8272c1979d754069277052ef11064fabbda"
+hash = "60de65566b1434709cdfb4c915d5bc6a7f9019dd48ebeaa04fe474f0ec7fd3b4"

 [[files]]
 file = "mods/onlyfun-0.0.0-alpha.25.jar"
-hash = "69cca044dd3cd3fbbd6d9d45706a502ec17689c040521524eac3aa20ab93bf5f"
+hash = "165ffe713b09db64484cceb6c508ac5e53b5d7e69e86ea6658c3e8ea04ee1ccf"

 [[files]]
 file = "mods/ouch-0.0.0-alpha.10.jar"
-hash = "c414a5b308796a797c6dce9b0337edfd06c536a18d1c746307f58e99e3a6be2c"
+hash = "3f66a1b0657c40b653ec9e7a7aa92e4edf72475af7e372a49d9254743696f0a5"

 [[files]]
-file = "mods/redstoner-0.0.0-alpha.11.jar"
-hash = "753a7b4f8a26a836904099ed034dc36dcb371b87f5b67044940345fdadeb6b33"
+file = "mods/redstoner-0.0.0-alpha.13.jar"
+hash = "226c000f5febd841d69420316af2c14dd4ec0ef1c774c21d5926f7120f44b7e6"

 [[files]]
-file = "mods/sanctuary-0.0.0-alpha.122.jar"
-hash = "b4ab04b167c50d412af791ccadf838ebcb0443303e05864c9940e02ec3cc0d40"
+file = "mods/sanctuary-0.0.0-alpha.125.jar"
+hash = "f0826d9be66f6498bc0455ea8075bfbaefc97c1f6a7b0d21b225003fe71ad958"

 [[files]]
 file = "mods/simple-voice-chat.pw.toml"
@@ -1,14 +1,14 @@
 name = "Just Enough Items (JEI)"
-filename = "jei-26.2-fabric-30.28.0.193.jar"
+filename = "jei-26.2-fabric-30.29.0.198.jar"
 side = "both"
 pin = true

 [download]
-url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/qaCQ7LGO/jei-26.2-fabric-30.28.0.193.jar"
+url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/67Dvn8sL/jei-26.2-fabric-30.29.0.198.jar"
 hash-format = "sha512"
-hash = "0869f4d5840a732a04bedc7684b40140f087f3d759066c206d9d1ec710007f7c9585e4f5ebb04f10e56bef1cf2eddc6978bb2b2c93541cff5fcf7e1609859468"
+hash = "06131c9528549840e07ddc9634e23454cd454380d7749a23d818f0efe0dacc02874e967ceb74a24ee82efb13e0fe2df4026f988a68f54f890586967e91dcaa5b"

 [update]
 [update.modrinth]
 mod-id = "u6dRKJwZ"
-version = "qaCQ7LGO"
+version = "67Dvn8sL"
@@ -1,12 +1,12 @@
 name = "Sanctuary 26.2"
 author = "KOKA99CAB"
-version = "26.2.0-alpha.219"
+version = "26.2.0-alpha.223"
 pack-format = "packwiz:1.1.0"

 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "a694c1327286dca4369aa64dfea7decbc36fedbba77188e7d8d310c08365d415"
+hash = "9e06da88d562c7a2ed5fbcd56a06779a37715d4f9cf26479ee1a664758ada599"

 [versions]
 fabric = "0.19.3"
@@ -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.219",
+	"versionId": "26.2.0-alpha.223",
 	"files": [
 		{
      "path": "mods/fabric-api-0.158.0+26.2.jar",
@@ -21,19 +21,19 @@
      "fileSize": 2535765
 		},
 		{
-      "path": "mods/jei-26.2-fabric-30.28.0.193.jar",
+      "path": "mods/jei-26.2-fabric-30.29.0.198.jar",
      "hashes": {
-		"sha1": "494f9dc787d6c9cd9d32793da2784ab16834faf3",
-		"sha512": "0869f4d5840a732a04bedc7684b40140f087f3d759066c206d9d1ec710007f7c9585e4f5ebb04f10e56bef1cf2eddc6978bb2b2c93541cff5fcf7e1609859468"
+        "sha1": "652e964c71a699fdfdd96cda265ea703b13c6ef4",
+        "sha512": "06131c9528549840e07ddc9634e23454cd454380d7749a23d818f0efe0dacc02874e967ceb74a24ee82efb13e0fe2df4026f988a68f54f890586967e91dcaa5b"
 			},
 			"env": {
 				"client": "required",
 				"server": "required"
 			},
 			"downloads": [
-		"https://cdn.modrinth.com/data/u6dRKJwZ/versions/qaCQ7LGO/jei-26.2-fabric-30.28.0.193.jar"
+        "https://cdn.modrinth.com/data/u6dRKJwZ/versions/67Dvn8sL/jei-26.2-fabric-30.29.0.198.jar"
      ],
-		"fileSize": 1822836
+      "fileSize": 1839279
 		},
 		{
 			"path": "mods/voicechat-fabric-2.6.22+26.2.jar",
@@ -1,6 +1,6 @@
 {
 	"schema_version": 1,
-	"pack_version": "26.2.0-alpha.219",
+	"pack_version": "26.2.0-alpha.223",
 	"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.219.mrpack",
+		"primary_file": "sanctuary-26.2.0-alpha.223.mrpack",
 		"shared_client_server_pack": true,
 		"update_owner": "packwiz-installer",
 		"check_on_launch": true,
@@ -3,6 +3,7 @@ package fr.koka99cab.sanctuary26.redstoner;
 import fr.koka99cab.sanctuary26.redstoner.api.RedStonerApi;
 import fr.koka99cab.sanctuary26.redstoner.network.RedStonerNetworking;
 import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerRegistries;
+import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerMenus;
 import fr.koka99cab.sanctuary26.sanctuary.api.server.SanctuaryServerIdentity;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.resources.Identifier;
@@ -26,6 +27,7 @@ public final class RedStonerMod implements ModInitializer {
 	public void onInitialize() {
 		RedStonerApi.registerServerIdentityProvider(SanctuaryServerIdentity::get);
 		RedStonerRegistries.initialize();
+		RedStonerMenus.initialize();
 		RedStonerNetworking.initialize();
 		LOGGER.info("[{}] Computers, Drawer, Particuleur and Storage Terminal ready (data v{}, network v{}).",
 			DISPLAY_NAME, CURRENT_DATA_VERSION, RedStonerNetworking.PROTOCOL_VERSION);
@@ -1,7 +1,7 @@
 package fr.koka99cab.sanctuary26.redstoner.block;

 import com.mojang.serialization.MapCodec;
-import fr.koka99cab.sanctuary26.redstoner.network.RedStonerNetworking;
+import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalMenu;
 import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalNetwork;
 import java.util.Map;
 import net.minecraft.core.BlockPos;
@@ -106,7 +106,7 @@ public final class StorageTerminalBlock extends Block {
 	private static InteractionResult open(Level level, BlockPos pos, Player player) {
 		if (level.isClientSide()) return InteractionResult.SUCCESS;
 		if (player instanceof ServerPlayer serverPlayer) {
-			RedStonerNetworking.openStorageTerminal(serverPlayer, pos);
+			StorageTerminalMenu.open(serverPlayer, pos);
 			return InteractionResult.SUCCESS_SERVER;
 		}
 		return InteractionResult.CONSUME;
@@ -7,17 +7,19 @@ import fr.koka99cab.sanctuary26.redstoner.client.gui.StorageTerminalScreen;
 import fr.koka99cab.sanctuary26.redstoner.client.renderer.DrawerBlockEntityRenderer;
 import fr.koka99cab.sanctuary26.redstoner.network.OpenComputerPayload;
 import fr.koka99cab.sanctuary26.redstoner.network.OpenPersonalComputerPayload;
-import fr.koka99cab.sanctuary26.redstoner.network.StorageTerminalSnapshotPayload;
+import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerMenus;
 import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerRegistries;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
+import net.minecraft.client.gui.screens.MenuScreens;

 public final class RedStonerClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		BlockEntityRendererRegistry.register(RedStonerRegistries.DRAWER_BLOCK_ENTITY, DrawerBlockEntityRenderer::new);
 		BlockEntityRendererRegistry.register(RedStonerRegistries.LEGACY_DRAWER_BLOCK_ENTITY, DrawerBlockEntityRenderer::new);
+		MenuScreens.register(RedStonerMenus.STORAGE_TERMINAL, StorageTerminalScreen::new);
 		ClientPlayNetworking.registerGlobalReceiver(OpenComputerPayload.TYPE, (payload, context) ->
 			context.client().execute(() -> context.client().gui.setScreen(new ComputerScreen(payload))));
 		ClientPlayNetworking.registerGlobalReceiver(OpenPersonalComputerPayload.TYPE, (payload, context) ->
@@ -28,15 +30,6 @@ public final class RedStonerClient implements ClientModInitializer {
 					context.client().gui.setScreen(new PersonalComputerScreen(payload));
 				}
 			}));
-		ClientPlayNetworking.registerGlobalReceiver(StorageTerminalSnapshotPayload.TYPE, (payload, context) ->
-			context.client().execute(() -> {
-				if (context.client().gui.screen() instanceof StorageTerminalScreen screen
-					&& screen.represents(payload)) {
-					screen.acceptSnapshot(payload);
-				} else {
-					context.client().gui.setScreen(new StorageTerminalScreen(payload));
-				}
-			}));
 		RedStonerMod.LOGGER.info("[{}] Client renderers and laboratory screens ready.", RedStonerMod.DISPLAY_NAME);
 	}

@@ -1,86 +1,111 @@
 package fr.koka99cab.sanctuary26.redstoner.client.gui;

-import fr.koka99cab.sanctuary26.redstoner.network.StorageTerminalActionPayload;
-import fr.koka99cab.sanctuary26.redstoner.network.StorageTerminalSnapshotPayload;
+import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalMenu;
 import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalRules;
 import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalStatus;
-import java.util.Locale;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;

-public final class StorageTerminalScreen extends Screen {
-	private static final int PANEL_WIDTH = 204;
-	private static final int PANEL_HEIGHT = 236;
-	private static final int SLOT_SIZE = 18;
-	private static final int GRID_X = 8;
-	private static final int GRID_Y = 20;
-	private static final int PLAYER_GRID_Y = 152;
-	private static final int HOTBAR_Y = 210;
-	private static final int SCROLL_X = 176;
-	private static final int SCROLL_WIDTH = 8;
-	private static final int REFRESH_TICKS = 20;
-
-	private StorageTerminalSnapshotPayload snapshot;
+/** Vanilla-style terminal surface composed with Sanctuary's dynamic player-inventory panel. */
+public final class StorageTerminalScreen extends AbstractContainerScreen<StorageTerminalMenu> {
+	private static final Identifier TEXTURE = Identifier.withDefaultNamespace(
+		"textures/gui/container/generic_54.png");
+	private static final int TERMINAL_TOP = 18;
+	private static final int TERMINAL_HEIGHT = 108;
+	private static final int SCROLL_X = 171;
+	private static final int SCROLL_WIDTH = 4;
 	private int requestedPage;
-	private int refreshCooldown = REFRESH_TICKS;
+	private EditBox searchBox;
+	private String searchValue = "";
+	private String sentSearchValue = "";

-	public StorageTerminalScreen(StorageTerminalSnapshotPayload snapshot) {
-		super(Component.translatable("screen.redstoner.storage_terminal.title"));
-		this.snapshot = snapshot;
-		this.requestedPage = snapshot.page();
-	}
-
-	public boolean represents(StorageTerminalSnapshotPayload other) {
-		return snapshot.pos().equals(other.pos());
-	}
-
-	public void acceptSnapshot(StorageTerminalSnapshotPayload refreshed) {
-		if (!represents(refreshed)) return;
-		snapshot = refreshed;
-		requestedPage = refreshed.page();
-		refreshCooldown = REFRESH_TICKS;
+	public StorageTerminalScreen(StorageTerminalMenu menu, Inventory inventory, Component title) {
+		super(menu, inventory, title, 176, 222);
+		requestedPage = menu.page();
 	}

 	@Override
 	protected void init() {
-		addRenderableWidget(Button.builder(Component.literal("×"), button -> onClose())
-			.bounds(panelX() + PANEL_WIDTH - 22, panelY() + 4, 18, 14).build());
+		super.init();
+		titleLabelY = 6;
+		searchBox = addRenderableWidget(new EditBox(font, leftPos + 8, topPos + 2, 126, 14,
+			Component.translatable("screen.redstoner.storage_terminal.search")));
+		searchBox.setMaxLength(StorageTerminalRules.MAX_SEARCH_LENGTH);
+		searchBox.setHint(Component.translatable("screen.redstoner.storage_terminal.search"));
+		searchBox.setValue(searchValue);
+		searchBox.setResponder(this::searchChanged);
+		setInitialFocus(searchBox);
 	}

 	@Override
-	public void tick() {
-		if (--refreshCooldown <= 0) requestPage(requestedPage);
+	public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickDelta) {
+		super.extractBackground(graphics, mouseX, mouseY, tickDelta);
+		graphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, leftPos, topPos, 0.0F, 0.0F,
+			imageWidth, imageHeight, 256, 256);
+		extractScrollBar(graphics);
 	}

 	@Override
-	public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickDelta) {
-		graphics.fill(0, 0, width, height, 0xCC101010);
-		int x = panelX();
-		int y = panelY();
-		graphics.fill(x + 3, y + 3, x + PANEL_WIDTH + 3, y + PANEL_HEIGHT + 3, 0xA0000000);
-		graphics.fill(x, y, x + PANEL_WIDTH, y + PANEL_HEIGHT, 0xFFC6C6C6);
-		graphics.outline(x, y, PANEL_WIDTH, PANEL_HEIGHT, 0xFF373737);
-		graphics.text(font, title, x + 8, y + 7, 0xFF202020, false);
+	protected void extractLabels(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
+		Component pageLabel = Component.literal((menu.page() + 1) + "/" + menu.pageCount());
+		graphics.text(font, pageLabel, 168 - font.width(pageLabel), titleLabelY, 0xFF404040, false);
+		if (menu.status() != StorageTerminalStatus.READY) {
+			graphics.centeredText(font, menu.statusMessage(), imageWidth / 2, 68, 0xFFAA3333);
+		} else if (!searchValue.isBlank() && menu.totalEntries() == 0) {
+			graphics.centeredText(font, Component.translatable(
+				"screen.redstoner.storage_terminal.no_results"), imageWidth / 2, 68, 0xFF777777);
+		}
+	}

-		if (snapshot.status() == StorageTerminalStatus.READY) {
-			renderTerminalGrid(graphics, x, y, mouseX, mouseY);
-		} else {
-			graphics.centeredText(font, Component.translatable("screen.redstoner.storage_terminal.error."
-				+ snapshot.status().name().toLowerCase(Locale.ROOT)), x + 90, y + 70, 0xFFAA3333);
+	@Override
+	protected void extractSlot(GuiGraphicsExtractor graphics, Slot slot, int mouseX, int mouseY) {
+		super.extractSlot(graphics, slot, mouseX, mouseY);
+		if (slot.index < StorageTerminalMenu.TERMINAL_SLOT_COUNT && slot.hasItem()) {
+			int total = menu.totalAt(slot.index);
+			if (total > 1) {
+				String label = StorageTerminalRules.compactCount(total);
+				graphics.text(font, label, slot.x + 17 - font.width(label), slot.y + 9,
+					0xFFFFFFFF, true);
+			}
+		}
+	}
+
+	@Override
+	protected List<Component> getTooltipFromContainerItem(ItemStack stack) {
+		List<Component> tooltip = new ArrayList<>(super.getTooltipFromContainerItem(stack));
+		if (hoveredSlot != null && hoveredSlot.index < StorageTerminalMenu.TERMINAL_SLOT_COUNT) {
+			int total = menu.totalAt(hoveredSlot.index);
+			if (total > 0) tooltip.add(Component.literal("×" + total).withStyle(ChatFormatting.GRAY));
+		}
+		return tooltip;
+	}
+
+	@Override
+	protected void extractTooltip(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
+		super.extractTooltip(graphics, mouseX, mouseY);
+		if (isHovering(SCROLL_X - 2, TERMINAL_TOP, SCROLL_WIDTH + 4, TERMINAL_HEIGHT, mouseX, mouseY)) {
+			graphics.setTooltipForNextFrame(font, Component.translatable(
+				"screen.redstoner.storage_terminal.summary",
+				menu.page() + 1, menu.pageCount(), menu.containerCount(), menu.totalEntries()),
+				mouseX, mouseY);
 		}
-		renderPlayerInventory(graphics, x, y, mouseX, mouseY);
-		super.extractRenderState(graphics, mouseX, mouseY, tickDelta);
 	}

 	@Override
 	public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
-		if (snapshot.status() == StorageTerminalStatus.READY && scrollY != 0.0D && insidePanel(mouseX, mouseY)) {
+		if (scrollY != 0.0D && isHovering(7, TERMINAL_TOP, 169, TERMINAL_HEIGHT, mouseX, mouseY)) {
 			requestPage(requestedPage + (scrollY < 0.0D ? 1 : -1));
 			return true;
 		}
@@ -89,156 +114,75 @@ public final class StorageTerminalScreen extends Screen {

 	@Override
 	public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
-		if (super.mouseClicked(event, doubleClick)) return true;
-		if (snapshot.status() == StorageTerminalStatus.READY) {
-			int entryIndex = terminalEntryAt(event.x(), event.y());
-			if (entryIndex >= 0 && entryIndex < snapshot.entries().size()
-				&& (event.button() == 0 || event.button() == 1)) {
-				StorageTerminalSnapshotPayload.Entry entry = snapshot.entries().get(entryIndex);
-				send(event.button() == 1 ? StorageTerminalActionPayload.Action.TAKE_ONE
-					: StorageTerminalActionPayload.Action.TAKE_STACK, snapshot.page(), entryIndex, -1, entry.stack());
-				return true;
-			}
-			if (insideScrollBar(event.x(), event.y()) && event.button() == 0) {
-				double ratio = Math.max(0.0D, Math.min(0.999D,
-					(event.y() - panelY() - GRID_Y) / (StorageTerminalRules.PAGE_SIZE / 9.0D * SLOT_SIZE)));
-				requestPage((int) Math.floor(ratio * snapshot.pageCount()));
-				return true;
-			}
-			int playerSlot = playerSlotAt(event.x(), event.y());
-			if (playerSlot >= 0 && event.button() == 0 && event.hasShiftDown() && minecraft.player != null) {
-				ItemStack stack = minecraft.player.getInventory().getItem(playerSlot);
-				if (!stack.isEmpty()) {
-					send(StorageTerminalActionPayload.Action.DEPOSIT_SLOT, snapshot.page(), -1, playerSlot, stack);
-					return true;
-				}
-			}
+		if (event.button() == 0
+			&& isHovering(SCROLL_X - 2, TERMINAL_TOP, SCROLL_WIDTH + 4, TERMINAL_HEIGHT,
+				event.x(), event.y())) {
+			double ratio = Math.clamp((event.y() - topPos - TERMINAL_TOP) / TERMINAL_HEIGHT,
+				0.0D, 0.999999D);
+			requestPage((int) Math.floor(ratio * menu.pageCount()));
+			return true;
 		}
-		return false;
+		return super.mouseClicked(event, doubleClick);
 	}

 	@Override
-	public boolean isPauseScreen() {
-		return false;
+	public boolean keyPressed(KeyEvent event) {
+		if (searchBox != null && searchBox.isFocused() && event.key() != 256) {
+			searchBox.keyPressed(event);
+			return true;
+		}
+		return super.keyPressed(event);
 	}

-	private void renderTerminalGrid(GuiGraphicsExtractor graphics, int x, int y, int mouseX, int mouseY) {
-		for (int index = 0; index < StorageTerminalRules.PAGE_SIZE; index++) {
-			int slotX = x + GRID_X + index % 9 * SLOT_SIZE;
-			int slotY = y + GRID_Y + index / 9 * SLOT_SIZE;
-			drawSlot(graphics, slotX, slotY);
-			if (index >= snapshot.entries().size()) continue;
-			StorageTerminalSnapshotPayload.Entry entry = snapshot.entries().get(index);
-			graphics.item(entry.stack(), slotX + 1, slotY + 1);
-			graphics.itemDecorations(font, entry.stack(), slotX + 1, slotY + 1, compactCount(entry.total()));
-			if (inside(mouseX, mouseY, slotX, slotY, SLOT_SIZE, SLOT_SIZE)) {
-				graphics.setTooltipForNextFrame(font, entry.stack(), mouseX, mouseY);
-			}
-		}
-
-		int trackX = x + SCROLL_X;
-		int trackY = y + GRID_Y;
-		int trackHeight = 6 * SLOT_SIZE;
-		graphics.fill(trackX, trackY, trackX + SCROLL_WIDTH, trackY + trackHeight, 0xFF575757);
-		int thumbHeight = snapshot.pageCount() <= 1 ? trackHeight : Math.max(10, trackHeight / snapshot.pageCount());
-		int travel = trackHeight - thumbHeight;
-		int thumbY = trackY + (snapshot.pageCount() <= 1 ? 0
-			: Math.round(travel * snapshot.page() / (float) (snapshot.pageCount() - 1)));
-		graphics.fill(trackX + 1, thumbY + 1, trackX + SCROLL_WIDTH - 1, thumbY + thumbHeight - 1, 0xFFD8D8D8);
-		graphics.text(font, Component.translatable("screen.redstoner.storage_terminal.summary",
-			snapshot.page() + 1, snapshot.pageCount(), snapshot.containerCount(), snapshot.totalEntries()),
-			x + 8, y + 131, 0xFF555555, false);
+	@Override
+	protected void containerTick() {
+		requestedPage = menu.page();
 	}

-	private void renderPlayerInventory(GuiGraphicsExtractor graphics, int x, int y, int mouseX, int mouseY) {
-		graphics.text(font, Component.translatable("container.inventory"), x + 8, y + 141, 0xFF202020, false);
-		if (minecraft.player == null) return;
-		Inventory inventory = minecraft.player.getInventory();
-		for (int row = 0; row < 3; row++) {
-			for (int column = 0; column < 9; column++) {
-				int inventorySlot = 9 + row * 9 + column;
-				drawPlayerSlot(graphics, inventory, inventorySlot, x + GRID_X + column * SLOT_SIZE,
-					y + PLAYER_GRID_Y + row * SLOT_SIZE, mouseX, mouseY);
-			}
-		}
-		for (int column = 0; column < 9; column++) {
-			drawPlayerSlot(graphics, inventory, column, x + GRID_X + column * SLOT_SIZE,
-				y + HOTBAR_Y, mouseX, mouseY);
+	private void requestPage(int requested) {
+		int page = Math.clamp(requested, 0, menu.pageCount() - 1);
+		requestedPage = page;
+		if (minecraft != null && minecraft.gameMode != null) {
+			minecraft.gameMode.handleInventoryButtonClick(menu.containerId,
+				StorageTerminalMenu.PAGE_BUTTON_BASE + page);
 		}
 	}

-	private void drawPlayerSlot(GuiGraphicsExtractor graphics, Inventory inventory, int inventorySlot,
-		int x, int y, int mouseX, int mouseY) {
-		drawSlot(graphics, x, y);
-		ItemStack stack = inventory.getItem(inventorySlot);
-		if (stack.isEmpty()) return;
-		graphics.item(stack, x + 1, y + 1);
-		graphics.itemDecorations(font, stack, x + 1, y + 1);
-		if (inside(mouseX, mouseY, x, y, SLOT_SIZE, SLOT_SIZE)) {
-			graphics.setTooltipForNextFrame(font, stack, mouseX, mouseY);
+	private void searchChanged(String value) {
+		String previous = sentSearchValue;
+		searchValue = value;
+		requestedPage = 0;
+		if (value.startsWith(previous)
+			&& value.codePointCount(previous.length(), value.length()) == 1) {
+			sendMenuButton(StorageTerminalMenu.SEARCH_CODEPOINT_BUTTON_BASE
+				+ value.codePointAt(previous.length()));
+		} else if (previous.startsWith(value)
+			&& previous.codePointCount(value.length(), previous.length()) == 1) {
+			sendMenuButton(StorageTerminalMenu.SEARCH_BACKSPACE_BUTTON);
+		} else {
+			sendMenuButton(StorageTerminalMenu.SEARCH_CLEAR_BUTTON);
+			value.codePoints().forEach(codePoint -> sendMenuButton(
+				StorageTerminalMenu.SEARCH_CODEPOINT_BUTTON_BASE + codePoint));
+		}
+		sentSearchValue = value;
+	}
+
+	private void sendMenuButton(int buttonId) {
+		if (minecraft != null && minecraft.gameMode != null) {
+			minecraft.gameMode.handleInventoryButtonClick(menu.containerId, buttonId);
 		}
 	}

-	private static void drawSlot(GuiGraphicsExtractor graphics, int x, int y) {
-		graphics.fill(x, y, x + SLOT_SIZE, y + SLOT_SIZE, 0xFF373737);
-		graphics.fill(x + 1, y + 1, x + SLOT_SIZE - 1, y + SLOT_SIZE - 1, 0xFF8B8B8B);
+	private void extractScrollBar(GuiGraphicsExtractor graphics) {
+		int x = leftPos + SCROLL_X;
+		int y = topPos + TERMINAL_TOP;
+		graphics.fill(x, y, x + SCROLL_WIDTH, y + TERMINAL_HEIGHT, 0xFF8B8B8B);
+		int pageCount = menu.pageCount();
+		int handleHeight = Math.max(8, TERMINAL_HEIGHT / pageCount);
+		int travel = TERMINAL_HEIGHT - handleHeight;
+		int handleY = y + (pageCount <= 1 ? 0 : menu.page() * travel / (pageCount - 1));
+		graphics.fill(x, handleY, x + SCROLL_WIDTH, handleY + handleHeight, 0xFFE0E0E0);
+		graphics.outline(x, y, SCROLL_WIDTH, TERMINAL_HEIGHT, 0xFF373737);
 	}

-	private void requestPage(int page) {
-		requestedPage = Math.max(0, Math.min(snapshot.pageCount() - 1, page));
-		refreshCooldown = REFRESH_TICKS;
-		send(StorageTerminalActionPayload.Action.REQUEST_PAGE, requestedPage, -1, -1, ItemStack.EMPTY);
-	}
-
-	private void send(StorageTerminalActionPayload.Action action, int page, int entryIndex,
-		int playerSlot, ItemStack expected) {
-		if (ClientPlayNetworking.canSend(StorageTerminalActionPayload.TYPE)) {
-			ClientPlayNetworking.send(new StorageTerminalActionPayload(
-				snapshot.pos(), action, page, entryIndex, playerSlot, expected));
-		}
-	}
-
-	private int terminalEntryAt(double mouseX, double mouseY) {
-		int relativeX = (int) mouseX - panelX() - GRID_X;
-		int relativeY = (int) mouseY - panelY() - GRID_Y;
-		if (relativeX < 0 || relativeY < 0 || relativeX >= 9 * SLOT_SIZE || relativeY >= 6 * SLOT_SIZE) return -1;
-		return relativeY / SLOT_SIZE * 9 + relativeX / SLOT_SIZE;
-	}
-
-	private int playerSlotAt(double mouseX, double mouseY) {
-		int relativeX = (int) mouseX - panelX() - GRID_X;
-		if (relativeX < 0 || relativeX >= 9 * SLOT_SIZE) return -1;
-		int column = relativeX / SLOT_SIZE;
-		int mainY = (int) mouseY - panelY() - PLAYER_GRID_Y;
-		if (mainY >= 0 && mainY < 3 * SLOT_SIZE) return 9 + mainY / SLOT_SIZE * 9 + column;
-		int hotbarY = (int) mouseY - panelY() - HOTBAR_Y;
-		return hotbarY >= 0 && hotbarY < SLOT_SIZE ? column : -1;
-	}
-
-	private boolean insideScrollBar(double mouseX, double mouseY) {
-		return inside(mouseX, mouseY, panelX() + SCROLL_X, panelY() + GRID_Y,
-			SCROLL_WIDTH, 6 * SLOT_SIZE);
-	}
-
-	private boolean insidePanel(double mouseX, double mouseY) {
-		return inside(mouseX, mouseY, panelX(), panelY(), PANEL_WIDTH, PANEL_HEIGHT);
-	}
-
-	private static boolean inside(double mouseX, double mouseY, int x, int y, int width, int height) {
-		return mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
-	}
-
-	private int panelX() {
-		return (width - PANEL_WIDTH) / 2;
-	}
-
-	private int panelY() {
-		return (height - PANEL_HEIGHT) / 2;
-	}
-
-	private static String compactCount(int count) {
-		if (count >= 1_000_000) return (count / 1_000_000) + "m";
-		if (count >= 10_000) return (count / 1_000) + "k";
-		return Integer.toString(count);
-	}
 }
@@ -4,11 +4,7 @@ import fr.koka99cab.sanctuary26.redstoner.RedStonerMod;
 import fr.koka99cab.sanctuary26.redstoner.block.entity.ComputerBlockEntity;
 import fr.koka99cab.sanctuary26.redstoner.block.entity.PersonalComputerBlockEntity;
 import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerRegistries;
-import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalNetwork;
-import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalService;
 import fr.koka99cab.sanctuary26.sanctuary.api.atlas.SanctuaryAtlasLandmarks;
-import java.util.List;
-import net.minecraft.core.BlockPos;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.server.level.ServerPlayer;
@@ -16,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 = 6;
+	public static final int PROTOCOL_VERSION = 7;
 	private static boolean initialized;

 	private RedStonerNetworking() {
@@ -29,8 +25,6 @@ public final class RedStonerNetworking {
 		initialized = true;
 		PayloadTypeRegistry.clientboundPlay().register(OpenComputerPayload.TYPE, OpenComputerPayload.STREAM_CODEC);
 		PayloadTypeRegistry.clientboundPlay().register(OpenPersonalComputerPayload.TYPE, OpenPersonalComputerPayload.STREAM_CODEC);
-		PayloadTypeRegistry.clientboundPlay().register(StorageTerminalSnapshotPayload.TYPE,
-			StorageTerminalSnapshotPayload.STREAM_CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(SaveComputerProgramPayload.TYPE, SaveComputerProgramPayload.STREAM_CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(PlaceAtlasLandmarkPayload.TYPE, PlaceAtlasLandmarkPayload.STREAM_CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(RequestPersonalComputerSnapshotPayload.TYPE,
@@ -39,8 +33,6 @@ public final class RedStonerNetworking {
 			AcknowledgePersonalComputerIntroPayload.STREAM_CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(ShutdownPersonalComputerPayload.TYPE,
 			ShutdownPersonalComputerPayload.STREAM_CODEC);
-		PayloadTypeRegistry.serverboundPlay().register(StorageTerminalActionPayload.TYPE,
-			StorageTerminalActionPayload.STREAM_CODEC);
 		ServerPlayNetworking.registerGlobalReceiver(SaveComputerProgramPayload.TYPE, (payload, context) ->
 			context.server().execute(() -> saveProgram(context.player(), payload)));
 		ServerPlayNetworking.registerGlobalReceiver(PlaceAtlasLandmarkPayload.TYPE, (payload, context) ->
@@ -51,8 +43,6 @@ public final class RedStonerNetworking {
 			context.server().execute(() -> acknowledgePersonalComputerIntro(context.player(), payload)));
 		ServerPlayNetworking.registerGlobalReceiver(ShutdownPersonalComputerPayload.TYPE, (payload, context) ->
 			context.server().execute(() -> shutdownPersonalComputer(context.player(), payload)));
-		ServerPlayNetworking.registerGlobalReceiver(StorageTerminalActionPayload.TYPE, (payload, context) ->
-			context.server().execute(() -> storageTerminalAction(context.player(), payload)));
 		RedStonerMod.LOGGER.debug("[{}] Networking contract v{} registered.", RedStonerMod.DISPLAY_NAME, PROTOCOL_VERSION);
 	}

@@ -87,23 +77,6 @@ public final class RedStonerNetworking {
 		}
 	}

-	public static void openStorageTerminal(ServerPlayer player, BlockPos pos) {
-		sendStorageTerminalSnapshot(player, pos, StorageTerminalService.snapshot(player, pos, 0));
-	}
-
-	private static void storageTerminalAction(ServerPlayer player, StorageTerminalActionPayload payload) {
-		sendStorageTerminalSnapshot(player, payload.pos(), StorageTerminalService.handle(player, payload));
-	}
-
-	private static void sendStorageTerminalSnapshot(ServerPlayer player, BlockPos pos,
-		StorageTerminalNetwork.Snapshot snapshot) {
-		if (!ServerPlayNetworking.canSend(player, StorageTerminalSnapshotPayload.TYPE)) return;
-		List<StorageTerminalSnapshotPayload.Entry> entries = snapshot.entries().stream()
-			.map(entry -> new StorageTerminalSnapshotPayload.Entry(entry.stack(), entry.total())).toList();
-		ServerPlayNetworking.send(player, new StorageTerminalSnapshotPayload(pos, snapshot.status(), snapshot.page(),
-			snapshot.pageCount(), snapshot.containerCount(), snapshot.totalEntries(), entries));
-	}
-
 	private static void requestPersonalComputerSnapshot(ServerPlayer player,
 		RequestPersonalComputerSnapshotPayload payload) {
 		PersonalComputerBlockEntity computer = validatedPersonalComputer(
@@ -1,56 +0,0 @@
-package fr.koka99cab.sanctuary26.redstoner.network;
-
-import fr.koka99cab.sanctuary26.redstoner.RedStonerMod;
-import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalRules;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.world.item.ItemStack;
-
-public record StorageTerminalActionPayload(BlockPos pos, Action action, int page, int entryIndex,
-	int playerSlot, ItemStack expected) implements CustomPacketPayload {
-	public static final Type<StorageTerminalActionPayload> TYPE =
-		new Type<>(RedStonerMod.id("c2s/storage_terminal_action"));
-	public static final StreamCodec<RegistryFriendlyByteBuf, StorageTerminalActionPayload> STREAM_CODEC =
-		StreamCodec.of(StorageTerminalActionPayload::write, StorageTerminalActionPayload::read);
-
-	public StorageTerminalActionPayload {
-		pos = pos == null ? BlockPos.ZERO : pos.immutable();
-		action = action == null ? Action.REQUEST_PAGE : action;
-		page = Math.max(0, Math.min(StorageTerminalRules.MAX_PAGE_COUNT - 1, page));
-		entryIndex = entryIndex >= 0 && entryIndex < StorageTerminalRules.PAGE_SIZE ? entryIndex : -1;
-		playerSlot = playerSlot >= 0 && playerSlot < StorageTerminalRules.PLAYER_STORAGE_SLOTS ? playerSlot : -1;
-		expected = expected == null || expected.isEmpty() ? ItemStack.EMPTY : expected.copyWithCount(1);
-	}
-
-	private static StorageTerminalActionPayload read(RegistryFriendlyByteBuf buffer) {
-		BlockPos pos = buffer.readBlockPos();
-		int ordinal = buffer.readVarInt();
-		Action[] values = Action.values();
-		Action action = ordinal >= 0 && ordinal < values.length ? values[ordinal] : Action.REQUEST_PAGE;
-		return new StorageTerminalActionPayload(pos, action, buffer.readVarInt(), buffer.readVarInt(),
-			buffer.readVarInt(), ItemStack.OPTIONAL_UNTRUSTED_STREAM_CODEC.decode(buffer));
-	}
-
-	private static void write(RegistryFriendlyByteBuf buffer, StorageTerminalActionPayload payload) {
-		buffer.writeBlockPos(payload.pos);
-		buffer.writeVarInt(payload.action.ordinal());
-		buffer.writeVarInt(payload.page);
-		buffer.writeVarInt(payload.entryIndex);
-		buffer.writeVarInt(payload.playerSlot);
-		ItemStack.OPTIONAL_UNTRUSTED_STREAM_CODEC.encode(buffer, payload.expected);
-	}
-
-	@Override
-	public Type<? extends CustomPacketPayload> type() {
-		return TYPE;
-	}
-
-	public enum Action {
-		REQUEST_PAGE,
-		TAKE_STACK,
-		TAKE_ONE,
-		DEPOSIT_SLOT
-	}
-}
@@ -1,80 +0,0 @@
-package fr.koka99cab.sanctuary26.redstoner.network;
-
-import fr.koka99cab.sanctuary26.redstoner.RedStonerMod;
-import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalRules;
-import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalStatus;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.world.item.ItemStack;
-
-public record StorageTerminalSnapshotPayload(BlockPos pos, StorageTerminalStatus status, int page,
-	int pageCount, int containerCount, int totalEntries, List<Entry> entries) implements CustomPacketPayload {
-	public static final Type<StorageTerminalSnapshotPayload> TYPE =
-		new Type<>(RedStonerMod.id("s2c/storage_terminal_snapshot"));
-	public static final StreamCodec<RegistryFriendlyByteBuf, StorageTerminalSnapshotPayload> STREAM_CODEC =
-		StreamCodec.of(StorageTerminalSnapshotPayload::write, StorageTerminalSnapshotPayload::read);
-
-	public StorageTerminalSnapshotPayload {
-		pos = pos == null ? BlockPos.ZERO : pos.immutable();
-		status = status == null ? StorageTerminalStatus.INVALID_TERMINAL : status;
-		pageCount = Math.max(1, Math.min(StorageTerminalRules.MAX_PAGE_COUNT, pageCount));
-		page = Math.max(0, Math.min(pageCount - 1, page));
-		containerCount = Math.max(0, Math.min(StorageTerminalRules.MAX_CONTAINERS, containerCount));
-		totalEntries = Math.max(0, Math.min(StorageTerminalRules.MAX_ENTRIES, totalEntries));
-		entries = entries == null ? List.of() : List.copyOf(entries.stream()
-			.limit(StorageTerminalRules.PAGE_SIZE).toList());
-	}
-
-	private static StorageTerminalSnapshotPayload read(RegistryFriendlyByteBuf buffer) {
-		BlockPos pos = buffer.readBlockPos();
-		StorageTerminalStatus status = status(buffer.readVarInt());
-		int page = buffer.readVarInt();
-		int pageCount = buffer.readVarInt();
-		int containerCount = buffer.readVarInt();
-		int totalEntries = buffer.readVarInt();
-		int size = buffer.readVarInt();
-		if (size < 0 || size > StorageTerminalRules.PAGE_SIZE) {
-			throw new IllegalArgumentException("Storage terminal page exceeds " + StorageTerminalRules.PAGE_SIZE);
-		}
-		List<Entry> entries = new ArrayList<>(size);
-		for (int index = 0; index < size; index++) {
-			entries.add(new Entry(ItemStack.OPTIONAL_UNTRUSTED_STREAM_CODEC.decode(buffer), buffer.readVarInt()));
-		}
-		return new StorageTerminalSnapshotPayload(pos, status, page, pageCount, containerCount, totalEntries, entries);
-	}
-
-	private static void write(RegistryFriendlyByteBuf buffer, StorageTerminalSnapshotPayload payload) {
-		buffer.writeBlockPos(payload.pos);
-		buffer.writeVarInt(payload.status.ordinal());
-		buffer.writeVarInt(payload.page);
-		buffer.writeVarInt(payload.pageCount);
-		buffer.writeVarInt(payload.containerCount);
-		buffer.writeVarInt(payload.totalEntries);
-		buffer.writeVarInt(payload.entries.size());
-		for (Entry entry : payload.entries) {
-			ItemStack.OPTIONAL_UNTRUSTED_STREAM_CODEC.encode(buffer, entry.stack);
-			buffer.writeVarInt(entry.total);
-		}
-	}
-
-	private static StorageTerminalStatus status(int ordinal) {
-		StorageTerminalStatus[] values = StorageTerminalStatus.values();
-		return values[Math.max(0, Math.min(values.length - 1, ordinal))];
-	}
-
-	@Override
-	public Type<? extends CustomPacketPayload> type() {
-		return TYPE;
-	}
-
-	public record Entry(ItemStack stack, int total) {
-		public Entry {
-			stack = stack == null || stack.isEmpty() ? ItemStack.EMPTY : stack.copyWithCount(1);
-			total = stack.isEmpty() ? 0 : Math.max(1, total);
-		}
-	}
-}
@@ -0,0 +1,23 @@
+package fr.koka99cab.sanctuary26.redstoner.registry;
+
+import fr.koka99cab.sanctuary26.redstoner.RedStonerMod;
+import fr.koka99cab.sanctuary26.redstoner.storage.StorageTerminalMenu;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.flag.FeatureFlags;
+import net.minecraft.world.inventory.MenuType;
+
+public final class RedStonerMenus {
+	public static final MenuType<StorageTerminalMenu> STORAGE_TERMINAL = Registry.register(
+		BuiltInRegistries.MENU,
+		RedStonerMod.id("storage_terminal"),
+		new MenuType<>(StorageTerminalMenu::new, FeatureFlags.VANILLA_SET)
+	);
+
+	private RedStonerMenus() {
+	}
+
+	public static void initialize() {
+		RedStonerMod.LOGGER.debug("[{}] Storage-terminal menu registered.", RedStonerMod.DISPLAY_NAME);
+	}
+}
@@ -12,12 +12,12 @@ public final class StorageTerminalInventory {
 	}

 	public static List<Entry> aggregate(List<? extends Container> containers) {
-		Map<StackKey, MutableEntry> grouped = new LinkedHashMap<>();
+		Map<StackIdentity, MutableEntry> grouped = new LinkedHashMap<>();
 		for (Container container : containers) {
 			for (int slot = 0; slot < container.getContainerSize(); slot++) {
 				ItemStack stack = container.getItem(slot);
 				if (stack.isEmpty()) continue;
-				StackKey key = new StackKey(stack);
+				StackIdentity key = identity(stack);
 				MutableEntry entry = grouped.computeIfAbsent(key, ignored -> new MutableEntry(key.stack));
 				entry.total = saturatedAdd(entry.total, stack.getCount());
 			}
@@ -27,7 +27,10 @@ public final class StorageTerminalInventory {
 		return List.copyOf(result);
 	}

-	/** Inserts into compatible existing stacks first, then into empty slots. Mutates {@code source}. */
+	/**
+	 * Fills each container in discovery order, preferring its compatible stacks before its empty slots.
+	 * Mutates {@code source} and only spills into the next container when the current one cannot accept more.
+	 */
 	public static int insert(List<? extends Container> containers, ItemStack source) {
 		if (source == null || source.isEmpty()) return 0;
 		int before = source.getCount();
@@ -43,8 +46,6 @@ public final class StorageTerminalInventory {
 				source.shrink(moved);
 				container.setChanged();
 			}
-		}
-		for (Container container : containers) {
 			for (int slot = 0; slot < container.getContainerSize() && !source.isEmpty(); slot++) {
 				if (!container.getItem(slot).isEmpty() || !container.canPlaceItem(slot, source)) continue;
 				int limit = Math.min(container.getMaxStackSize(source), source.getMaxStackSize());
@@ -83,10 +84,14 @@ public final class StorageTerminalInventory {
 	public record Entry(ItemStack stack, int total) {
 		public Entry {
 			stack = stack == null || stack.isEmpty() ? ItemStack.EMPTY : stack.copyWithCount(1);
-			total = stack.isEmpty() ? 0 : Math.max(1, total);
+			total = stack.isEmpty() ? 0 : Math.max(0, total);
 		}
 	}

+	static StackIdentity identity(ItemStack stack) {
+		return new StackIdentity(stack);
+	}
+
 	private static final class MutableEntry {
 		private final ItemStack stack;
 		private int total;
@@ -96,11 +101,11 @@ public final class StorageTerminalInventory {
 		}
 	}

-	private static final class StackKey {
+	static final class StackIdentity {
 		private final ItemStack stack;
 		private final int hash;

-		private StackKey(ItemStack stack) {
+		private StackIdentity(ItemStack stack) {
 			this.stack = stack.copyWithCount(1);
 			this.hash = ItemStack.hashItemAndComponents(this.stack);
 		}
@@ -112,7 +117,12 @@ public final class StorageTerminalInventory {

 		@Override
 		public boolean equals(Object other) {
-			return other instanceof StackKey key && ItemStack.isSameItemSameComponents(stack, key.stack);
+			return other instanceof StackIdentity identity
+				&& ItemStack.isSameItemSameComponents(stack, identity.stack);
+		}
+
+		ItemStack representative() {
+			return stack.copyWithCount(1);
 		}
 	}
 }
@@ -0,0 +1,52 @@
+package fr.koka99cab.sanctuary26.redstoner.storage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.minecraft.world.item.ItemStack;
+
+/** Keeps terminal slot identities stable for the lifetime of one search layout. */
+final class StorageTerminalLayout {
+	private static final StorageTerminalInventory.Entry EMPTY_ENTRY =
+		new StorageTerminalInventory.Entry(ItemStack.EMPTY, 0);
+	private final List<StorageTerminalInventory.StackIdentity> order = new ArrayList<>();
+	private Map<StorageTerminalInventory.StackIdentity, StorageTerminalInventory.Entry> liveByIdentity = Map.of();
+
+	void update(List<StorageTerminalInventory.Entry> liveEntries, boolean resetOrder) {
+		Map<StorageTerminalInventory.StackIdentity, StorageTerminalInventory.Entry> live =
+			new LinkedHashMap<>();
+		for (StorageTerminalInventory.Entry entry : liveEntries) {
+			live.put(StorageTerminalInventory.identity(entry.stack()), entry);
+		}
+		if (resetOrder) order.clear();
+		Set<StorageTerminalInventory.StackIdentity> known = new HashSet<>(order);
+		for (StorageTerminalInventory.StackIdentity identity : live.keySet()) {
+			if (known.add(identity)) order.add(identity);
+		}
+		liveByIdentity = Map.copyOf(live);
+	}
+
+	int size() {
+		return order.size();
+	}
+
+	List<StorageTerminalInventory.Entry> page(int requestedPage) {
+		int start = StorageTerminalRules.pageStart(requestedPage, order.size());
+		List<StorageTerminalInventory.Entry> entries = new ArrayList<>(StorageTerminalRules.PAGE_SIZE);
+		for (int slot = 0; slot < StorageTerminalRules.PAGE_SIZE; slot++) {
+			int orderedIndex = start + slot;
+			if (orderedIndex >= order.size()) {
+				entries.add(EMPTY_ENTRY);
+				continue;
+			}
+			StorageTerminalInventory.StackIdentity identity = order.get(orderedIndex);
+			StorageTerminalInventory.Entry live = liveByIdentity.get(identity);
+			entries.add(live == null
+				? new StorageTerminalInventory.Entry(identity.representative(), 0) : live);
+		}
+		return List.copyOf(entries);
+	}
+}
@@ -0,0 +1,336 @@
+package fr.koka99cab.sanctuary26.redstoner.storage;
+
+import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerMenus;
+import fr.koka99cab.sanctuary26.redstoner.registry.RedStonerRegistries;
+import fr.koka99cab.sanctuary26.sanctuary.api.inventory.SanctuaryPlayerInventoryView;
+import java.util.List;
+import java.util.Locale;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.inventory.ContainerInput;
+import net.minecraft.world.inventory.SimpleContainerData;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.Vec3;
+
+/** A server-authoritative aggregate view over the connected physical storage. */
+public final class StorageTerminalMenu extends AbstractContainerMenu {
+	public static final int TERMINAL_SLOT_COUNT = StorageTerminalRules.PAGE_SIZE;
+	public static final int PAGE_BUTTON_BASE = 10;
+	public static final int SEARCH_CLEAR_BUTTON = 100;
+	public static final int SEARCH_BACKSPACE_BUTTON = 101;
+	public static final int SEARCH_CODEPOINT_BUTTON_BASE = 1_000;
+	private static final int PLAYER_INVENTORY_Y = 140;
+	private static final int REFRESH_INTERVAL = 20;
+	private static final double MAX_DISTANCE_SQUARED = 64.0D;
+	private static final int STATUS_DATA = 0;
+	private static final int PAGE_DATA = 1;
+	private static final int PAGE_COUNT_DATA = 2;
+	private static final int CONTAINER_COUNT_DATA = 3;
+	private static final int TOTAL_ENTRIES_DATA = 4;
+	private static final int TOTALS_DATA = 5;
+	private static final int WORDS_PER_TOTAL = 2;
+	private static final int DATA_COUNT = TOTALS_DATA + TERMINAL_SLOT_COUNT * WORDS_PER_TOTAL;
+
+	private final SimpleContainer display = new SimpleContainer(TERMINAL_SLOT_COUNT);
+	private final ContainerData data;
+	private final ServerPlayer serverPlayer;
+	private final BlockPos terminalPos;
+	private StorageTerminalNetwork.Discovery discovery =
+		StorageTerminalNetwork.Discovery.error(StorageTerminalStatus.INVALID_TERMINAL);
+	private final StorageTerminalLayout layout = new StorageTerminalLayout();
+	private List<StorageTerminalInventory.Entry> entries = List.of();
+	private String searchQuery = "";
+	private int refreshCooldown = REFRESH_INTERVAL;
+
+	public StorageTerminalMenu(int containerId, Inventory inventory) {
+		this(containerId, inventory, new SimpleContainerData(DATA_COUNT), null, null);
+	}
+
+	public StorageTerminalMenu(int containerId, Inventory inventory, ServerPlayer player, BlockPos pos) {
+		this(containerId, inventory, new SimpleContainerData(DATA_COUNT), player, pos.immutable());
+		refresh(0, true);
+	}
+
+	private StorageTerminalMenu(int containerId, Inventory inventory, ContainerData data,
+		ServerPlayer serverPlayer, BlockPos terminalPos) {
+		super(RedStonerMenus.STORAGE_TERMINAL, containerId);
+		checkContainerDataCount(data, DATA_COUNT);
+		this.data = data;
+		this.serverPlayer = serverPlayer;
+		this.terminalPos = terminalPos;
+		for (int row = 0; row < 6; row++) {
+			for (int column = 0; column < 9; column++) {
+				int slot = column + row * 9;
+				addSlot(new TerminalDisplaySlot(display, slot, 8 + column * 18, 18 + row * 18));
+			}
+		}
+		addStandardInventorySlots(inventory, 8, PLAYER_INVENTORY_Y);
+		addDataSlots(data);
+	}
+
+	public static void open(ServerPlayer player, BlockPos pos) {
+		if (player.distanceToSqr(Vec3.atCenterOf(pos)) > MAX_DISTANCE_SQUARED) return;
+		player.openMenu(new SimpleMenuProvider(
+			(containerId, inventory, ignored) -> new StorageTerminalMenu(containerId, inventory, player, pos),
+			Component.translatable("screen.redstoner.storage_terminal.title")));
+	}
+
+	public StorageTerminalStatus status() {
+		StorageTerminalStatus[] values = StorageTerminalStatus.values();
+		return values[Math.clamp(data.get(STATUS_DATA), 0, values.length - 1)];
+	}
+
+	public int page() {
+		return Math.max(0, data.get(PAGE_DATA));
+	}
+
+	public int pageCount() {
+		return Math.max(1, data.get(PAGE_COUNT_DATA));
+	}
+
+	public int containerCount() {
+		return Math.max(0, data.get(CONTAINER_COUNT_DATA));
+	}
+
+	public int totalEntries() {
+		return Math.max(0, data.get(TOTAL_ENTRIES_DATA));
+	}
+
+	public int totalAt(int slot) {
+		if (slot < 0 || slot >= TERMINAL_SLOT_COUNT) return 0;
+		int base = TOTALS_DATA + slot * WORDS_PER_TOTAL;
+		return StorageTerminalRules.totalFromWords(data.get(base), data.get(base + 1));
+	}
+
+	public Component statusMessage() {
+		return Component.translatable("screen.redstoner.storage_terminal.error."
+			+ status().name().toLowerCase(Locale.ROOT));
+	}
+
+	@Override
+	public boolean clickMenuButton(Player player, int buttonId) {
+		if (serverPlayer == null || player != serverPlayer || !stillValid(player)) return false;
+		int requestedPage = buttonId - PAGE_BUTTON_BASE;
+		if (requestedPage >= 0 && requestedPage < StorageTerminalRules.MAX_PAGE_COUNT) {
+			refresh(requestedPage, false);
+			broadcastChanges();
+			return true;
+		}
+		if (buttonId == SEARCH_CLEAR_BUTTON) {
+			searchQuery = "";
+		} else if (buttonId == SEARCH_BACKSPACE_BUTTON) {
+			if (searchQuery.isEmpty()) return true;
+			searchQuery = searchQuery.substring(0,
+				searchQuery.offsetByCodePoints(searchQuery.length(), -1));
+		} else {
+			int codePoint = buttonId - SEARCH_CODEPOINT_BUTTON_BASE;
+			if (!isSearchCodePoint(codePoint)) return false;
+			String appended = new String(Character.toChars(codePoint));
+			if (searchQuery.length() + appended.length() > StorageTerminalRules.MAX_SEARCH_LENGTH) return false;
+			searchQuery += appended;
+		}
+		refresh(0, true);
+		broadcastChanges();
+		return true;
+	}
+
+	@Override
+	public void clicked(int slotId, int button, ContainerInput input, Player player) {
+		if (slotId >= 0 && slotId < TERMINAL_SLOT_COUNT) {
+			if (input == ContainerInput.QUICK_MOVE) {
+				if (serverPlayer != null) quickMoveStack(player, slotId);
+				return;
+			}
+			if (input == ContainerInput.PICKUP && (button == 0 || button == 1)) {
+				if (serverPlayer != null && player == serverPlayer && stillValid(player)) {
+					if (getCarried().isEmpty()) takeToCarried(slotId, button == 1);
+					else depositCarried(button == 1);
+				}
+				return;
+			}
+			return;
+		}
+		super.clicked(slotId, button, input, player);
+	}
+
+	@Override
+	public ItemStack quickMoveStack(Player player, int index) {
+		if (serverPlayer == null || player != serverPlayer || !stillValid(player)
+			|| index < 0 || index >= slots.size()) return ItemStack.EMPTY;
+		if (index < TERMINAL_SLOT_COUNT) return takeIntoPlayer(index);
+
+		Slot sourceSlot = slots.get(index);
+		if (!sourceSlot.hasItem() || !sourceSlot.mayPickup(player)) return ItemStack.EMPTY;
+		if (!ready()) return ItemStack.EMPTY;
+		ItemStack source = sourceSlot.getItem();
+		ItemStack original = source.copy();
+		int moved = StorageTerminalInventory.insert(discovery.inventoryContainers(), source);
+		if (moved <= 0) return ItemStack.EMPTY;
+		if (source.isEmpty()) sourceSlot.setByPlayer(ItemStack.EMPTY);
+		else sourceSlot.setChanged();
+		sourceSlot.onTake(player, source);
+		refresh(page(), false);
+		broadcastChanges();
+		return original;
+	}
+
+	@Override
+	public boolean stillValid(Player player) {
+		if (serverPlayer == null || terminalPos == null) return true;
+		return player == serverPlayer
+			&& player.distanceToSqr(Vec3.atCenterOf(terminalPos)) <= MAX_DISTANCE_SQUARED
+			&& player.level().getBlockState(terminalPos).is(RedStonerRegistries.STORAGE_TERMINAL);
+	}
+
+	@Override
+	public void broadcastChanges() {
+		if (serverPlayer != null && --refreshCooldown <= 0) refresh(page(), false);
+		super.broadcastChanges();
+	}
+
+	@Override
+	public boolean canDragTo(Slot slot) {
+		return !(slot instanceof TerminalDisplaySlot) && super.canDragTo(slot);
+	}
+
+	@Override
+	public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) {
+		return !(slot instanceof TerminalDisplaySlot) && super.canTakeItemForPickAll(stack, slot);
+	}
+
+	private void refresh(int requestedPage, boolean resetOrder) {
+		if (serverPlayer == null || terminalPos == null) return;
+		discovery = StorageTerminalNetwork.discover(serverPlayer, terminalPos);
+		List<StorageTerminalInventory.Entry> liveEntries =
+			StorageTerminalNetwork.filteredEntries(discovery, searchQuery);
+		layout.update(liveEntries, resetOrder);
+
+		int page = discovery.status() == StorageTerminalStatus.READY
+			? StorageTerminalRules.clampPage(requestedPage, layout.size()) : 0;
+		int pageCount = discovery.status() == StorageTerminalStatus.READY
+			? StorageTerminalRules.pageCount(layout.size()) : 1;
+		entries = discovery.status() == StorageTerminalStatus.READY ? layout.page(page) : List.of();
+		data.set(STATUS_DATA, discovery.status().ordinal());
+		data.set(PAGE_DATA, page);
+		data.set(PAGE_COUNT_DATA, pageCount);
+		data.set(CONTAINER_COUNT_DATA, discovery.containers().size());
+		data.set(TOTAL_ENTRIES_DATA, liveEntries.size());
+		for (int slot = 0; slot < TERMINAL_SLOT_COUNT; slot++) {
+			StorageTerminalInventory.Entry entry = slot < entries.size() ? entries.get(slot) : null;
+			display.setItem(slot, entry == null || entry.total() <= 0
+				? ItemStack.EMPTY : entry.stack().copyWithCount(1));
+			int total = entry == null ? 0 : entry.total();
+			int base = TOTALS_DATA + slot * WORDS_PER_TOTAL;
+			data.set(base, StorageTerminalRules.totalLowWord(total));
+			data.set(base + 1, StorageTerminalRules.totalHighWord(total));
+		}
+		refreshCooldown = REFRESH_INTERVAL;
+	}
+
+	private static boolean isSearchCodePoint(int codePoint) {
+		return Character.isValidCodePoint(codePoint)
+			&& !(codePoint >= Character.MIN_SURROGATE && codePoint <= Character.MAX_SURROGATE)
+			&& !Character.isISOControl(codePoint);
+	}
+
+	private boolean ready() {
+		if (serverPlayer == null || terminalPos == null) return false;
+		discovery = StorageTerminalNetwork.discover(serverPlayer, terminalPos);
+		return discovery.status() == StorageTerminalStatus.READY;
+	}
+
+	private void takeToCarried(int slot, boolean single) {
+		if (!ready() || slot >= entries.size()) return;
+		StorageTerminalInventory.Entry entry = entries.get(slot);
+		if (entry.stack().isEmpty() || entry.total() <= 0) return;
+		int requested = single ? 1 : entry.stack().getMaxStackSize();
+		ItemStack extracted = StorageTerminalInventory.take(discovery.inventoryContainers(), entry.stack(),
+			Math.min(entry.total(), requested));
+		if (extracted.isEmpty()) return;
+		setCarried(extracted);
+		refresh(page(), false);
+		broadcastChanges();
+	}
+
+	private void depositCarried(boolean single) {
+		if (!ready()) return;
+		ItemStack carried = getCarried();
+		int offeredCount = single ? 1 : carried.getCount();
+		ItemStack offered = carried.copyWithCount(offeredCount);
+		int moved = StorageTerminalInventory.insert(discovery.inventoryContainers(), offered);
+		if (moved <= 0) return;
+		carried.shrink(moved);
+		if (carried.isEmpty()) setCarried(ItemStack.EMPTY);
+		refresh(page(), false);
+		broadcastChanges();
+	}
+
+	private ItemStack takeIntoPlayer(int slot) {
+		if (!ready() || slot >= entries.size()) return ItemStack.EMPTY;
+		StorageTerminalInventory.Entry entry = entries.get(slot);
+		if (entry.stack().isEmpty() || entry.total() <= 0) return ItemStack.EMPTY;
+		int requested = Math.min(entry.total(), entry.stack().getMaxStackSize());
+		ItemStack extracted = StorageTerminalInventory.take(discovery.inventoryContainers(), entry.stack(), requested);
+		if (extracted.isEmpty()) return ItemStack.EMPTY;
+		ItemStack original = extracted.copy();
+		int inserted = insertPlayer(serverPlayer, extracted);
+		if (!extracted.isEmpty()) StorageTerminalInventory.insert(discovery.inventoryContainers(), extracted);
+		if (inserted <= 0) return ItemStack.EMPTY;
+		refresh(page(), false);
+		broadcastChanges();
+		return original.copyWithCount(inserted);
+	}
+
+	private static int insertPlayer(ServerPlayer player, ItemStack source) {
+		int before = source.getCount();
+		var slots = SanctuaryPlayerInventoryView.unlockedRows(player);
+		for (var slot : slots) {
+			if (source.isEmpty()) break;
+			ItemStack target = slot.stack();
+			if (target.isEmpty() || !ItemStack.isSameItemSameComponents(target, source)
+				|| !slot.container().canPlaceItem(slot.slot(), source)) continue;
+			int limit = Math.min(target.getMaxStackSize(), slot.container().getMaxStackSize(source));
+			int moved = Math.min(source.getCount(), Math.max(0, limit - target.getCount()));
+			if (moved <= 0) continue;
+			target.grow(moved);
+			source.shrink(moved);
+			slot.markChanged();
+		}
+		for (var slot : slots) {
+			if (source.isEmpty()) break;
+			if (!slot.stack().isEmpty() || !slot.container().canPlaceItem(slot.slot(), source)) continue;
+			int limit = Math.min(source.getMaxStackSize(), slot.container().getMaxStackSize(source));
+			int moved = Math.min(source.getCount(), Math.max(0, limit));
+			if (moved <= 0) continue;
+			slot.container().setItem(slot.slot(), source.copyWithCount(moved));
+			source.shrink(moved);
+			slot.markChanged();
+		}
+		return before - source.getCount();
+	}
+
+	private static final class TerminalDisplaySlot extends Slot {
+		private TerminalDisplaySlot(Container container, int slot, int x, int y) {
+			super(container, slot, x, y);
+		}
+
+		@Override
+		public boolean mayPlace(ItemStack stack) {
+			return false;
+		}
+
+		@Override
+		public boolean mayPickup(Player player) {
+			return hasItem();
+		}
+	}
+}
@@ -48,16 +48,11 @@ public final class StorageTerminalNetwork {
 		return new Discovery(StorageTerminalStatus.READY, containers);
 	}

-	public static Snapshot snapshot(Discovery discovery, int requestedPage) {
-		if (discovery.status() != StorageTerminalStatus.READY) {
-			return new Snapshot(discovery.status(), 0, 1, 0, 0, List.of());
-		}
-		List<StorageTerminalInventory.Entry> all = StorageTerminalInventory.aggregate(discovery.containers());
-		int page = StorageTerminalRules.clampPage(requestedPage, all.size());
-		int start = StorageTerminalRules.pageStart(page, all.size());
-		int end = Math.min(all.size(), start + StorageTerminalRules.PAGE_SIZE);
-		return new Snapshot(StorageTerminalStatus.READY, page, StorageTerminalRules.pageCount(all.size()),
-			discovery.containers().size(), all.size(), all.subList(start, end));
+	public static List<StorageTerminalInventory.Entry> filteredEntries(
+		Discovery discovery, String searchQuery) {
+		if (discovery.status() != StorageTerminalStatus.READY) return List.of();
+		return StorageTerminalSearch.filter(
+			StorageTerminalInventory.aggregate(discovery.containers()), searchQuery);
 	}

 	private static BaseContainerBlockEntity storageEntity(ServerLevel level, BlockPos pos) {
@@ -81,12 +76,4 @@ public final class StorageTerminalNetwork {
 			return containers;
 		}
 	}
-
-	public record Snapshot(StorageTerminalStatus status, int page, int pageCount, int containerCount,
-		int totalEntries, List<StorageTerminalInventory.Entry> entries) {
-		public Snapshot {
-			status = status == null ? StorageTerminalStatus.INVALID_TERMINAL : status;
-			entries = entries == null ? List.of() : List.copyOf(entries);
-		}
-	}
 }
@@ -6,7 +6,7 @@ public final class StorageTerminalRules {
 	public static final int SLOTS_PER_CONTAINER = 27;
 	public static final int MAX_ENTRIES = MAX_CONTAINERS * SLOTS_PER_CONTAINER;
 	public static final int MAX_PAGE_COUNT = MAX_ENTRIES / PAGE_SIZE;
-	public static final int PLAYER_STORAGE_SLOTS = 36;
+	public static final int MAX_SEARCH_LENGTH = 32;

 	private StorageTerminalRules() {
 	}
@@ -23,4 +23,32 @@ public final class StorageTerminalRules {
 	public static int pageStart(int requestedPage, int entryCount) {
 		return clampPage(requestedPage, entryCount) * PAGE_SIZE;
 	}
+
+	public static int totalLowWord(int total) {
+		return Math.max(0, total) & 0xFFFF;
+	}
+
+	public static int totalHighWord(int total) {
+		return Math.max(0, total) >>> 16;
+	}
+
+	public static int totalFromWords(int low, int high) {
+		return (low & 0xFFFF) | (high & 0xFFFF) << 16;
+	}
+
+	public static String compactCount(int count) {
+		int bounded = Math.max(0, count);
+		if (bounded < 1_000) return Integer.toString(bounded);
+		if (bounded < 10_000) return decimalUnit(bounded, 1_000, "K");
+		if (bounded < 1_000_000) return (bounded / 1_000) + "K";
+		if (bounded < 10_000_000) return decimalUnit(bounded, 1_000_000, "M");
+		return (bounded / 1_000_000) + "M";
+	}
+
+	private static String decimalUnit(int count, int unit, String suffix) {
+		int tenths = count / (unit / 10);
+		int decimal = tenths % 10;
+		return decimal == 0 ? (tenths / 10) + suffix
+			: (tenths / 10) + "." + decimal + suffix;
+	}
 }
@@ -0,0 +1,51 @@
+package fr.koka99cab.sanctuary26.redstoner.storage;
+
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.ItemStack;
+
+/** Server-side matching for the bounded terminal search field. */
+public final class StorageTerminalSearch {
+	private static final Pattern COMBINING_MARKS = Pattern.compile("\\p{M}+");
+	private static final Pattern NON_ALPHANUMERIC = Pattern.compile("[^\\p{L}\\p{N}]+");
+
+	private StorageTerminalSearch() {
+	}
+
+	public static List<StorageTerminalInventory.Entry> filter(
+		List<StorageTerminalInventory.Entry> entries, String query) {
+		String normalizedQuery = normalize(query);
+		if (normalizedQuery.isEmpty()) return List.copyOf(entries);
+		String[] terms = normalizedQuery.split(" ");
+		List<StorageTerminalInventory.Entry> matches = new ArrayList<>();
+		for (StorageTerminalInventory.Entry entry : entries) {
+			if (matches(entry.stack(), terms)) matches.add(entry);
+		}
+		return List.copyOf(matches);
+	}
+
+	static String normalize(String value) {
+		if (value == null || value.isBlank()) return "";
+		String withoutMarks = COMBINING_MARKS.matcher(
+			Normalizer.normalize(value, Normalizer.Form.NFD)).replaceAll("");
+		return NON_ALPHANUMERIC.matcher(withoutMarks.toLowerCase(Locale.ROOT))
+			.replaceAll(" ").strip();
+	}
+
+	private static boolean matches(ItemStack stack, String[] terms) {
+		StringBuilder searchable = new StringBuilder(stack.getHoverName().getString());
+		Identifier id = BuiltInRegistries.ITEM.getKey(stack.getItem());
+		if (id != null) searchable.append(' ').append(id);
+		searchable.append(' ').append(stack.getItem().getDescriptionId());
+		String normalized = normalize(searchable.toString());
+		for (String term : terms) {
+			if (!normalized.contains(term)) return false;
+		}
+		return true;
+	}
+}
@@ -1,109 +0,0 @@
-package fr.koka99cab.sanctuary26.redstoner.storage;
-
-import fr.koka99cab.sanctuary26.redstoner.network.StorageTerminalActionPayload;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.phys.Vec3;
-
-public final class StorageTerminalService {
-	private static final double MAX_DISTANCE_SQUARED = 64.0D;
-
-	private StorageTerminalService() {
-	}
-
-	public static StorageTerminalNetwork.Snapshot snapshot(ServerPlayer player, BlockPos pos, int page) {
-		if (player.distanceToSqr(Vec3.atCenterOf(pos)) > MAX_DISTANCE_SQUARED) {
-			return StorageTerminalNetwork.snapshot(
-				StorageTerminalNetwork.Discovery.error(StorageTerminalStatus.INVALID_TERMINAL), 0);
-		}
-		return StorageTerminalNetwork.snapshot(StorageTerminalNetwork.discover(player, pos), page);
-	}
-
-	public static StorageTerminalNetwork.Snapshot handle(ServerPlayer player, StorageTerminalActionPayload payload) {
-		if (player.distanceToSqr(Vec3.atCenterOf(payload.pos())) > MAX_DISTANCE_SQUARED) {
-			return StorageTerminalNetwork.snapshot(
-				StorageTerminalNetwork.Discovery.error(StorageTerminalStatus.INVALID_TERMINAL), 0);
-		}
-		StorageTerminalNetwork.Discovery discovery = StorageTerminalNetwork.discover(player, payload.pos());
-		StorageTerminalNetwork.Snapshot before = StorageTerminalNetwork.snapshot(discovery, payload.page());
-		if (before.status() != StorageTerminalStatus.READY
-			|| payload.action() == StorageTerminalActionPayload.Action.REQUEST_PAGE) return before;
-
-		boolean changed = switch (payload.action()) {
-			case TAKE_STACK -> take(player, discovery, before, payload, false);
-			case TAKE_ONE -> take(player, discovery, before, payload, true);
-			case DEPOSIT_SLOT -> deposit(player, discovery, payload);
-			case REQUEST_PAGE -> false;
-		};
-		if (changed) {
-			player.getInventory().setChanged();
-			player.containerMenu.broadcastChanges();
-			player.inventoryMenu.broadcastChanges();
-		}
-		return StorageTerminalNetwork.snapshot(discovery, before.page());
-	}
-
-	private static boolean take(ServerPlayer player, StorageTerminalNetwork.Discovery discovery,
-		StorageTerminalNetwork.Snapshot snapshot, StorageTerminalActionPayload payload, boolean single) {
-		if (payload.entryIndex() < 0 || payload.entryIndex() >= snapshot.entries().size()) return false;
-		StorageTerminalInventory.Entry entry = snapshot.entries().get(payload.entryIndex());
-		if (payload.expected().isEmpty()
-			|| !ItemStack.isSameItemSameComponents(entry.stack(), payload.expected())) return false;
-		int capacity = playerCapacity(player.getInventory(), entry.stack());
-		int requested = single ? 1 : entry.stack().getMaxStackSize();
-		int amount = Math.min(entry.total(), Math.min(capacity, requested));
-		if (amount <= 0) return false;
-		ItemStack extracted = StorageTerminalInventory.take(discovery.inventoryContainers(), entry.stack(), amount);
-		if (extracted.isEmpty()) return false;
-		int inserted = insertPlayer(player.getInventory(), extracted);
-		if (!extracted.isEmpty()) StorageTerminalInventory.insert(discovery.inventoryContainers(), extracted);
-		return inserted > 0;
-	}
-
-	private static boolean deposit(ServerPlayer player, StorageTerminalNetwork.Discovery discovery,
-		StorageTerminalActionPayload payload) {
-		int slot = payload.playerSlot();
-		if (slot < 0 || slot >= StorageTerminalRules.PLAYER_STORAGE_SLOTS) return false;
-		Inventory inventory = player.getInventory();
-		ItemStack source = inventory.getItem(slot);
-		if (source.isEmpty() || payload.expected().isEmpty()
-			|| !ItemStack.isSameItemSameComponents(source, payload.expected())) return false;
-		int inserted = StorageTerminalInventory.insert(discovery.inventoryContainers(), source);
-		if (source.isEmpty()) inventory.setItem(slot, ItemStack.EMPTY);
-		return inserted > 0;
-	}
-
-	private static int playerCapacity(Inventory inventory, ItemStack expected) {
-		long capacity = 0L;
-		for (int slot = 0; slot < StorageTerminalRules.PLAYER_STORAGE_SLOTS; slot++) {
-			ItemStack stack = inventory.getItem(slot);
-			if (stack.isEmpty()) capacity += expected.getMaxStackSize();
-			else if (ItemStack.isSameItemSameComponents(stack, expected)) {
-				capacity += Math.max(0, stack.getMaxStackSize() - stack.getCount());
-			}
-		}
-		return (int) Math.min(Integer.MAX_VALUE, capacity);
-	}
-
-	/** Inserts into the 36 survival storage slots and mutates {@code source}. */
-	private static int insertPlayer(Inventory inventory, ItemStack source) {
-		int before = source.getCount();
-		for (int slot = 0; slot < StorageTerminalRules.PLAYER_STORAGE_SLOTS && !source.isEmpty(); slot++) {
-			ItemStack target = inventory.getItem(slot);
-			if (target.isEmpty() || !ItemStack.isSameItemSameComponents(target, source)) continue;
-			int moved = Math.min(source.getCount(), Math.max(0, target.getMaxStackSize() - target.getCount()));
-			if (moved <= 0) continue;
-			target.grow(moved);
-			source.shrink(moved);
-		}
-		for (int slot = 0; slot < StorageTerminalRules.PLAYER_STORAGE_SLOTS && !source.isEmpty(); slot++) {
-			if (!inventory.getItem(slot).isEmpty()) continue;
-			int moved = Math.min(source.getCount(), source.getMaxStackSize());
-			inventory.setItem(slot, source.copyWithCount(moved));
-			source.shrink(moved);
-		}
-		return before - source.getCount();
-	}
-}
@@ -52,6 +52,8 @@
 	"tooltip.redstoner.particuleur": "Insert a catalyst, then power the block with redstone.",
 	"block.redstoner.storage_terminal": "Storage Terminal",
 	"screen.redstoner.storage_terminal.title": "Storage Terminal",
+	"screen.redstoner.storage_terminal.search": "Search…",
+	"screen.redstoner.storage_terminal.no_results": "No items found.",
 	"screen.redstoner.storage_terminal.summary": "%s/%s · %s blocks · %s types",
 	"screen.redstoner.storage_terminal.error.invalid_terminal": "The terminal is no longer accessible.",
 	"screen.redstoner.storage_terminal.error.disconnected": "No connected chest or barrel.",
@@ -52,6 +52,8 @@
 	"tooltip.redstoner.particuleur": "Insérez un catalyseur puis alimentez le bloc en redstone.",
 	"block.redstoner.storage_terminal": "Terminal de stockage",
 	"screen.redstoner.storage_terminal.title": "Terminal de stockage",
+	"screen.redstoner.storage_terminal.search": "Rechercher…",
+	"screen.redstoner.storage_terminal.no_results": "Aucun objet trouvé.",
 	"screen.redstoner.storage_terminal.summary": "%s/%s · %s blocs · %s types",
 	"screen.redstoner.storage_terminal.error.invalid_terminal": "Le terminal n'est plus accessible.",
 	"screen.redstoner.storage_terminal.error.disconnected": "Aucun coffre ou baril connecté.",
@@ -52,6 +52,8 @@
 	"tooltip.redstoner.particuleur": "Вставьте катализатор и подайте сигнал редстоуна.",
 	"block.redstoner.storage_terminal": "Терминал хранилища",
 	"screen.redstoner.storage_terminal.title": "Терминал хранилища",
+	"screen.redstoner.storage_terminal.search": "Поиск…",
+	"screen.redstoner.storage_terminal.no_results": "Предметы не найдены.",
 	"screen.redstoner.storage_terminal.summary": "%s/%s · блоков: %s · типов: %s",
 	"screen.redstoner.storage_terminal.error.invalid_terminal": "Терминал больше недоступен.",
 	"screen.redstoner.storage_terminal.error.disconnected": "Нет подключённых сундуков или бочек.",
@@ -31,7 +31,7 @@
 			"system_type": "gameplay-system",
 			"namespace": "redstoner",
 			"data_version": 3,
-			"network_protocol": 6,
+			"network_protocol": 7,
 			"lifecycle": "${lifecycle}",
 			"pack_version": "${pack_version}",
 			"descriptions": {
@@ -1,6 +1,5 @@
 package fr.koka99cab.sanctuary26.redstoner.storage;

-import fr.koka99cab.sanctuary26.redstoner.network.StorageTerminalActionPayload;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -25,8 +24,9 @@ public final class StorageTerminalSmoke {
 		Bootstrap.bootStrap();
 		verifyTopology();
 		verifyPagination();
-		verifyActionBounds();
 		verifyAggregationAndTransfers();
+		verifySearch();
+		verifyStableLayout();
 	}

 	private static void verifyTopology() {
@@ -54,17 +54,18 @@ public final class StorageTerminalSmoke {
 		require(StorageTerminalRules.pageCount(54) == 1, "A full visible page overflowed");
 		require(StorageTerminalRules.pageCount(55) == 2, "The second page did not open");
 		require(StorageTerminalRules.clampPage(999, 55) == 1, "A hostile page index was not clamped");
-	}
-
-	private static void verifyActionBounds() {
-		StorageTerminalActionPayload hostile = new StorageTerminalActionPayload(BlockPos.ZERO,
-			StorageTerminalActionPayload.Action.DEPOSIT_SLOT, -5, 999, 999, ItemStack.EMPTY);
-		require(hostile.page() == 0 && hostile.entryIndex() == -1 && hostile.playerSlot() == -1,
-			"Hostile terminal action indexes were mapped to valid slots");
-		StorageTerminalActionPayload missingAction = new StorageTerminalActionPayload(
-			BlockPos.ZERO, null, 0, -1, -1, ItemStack.EMPTY);
-		require(missingAction.action() == StorageTerminalActionPayload.Action.REQUEST_PAGE,
-			"A missing terminal action did not fall back to a read-only request");
+		int networkMaximum = StorageTerminalRules.MAX_CONTAINERS
+			* StorageTerminalRules.SLOTS_PER_CONTAINER * 64;
+		require(StorageTerminalRules.totalFromWords(
+			(short) StorageTerminalRules.totalLowWord(networkMaximum),
+			(short) StorageTerminalRules.totalHighWord(networkMaximum)) == networkMaximum,
+			"A large aggregated quantity was truncated by menu data synchronization");
+		require(StorageTerminalRules.compactCount(999).equals("999")
+			&& StorageTerminalRules.compactCount(1_000).equals("1K")
+			&& StorageTerminalRules.compactCount(1_250).equals("1.2K")
+			&& StorageTerminalRules.compactCount(12_345).equals("12K")
+			&& StorageTerminalRules.compactCount(1_250_000).equals("1.2M"),
+			"Terminal quantities were not compacted without overstating their value");
 	}

 	private static void verifyAggregationAndTransfers() {
@@ -83,6 +84,14 @@ public final class StorageTerminalSmoke {
 		require(first.getItem(0).getCount() == 64 && first.getItem(1).getCount() == 6,
 			"Terminal deposit did not fill matching stacks before empty slots");

+		SimpleContainer earliest = new SimpleContainer(1);
+		SimpleContainer laterMatch = new SimpleContainer(1);
+		laterMatch.setItem(0, new ItemStack(cobblestone, 60));
+		ItemStack orderedDeposit = new ItemStack(cobblestone, 10);
+		StorageTerminalInventory.insert(List.of(earliest, laterMatch), orderedDeposit);
+		require(earliest.getItem(0).getCount() == 10 && laterMatch.getItem(0).getCount() == 60,
+			"Terminal deposit skipped the first available physical container");
+
 		List<StorageTerminalInventory.Entry> entries = StorageTerminalInventory.aggregate(List.of(first, second));
 		require(entries.size() == 2, "Items with distinct components were merged");
 		StorageTerminalInventory.Entry plain = entries.stream()
@@ -97,6 +106,55 @@ public final class StorageTerminalSmoke {
 			.findFirst().orElseThrow().total() == 6, "Terminal extraction did not update physical slots");
 	}

+	private static void verifySearch() {
+		SimpleContainer container = new SimpleContainer(4);
+		container.setItem(0, new ItemStack(stackable(Items.COBBLESTONE), 12));
+		ItemStack accented = new ItemStack(stackable(Items.DIAMOND), 2);
+		accented.set(DataComponents.CUSTOM_NAME, Component.literal("Élément spécial"));
+		container.setItem(1, accented);
+		ItemStack russian = new ItemStack(stackable(Items.REDSTONE), 3);
+		russian.set(DataComponents.CUSTOM_NAME, Component.literal("Красный камень"));
+		container.setItem(2, russian);
+
+		List<StorageTerminalInventory.Entry> entries = StorageTerminalInventory.aggregate(List.of(container));
+		require(StorageTerminalSearch.filter(entries, "minecraft:cobblestone").size() == 1,
+			"Terminal search did not match a namespaced item id");
+		require(StorageTerminalSearch.filter(entries, "cobble stone").size() == 1,
+			"Terminal search did not combine multiple terms");
+		require(StorageTerminalSearch.filter(entries, "element special").size() == 1,
+			"Terminal search did not ignore accents in a custom name");
+		require(StorageTerminalSearch.filter(entries, "красный камень").size() == 1,
+			"Terminal search did not preserve non-Latin keyboard input");
+		require(StorageTerminalSearch.filter(entries, "missing").isEmpty(),
+			"Terminal search retained an unrelated item");
+	}
+
+	private static Holder<Item> stackable(Item item) {
+		return new Holder.Direct<>(item, DataComponentMap.builder()
+			.set(DataComponents.MAX_STACK_SIZE, 64).build());
+	}
+
+	private static void verifyStableLayout() {
+		StorageTerminalInventory.Entry stone = new StorageTerminalInventory.Entry(
+			new ItemStack(stackable(Items.STONE)), 64);
+		StorageTerminalInventory.Entry dirt = new StorageTerminalInventory.Entry(
+			new ItemStack(stackable(Items.DIRT)), 64);
+		StorageTerminalInventory.Entry diamond = new StorageTerminalInventory.Entry(
+			new ItemStack(stackable(Items.DIAMOND)), 8);
+		StorageTerminalLayout layout = new StorageTerminalLayout();
+		layout.update(List.of(stone, dirt), true);
+		layout.update(List.of(dirt, diamond), false);
+		List<StorageTerminalInventory.Entry> page = layout.page(0);
+		require(page.get(0).total() == 0 && ItemStack.isSameItemSameComponents(page.get(0).stack(), stone.stack()),
+			"An exhausted terminal resource moved another item under the cursor");
+		require(ItemStack.isSameItemSameComponents(page.get(1).stack(), dirt.stack())
+			&& ItemStack.isSameItemSameComponents(page.get(2).stack(), diamond.stack()),
+			"A terminal refresh did not preserve existing slots or append a new resource");
+		layout.update(List.of(dirt, diamond), true);
+		require(ItemStack.isSameItemSameComponents(layout.page(0).get(0).stack(), dirt.stack()),
+			"A deliberate terminal layout reset did not compact the visible resources");
+	}
+
 	private static void require(boolean condition, String message) {
 		if (!condition) throw new IllegalStateException(message);
 	}
@@ -36,3 +36,18 @@ l'arrivée sûre du gameplay normal.
 Les textures historiques facultatives sont décrites dans
 [`ambiance/GOLDEN_DAYS.md`](../ambiance/GOLDEN_DAYS.md). Elles ne font pas
 partie de Sanctuary.
+
+## Résident et jalon mondial
+
+It's Alive place exactement un `itsalive:notch` persistant dans la résidence.
+Son UUID canonique est sauvegardé dans Alpha, les doublons chargés sont retirés
+et `/masterkey notch restore` permet de le recréer ou le ramener chez lui. Un
+alias caché `portals:notch` conserve le chargement des anciennes sauvegardes.
+
+Le premier coup volontaire d'un joueur déclenche le combat de Notch Titan.
+Ouch possède les attaques et les dégâts ; seule l'explosion de transformation
+peut casser des blocs. La victoire est enregistrée une seule fois dans les
+données globales Sanctuary, même après redémarrage ou restauration de l'entité.
+Les participants reçoivent le jalon `sanctuary:notch_defeated` et un marqueur
+de boss dans leur Atlas si Alpha y était déjà découverte. Le drapeau de
+récompense initiale reste séparé et monotone pour la future étape CARPET-01.
@@ -68,6 +68,30 @@ tasks.register("questRequestModelSmoke", JavaExec) {
 	mainClass = "fr.koka99cab.sanctuary26.sanctuary.shop.QuestRequestModelSmoke"
 }

+tasks.register("questTrackerModelSmoke", JavaExec) {
+	group = "verification"
+	description = "Checks the bounded quest-tracker snapshot used by the HUD concept."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.shop.QuestTrackerModelSmoke"
+}
+
+tasks.register("questTrackerDisplaySmoke", JavaExec) {
+	group = "verification"
+	description = "Checks quest-tracker display modes and permanent-F3 layout."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.client.QuestTrackerDisplaySmoke"
+}
+
+tasks.register("questIdSuggestionsSmoke", JavaExec) {
+	group = "verification"
+	description = "Checks accent-folded quest-panel item name ranking and inventory pins."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.shop.QuestIdSuggestionsSmoke"
+}
+
 tasks.register("shopHeaderLayoutSmoke", JavaExec) {
 	group = "verification"
 	description = "Checks that the daily Shop timer and unlocked-offer status cannot overlap."
@@ -92,6 +116,14 @@ tasks.register("capeJoinSyncSmoke", JavaExec) {
 	mainClass = "fr.koka99cab.sanctuary26.sanctuary.gameplay.CapeJoinSyncQueueSmoke"
 }

+tasks.register("inventorySortSmoke", JavaExec) {
+	group = "verification"
+	description = "Checks that storage stacks merge and sort while the hotbar row stays out of the sort."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventorySortSmoke"
+}
+
 tasks.register("alphaIndevGeneratorSmoke", JavaExec) {
 	group = "verification"
 	description = "Checks deterministic finite Indev islands, residences and safe portal arrivals."
@@ -100,6 +132,14 @@ tasks.register("alphaIndevGeneratorSmoke", JavaExec) {
 	mainClass = "fr.koka99cab.sanctuary26.sanctuary.worldgen.feature.AlphaIndevGeneratorSmoke"
 }

+tasks.register("notchVictoryStateSmoke", JavaExec) {
+	group = "verification"
+	description = "Checks the monotone, bounded and codec-stable world-wide Notch victory."
+	dependsOn tasks.named("testClasses")
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = "fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryStateSmoke"
+}
+
 tasks.register("verifyBlackMarket") {
 	group = "verification"
 	description = "Checks the physical sign market, flash Shop, escrow ledger and mailbox delivery."
@@ -135,7 +175,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| !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")
@@ -278,8 +318,11 @@ tasks.register("verifySanctuary") {
 	inputs.files(fileTree("tools"))
 	dependsOn tasks.named("progressionModelSmoke"), tasks.named("serverIdentityModelSmoke"),
 		tasks.named("shopDeliveryTimingSmoke"), tasks.named("blackMarketModelSmoke"),
-		tasks.named("questBoardModelSmoke"), tasks.named("shopHeaderLayoutSmoke"), tasks.named("zombieNamesSmoke"),
+		tasks.named("questBoardModelSmoke"), tasks.named("questTrackerModelSmoke"),
+		tasks.named("questIdSuggestionsSmoke"),
+		tasks.named("shopHeaderLayoutSmoke"), tasks.named("zombieNamesSmoke"),
 		tasks.named("capeJoinSyncSmoke"),
+		tasks.named("inventorySortSmoke"),
 		tasks.named("verifyBlackMarket")

 	doLast {
@@ -596,6 +639,14 @@ tasks.register("verifySanctuary") {
 			,'class SanctuaryHotbarRowsClient'
 			,'id("c2s/hotbar_row_switch")'
 			,'id("s2c/hotbar_row_sync")'
+			,'class SanctuaryInventorySort'
+			,'class SanctuaryInventorySorter'
+			,'id("c2s/sort_inventory")'
+			,'key.sanctuary.sort_inventory'
+			,'GLFW.GLFW_MOUSE_BUTTON_MIDDLE'
+			,'matchesMouse'
+			,'int bankIndex(int visualRow, int visibleRows)'
+			,'playButtonClickSound'
 			,'GLFW.GLFW_KEY_TAB'
 			,'HOTBAR_TEXTURE'
 			,'0.0F, 0.0F, 182, 22, 182, 22'
@@ -1125,7 +1176,7 @@ tasks.register("verifySanctuary") {
 		}

 		def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
-		if (manifest.custom?.sanctuary26?.data_version != 11
+		if (manifest.custom?.sanctuary26?.data_version != 12
 			|| manifest.custom?.sanctuary26?.network_protocol != 22
 			|| manifest.depends?.jei != ">=30.24.0.176"
 			|| manifest.depends?."fabric-api" != ">=0.155.0+26.2"
@@ -2832,7 +2883,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| 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
@@ -2998,7 +3049,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| 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
@@ -3036,7 +3087,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| 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]
@@ -3067,7 +3118,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| migration.target?.pack_version != "26.2.0-alpha.195"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
 			|| migration.compatibility?.sanctuary_data_version != 11
@@ -3098,7 +3149,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
 			|| migration.mailbox?.id != "sanctuary:delivery_box"
 			|| migration.mailbox?.horizontal_facing != true
@@ -3126,7 +3177,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| !transfer.contains("shouldAppendOverflow")
 			|| !transfer.contains("isVanillaStorageRange")
 			|| !transfer.contains("hotbarStart")
@@ -3172,7 +3223,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
 			|| migration.quest_requests?.save_key != "quest_requests"
 			|| migration.quest_requests?.data_version != 1
@@ -3230,7 +3281,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| 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"
@@ -3299,7 +3350,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| 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"
@@ -3371,7 +3422,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.122"
+		if (project.version.toString() != "0.0.0-alpha.126"
 			|| migration.target?.modules?.sanctuary != "0.0.0-alpha.122"
 			|| migration.alpha_world?.dimension != "sanctuary:alpha"
 			|| migration.alpha_world?.legacy_dimension != "portals:alpha"
@@ -3394,6 +3445,7 @@ tasks.register("verifyAlphaIndev") {
 }

 tasks.named("check") {
+	dependsOn tasks.named("notchVictoryStateSmoke")
 	dependsOn tasks.named("verifySanctuary")
 	dependsOn tasks.named("verifyDeliveryBoxOrientation")
 	dependsOn tasks.named("verifyQuestRequests")
@@ -3402,6 +3454,11 @@ tasks.named("check") {
 	dependsOn tasks.named("verifyShopCurrencyRowsRelease")
 	dependsOn tasks.named("celestialGraphSmoke")
 	dependsOn tasks.named("questRequestModelSmoke")
+	dependsOn tasks.named("questTrackerModelSmoke")
+	dependsOn tasks.named("questTrackerDisplaySmoke")
+	dependsOn tasks.named("questIdSuggestionsSmoke")
 	dependsOn tasks.named("alphaIndevGeneratorSmoke")
+	dependsOn tasks.named("capeJoinSyncSmoke")
+	dependsOn tasks.named("inventorySortSmoke")
 	dependsOn tasks.named("verifyAlphaIndev")
 }
@@ -7,6 +7,7 @@ import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryBulkActions;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventoryCapacity;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanions;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryHotbarRows;
+import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventorySort;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanionPowers;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCapeService;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuarySitting;
@@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
 public final class SanctuaryMod implements ModInitializer {
 	public static final String MOD_ID = "sanctuary";
 	public static final String DISPLAY_NAME = "Sanctuary";
-	public static final int CURRENT_DATA_VERSION = 11;
+	public static final int CURRENT_DATA_VERSION = 12;
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);

 	public SanctuaryMod() {
@@ -55,6 +56,7 @@ public final class SanctuaryMod implements ModInitializer {
 		SanctuaryBulkActions.initialize();
 		SanctuaryInventoryCapacity.initialize();
 		SanctuaryHotbarRows.initialize();
+		SanctuaryInventorySort.initialize();
 		SanctuaryCompanions.initialize();
 		SanctuaryCompanionPowers.initialize();
 		SanctuaryCapeService.initialize();
@@ -28,7 +28,7 @@ public record AtlasLandmark(
 		Codec.LONG.optionalFieldOf("discovered_at", 0L).forGetter(AtlasLandmark::discoveredAt),
 		Codec.BOOL.optionalFieldOf("manual", false).forGetter(AtlasLandmark::manual)
 	).apply(instance, AtlasLandmark::new));
-	public static final Set<String> AUTOMATIC_TYPES = Set.of("danger", "mine", "portal", "chest", "spawner");
+	public static final Set<String> AUTOMATIC_TYPES = Set.of("danger", "mine", "portal", "chest", "spawner", "boss");
 	public static final Set<String> MANUAL_TYPES = Set.of("home", "tree");

 	public AtlasLandmark {
@@ -4,6 +4,7 @@ import fr.koka99cab.sanctuary26.sanctuary.data.SanctuaryData;
 import fr.koka99cab.sanctuary26.sanctuary.network.SanctuaryNetworking;
 import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryPlayerProgress;
 import java.util.Locale;
+import java.util.UUID;
 import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.core.BlockPos;
@@ -12,6 +13,8 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.level.block.Blocks;
@@ -56,6 +59,26 @@ public final class SanctuaryAtlasLandmarks {
 		return true;
 	}

+	/** Adds a server-owned landmark only when the player already knows its dimension. */
+	public static boolean recordTrusted(MinecraftServer server, UUID playerId,
+		ResourceKey<Level> dimension, BlockPos pos, String type) {
+		if (!AtlasLandmark.AUTOMATIC_TYPES.contains(type)) return false;
+		SanctuaryData data = SanctuaryData.get(server);
+		SanctuaryPlayerProgress progress = data.player(playerId);
+		String dimensionId = dimension.identifier().toString();
+		if (!progress.dimensions().contains(dimensionId)
+			|| progress.hasAtlasLandmarkNear(type, dimensionId, pos, 8)) return false;
+		ServerLevel level = server.getLevel(dimension);
+		long gameTime = level == null ? 0L : level.getGameTime();
+		AtlasLandmark landmark = new AtlasLandmark(type, dimensionId, pos.getX(), pos.getY(), pos.getZ(),
+			"", gameTime, false);
+		if (!progress.recordAtlasLandmark(landmark)) return false;
+		data.markChanged();
+		ServerPlayer online = server.getPlayerList().getPlayer(playerId);
+		if (online != null) SanctuaryNetworking.sync(online);
+		return true;
+	}
+
 	private static void tick(MinecraftServer server) {
 		if (++tickCounter < SCAN_INTERVAL_TICKS) return;
 		tickCounter = 0;
@@ -0,0 +1,99 @@
+package fr.koka99cab.sanctuary26.sanctuary.api.notch;
+
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import fr.koka99cab.sanctuary26.sanctuary.api.atlas.SanctuaryAtlasLandmarks;
+import fr.koka99cab.sanctuary26.sanctuary.api.world.SanctuaryAlphaWorld;
+import fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryData;
+import fr.koka99cab.sanctuary26.sanctuary.data.NotchVictoryState;
+import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryProgressionService;
+import fr.koka99cab.sanctuary26.sanctuary.world.SanctuaryDimensions;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.UUID;
+import net.minecraft.ChatFormatting;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+
+/** Public server-only resolver for the monotone {@code notch_defeated} milestone. */
+public final class SanctuaryNotchMilestone {
+	public static final Identifier NOTCH_DEFEATED = SanctuaryMod.id("notch_defeated");
+	private static final String SOURCE = "itsalive";
+
+	private SanctuaryNotchMilestone() {
+	}
+
+	public static boolean isDefeated(MinecraftServer server) {
+		return NotchVictoryData.get(server).snapshot().defeated();
+	}
+
+	public static NotchVictoryState snapshot(MinecraftServer server) {
+		return NotchVictoryData.get(server).snapshot();
+	}
+
+	/** Records a real server-side defeat and credits every bounded canonical participant once. */
+	public static VictoryResult recordVictory(ServerLevel alphaLevel, Collection<UUID> candidates) {
+		if (!alphaLevel.dimension().equals(SanctuaryDimensions.ALPHA)) {
+			throw new IllegalArgumentException("Notch can only be defeated in sanctuary:alpha");
+		}
+		List<UUID> participants = sanitizeParticipants(alphaLevel, candidates);
+		return record(alphaLevel, participants, false, true);
+	}
+
+	/** Imports the defeated phase from the historical portals:notch entity without duplicating rewards. */
+	public static VictoryResult migrateLegacyVictory(ServerLevel alphaLevel, boolean rewardAlreadyClaimed) {
+		if (!alphaLevel.dimension().equals(SanctuaryDimensions.ALPHA)) {
+			throw new IllegalArgumentException("Legacy Notch can only be migrated from sanctuary:alpha");
+		}
+		return record(alphaLevel, List.of(), rewardAlreadyClaimed, false);
+	}
+
+	/** Atomically reserves the one canonical initial reward for CARPET-01. */
+	public static boolean claimInitialReward(MinecraftServer server) {
+		return NotchVictoryData.get(server).claimInitialReward();
+	}
+
+	private static VictoryResult record(ServerLevel alphaLevel, List<UUID> participants,
+		boolean rewardAlreadyClaimed, boolean announce) {
+		NotchVictoryData data = NotchVictoryData.get(alphaLevel.getServer());
+		boolean newlyDefeated = data.recordDefeat(participants, alphaLevel.getGameTime(), rewardAlreadyClaimed);
+		NotchVictoryState state = data.snapshot();
+		BlockPos home = SanctuaryAlphaWorld.residence(alphaLevel.getSeed());
+		for (UUID participant : state.participants()) {
+			SanctuaryProgressionService.recordExternalAt(alphaLevel.getServer(), participant,
+				NOTCH_DEFEATED, SanctuaryDimensions.ALPHA, home, alphaLevel.getGameTime(), SOURCE);
+			SanctuaryAtlasLandmarks.recordTrusted(alphaLevel.getServer(), participant,
+				SanctuaryDimensions.ALPHA, home, "boss");
+		}
+		if (newlyDefeated && announce) {
+			alphaLevel.getServer().getPlayerList().broadcastSystemMessage(
+				Component.translatable("message.sanctuary.notch_defeated").withStyle(ChatFormatting.GOLD), false);
+		}
+		return new VictoryResult(newlyDefeated, state.participants(), state.initialRewardClaimed());
+	}
+
+	private static List<UUID> sanitizeParticipants(ServerLevel level, Collection<UUID> candidates) {
+		if (candidates == null || candidates.isEmpty()) return List.of();
+		LinkedHashSet<UUID> result = new LinkedHashSet<>();
+		for (UUID candidate : candidates) {
+			if (result.size() >= NotchVictoryState.MAX_PARTICIPANTS) break;
+			ServerPlayer player = level.getServer().getPlayerList().getPlayer(candidate);
+			if (player != null && player.level() == level && !player.isSpectator()
+				&& SanctuaryAlphaWorld.containsHorizontal(player.blockPosition())) {
+				result.add(candidate);
+			}
+		}
+		return List.copyOf(result);
+	}
+
+	public record VictoryResult(boolean newlyDefeated, List<UUID> participants,
+		boolean initialRewardClaimed) {
+		public VictoryResult {
+			participants = List.copyOf(participants);
+		}
+	}
+}
@@ -1,14 +1,29 @@
 package fr.koka99cab.sanctuary26.sanctuary.client;

+import fr.koka99cab.sanctuary26.sanctuary.api.inventory.SanctuaryPlayerInventoryView;
 import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestEditorPayload;
 import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestSubmitPayload;
+import fr.koka99cab.sanctuary26.sanctuary.shop.QuestIdSuggestions;
 import fr.koka99cab.sanctuary26.sanctuary.shop.QuestRequestService;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import org.lwjgl.glfw.GLFW;

 /** Complete bounded editor for mission target and promised reward contracts. */
 public final class QuestRequestEditorScreen extends Screen {
@@ -19,8 +34,12 @@ public final class QuestRequestEditorScreen extends Screen {
 		QuestRequestService.REWARD_GIFT, QuestRequestService.REWARD_PAYMENT,
 		QuestRequestService.REWARD_LOAN
 	};
+	private static final int SUGGESTION_ROW = 16;
+	private static final int SUGGESTION_MARGIN = 4;
 	private final Screen parent;
 	private final QuestRequestEditorPayload payload;
+	private final List<QuestIdSuggestions.Entry> itemCatalog = new ArrayList<>();
+	private final List<QuestIdSuggestions.Entry> mobCatalog = new ArrayList<>();
 	private EditBox alias;
 	private EditBox objective;
 	private EditBox target;
@@ -34,6 +53,10 @@ public final class QuestRequestEditorScreen extends Screen {
 	private int actionIndex;
 	private int rewardIndex;
 	private int killTargetIndex;
+	private int selectedSuggestion;
+	private boolean applyingCompletion;
+	private boolean suggestionsOpen;
+	private List<QuestIdSuggestions.Match> suggestions = List.of();

 	public QuestRequestEditorScreen(Screen parent, QuestRequestEditorPayload payload) {
 		super(Component.translatable("screen.sanctuary.quest_request.title"));
@@ -51,6 +74,7 @@ public final class QuestRequestEditorScreen extends Screen {
 	@Override
 	protected void init() {
 		int center = width / 2;
+		fillCatalogs();
 		alias = addRenderableWidget(new EditBox(font, center - 152, 48, 304, 20,
 			Component.translatable("screen.sanctuary.quest_request.alias")));
 		alias.setMaxLength(QuestRequestService.MAX_ALIAS_LENGTH);
@@ -80,15 +104,17 @@ public final class QuestRequestEditorScreen extends Screen {
 		quantity.setMaxLength(4);
 		quantity.setValue(Integer.toString(payload.quantity()));

-		target = addRenderableWidget(new EditBox(font, center + 52, 118, 100, 20,
+		target = addRenderableWidget(new EditBox(font, center + 70, 118, 82, 20,
 			Component.translatable("screen.sanctuary.quest_request.target")));
 		target.setMaxLength(QuestRequestService.MAX_TARGET_LENGTH);
 		target.setValue(payload.target());
+		target.setResponder(value -> onIdTyped());

 		reward = addRenderableWidget(Button.builder(rewardLabel(), button -> {
 			rewardIndex = (rewardIndex + 1) % REWARDS.length;
 			button.setMessage(rewardLabel());
 			rewardTarget.setHint(rewardHint());
+			closeSuggestions();
 		}).bounds(center - 152, 157, 84, 20).build());

 		rewardQuantity = addRenderableWidget(new EditBox(font, center - 64, 157, 46, 20,
@@ -96,11 +122,12 @@ public final class QuestRequestEditorScreen extends Screen {
 		rewardQuantity.setMaxLength(4);
 		rewardQuantity.setValue(Integer.toString(payload.rewardQuantity()));

-		rewardTarget = addRenderableWidget(new EditBox(font, center - 14, 157, 166, 20,
+		rewardTarget = addRenderableWidget(new EditBox(font, center + 8, 157, 144, 20,
 			Component.translatable("screen.sanctuary.quest_request.reward_target")));
 		rewardTarget.setMaxLength(QuestRequestService.MAX_TARGET_LENGTH);
 		rewardTarget.setValue(payload.rewardTarget());
 		rewardTarget.setHint(rewardHint());
+		rewardTarget.setResponder(value -> onIdTyped());

 		submit = addRenderableWidget(Button.builder(Component.translatable("screen.sanctuary.quest_request.publish"),
 			button -> submit()).bounds(center - 152, 199, 149, 20).build());
@@ -112,9 +139,16 @@ public final class QuestRequestEditorScreen extends Screen {

 	@Override
 	public void tick() {
+		if (suggestionsOpen) refreshSuggestions();
 		submit.active = values() != null;
 	}

+	@Override
+	public void setFocused(GuiEventListener listener) {
+		super.setFocused(listener);
+		if (listener != target && listener != rewardTarget) closeSuggestions();
+	}
+
 	@Override
 	public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickDelta) {
 		int center = width / 2;
@@ -129,9 +163,53 @@ public final class QuestRequestEditorScreen extends Screen {
 			center - 152, 107, 0xFFDBB7CA);
 		graphics.text(font, Component.translatable("screen.sanctuary.quest_request.reward"),
 			center - 152, 146, 0xFFF2C4D7);
-		graphics.centeredText(font, Component.translatable("screen.sanctuary.quest_request.help"),
-			center, 183, 0xFF9F8B95);
+		graphics.centeredText(font, Component.translatable(idFieldFocused()
+			? "screen.sanctuary.quest_request.id_help"
+			: "screen.sanctuary.quest_request.help"), center, 183, 0xFF9F8B95);
+		drawPreview(graphics, target, targetPreview(mouseX, mouseY), center + 52, 120);
+		drawPreview(graphics, rewardTarget, rewardPreview(mouseX, mouseY), center - 14, 159);
 		super.extractRenderState(graphics, mouseX, mouseY, tickDelta);
+		renderSuggestions(graphics, mouseX, mouseY);
+	}
+
+	@Override
+	public boolean keyPressed(KeyEvent event) {
+		if (!suggestions.isEmpty()) {
+			if (event.key() == GLFW.GLFW_KEY_DOWN) {
+				selectedSuggestion = (selectedSuggestion + 1) % suggestions.size();
+				return true;
+			}
+			if (event.key() == GLFW.GLFW_KEY_UP) {
+				selectedSuggestion = (selectedSuggestion + suggestions.size() - 1) % suggestions.size();
+				return true;
+			}
+		}
+		return super.keyPressed(event);
+	}
+
+	@Override
+	public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
+		int index = suggestionIndexAt(event.x(), event.y());
+		if (index >= 0) {
+			applySuggestion(index);
+			return true;
+		}
+		boolean handled = super.mouseClicked(event, doubleClick);
+		if (clickedSearchField(event.x(), event.y())) {
+			suggestionsOpen = true;
+			refreshSuggestions();
+		} else closeSuggestions();
+		return handled;
+	}
+
+	@Override
+	public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+		if (!suggestions.isEmpty() && suggestionPanel().contains(mouseX, mouseY)) {
+			int delta = scrollY > 0 ? -1 : 1;
+			selectedSuggestion = Math.floorMod(selectedSuggestion + delta, suggestions.size());
+			return true;
+		}
+		return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
 	}

 	private void refreshMissionControls() {
@@ -139,6 +217,7 @@ public final class QuestRequestEditorScreen extends Screen {
 		targetKind.setMessage(targetKindLabel());
 		targetKind.active = QuestRequestService.KILL.equals(currentAction());
 		target.setHint(targetHint());
+		closeSuggestions();
 	}

 	private String currentAction() { return ACTIONS[actionIndex]; }
@@ -172,14 +251,16 @@ public final class QuestRequestEditorScreen extends Screen {
 	}

 	private Values values() {
-		if (objective.getValue().isBlank() || target.getValue().isBlank()
-			|| rewardTarget.getValue().isBlank()) return null;
+		if (objective.getValue().isBlank()) return null;
+		String resolvedTarget = resolveTarget();
+		String resolvedReward = QuestIdSuggestions.resolve(itemCatalog, rewardTarget.getValue(), inventoryIds());
+		if (resolvedTarget == null || resolvedReward == null) return null;
 		try {
 			int amount = Integer.parseInt(quantity.getValue());
 			int rewardAmount = Integer.parseInt(rewardQuantity.getValue());
 			if (amount < 1 || amount > QuestRequestService.MAX_QUANTITY
 				|| rewardAmount < 1 || rewardAmount > QuestRequestService.MAX_QUANTITY) return null;
-			return new Values(amount, rewardAmount);
+			return new Values(resolvedTarget, amount, resolvedReward, rewardAmount);
 		} catch (NumberFormatException exception) {
 			return null;
 		}
@@ -189,13 +270,232 @@ public final class QuestRequestEditorScreen extends Screen {
 		Values values = values();
 		if (values == null || !ClientPlayNetworking.canSend(QuestRequestSubmitPayload.ID)) return;
 		ClientPlayNetworking.send(new QuestRequestSubmitPayload(payload.pos(), alias.getValue(),
-			objective.getValue(), currentAction(), currentTargetKind(), target.getValue(), values.quantity(),
-			currentReward(), rewardTarget.getValue(), values.rewardQuantity()));
+			objective.getValue(), currentAction(), currentTargetKind(), values.target(), values.quantity(),
+			currentReward(), values.rewardTarget(), values.rewardQuantity()));
 		onClose();
 	}

+	private void fillCatalogs() {
+		itemCatalog.clear();
+		for (Item item : BuiltInRegistries.ITEM) {
+			if (item == Items.AIR) continue;
+			Identifier id = BuiltInRegistries.ITEM.getKey(item);
+			itemCatalog.add(new QuestIdSuggestions.Entry(id.toString(), id.getPath(),
+				new ItemStack(item).getHoverName().getString()));
+		}
+		mobCatalog.clear();
+		for (var type : BuiltInRegistries.ENTITY_TYPE) {
+			Identifier id = BuiltInRegistries.ENTITY_TYPE.getKey(type);
+			if ("minecraft:player".equals(id.toString())) continue;
+			mobCatalog.add(new QuestIdSuggestions.Entry(id.toString(), id.getPath(),
+				type.getDescription().getString()));
+		}
+	}
+
+	private void onIdTyped() {
+		if (applyingCompletion) return;
+		suggestionsOpen = !focusedSearchValue().isBlank();
+		refreshSuggestions();
+	}
+
+	private void closeSuggestions() {
+		suggestionsOpen = false;
+		suggestions = List.of();
+		selectedSuggestion = 0;
+	}
+
+	private void refreshSuggestions() {
+		if (applyingCompletion || !suggestionsOpen) {
+			if (!suggestionsOpen) suggestions = List.of();
+			return;
+		}
+		EditBox field = focusedIdField();
+		if (field == null || field.getValue().isBlank()) {
+			closeSuggestions();
+			return;
+		}
+		boolean itemField = field == rewardTarget || QuestRequestService.ITEM.equals(currentTargetKind());
+		List<QuestIdSuggestions.Match> next = QuestIdSuggestions.suggest(
+			itemField ? itemCatalog : mobCatalog, field.getValue(),
+			itemField ? inventoryIds() : Set.of(), QuestIdSuggestions.LIMIT);
+		if (!next.equals(suggestions)) {
+			suggestions = next;
+			selectedSuggestion = 0;
+		} else if (selectedSuggestion >= suggestions.size()) {
+			selectedSuggestion = 0;
+		}
+	}
+
+	private void applySuggestion(int index) {
+		EditBox field = focusedIdField();
+		if (field == null || index < 0 || index >= suggestions.size()) return;
+		writeId(field, suggestions.get(index).id());
+		closeSuggestions();
+	}
+
+	private boolean clickedSearchField(double mouseX, double mouseY) {
+		if (contains(rewardTarget, mouseX, mouseY)) return true;
+		return contains(target, mouseX, mouseY)
+			&& !QuestRequestService.PLAYER.equals(currentTargetKind());
+	}
+
+	private boolean contains(EditBox field, double mouseX, double mouseY) {
+		return field != null && mouseX >= field.getX() && mouseX < field.getX() + field.getWidth()
+			&& mouseY >= field.getY() && mouseY < field.getY() + field.getHeight();
+	}
+
+	private String focusedSearchValue() {
+		EditBox field = focusedIdField();
+		return field == null ? "" : field.getValue();
+	}
+
+	private void writeId(EditBox field, String id) {
+		applyingCompletion = true;
+		field.setValue(id);
+		field.moveCursorToEnd(false);
+		applyingCompletion = false;
+	}
+
+	private String resolveTarget() {
+		if (QuestRequestService.PLAYER.equals(currentTargetKind())) {
+			String name = target.getValue().strip();
+			return name.matches("[A-Za-z0-9_]{1,16}") ? name : null;
+		}
+		boolean item = QuestRequestService.ITEM.equals(currentTargetKind());
+		return QuestIdSuggestions.resolve(item ? itemCatalog : mobCatalog, target.getValue(),
+			item ? inventoryIds() : Set.of());
+	}
+
+	private QuestIdSuggestions.Match targetPreview(int mouseX, int mouseY) {
+		if (QuestRequestService.PLAYER.equals(currentTargetKind())) return null;
+		return previewFor(target, mouseX, mouseY);
+	}
+
+	private QuestIdSuggestions.Match rewardPreview(int mouseX, int mouseY) {
+		return previewFor(rewardTarget, mouseX, mouseY);
+	}
+
+	private QuestIdSuggestions.Match previewFor(EditBox field, int mouseX, int mouseY) {
+		if (field == null) return null;
+		if (field.isFocused() && !suggestions.isEmpty()) {
+			int hover = suggestionIndexAt(mouseX, mouseY);
+			return suggestions.get(hover >= 0 ? hover : selectedSuggestion);
+		}
+		boolean item = field == rewardTarget || QuestRequestService.ITEM.equals(currentTargetKind());
+		return QuestIdSuggestions.exact(item ? itemCatalog : mobCatalog, field.getValue(),
+			item ? inventoryIds() : Set.of());
+	}
+
+	private void drawPreview(GuiGraphicsExtractor graphics, EditBox field,
+		QuestIdSuggestions.Match match, int x, int y) {
+		if (field == null || match == null) return;
+		graphics.fill(x, y, x + 16, y + 16, 0x66101010);
+		graphics.outline(x, y, 16, 16, 0x88E8A8C3);
+		ItemStack stack = iconFor(match.id(), field == rewardTarget
+			|| QuestRequestService.ITEM.equals(currentTargetKind()));
+		if (!stack.isEmpty()) graphics.item(stack, x, y);
+	}
+
+	private void renderSuggestions(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
+		if (suggestions.isEmpty()) return;
+		Panel panel = suggestionPanel();
+		graphics.fill(panel.x(), panel.y(), panel.x() + panel.width(), panel.y() + panel.height(), 0xF2181417);
+		graphics.outline(panel.x(), panel.y(), panel.width(), panel.height(), 0xFFE8A8C3);
+		boolean itemField = focusedIdField() == rewardTarget
+			|| QuestRequestService.ITEM.equals(currentTargetKind());
+		int hover = suggestionIndexAt(mouseX, mouseY);
+		for (int index = 0; index < suggestions.size(); index++) {
+			QuestIdSuggestions.Match match = suggestions.get(index);
+			int top = panel.y() + 1 + index * SUGGESTION_ROW;
+			if (index == selectedSuggestion || index == hover) {
+				graphics.fill(panel.x() + 1, top, panel.x() + panel.width() - 1, top + SUGGESTION_ROW, 0x55E8A8C3);
+			}
+			ItemStack stack = iconFor(match.id(), itemField);
+			if (!stack.isEmpty()) graphics.item(stack, panel.x() + 2, top);
+			graphics.text(font, Component.literal(ellipsize(match.displayName(), panel.width() - 24)),
+				panel.x() + 20, top + 4, 0xFFF2C4D7);
+		}
+	}
+
+	private ItemStack iconFor(String id, boolean item) {
+		Identifier identifier = Identifier.tryParse(id);
+		if (identifier == null) return ItemStack.EMPTY;
+		if (item) {
+			return BuiltInRegistries.ITEM.getOptional(identifier).map(ItemStack::new).orElse(ItemStack.EMPTY);
+		}
+		Identifier egg = Identifier.fromNamespaceAndPath(identifier.getNamespace(),
+			identifier.getPath() + "_spawn_egg");
+		return BuiltInRegistries.ITEM.getOptional(egg).map(ItemStack::new).orElse(ItemStack.EMPTY);
+	}
+
+	private Set<String> inventoryIds() {
+		Set<String> ids = new LinkedHashSet<>();
+		if (minecraft == null || minecraft.player == null) return ids;
+		ItemStack held = minecraft.player.getMainHandItem();
+		if (!held.isEmpty()) ids.add(BuiltInRegistries.ITEM.getKey(held.getItem()).toString());
+		for (var slot : SanctuaryPlayerInventoryView.unlockedRows(minecraft.player)) {
+			if (!slot.stack().isEmpty()) {
+				ids.add(BuiltInRegistries.ITEM.getKey(slot.stack().getItem()).toString());
+			}
+		}
+		return ids;
+	}
+
+	private EditBox focusedIdField() {
+		if (target != null && target.isFocused() && !QuestRequestService.PLAYER.equals(currentTargetKind())) {
+			return target;
+		}
+		if (rewardTarget != null && rewardTarget.isFocused()) return rewardTarget;
+		return null;
+	}
+
+	private boolean idFieldFocused() {
+		return focusedIdField() != null;
+	}
+
+	private Panel suggestionPanel() {
+		EditBox field = focusedIdField();
+		if (field == null) return new Panel(0, 0, 0, 0);
+		int rows = Math.max(1, suggestions.size());
+		int height = rows * SUGGESTION_ROW + 2;
+		int width = 200;
+		int x = Math.max(SUGGESTION_MARGIN, Math.min(this.width / 2 - width / 2,
+			this.width - width - SUGGESTION_MARGIN));
+		int below = field.getY() + field.getHeight() + 2;
+		int above = field.getY() - 2 - height;
+		boolean preferAbove = field == rewardTarget;
+		int y = preferAbove && above >= SUGGESTION_MARGIN ? above : below;
+		if (y + height > this.height - SUGGESTION_MARGIN) y = above;
+		y = Math.max(SUGGESTION_MARGIN, Math.min(y, this.height - height - SUGGESTION_MARGIN));
+		return new Panel(x, y, width, height);
+	}
+
+	private int suggestionIndexAt(double mouseX, double mouseY) {
+		if (suggestions.isEmpty()) return -1;
+		Panel panel = suggestionPanel();
+		if (!panel.contains(mouseX, mouseY)) return -1;
+		int index = (int) ((mouseY - panel.y() - 1) / SUGGESTION_ROW);
+		return index >= 0 && index < suggestions.size() ? index : -1;
+	}
+
+	private String ellipsize(String value, int maxWidth) {
+		if (font.width(value) <= maxWidth) return value;
+		String suffix = "…";
+		int suffixWidth = font.width(suffix);
+		StringBuilder cut = new StringBuilder(value);
+		while (cut.length() > 0 && font.width(cut.toString()) + suffixWidth > maxWidth) {
+			cut.deleteCharAt(cut.length() - 1);
+		}
+		return cut + suffix;
+	}
+
 	@Override public void onClose() { if (minecraft != null) minecraft.gui.setScreen(parent); }
 	@Override public boolean isPauseScreen() { return false; }

-	private record Values(int quantity, int rewardQuantity) {}
+	private record Values(String target, int quantity, String rewardTarget, int rewardQuantity) {}
+	private record Panel(int x, int y, int width, int height) {
+		boolean contains(double mouseX, double mouseY) {
+			return mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
+		}
+	}
 }
@@ -0,0 +1,19 @@
+package fr.koka99cab.sanctuary26.sanctuary.client;
+
+/** Tracks the exact height occupied by the left-hand F3 column. */
+public final class QuestTrackerDebugLayout {
+	private static final int TOP_MARGIN = 2;
+	private static final int DEBUG_LINE_HEIGHT = 9;
+	private static final int GAP = 2;
+	private static int leftLineCount;
+
+	private QuestTrackerDebugLayout() {}
+
+	public static void captureLeftLines(int count) {
+		leftLineCount = Math.max(0, count);
+	}
+
+	static int textTop(boolean debugVisible) {
+		return debugVisible ? TOP_MARGIN + leftLineCount * DEBUG_LINE_HEIGHT + GAP : TOP_MARGIN;
+	}
+}
@@ -0,0 +1,30 @@
+package fr.koka99cab.sanctuary26.sanctuary.client;
+
+/** Persisted visual styles offered by the quest tracker. */
+enum QuestTrackerDisplayMode {
+	TEXT("text"),
+	PANEL("panel");
+
+	private final String id;
+
+	QuestTrackerDisplayMode(String id) {
+		this.id = id;
+	}
+
+	String id() {
+		return id;
+	}
+
+	QuestTrackerDisplayMode next() {
+		return this == TEXT ? PANEL : TEXT;
+	}
+
+	static QuestTrackerDisplayMode byId(String value) {
+		if (value != null) {
+			for (QuestTrackerDisplayMode mode : values()) {
+				if (mode.id.equalsIgnoreCase(value)) return mode;
+			}
+		}
+		return TEXT;
+	}
+}
@@ -0,0 +1,144 @@
+package fr.koka99cab.sanctuary26.sanctuary.client;
+
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import fr.koka99cab.sanctuary26.sanctuary.network.QuestTrackerSnapshotPayload;
+import fr.koka99cab.sanctuary26.sanctuary.shop.QuestTrackerSync;
+import java.util.List;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.ItemStack;
+
+/** Toggleable quest overlay with transparent F3-aligned and original panel modes. */
+final class QuestTrackerHud {
+	private static final int TEXT_MAX_WIDTH = 240;
+	private static final int TEXT_MARGIN = 2;
+	private static final int TEXT_ENTRY_SPACING = 2;
+	private static final int PANEL_WIDTH = 168;
+	private static final int PANEL_MARGIN = 6;
+	private static final int PANEL_HEADER_HEIGHT = 14;
+	private static final int PANEL_ENTRY_HEIGHT = 22;
+	private static final int PANEL_EMPTY_HEIGHT = 22;
+	private static final int PANEL_BACKGROUND = 0xD0181417;
+	private static final int PANEL_OUTLINE = 0xFFE8A8C3;
+	private static final int PANEL_TITLE = 0xFFF2C4D7;
+	private static final int PANEL_MUTED = 0xFF9F8B95;
+	private static final int PANEL_BAR_BACK = 0xFF3A2A30;
+	private static final int BODY = 0xFFE9DDE2;
+
+	private QuestTrackerHud() {}
+
+	static void register() {
+		HudElementRegistry.addLast(SanctuaryMod.id("quest_tracker"), QuestTrackerHud::render);
+	}
+
+	private static void render(GuiGraphicsExtractor graphics, DeltaTracker tickCounter) {
+		Minecraft client = Minecraft.getInstance();
+		if (client.player == null || client.level == null || client.gui.screen() != null) return;
+		if (!SanctuaryClientQuests.visible()) return;
+		List<QuestTrackerSnapshotPayload.Entry> entries = SanctuaryClientQuests.entries();
+		if (SanctuaryClientQuests.displayMode() == QuestTrackerDisplayMode.PANEL) {
+			renderPanel(graphics, client, entries);
+			return;
+		}
+		renderText(graphics, client, entries);
+	}
+
+	private static void renderText(GuiGraphicsExtractor graphics, Minecraft client,
+		List<QuestTrackerSnapshotPayload.Entry> entries) {
+		if (entries.isEmpty()) return;
+		int width = Math.max(1, Math.min(TEXT_MAX_WIDTH, graphics.guiWidth() - TEXT_MARGIN * 2));
+		int y = QuestTrackerDebugLayout.textTop(client.getDebugOverlay().showDebugScreen());
+		for (QuestTrackerSnapshotPayload.Entry entry : entries) {
+			drawTextEntry(graphics, client.font, entry, TEXT_MARGIN, y, width);
+			y += client.font.lineHeight * 2 + TEXT_ENTRY_SPACING;
+		}
+	}
+
+	private static void drawTextEntry(GuiGraphicsExtractor graphics, Font font,
+		QuestTrackerSnapshotPayload.Entry entry, int x, int y, int width) {
+		int accent = 0xFF000000 | (entry.accent() & 0xFFFFFF);
+		graphics.text(font, ellipsize(font, title(entry), width), x, y, accent, true);
+		Component progress = progress(entry);
+		graphics.text(font, ellipsize(font, progress, width), x, y + font.lineHeight, BODY, true);
+	}
+
+	private static void renderPanel(GuiGraphicsExtractor graphics, Minecraft client,
+		List<QuestTrackerSnapshotPayload.Entry> entries) {
+		int height = PANEL_HEADER_HEIGHT + 6
+			+ (entries.isEmpty() ? PANEL_EMPTY_HEIGHT : entries.size() * PANEL_ENTRY_HEIGHT);
+		int right = PANEL_MARGIN + PANEL_WIDTH;
+		int bottom = PANEL_MARGIN + height;
+		graphics.fill(PANEL_MARGIN, PANEL_MARGIN, right, bottom, PANEL_BACKGROUND);
+		graphics.outline(PANEL_MARGIN, PANEL_MARGIN, PANEL_WIDTH, height, PANEL_OUTLINE);
+		graphics.text(client.font, Component.translatable("hud.sanctuary.quest_tracker.title"),
+			PANEL_MARGIN + 6, PANEL_MARGIN + 4, PANEL_TITLE);
+		if (entries.isEmpty()) {
+			graphics.text(client.font, Component.translatable("hud.sanctuary.quest_tracker.empty"),
+				PANEL_MARGIN + 6, PANEL_MARGIN + PANEL_HEADER_HEIGHT + 4, PANEL_MUTED);
+			return;
+		}
+		int y = PANEL_MARGIN + PANEL_HEADER_HEIGHT + 2;
+		for (QuestTrackerSnapshotPayload.Entry entry : entries) {
+			drawPanelEntry(graphics, client.font, entry, PANEL_MARGIN + 6, y, PANEL_WIDTH - 12);
+			y += PANEL_ENTRY_HEIGHT;
+		}
+	}
+
+	private static void drawPanelEntry(GuiGraphicsExtractor graphics, Font font,
+		QuestTrackerSnapshotPayload.Entry entry, int x, int y, int width) {
+		int accent = 0xFF000000 | (entry.accent() & 0xFFFFFF);
+		graphics.text(font, ellipsize(font, title(entry), width), x, y, accent);
+		graphics.text(font, ellipsize(font, progress(entry), width), x, y + 9, BODY);
+		int barTop = y + 18;
+		graphics.fill(x, barTop, x + width, barTop + 2, PANEL_BAR_BACK);
+		int filled = Math.round(width * Math.min(1.0F, entry.progress() / (float) entry.required()));
+		if (filled > 0) graphics.fill(x, barTop, x + filled, barTop + 2, accent);
+	}
+
+	private static Component title(QuestTrackerSnapshotPayload.Entry entry) {
+		if (QuestTrackerSync.SOURCE_BOARD.equals(entry.source())) {
+			return switch (entry.title()) {
+				case "ruby", "sapphire", "emerald" -> Component.translatable(
+					"hud.sanctuary.quest_tracker.reward." + entry.title());
+				default -> Component.translatable("hud.sanctuary.quest_tracker.source.board");
+			};
+		}
+		if (!entry.title().isBlank()) return Component.literal(entry.title());
+		return Component.translatable("hud.sanctuary.quest_tracker.source." + entry.source());
+	}
+
+	private static Component progress(QuestTrackerSnapshotPayload.Entry entry) {
+		return Component.translatable("hud.sanctuary.quest_tracker.progress",
+			action(entry), describeTarget(entry), entry.progress(), entry.required());
+	}
+
+	private static Component action(QuestTrackerSnapshotPayload.Entry entry) {
+		if (QuestTrackerSync.SOURCE_BOARD.equals(entry.source())) {
+			return Component.translatable("sign.sanctuary.quest_board.action." + entry.action());
+		}
+		return Component.translatable("message.sanctuary.quest_request.action." + entry.action());
+	}
+
+	private static Component describeTarget(QuestTrackerSnapshotPayload.Entry entry) {
+		Identifier id = Identifier.tryParse(entry.target());
+		if (id == null) return Component.literal(entry.target());
+		return BuiltInRegistries.ENTITY_TYPE.getOptional(id).map(type -> type.getDescription())
+			.or(() -> BuiltInRegistries.ITEM.getOptional(id).map(item -> new ItemStack(item).getHoverName()))
+			.orElse(Component.literal(id.getPath()));
+	}
+
+	private static Component ellipsize(Font font, Component text, int maxWidth) {
+		if (font.width(text) <= maxWidth) return text;
+		String value = text.getString();
+		while (!value.isEmpty() && font.width(value + "…") > maxWidth) {
+			value = value.substring(0, value.length() - 1);
+		}
+		return Component.literal(value + "…");
+	}
+}
@@ -101,6 +101,7 @@ final class SanctuaryAtlasMarkerLayer {
 			case "portal" -> 0xFF9D46FF;
 			case "chest" -> 0xFFC88B3A;
 			case "spawner" -> 0xFF6E7EA8;
+			case "boss" -> 0xFFFF5A45;
 			case "tree" -> 0xFF5FD34F;
 			default -> 0xFFE8E8DD;
 		};
@@ -14,6 +14,7 @@ import fr.koka99cab.sanctuary26.sanctuary.network.BlackMarketEditorPayload;
 import fr.koka99cab.sanctuary26.sanctuary.network.BlackMarketInteractPayload;
 import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestEditorPayload;
 import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestConfirmPayload;
+import fr.koka99cab.sanctuary26.sanctuary.network.QuestTrackerSnapshotPayload;
 import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryProgressionCosts;
 import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryUnlock;
 import net.fabricmc.api.ClientModInitializer;
@@ -27,6 +28,7 @@ import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Screenshot;
 import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.gui.screens.inventory.ContainerScreen;
 import net.minecraft.client.gui.screens.inventory.CraftingScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
@@ -48,6 +50,9 @@ public final class SanctuaryClient implements ClientModInitializer {
 	private static KeyMapping zoomKey;
 	private static KeyMapping celestialKey;
 	private static KeyMapping switchHotbarRowKey;
+	private static KeyMapping sortInventoryKey;
+	private static KeyMapping questTrackerKey;
+	private static KeyMapping questTrackerModeKey;
 	private static boolean zoomWasHeld;
 	private static boolean smokeScreenOpened;
 	private static boolean inventorySmokeScreenOpened;
@@ -91,7 +96,26 @@ public final class SanctuaryClient implements ClientModInitializer {
 			GLFW.GLFW_KEY_TAB,
 			SANCTUARY_CATEGORY
 		));
+		sortInventoryKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
+			"key.sanctuary.sort_inventory",
+			InputConstants.Type.MOUSE,
+			GLFW.GLFW_MOUSE_BUTTON_MIDDLE,
+			SANCTUARY_CATEGORY
+		));
+		questTrackerKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
+			"key.sanctuary.quest_tracker",
+			InputConstants.Type.KEYSYM,
+			GLFW.GLFW_KEY_J,
+			SANCTUARY_CATEGORY
+		));
+		questTrackerModeKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
+			"key.sanctuary.quest_tracker_mode",
+			InputConstants.Type.KEYSYM,
+			GLFW.GLFW_KEY_N,
+			SANCTUARY_CATEGORY
+		));
 		SanctuaryAtlasOptions.load();
+		SanctuaryClientQuests.load();
 		SanctuaryBulkActionsClient.initialize();
 		SanctuaryHealthPreview.register();
 		CelestialSpyglassSelection.register();
@@ -124,6 +148,8 @@ public final class SanctuaryClient implements ClientModInitializer {
 		ClientPlayNetworking.registerGlobalReceiver(QuestRequestConfirmPayload.ID, (payload, context) ->
 			context.client().execute(() -> context.client().gui.setScreen(
 				new QuestRequestConfirmScreen(context.client().gui.screen(), payload))));
+		ClientPlayNetworking.registerGlobalReceiver(QuestTrackerSnapshotPayload.ID, (payload, context) ->
+			context.client().execute(() -> SanctuaryClientQuests.update(payload)));
 		ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> {
 			SanctuaryAtlasVisitedChunks.saveIfDirty(client);
 			SanctuaryAtlasMapCache.clear();
@@ -135,6 +161,7 @@ public final class SanctuaryClient implements ClientModInitializer {
 			CelestialSpyglassSelection.reset();
 			SanctuaryClientShop.clear();
 			SanctuaryClientCapes.clear();
+			SanctuaryClientQuests.clear();
 			zoomWasHeld = false;
 		});
 		ClientHotbarScrollEvents.ALLOW.register((inventory, selectedSlot, scrollDirection, horizontalAmount, verticalAmount) -> {
@@ -142,6 +169,7 @@ public final class SanctuaryClient implements ClientModInitializer {
 			return !SanctuaryAtlasHud.handleScroll(amount);
 		});
 		SanctuaryAtlasHud.register();
+		QuestTrackerHud.register();
 		SanctuaryMod.LOGGER.info("[{}] Atlas ready on M; Mouse 5 controls the HUD preview.", SanctuaryMod.DISPLAY_NAME);
 	}

@@ -181,6 +209,14 @@ public final class SanctuaryClient implements ClientModInitializer {
 			}
 		}
 		while (openAtlasKey.consumeClick()) toggleAtlas(client);
+		while (questTrackerKey.consumeClick()) {
+			if (client.player != null && client.level != null && client.gui.screen() == null)
+				toggleQuestTracker(client);
+		}
+		while (questTrackerModeKey.consumeClick()) {
+			if (client.player != null && client.level != null && client.gui.screen() == null)
+				cycleQuestTrackerMode(client);
+		}
 		while (celestialKey.consumeClick()) {
 			if (client.player != null && client.level != null && client.gui.screen() == null)
 				client.gui.setScreen(new CelestialSkyScreen(null));
@@ -205,6 +241,14 @@ public final class SanctuaryClient implements ClientModInitializer {
 		return switchHotbarRowKey != null && switchHotbarRowKey.matches(event);
 	}

+	public static boolean isSortInventoryKey(KeyEvent event) {
+		return sortInventoryKey != null && sortInventoryKey.matches(event);
+	}
+
+	public static boolean isSortInventoryMouse(MouseButtonEvent event) {
+		return sortInventoryKey != null && sortInventoryKey.matchesMouse(event);
+	}
+
 	public static boolean handleBlackMarketMiddleClick(Minecraft client) {
 		if (client.player == null || client.level == null || client.gui.screen() != null
 			|| !(client.hitResult instanceof BlockHitResult hit)
@@ -275,6 +319,21 @@ public final class SanctuaryClient implements ClientModInitializer {
 			&& client.level != null && client.gui.screen() == null;
 	}

+	private static void toggleQuestTracker(Minecraft client) {
+		boolean visible = SanctuaryClientQuests.toggle();
+		if (client.player == null) return;
+		client.player.sendOverlayMessage(Component.translatable(visible
+			? "hud.sanctuary.quest_tracker.toggle_on"
+			: "hud.sanctuary.quest_tracker.toggle_off"));
+	}
+
+	private static void cycleQuestTrackerMode(Minecraft client) {
+		QuestTrackerDisplayMode mode = SanctuaryClientQuests.cycleDisplayMode();
+		if (client.player == null) return;
+		client.player.sendOverlayMessage(Component.translatable(
+			"hud.sanctuary.quest_tracker.mode." + mode.id()));
+	}
+
 	private static void toggleAtlas(Minecraft client) {
 		if (client.gui.screen() instanceof SanctuaryAtlasScreen) {
 			client.gui.setScreen(null);
@@ -0,0 +1,93 @@
+package fr.koka99cab.sanctuary26.sanctuary.client;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import fr.koka99cab.sanctuary26.sanctuary.network.QuestTrackerSnapshotPayload;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import net.fabricmc.loader.api.FabricLoader;
+
+/** Client-side quest tracker snapshot and persisted display preferences. */
+final class SanctuaryClientQuests {
+	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+	private static final Path FILE = FabricLoader.getInstance().getConfigDir()
+		.resolve("sanctuary-quest-tracker.json");
+	private static Settings settings = new Settings();
+	private static boolean loaded;
+	private static List<QuestTrackerSnapshotPayload.Entry> entries = List.of();
+
+	private SanctuaryClientQuests() {}
+
+	static void load() {
+		if (loaded) return;
+		loaded = true;
+		if (!Files.isRegularFile(FILE)) return;
+		try (Reader reader = Files.newBufferedReader(FILE, StandardCharsets.UTF_8)) {
+			Settings decoded = GSON.fromJson(reader, Settings.class);
+			if (decoded != null) settings = decoded;
+		} catch (IOException | RuntimeException exception) {
+			SanctuaryMod.LOGGER.warn("[{}] Could not read quest tracker options.",
+				SanctuaryMod.DISPLAY_NAME, exception);
+		}
+	}
+
+	static void update(QuestTrackerSnapshotPayload payload) {
+		entries = payload.entries();
+	}
+
+	static void clear() {
+		entries = List.of();
+	}
+
+	static List<QuestTrackerSnapshotPayload.Entry> entries() {
+		return entries;
+	}
+
+	static boolean visible() {
+		load();
+		return settings.visible;
+	}
+
+	static boolean toggle() {
+		load();
+		settings.visible = !settings.visible;
+		save();
+		return settings.visible;
+	}
+
+	static QuestTrackerDisplayMode displayMode() {
+		load();
+		return QuestTrackerDisplayMode.byId(settings.mode);
+	}
+
+	static QuestTrackerDisplayMode cycleDisplayMode() {
+		load();
+		QuestTrackerDisplayMode mode = displayMode().next();
+		settings.mode = mode.id();
+		save();
+		return mode;
+	}
+
+	private static void save() {
+		try {
+			Files.createDirectories(FILE.getParent());
+			try (Writer writer = Files.newBufferedWriter(FILE, StandardCharsets.UTF_8)) {
+				GSON.toJson(settings, writer);
+			}
+		} catch (IOException exception) {
+			SanctuaryMod.LOGGER.warn("[{}] Could not save quest tracker options.",
+				SanctuaryMod.DISPLAY_NAME, exception);
+		}
+	}
+
+	private static final class Settings {
+		boolean visible = true;
+		String mode = QuestTrackerDisplayMode.TEXT.id();
+	}
+}
@@ -24,6 +24,10 @@ public final class SanctuaryHotbarRowsClient {
 		return VISUAL_ROW_BY_LOGICAL[logicalRow];
 	}

+	public static int bankIndex(int logicalRow, int visibleRows) {
+		return SanctuaryInventoryCapacity.bankIndex(visualRow(logicalRow), visibleRows);
+	}
+
 	public static int activeVisualRow() {
 		return VISUAL_ROW_BY_LOGICAL[0];
 	}
@@ -0,0 +1,34 @@
+package fr.koka99cab.sanctuary26.sanctuary.client;
+
+import fr.koka99cab.sanctuary26.sanctuary.network.SortInventoryPayload;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
+
+/** Sends a sort request while a survival container is open. */
+public final class SanctuaryInventorySortClient {
+	private SanctuaryInventorySortClient() {
+	}
+
+	public static boolean requestFromKeyboard(Minecraft client) {
+		if (client.gui.screen() != null && client.gui.screen().getFocused() instanceof EditBox) {
+			return false;
+		}
+		return request(client);
+	}
+
+	public static boolean request(Minecraft client) {
+		if (client.player == null || client.level == null
+			|| !(client.gui.screen() instanceof AbstractContainerScreen<?>)
+			|| client.gui.screen() instanceof CreativeModeInventoryScreen
+			|| !ClientPlayNetworking.canSend(SortInventoryPayload.ID)) {
+			return false;
+		}
+		AbstractWidget.playButtonClickSound(client.getSoundManager());
+		ClientPlayNetworking.send(new SortInventoryPayload());
+		return true;
+	}
+}
@@ -0,0 +1,60 @@
+package fr.koka99cab.sanctuary26.sanctuary.data;
+
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import java.util.Collection;
+import java.util.UUID;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.datafix.DataFixTypes;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.saveddata.SavedData;
+import net.minecraft.world.level.saveddata.SavedDataType;
+
+/** SavedData wrapper for the world-wide Notch victory and future unique reward claim. */
+public final class NotchVictoryData extends SavedData {
+	private static final SavedDataType<NotchVictoryData> TYPE = new SavedDataType<>(
+		SanctuaryMod.id("notch_victory"),
+		NotchVictoryData::new,
+		NotchVictoryState.CODEC.xmap(NotchVictoryData::new, data -> data.state),
+		DataFixTypes.LEVEL
+	);
+
+	private NotchVictoryState state;
+
+	public NotchVictoryData() {
+		this(NotchVictoryState.empty());
+	}
+
+	private NotchVictoryData(NotchVictoryState state) {
+		this.state = state == null ? NotchVictoryState.empty() : state;
+	}
+
+	public static NotchVictoryData get(MinecraftServer server) {
+		ServerLevel overworld = server.getLevel(Level.OVERWORLD);
+		if (overworld == null) {
+			throw new IllegalStateException("The Overworld is required for the global Notch milestone");
+		}
+		return overworld.getDataStorage().computeIfAbsent(TYPE);
+	}
+
+	public NotchVictoryState snapshot() {
+		return state;
+	}
+
+	public boolean recordDefeat(Collection<UUID> participants, long gameTime, boolean rewardAlreadyClaimed) {
+		NotchVictoryState updated = state.defeat(participants, gameTime, rewardAlreadyClaimed);
+		if (updated.equals(state)) return false;
+		boolean newlyDefeated = !state.defeated() && updated.defeated();
+		state = updated;
+		setDirty();
+		return newlyDefeated;
+	}
+
+	public boolean claimInitialReward() {
+		NotchVictoryState updated = state.claimInitialReward();
+		if (updated.equals(state)) return false;
+		state = updated;
+		setDirty();
+		return true;
+	}
+}
@@ -0,0 +1,77 @@
+package fr.koka99cab.sanctuary26.sanctuary.data;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.UUID;
+
+/** Immutable model behind the monotone world-wide Notch milestone. */
+public record NotchVictoryState(
+	int dataVersion,
+	boolean defeated,
+	long defeatedAt,
+	List<String> participantIds,
+	boolean initialRewardClaimed
+) {
+	public static final int DATA_VERSION = 1;
+	public static final int MAX_PARTICIPANTS = 16;
+	public static final Codec<NotchVictoryState> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+		Codec.INT.optionalFieldOf("data_version", DATA_VERSION).forGetter(NotchVictoryState::dataVersion),
+		Codec.BOOL.optionalFieldOf("notch_defeated", false).forGetter(NotchVictoryState::defeated),
+		Codec.LONG.optionalFieldOf("defeated_at", 0L).forGetter(NotchVictoryState::defeatedAt),
+		Codec.STRING.listOf().optionalFieldOf("participants", List.of()).forGetter(NotchVictoryState::participantIds),
+		Codec.BOOL.optionalFieldOf("initial_reward_claimed", false)
+			.forGetter(NotchVictoryState::initialRewardClaimed)
+	).apply(instance, NotchVictoryState::new));
+
+	public NotchVictoryState {
+		dataVersion = DATA_VERSION;
+		defeatedAt = Math.max(0L, defeatedAt);
+		participantIds = normalizeStrings(participantIds);
+		initialRewardClaimed = defeated && initialRewardClaimed;
+	}
+
+	public static NotchVictoryState empty() {
+		return new NotchVictoryState(DATA_VERSION, false, 0L, List.of(), false);
+	}
+
+	public NotchVictoryState defeat(Collection<UUID> participants, long gameTime, boolean rewardAlreadyClaimed) {
+		if (defeated) {
+			return rewardAlreadyClaimed && !initialRewardClaimed
+				? new NotchVictoryState(DATA_VERSION, true, defeatedAt, participantIds, true)
+				: this;
+		}
+		List<String> ids = participants == null ? List.of() : participants.stream()
+			.filter(java.util.Objects::nonNull)
+			.map(UUID::toString)
+			.toList();
+		return new NotchVictoryState(DATA_VERSION, true, Math.max(0L, gameTime), ids,
+			rewardAlreadyClaimed);
+	}
+
+	public NotchVictoryState claimInitialReward() {
+		return defeated && !initialRewardClaimed
+			? new NotchVictoryState(DATA_VERSION, true, defeatedAt, participantIds, true)
+			: this;
+	}
+
+	public List<UUID> participants() {
+		return participantIds.stream().map(UUID::fromString).toList();
+	}
+
+	private static List<String> normalizeStrings(Collection<String> values) {
+		if (values == null || values.isEmpty()) return List.of();
+		LinkedHashSet<String> normalized = new LinkedHashSet<>();
+		for (String value : values) {
+			if (normalized.size() >= MAX_PARTICIPANTS) break;
+			try {
+				normalized.add(UUID.fromString(value).toString());
+			} catch (IllegalArgumentException ignored) {
+				// Invalid legacy entries are ignored instead of poisoning the save.
+			}
+		}
+		return List.copyOf(normalized);
+	}
+}
@@ -88,6 +88,12 @@ public final class SanctuaryHotbarRows {
 		return layout;
 	}

+	/** Visual row of each physical row. Index 0 is the live hotbar. */
+	public static int[] visualLayout(ServerPlayer player) {
+		int[] layout = SESSION_LAYOUTS.get(player.getUUID());
+		return layout == null ? identityLayout() : layout.clone();
+	}
+
 	private static int indexOf(int[] layout, int visualRow) {
 		for (int index = 0; index < layout.length; index++) {
 			if (layout[index] == visualRow) return index;
@@ -20,6 +20,27 @@ public final class SanctuaryInventoryCapacity {
 	private SanctuaryInventoryCapacity() {
 	}

+	/**
+	 * Turns a visual row (0 = live hotbar) into a top-to-bottom bank index.
+	 * Storage occupies the first lines; the hotbar sits on the last one, like vanilla.
+	 */
+	public static int bankIndex(int visualRow, int visibleRows) {
+		visibleRows = Math.clamp(visibleRows, 1, MAX_ROW_COUNT);
+		visualRow = Math.clamp(visualRow, 0, visibleRows - 1);
+		return visibleRows - 1 - visualRow;
+	}
+
+	public static int physicalRowAtBankIndex(int bankIndex, int[] visualByPhysical, int unlockedRows) {
+		unlockedRows = Math.clamp(unlockedRows, 1, MAX_ROW_COUNT);
+		bankIndex = Math.clamp(bankIndex, 0, unlockedRows - 1);
+		for (int physical = 0; physical < unlockedRows; physical++) {
+			int visual = visualByPhysical == null || physical >= visualByPhysical.length
+				? physical : visualByPhysical[physical];
+			if (bankIndex(visual, unlockedRows) == bankIndex) return physical;
+		}
+		return bankIndex;
+	}
+
 	public static void initialize() {
 		if (initialized) return;
 		initialized = true;
@@ -0,0 +1,144 @@
+package fr.koka99cab.sanctuary26.sanctuary.gameplay;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.item.ItemStack;
+
+/**
+ * Server-authoritative sort of every unlocked inventory row except the live hotbar.
+ * Armor, off-hand, crafting, cape and companion slots stay untouched.
+ */
+public final class SanctuaryInventorySort {
+	private static final int COOLDOWN_TICKS = 8;
+	private static final Map<UUID, Long> LAST_SORT_TICK = new HashMap<>();
+	private static final SanctuaryInventorySorter.StackAccess<ItemStack> STACKS =
+		new SanctuaryInventorySorter.StackAccess<>() {
+			@Override
+			public boolean isEmpty(ItemStack stack) {
+				return stack == null || stack.isEmpty();
+			}
+
+			@Override
+			public int count(ItemStack stack) {
+				return stack.getCount();
+			}
+
+			@Override
+			public int maxStackSize(ItemStack stack) {
+				return stack.getMaxStackSize();
+			}
+
+			@Override
+			public boolean sameItem(ItemStack first, ItemStack second) {
+				return ItemStack.isSameItemSameComponents(first, second);
+			}
+
+			@Override
+			public ItemStack copy(ItemStack stack) {
+				return stack.copy();
+			}
+
+			@Override
+			public ItemStack withCount(ItemStack stack, int count) {
+				if (count <= 0) return ItemStack.EMPTY;
+				ItemStack copy = stack.copy();
+				copy.setCount(count);
+				return copy;
+			}
+
+			@Override
+			public ItemStack empty() {
+				return ItemStack.EMPTY;
+			}
+
+			@Override
+			public int compare(ItemStack first, ItemStack second) {
+				boolean firstEmpty = first.isEmpty();
+				boolean secondEmpty = second.isEmpty();
+				if (firstEmpty || secondEmpty) return Boolean.compare(firstEmpty, secondEmpty);
+				int byId = BuiltInRegistries.ITEM.getKey(first.getItem()).toString()
+					.compareTo(BuiltInRegistries.ITEM.getKey(second.getItem()).toString());
+				if (byId != 0) return byId;
+				int byComponents = String.valueOf(first.getComponents())
+					.compareTo(String.valueOf(second.getComponents()));
+				if (byComponents != 0) return byComponents;
+				return Integer.compare(second.getCount(), first.getCount());
+			}
+		};
+
+	private static boolean initialized;
+
+	private SanctuaryInventorySort() {
+	}
+
+	public static void initialize() {
+		if (initialized) return;
+		initialized = true;
+		ServerPlayerEvents.LEAVE.register(player -> LAST_SORT_TICK.remove(player.getUUID()));
+	}
+
+	public static void sort(ServerPlayer player) {
+		long now = player.level().getGameTime();
+		Long previous = LAST_SORT_TICK.get(player.getUUID());
+		if (previous != null && now - previous < COOLDOWN_TICKS) return;
+		LAST_SORT_TICK.put(player.getUUID(), now);
+
+		int unlockedRows = SanctuaryInventoryCapacity.unlockedRows(player);
+		if (unlockedRows <= 1) return;
+
+		Inventory inventory = player.getInventory();
+		SanctuaryOverflowContainer overflow = SanctuaryOverflowAccess.of(player);
+		int[] visualByPhysical = SanctuaryHotbarRows.visualLayout(player);
+		List<ItemStack> slots = new ArrayList<>(
+			(unlockedRows - 1) * SanctuaryInventoryCapacity.ROW_SIZE);
+		for (int bank = 0; bank < unlockedRows; bank++) {
+			int row = SanctuaryInventoryCapacity.physicalRowAtBankIndex(
+				bank, visualByPhysical, unlockedRows);
+			if (row == 0) continue;
+			for (int column = 0; column < SanctuaryInventoryCapacity.ROW_SIZE; column++) {
+				slots.add(getRowItem(inventory, overflow, row, column).copy());
+			}
+		}
+		SanctuaryInventorySorter.compactAndSort(slots, STACKS);
+		int index = 0;
+		for (int bank = 0; bank < unlockedRows; bank++) {
+			int row = SanctuaryInventoryCapacity.physicalRowAtBankIndex(
+				bank, visualByPhysical, unlockedRows);
+			if (row == 0) continue;
+			for (int column = 0; column < SanctuaryInventoryCapacity.ROW_SIZE; column++) {
+				setRowItem(inventory, overflow, row, column, slots.get(index++));
+			}
+		}
+		inventory.setChanged();
+		overflow.setChanged();
+		player.inventoryMenu.broadcastChanges();
+		if (player.containerMenu != player.inventoryMenu) player.containerMenu.broadcastChanges();
+	}
+
+	private static ItemStack getRowItem(Inventory inventory, Container overflow,
+		int logicalRow, int column) {
+		if (logicalRow < SanctuaryInventoryCapacity.VANILLA_ROW_COUNT) {
+			return inventory.getItem(logicalRow * SanctuaryInventoryCapacity.ROW_SIZE + column);
+		}
+		return overflow.getItem((logicalRow - SanctuaryInventoryCapacity.VANILLA_ROW_COUNT)
+			* SanctuaryInventoryCapacity.ROW_SIZE + column);
+	}
+
+	private static void setRowItem(Inventory inventory, Container overflow,
+		int logicalRow, int column, ItemStack stack) {
+		if (logicalRow < SanctuaryInventoryCapacity.VANILLA_ROW_COUNT) {
+			inventory.setItem(logicalRow * SanctuaryInventoryCapacity.ROW_SIZE + column, stack);
+			return;
+		}
+		overflow.setItem((logicalRow - SanctuaryInventoryCapacity.VANILLA_ROW_COUNT)
+			* SanctuaryInventoryCapacity.ROW_SIZE + column, stack);
+	}
+}
@@ -0,0 +1,54 @@
+package fr.koka99cab.sanctuary26.sanctuary.gameplay;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Merges identical stacks then orders them, leaving empty slots at the end.
+ * The access adapter keeps this independent of Minecraft types so smoke tests
+ * can cover the contract without a running game.
+ */
+public final class SanctuaryInventorySorter {
+	private SanctuaryInventorySorter() {
+	}
+
+	public interface StackAccess<T> {
+		boolean isEmpty(T stack);
+
+		int count(T stack);
+
+		int maxStackSize(T stack);
+
+		boolean sameItem(T first, T second);
+
+		T copy(T stack);
+
+		T withCount(T stack, int count);
+
+		T empty();
+
+		int compare(T first, T second);
+	}
+
+	public static <T> void compactAndSort(List<T> slots, StackAccess<T> access) {
+		List<T> merged = new ArrayList<>();
+		for (T slot : slots) {
+			if (access.isEmpty(slot)) continue;
+			T remaining = access.copy(slot);
+			for (int index = 0; index < merged.size() && !access.isEmpty(remaining); index++) {
+				T existing = merged.get(index);
+				if (!access.sameItem(existing, remaining)) continue;
+				int space = access.maxStackSize(existing) - access.count(existing);
+				if (space <= 0) continue;
+				int moved = Math.min(space, access.count(remaining));
+				merged.set(index, access.withCount(existing, access.count(existing) + moved));
+				remaining = access.withCount(remaining, access.count(remaining) - moved);
+			}
+			if (!access.isEmpty(remaining)) merged.add(remaining);
+		}
+		merged.sort(access::compare);
+		for (int index = 0; index < slots.size(); index++) {
+			slots.set(index, index < merged.size() ? merged.get(index) : access.empty());
+		}
+	}
+}
@@ -1,7 +1,9 @@
 package fr.koka99cab.sanctuary26.sanctuary.mixin.client;

 import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryInventoryClient;
+import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryInventorySortClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryHotbarRowsClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryContainerScreenGeometry;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryExtendedInventoryMenu;
@@ -191,7 +193,7 @@ abstract class AbstractContainerScreenMixin implements SanctuaryContainerScreenG
 				sanctuary$panelLeft + PANEL_BANK_X - 3
 					+ minecraft.player.getInventory().getSelectedSlot() * BANK_ROW_STEP,
 				sanctuary$panelTop + PANEL_BANK_Y - 3
-					+ SanctuaryHotbarRowsClient.activeVisualRow() * BANK_ROW_STEP, 22, 21);
+					+ SanctuaryHotbarRowsClient.bankIndex(0, sanctuary$visibleRows) * BANK_ROW_STEP, 22, 21);
 		}
 		graphics.text(minecraft.font,
 			Component.translatable("screen.sanctuary.inventory.banks",
@@ -245,6 +247,15 @@ abstract class AbstractContainerScreenMixin implements SanctuaryContainerScreenG
 		cir.setReturnValue(true);
 	}

+	@Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
+	private void sanctuary$sortInventory(MouseButtonEvent event, boolean doubleClick,
+		CallbackInfoReturnable<Boolean> cir) {
+		if (!SanctuaryClient.isSortInventoryMouse(event)) return;
+		if (SanctuaryInventorySortClient.request(Minecraft.getInstance())) {
+			cir.setReturnValue(true);
+		}
+	}
+
 	/** Shift + held left click quick-moves every slot crossed exactly once. */
 	@Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
 	private void sanctuary$startRapidTransfer(MouseButtonEvent event, boolean doubleClick,
@@ -373,7 +384,8 @@ abstract class AbstractContainerScreenMixin implements SanctuaryContainerScreenG
 		}
 		sanctuary$move(slot,
 			sanctuary$panelLeft + PANEL_BANK_X + column * BANK_ROW_STEP,
-			sanctuary$panelTop + PANEL_BANK_Y + visualRow * BANK_ROW_STEP);
+			sanctuary$panelTop + PANEL_BANK_Y
+				+ SanctuaryHotbarRowsClient.bankIndex(logicalRow, sanctuary$visibleRows) * BANK_ROW_STEP);
 	}

 	@Unique
@@ -0,0 +1,20 @@
+package fr.koka99cab.sanctuary26.sanctuary.mixin.client;
+
+import fr.koka99cab.sanctuary26.sanctuary.client.QuestTrackerDebugLayout;
+import java.util.List;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.DebugScreenOverlay;
+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;
+
+/** Lets the transparent quest tracker start immediately below the current F3 lines. */
+@Mixin(DebugScreenOverlay.class)
+abstract class DebugScreenOverlayMixin {
+	@Inject(method = "extractLines", at = @At("HEAD"))
+	private void sanctuary$captureLeftColumn(GuiGraphicsExtractor graphics, List<String> lines,
+		boolean left, CallbackInfo ci) {
+		if (left) QuestTrackerDebugLayout.captureLeftLines(lines.size());
+	}
+}
@@ -163,15 +163,15 @@ abstract class InventoryScreenMixin {
 			}
 		}
 		if (minecraft.player != null) {
-			int activeRow = SanctuaryHotbarRowsClient.activeVisualRow();
+			int hotbarRow = SanctuaryHotbarRowsClient.bankIndex(0, sanctuary$visibleRows);
 			graphics.blit(RenderPipelines.GUI_TEXTURED, HOTBAR_TEXTURE,
 				leftPos + HOTBAR_X,
-				topPos + BANK_Y + activeRow * BANK_ROW_STEP - 3,
+				topPos + BANK_Y + hotbarRow * BANK_ROW_STEP - 3,
 				0.0F, 0.0F, 182, 22, 182, 22);
 			graphics.blitSprite(RenderPipelines.GUI_TEXTURED, HOTBAR_SELECTION_SPRITE,
 				leftPos + HOTBAR_X - 1
 					+ minecraft.player.getInventory().getSelectedSlot() * HOTBAR_COLUMN_STEP,
-				topPos + BANK_Y + activeRow * BANK_ROW_STEP - 4, 24, 23);
+				topPos + BANK_Y + hotbarRow * BANK_ROW_STEP - 4, 24, 23);
 		}
 		if (minecraft.player != null) {
 			InventoryScreen.extractEntityInInventoryFollowsMouse(
@@ -212,7 +212,8 @@ abstract class InventoryScreenMixin {
 			return;
 		}
 		int x = hotbar ? HOTBAR_SLOT_X + column * HOTBAR_COLUMN_STEP : BANK_X + column * 18;
-		move(slot, x, BANK_Y + visualRow * BANK_ROW_STEP);
+		move(slot, x, BANK_Y + SanctuaryHotbarRowsClient.bankIndex(logicalRow, sanctuary$visibleRows)
+			* BANK_ROW_STEP);
 	}

 	@Unique
@@ -2,6 +2,7 @@ package fr.koka99cab.sanctuary26.sanctuary.mixin.client;

 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryHotbarRowsClient;
+import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryInventorySortClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuarySittingClient;
 import net.minecraft.client.KeyboardHandler;
 import net.minecraft.client.Minecraft;
@@ -45,4 +46,17 @@ public abstract class KeyboardHandlerMixin {
 			callback.cancel();
 		}
 	}
+
+	@Inject(method = "keyPress", at = @At("HEAD"), cancellable = true)
+	private void sanctuary$sortInventory(long windowPointer, int action, KeyEvent event,
+		CallbackInfo callback) {
+		Minecraft client = Minecraft.getInstance();
+		if (windowPointer != client.getWindow().handle() || action != GLFW.GLFW_PRESS
+			|| !SanctuaryClient.isSortInventoryKey(event)) {
+			return;
+		}
+		if (SanctuaryInventorySortClient.requestFromKeyboard(client)) {
+			callback.cancel();
+		}
+	}
 }
@@ -1,8 +1,14 @@
 package fr.koka99cab.sanctuary26.sanctuary.mixin.client;

 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryBulkActionsClient;
+import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient;
+import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryInventorySortClient;
 import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryZoom;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.MouseHandler;
+import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.client.input.MouseButtonInfo;
+import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,4 +25,17 @@ public abstract class MouseHandlerMixin {
 			callback.cancel();
 		}
 	}
+
+	@Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
+	private void sanctuary$sortInventory(long windowPointer, MouseButtonInfo buttonInfo, int action,
+		CallbackInfo callback) {
+		if (action != GLFW.GLFW_PRESS) return;
+		Minecraft client = Minecraft.getInstance();
+		if (windowPointer != client.getWindow().handle()) return;
+		MouseButtonEvent event = new MouseButtonEvent(0.0, 0.0, buttonInfo);
+		if (!SanctuaryClient.isSortInventoryMouse(event)) return;
+		if (SanctuaryInventorySortClient.request(client)) {
+			callback.cancel();
+		}
+	}
 }
@@ -0,0 +1,70 @@
+package fr.koka99cab.sanctuary26.sanctuary.network;
+
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import java.util.ArrayList;
+import java.util.List;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+
+/** Bounded snapshot of the player's tracked community requests and reserved boards. */
+public record QuestTrackerSnapshotPayload(List<Entry> entries) implements CustomPacketPayload {
+	public static final int MAX_ENTRIES = 8;
+	public static final Type<QuestTrackerSnapshotPayload> ID =
+		new Type<>(SanctuaryMod.id("s2c/quest_tracker"));
+	public static final StreamCodec<RegistryFriendlyByteBuf, QuestTrackerSnapshotPayload> CODEC =
+		CustomPacketPayload.codec(QuestTrackerSnapshotPayload::write, QuestTrackerSnapshotPayload::new);
+
+	public QuestTrackerSnapshotPayload {
+		entries = List.copyOf(entries == null ? List.of()
+			: entries.stream().limit(MAX_ENTRIES).toList());
+	}
+
+	private QuestTrackerSnapshotPayload(RegistryFriendlyByteBuf buffer) {
+		this(readEntries(buffer));
+	}
+
+	private void write(RegistryFriendlyByteBuf buffer) {
+		buffer.writeVarInt(Math.min(MAX_ENTRIES, entries.size()));
+		for (int index = 0; index < Math.min(MAX_ENTRIES, entries.size()); index++) {
+			Entry entry = entries.get(index);
+			buffer.writeUtf(entry.source(), 8);
+			buffer.writeUtf(entry.id(), 36);
+			buffer.writeUtf(entry.title(), 96);
+			buffer.writeUtf(entry.action(), 16);
+			buffer.writeUtf(entry.target(), 64);
+			buffer.writeVarInt(entry.progress());
+			buffer.writeVarInt(entry.required());
+			buffer.writeInt(entry.accent());
+		}
+	}
+
+	private static List<Entry> readEntries(RegistryFriendlyByteBuf buffer) {
+		int count = Math.clamp(buffer.readVarInt(), 0, MAX_ENTRIES);
+		List<Entry> values = new ArrayList<>(count);
+		for (int index = 0; index < count; index++) {
+			values.add(new Entry(buffer.readUtf(8), buffer.readUtf(36), buffer.readUtf(96),
+				buffer.readUtf(16), buffer.readUtf(64), Math.max(0, buffer.readVarInt()),
+				Math.max(1, buffer.readVarInt()), buffer.readInt()));
+		}
+		return values;
+	}
+
+	@Override
+	public Type<? extends CustomPacketPayload> type() {
+		return ID;
+	}
+
+	public record Entry(String source, String id, String title, String action, String target,
+		int progress, int required, int accent) {
+		public Entry {
+			source = source == null ? "" : source;
+			id = id == null ? "" : id;
+			title = title == null ? "" : title;
+			action = action == null ? "" : action;
+			target = target == null ? "" : target;
+			progress = Math.max(0, progress);
+			required = Math.max(1, required);
+		}
+	}
+}
@@ -6,12 +6,14 @@ import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryMealHeartsService
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.building.SanctuaryBuildingManager;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.mining.SanctuaryMiningManager;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryHotbarRows;
+import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryInventorySort;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCompanionPowers;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuarySitting;
 import fr.koka99cab.sanctuary26.sanctuary.celestial.CelestialSkyService;
 import fr.koka99cab.sanctuary26.sanctuary.shop.ShopService;
 import fr.koka99cab.sanctuary26.sanctuary.shop.BlackMarketService;
 import fr.koka99cab.sanctuary26.sanctuary.shop.QuestRequestService;
+import fr.koka99cab.sanctuary26.sanctuary.shop.QuestTrackerSync;
 import fr.koka99cab.sanctuary26.sanctuary.gameplay.SanctuaryCapeService;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
@@ -42,10 +44,12 @@ public final class SanctuaryNetworking {
 		PayloadTypeRegistry.clientboundPlay().register(BlackMarketEditorPayload.ID, BlackMarketEditorPayload.CODEC);
 		PayloadTypeRegistry.clientboundPlay().register(QuestRequestEditorPayload.ID, QuestRequestEditorPayload.CODEC);
 		PayloadTypeRegistry.clientboundPlay().register(QuestRequestConfirmPayload.ID, QuestRequestConfirmPayload.CODEC);
+		PayloadTypeRegistry.clientboundPlay().register(QuestTrackerSnapshotPayload.ID, QuestTrackerSnapshotPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(PurchaseProgressionPayload.ID, PurchaseProgressionPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(BuildControlPayload.ID, BuildControlPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(MiningControlPayload.ID, MiningControlPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(HotbarRowSwitchPayload.ID, HotbarRowSwitchPayload.CODEC);
+		PayloadTypeRegistry.serverboundPlay().register(SortInventoryPayload.ID, SortInventoryPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(CompanionPowerUsePayload.ID, CompanionPowerUsePayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(SitRequestPayload.ID, SitRequestPayload.CODEC);
 		PayloadTypeRegistry.serverboundPlay().register(CelestialActionPayload.ID, CelestialActionPayload.CODEC);
@@ -70,6 +74,8 @@ public final class SanctuaryNetworking {
 						new HotbarRowSyncPayload(accepted, payload.logicalRow()));
 				}
 			}));
+		ServerPlayNetworking.registerGlobalReceiver(SortInventoryPayload.ID, (payload, context) ->
+			context.server().execute(() -> SanctuaryInventorySort.sort(context.player())));
 		ServerPlayNetworking.registerGlobalReceiver(CompanionPowerUsePayload.ID, (payload, context) ->
 			context.server().execute(() -> SanctuaryCompanionPowers.use(context.player())));
 		ServerPlayNetworking.registerGlobalReceiver(SitRequestPayload.ID, (payload, context) ->
@@ -95,6 +101,7 @@ public final class SanctuaryNetworking {
 			SanctuaryMealHeartsService.join(handler.player);
 			CelestialSkyService.join(handler.player);
 			SanctuaryCapeService.join(handler.player);
+			QuestTrackerSync.sync(handler.player);
 		});
 		SanctuaryMod.LOGGER.debug("[{}] Networking contract v{} ready; Atlas snapshot registered.",
 			SanctuaryMod.DISPLAY_NAME, PROTOCOL_VERSION);
@@ -0,0 +1,27 @@
+package fr.koka99cab.sanctuary26.sanctuary.network;
+
+import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+
+/** A parameterless client intent. The server owns which unlocked rows are sorted. */
+public record SortInventoryPayload() implements CustomPacketPayload {
+	public static final Type<SortInventoryPayload> ID =
+		new Type<>(SanctuaryMod.id("c2s/sort_inventory"));
+	public static final StreamCodec<RegistryFriendlyByteBuf, SortInventoryPayload> CODEC =
+		CustomPacketPayload.codec(SortInventoryPayload::write, SortInventoryPayload::new);
+
+	private SortInventoryPayload(RegistryFriendlyByteBuf buffer) {
+		this();
+	}
+
+	private void write(RegistryFriendlyByteBuf buffer) {
+		// Intentionally empty: no client-supplied slot list or item identity can be trusted.
+	}
+
+	@Override
+	public Type<? extends CustomPacketPayload> type() {
+		return ID;
+	}
+}
@@ -6,12 +6,17 @@ import fr.koka99cab.sanctuary26.sanctuary.network.SanctuaryNetworking;
 import fr.koka99cab.sanctuary26.sanctuary.network.PurchaseProgressionPayload;
 import java.util.Collection;
 import java.util.List;
+import java.time.Instant;
+import java.util.UUID;
+import net.minecraft.core.BlockPos;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.Level;

 /** Low-frequency server tracker and the mutation API used by MasterKey and future systems. */
 public final class SanctuaryProgressionService {
@@ -132,6 +137,25 @@ public final class SanctuaryProgressionService {
 		return true;
 	}

+	/** Records a trusted located event for an online or offline participant. */
+	public static boolean recordExternalAt(MinecraftServer server, UUID playerId, Identifier eventId,
+		ResourceKey<Level> dimension, BlockPos pos, long gameTime, String source) {
+		SanctuaryData data = SanctuaryData.get(server);
+		SanctuaryPlayerProgress progress = data.player(playerId);
+		ProgressMarker marker = new ProgressMarker(DiscoveryKind.EXTERNAL.serializedName(), eventId.toString(),
+			dimension.identifier().toString(), pos.getX(), pos.getY(), pos.getZ(), Math.max(0L, gameTime),
+			Instant.now().toEpochMilli(), 0, source, true);
+		if (!progress.recordMarker(marker)) return false;
+		data.recordGlobalFirst(marker);
+		data.markChanged();
+		ServerPlayer online = server.getPlayerList().getPlayer(playerId);
+		if (online != null) {
+			SanctuaryNetworking.sync(online);
+			SanctuaryProgressionEvents.RECORDED.invoker().onRecorded(online, marker, progress.stardust());
+		}
+		return true;
+	}
+
 	public static SanctuaryProgressSnapshot snapshot(ServerPlayer player) {
 		return SanctuaryProgressSnapshot.create(player, SanctuaryData.get(player.level().getServer()));
 	}
@@ -167,6 +167,7 @@ public final class QuestBoardService {
 		data.audit(new QuestBoardData.AuditEntry(now, "reserve", player.getUUID().toString(), board.id(),
 			contract.id(), deposit.currency + ":" + deposit.amount));
 		writeSign(level, sign, updated);
+		QuestTrackerSync.sync(player);
 		level.playSound(null, sign.getBlockPos(), SoundEvents.VILLAGER_YES, SoundSource.BLOCKS, 0.7F, 1.1F);
 		player.sendSystemMessage(Component.translatable("message.sanctuary.quest_board.reserved",
 			contract.objective().required(), describeTarget(contract.objective()), minutes(board.questTier().reservationMillis())));
@@ -213,6 +214,7 @@ public final class QuestBoardService {
 			QuestBoardData.Board updated = board.withContract(Optional.of(advanced));
 			data.replace(updated);
 			refreshSign(level.getServer(), updated);
+			QuestTrackerSync.sync(player);
 			if (advanced.objective().complete()) complete(player, level.getServer(), data, updated, advanced);
 		}
 	}
@@ -234,6 +236,7 @@ public final class QuestBoardService {
 		data.audit(new QuestBoardData.AuditEntry(now, "complete", player.getUUID().toString(), board.id(),
 			contract.id(), rewardDetail(contract.reward())));
 		refreshSign(server, completedBoard);
+		QuestTrackerSync.sync(player);
 		ServerLevel boardLevel = level(server, board.dimension());
 		BlockPos boardPos = BlockPos.of(board.pos());
 		if (boardLevel != null && boardLevel.isLoaded(boardPos))
@@ -252,6 +255,7 @@ public final class QuestBoardService {
 		data.audit(new QuestBoardData.AuditEntry(System.currentTimeMillis(), "release", player.getUUID().toString(),
 			board.id(), contract.id(), reason));
 		writeSign(level, sign, released);
+		QuestTrackerSync.sync(player);
 		message(player, "abandoned");
 	}

@@ -276,7 +280,9 @@ public final class QuestBoardService {
 				data.replace(released);
 				data.audit(new QuestBoardData.AuditEntry(now, "expire", claim.player(), board.id(), contract.id(),
 					claim.depositCurrency() + ":" + claim.depositAmount()));
-				refreshSign(server, released); continue;
+				refreshSign(server, released);
+				QuestTrackerSync.sync(server, claim.playerId());
+				continue;
 			}
 			if (!board.frozen() && now >= board.nextRefreshAt()
 				&& (contract == null || contract.claim().isEmpty())) {
@@ -303,6 +309,7 @@ public final class QuestBoardService {
 		});
 		data.audit(new QuestBoardData.AuditEntry(now, "remove_board", actor, board.id(),
 			board.contract().map(QuestBoardData.Contract::id).orElse(""), reason));
+		QuestTrackerSync.syncBoard(server, board);
 	}

 	static boolean setFrozen(MinecraftServer server, String id, boolean frozen, String actor) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
koka	f283c1705b	feat: add Notch Alpha encounter Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-31 05:42:19 +02:00
koka	6ee5cdc2fb	Merge pull request 'release: tester les dernières PR dans Packwiz alpha.223' (#117 ) from release/26.2.0-alpha.223 into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #117	2026-08-31 03:15:43 +00:00
koka	87428c5f0d	release: test latest PRs in Packwiz alpha.223 Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-31 05:13:46 +02:00
koka	0599bf6885	Merge pull request 'feat(sanctuary): ajouter les modes du suivi de quêtes' (#107 ) from feature/quest-tracker-display-modes into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #107	2026-08-31 03:02:03 +00:00
koka	624f441578	Merge pull request 'feat(sanctuary): trier le stockage sans deplacer la hotbar' (#112 ) from feature/inventory-sorter into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #112	2026-08-31 03:01:13 +00:00
ChrisM-PekandCursor	d6ca1140b5	feat(sanctuary): trier le stockage sans deplacer la hotbar Verification 26.2 / check (pull_request) Canceled after 0s Details Le clic molette range les rangées débloquées depuis le haut, fusionne les piles identiques et laisse la hotbar, l'armure et les slots spéciaux intacts. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-31 04:20:33 +02:00
koka	53fa32bbc5	feat(sanctuary): ajouter les modes du suivi de quetes Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-31 03:27:36 +02:00
koka	7a2f697024	Merge pull request 'release: publier les dernières PR dans Packwiz alpha.222' (#100 ) from release/26.2.0-alpha.222 into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #100	2026-08-30 13:33:43 +00:00
koka	4d0750e993	release: update Packwiz to alpha.222 Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 15:29:24 +02:00
koka	c49673801f	Merge pull request 'fix(sanctuary): simplifier le suivi de quetes' (#99 ) from fix/quest-tracker-transparent into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #99	2026-08-30 13:15:18 +00:00
koka	5386c7ac8a	fix(sanctuary): simplifier le suivi de quetes Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 15:09:01 +02:00
koka	eb25625a45	Merge pull request 'feat(sanctuary): ajouter un suivi d'avancement des quetes' (#86 ) from feature/quest-tracker-hud into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #86	2026-08-30 13:00:21 +00:00
ChrisM-PekandCursor	05c445eaeb	Merge origin/main into feature/quest-tracker-hud Verification 26.2 / check (pull_request) Canceled after 0s Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 11:50:24 +02:00
koka	788928f2d9	Merge pull request 'feat(redstoner): rechercher et vider sans glissement dans le terminal' (#97 ) from feature/storage-terminal-search into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #97	2026-08-30 08:06:20 +00:00
koka	5d3db9bb42	chore(redstoner): defer packwiz refresh Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 10:01:50 +02:00
koka	fd528abb9d	feat(redstoner): add storage terminal keyboard search	2026-08-30 10:00:31 +02:00
koka	40acccc818	feat(redstoner): add storage terminal keyboard search Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 08:43:17 +02:00
koka	62c8c87eb0	Merge pull request 'fix(ambiance): restaurer la vitesse native du disque blanc (alpha.221)' (#96 ) from fix/white-disc-native-rate into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #96	2026-08-30 06:03:00 +00:00
koka	b5dab3b5f6	chore(release): prepare alpha.221 native audio Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 07:07:36 +02:00
koka	90790161db	Merge remote-tracking branch 'origin/feature/storage-terminal-menu' into fix/white-disc-native-rate	2026-08-30 06:58:50 +02:00
koka	e8dee9b7f8	feat(redstoner): integrate storage terminal menu Verification 26.2 / check (pull_request) Canceled after 0s Details	2026-08-30 06:55:18 +02:00
koka	6fc93ca732	fix(ambiance): preserve white disc native audio rate	2026-08-30 06:51:22 +02:00
koka	8787969347	Merge pull request 'feat(alpha): intégrer l’île Indev, son portail et ses textures locales' (#93 ) from integration/alpha-indev into main Verification 26.2 / check (push) Canceled after 0s Details Reviewed-on: #93	2026-08-30 03:10:56 +00:00
ChrisM-PekandCursor	6e58d44c71	feat(sanctuary): assister les IDs de quete et limiter le tracker aux quetes acceptees Verification 26.2 / check (pull_request) Canceled after 0s Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-30 00:44:38 +02:00
ChrisM-PekandCursor	d45afc7767	feat(sanctuary): ajouter un suivi d'avancement des quetes Verification 26.2 / check (pull_request) Canceled after 0s Details Co-authored-by: Cursor <cursoragent@cursor.com>	2026-08-29 23:45:40 +02:00