Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.
Rust differential-testinggame-enginegamedevlinuxminecraftminecraft-javareimplementationrustvoxelvulkanwgpu
OptiFine CTM: connected-texture tiles glow with their emissive overlays
some-du6e6d89cb01957a
diff --git a/crates/horizon-client-render/src/native_emissive.rs b/crates/horizon-client-render/src/native_emissive.rsindex 4a684a352..c0a747c94 100644--- a/crates/horizon-client-render/src/native_emissive.rs+++ b/crates/horizon-client-render/src/native_emissive.rs@@ -30,9 +30,19 @@ pub fn load(root: &Path, sprites: &mut Sprites) {/// OptiFine's emissive overlays of the block sprites already loaded (what the terrain draws;/// items draw from the HUD atlas): for each-/// `<ns>:block/<name>` whose `<name><suffix>.png` sits beside it, the overlay is loaded too and-/// paired with it, first by name, at most [`MAX`] - [`NATIVE`] (native mods keep their share of+/// `<ns>:block/<name>`, or connected-texture tile `assets/<ns>/optifine/ctm/.../<name>.png`,+/// whose `<name><suffix>.png` sits beside it, the overlay is loaded too and paired with it, first+/// by name, at most [`MAX`] - [`NATIVE`] (native mods keep their share of/// the table). A pack without such files adds nothing.+/// A connected-texture tile's sprite name (its resource path, `Sprites::insert_file`'s) without+/// `.png`.+fn ctm_tile(name: &str) -> Option<&str> {+ let stem = name.strip_suffix(".png")?;+ let mut parts = stem.strip_prefix("assets/")?.splitn(3, '/');+ let (_namespace, top, rest) = (parts.next()?, parts.next()?, parts.next()?);+ (matches!(top, "optifine" | "mcpatcher") && rest.starts_with("ctm/")).then_some(stem)+}+pub fn load_optifine(root: &Path, sprites: &mut Sprites) -> Vec<(String, String)> {let suffix = horizon_optifine::emissive::suffix(root);// Blocks with identical pixels share a layer (and the shader pairs by layer): a shared@@ -46,16 +56,27 @@ pub fn load_optifine(root: &Path, sprites: &mut Sprites) -> Vec<(String, String).iter().filter(|(name, layer)| {sharing[layer] == 1- && name+ && (name.split_once(':').is_some_and(|(_, p)| p.starts_with("block/") && !p.ends_with(&suffix))+ || ctm_tile(name).is_some_and(|stem| !stem.ends_with(&suffix)))}).map(|(name, _)| name.clone()).collect();let mut pairs = Vec::new();for base in bases {- let overlay = format!("{base}{suffix}");- let file = crate::atlas_sources::texture_path(root, &overlay, "textures");+ // A tile is named by its file, a block sprite by its id.+ let (overlay, file) = match ctm_tile(&base) {+ Some(stem) => {+ let overlay = format!("{stem}{suffix}.png");+ (overlay.clone(), root.join(overlay))+ }+ None => {+ let overlay = format!("{base}{suffix}");+ let file = crate::atlas_sources::texture_path(root, &overlay, "textures");+ (overlay, file)+ }+ };if !std::fs::metadata(&file).is_ok_and(|m| m.is_file()) {continue;}@@ -71,7 +92,12 @@ pub fn load_optifine(root: &Path, sprites: &mut Sprites) -> Vec<(String, String)continue;}// A file that doesn't load would glow as the missing texture: no pair instead.- match sprites.try_insert(root, &overlay) {+ let loaded = if overlay.starts_with("assets/") {+ sprites.insert_file(root, &overlay)+ } else {+ sprites.try_insert(root, &overlay)+ };+ match loaded {Ok(_) => pairs.push((base, overlay)),Err(e) => log::warn!("Horizon: emissive overlay {overlay} skipped: {e}"),}@@ -192,13 +218,32 @@ mod tests {let props = root.join("assets/minecraft/optifine/emissive.properties");std::fs::create_dir_all(props.parent().unwrap()).unwrap();std::fs::write(&props, "suffix.emissive=_glow").unwrap();+ // Connected-texture tiles pair with the overlay beside them.+ let tiles = root.join("assets/minecraft/optifine/ctm/lamp");+ png(&tiles.join("0.png"), 230);+ png(&tiles.join("0_glow.png"), 240);+ png(&tiles.join("1.png"), 250);+ for tile in ["0", "1"] {+ sprites+ .insert_file(+ &root,+ &format!("assets/minecraft/optifine/ctm/lamp/{tile}.png"),+ )+ .unwrap();+ }let pairs = load_optifine(&root, &mut sprites);assert_eq!(pairs,- [(- "minecraft:block/deepslate".into(),- "minecraft:block/deepslate_glow".into()- )]+ [+ (+ "assets/minecraft/optifine/ctm/lamp/0.png".into(),+ "assets/minecraft/optifine/ctm/lamp/0_glow.png".into()+ ),+ (+ "minecraft:block/deepslate".into(),+ "minecraft:block/deepslate_glow".into()+ ),+ ]);std::fs::remove_dir_all(&root).unwrap();}diff --git a/docs/resource-packs.md b/docs/resource-packs.mdindex dce282f76..1a0c7d0de 100644--- a/docs/resource-packs.md+++ b/docs/resource-packs.md@@ -40,8 +40,8 @@ harness named checks that loader against vanilla).| Item definitions and item models (all model types, display transforms, tints) | `items/`, `models/item/` | works | `test_item_model_parity` || Custom entity models (OptiFine/EMF): a `.jem` reshapes a mob's model layer, with its animations and texture; Entity Model Features' files win over OptiFine's | `optifine/cem/`, `emf/cem/` | partly | `mobs::cem` and `mobs::cem_anim` unit tests; no per-bone textures, no random models, no textures under `optifine/` (vanilla's own entity models are code in 26.3, which `test_entity_model_parity` checks) || Random entity textures (OptiFine/ETF): numbered variants and their rules (biome, height, name, profession, colour, baby, health, moon, time, weather, size, blocks), chosen per entity from its UUID and rechecked once a second | `optifine/random/`, `optifine/mob/`, `mcpatcher/mob/`, `etf/random/`, `textures/entity/` with a `.properties` | partly | `horizon-optifine` `random` and `random_textures` tests, `mobs::random_textures` tests; no `nbt.*` or ETF's extra conditions (teams, items...), no block entities |-| Connected textures (OptiFine/Continuity): every method (`ctm`, `ctm_compact` with `ctm.N`, `horizontal`, `vertical`, `horizontal+vertical`, `vertical+horizontal`, `top`, `random`, `repeat`, `fixed`, `overlay`, `overlay_ctm`/`_random`/`_repeat`/`_fixed`, and Continuity's `overlay_horizontal`/`_vertical`/`_h+v`/`_v+h`), `matchTiles`/`matchBlocks` and the file-name forms, `tiles` (ranges, names, paths, `<skip>`, `<default>`), `weight`, `faces`, `biomes`, `heights` (and the old `minHeight`/`maxHeight`), `connect`, `connectTiles`/`connectBlocks`, `innerSeams`, `weights`, `randomLoops`, `symmetry`, `linked`, `width`/`height`, `tintIndex`/`tintBlock`, `layer`; Continuity's `orient`, `prioritize`, `optifineOnly` and its stacked-pane culling; tiles a rule picked matched again by another; panes drawn with OptiFine's unmirrored UVs | `optifine/ctm/**/*.properties` (and `mcpatcher/ctm/`) in any namespace, with their tiles | partly | `horizon-optifine` `ctm` and `ctm::connect` tests (the tile tables read off OptiFine's template images), `connected` and `mesher::quarter_tests` tests; `name=` rules are not loaded (the client meshing chunks never receives block entities' custom names, so they could never match); `random` picks from its own fixed hash, so random tiles land in other places than in OptiFine (same weights); no emissive overlays on tiles yet |-| Emissive textures (OptiFine/ETF): `<texture>_e.png` (or the pack's `suffix.emissive`) drawn full bright over mobs, their layers and armour, armour stands, the elytra, the dragon, thrown tridents, block entities and placed blocks | `<texture>_e.png` beside its texture (also random variants' and blink frames'); the suffix from `optifine/emissive.properties`, `etf/emissive.properties` or `textures/emissive.properties` | partly | `horizon-optifine` `emissive` tests, `mobs::render::emissive_tests`, `block_entity_render` and `native_emissive` tests; at most 96 block overlays (native mods keep 32 more), cutout; none on translucent faces, nor on blocks whose texture is pixel-identical to another's (they share a layer); not over items, armour trims, other projectiles, minecarts or end crystals, nor connected-texture tiles |+| Connected textures (OptiFine/Continuity): every method (`ctm`, `ctm_compact` with `ctm.N`, `horizontal`, `vertical`, `horizontal+vertical`, `vertical+horizontal`, `top`, `random`, `repeat`, `fixed`, `overlay`, `overlay_ctm`/`_random`/`_repeat`/`_fixed`, and Continuity's `overlay_horizontal`/`_vertical`/`_h+v`/`_v+h`), `matchTiles`/`matchBlocks` and the file-name forms, `tiles` (ranges, names, paths, `<skip>`, `<default>`), `weight`, `faces`, `biomes`, `heights` (and the old `minHeight`/`maxHeight`), `connect`, `connectTiles`/`connectBlocks`, `innerSeams`, `weights`, `randomLoops`, `symmetry`, `linked`, `width`/`height`, `tintIndex`/`tintBlock`, `layer`; Continuity's `orient`, `prioritize`, `optifineOnly` and its stacked-pane culling; tiles a rule picked matched again by another; panes drawn with OptiFine's unmirrored UVs | `optifine/ctm/**/*.properties` (and `mcpatcher/ctm/`) in any namespace, with their tiles | partly | `horizon-optifine` `ctm` and `ctm::connect` tests (the tile tables read off OptiFine's template images), `connected` and `mesher::quarter_tests` tests; `name=` rules are not loaded (the client meshing chunks never receives block entities' custom names, so they could never match); `random` picks from its own fixed hash, so random tiles land in other places than in OptiFine (same weights); tiles glow with their `_e` overlays as blocks do |+| Emissive textures (OptiFine/ETF): `<texture>_e.png` (or the pack's `suffix.emissive`) drawn full bright over mobs, their layers and armour, armour stands, the elytra, the dragon, thrown tridents, block entities, placed blocks and connected-texture tiles | `<texture>_e.png` beside its texture (also random variants' and blink frames'); the suffix from `optifine/emissive.properties`, `etf/emissive.properties` or `textures/emissive.properties` | partly | `horizon-optifine` `emissive` tests, `mobs::render::emissive_tests`, `block_entity_render` and `native_emissive` tests; at most 96 block overlays (native mods keep 32 more), cutout; none on translucent faces, nor on blocks whose texture is pixel-identical to another's (they share a layer); not over items, armour trims, other projectiles, minecarts or end crystals || Blinking textures (ETF): `<texture>_blink.png` and `_blink2.png`, `blinkLength`/`blinkFrequency` | `textures/entity/`, random variants' folders | works | `horizon-optifine` `blink` tests, `mobs::render` blink test; sleeping villagers keep their eyes shut || Textures, any resolution (16x to 512x) | `textures/` | works | atlases stitched from the overlay; Faithful 32x, Default HD 128x and FPBR measured in [reuse-pack-overlays.md](reuse-pack-overlays.md) || Texture animation: frames, frame time, frame size | `*.png.mcmeta` `animation` | works | `test_sprite_animation_parity` |