diff --git a/AGENTS.md b/AGENTS.md
index 0656e40fc..a72c6723a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -45,6 +45,7 @@ Game workspace (root `Cargo.toml`); `launcher/` and `crates/horizon-telemetry-se
| `horizon-friends`, `horizon-relay` | Play with Friends: invite codes, encrypted tunnel, the relay ([docs/play-with-friends.md](docs/play-with-friends.md)) |
| `horizon-mods`, `horizon-mod-sdk`, `cargo-horizon-mod` | Sandboxed WebAssembly mods: runtime, SDK + WIT, `cargo horizon-mod` ([docs/mods.md](docs/mods.md)) |
| `horizon-port-pack` | Porting Java modpacks ([docs/modpacks.md](docs/modpacks.md)) |
+| `horizon-shader-api` | Horizon's own WGSL shader packs ([docs/api/shaders.md](docs/api/shaders.md)): `horizon-shaders.toml`, the `.hshader` package; shared by the game, the launcher and the registry |
| `horizon-shaders` | Shader packs (the `shaders/` folder format), rebuilt clean-room from a written spec of the format; no wgpu |
| `horizon-theme` | Design tokens and fonts for the launcher, the game's own menus and the website |
| `horizon-telemetry`, `horizon-telemetry-server`, `horizon-bench` | Opt-in data collection, its ingest server, the benchmark report format |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e6e959186..21951c083 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,6 +7,11 @@ welcome on [Discord](https://discord.gg/HcTeMZxe5E).
This repository holds the game, the launcher and the website, plus the tools, tests and docs that build, check and
release them. Anything else (videos, Discord and other community material) lives elsewhere.
+**Where to start: [playhorizon.dev/hub](https://playhorizon.dev/hub).** It shows what is being done now and next
+([ROADMAP.md](ROADMAP.md) in the repository), the work board, good first tasks, and the forms to report a bug or
+suggest something. A pull request for a roadmap item carries its `roadmap:` label; ideas go to the suggestion
+queue (the hub, or `/suggest` on Discord) rather than to issues, which are for bugs.
+
## Build it
You need Rust (stable), Python 3.10+, JDK 25, and on Linux the ALSA and udev headers (`libasound2-dev libudev-dev`).
diff --git a/Cargo.lock b/Cargo.lock
index 54be02330..70c3c831c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -428,6 +428,8 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
dependencies = [
+ "serde",
+ "termcolor",
"unicode-width",
]
@@ -1266,6 +1268,7 @@ dependencies = [
"horizon-mods",
"horizon-protocol",
"horizon-server-files",
+ "horizon-shaders",
"horizon-telemetry",
"horizon-theme",
"horizon-threads",
@@ -1434,10 +1437,25 @@ dependencies = [
"ureq",
]
+[[package]]
+name = "horizon-shader-api"
+version = "0.1.0"
+dependencies = [
+ "bytemuck",
+ "naga",
+ "serde",
+ "serde_json",
+ "sha2",
+ "toml",
+ "zip",
+]
+
[[package]]
name = "horizon-shaders"
version = "0.1.0"
dependencies = [
+ "horizon-core",
+ "naga",
"zip",
]
@@ -1973,6 +1991,7 @@ dependencies = [
"naga-types",
"num-traits",
"once_cell",
+ "pp-rs",
"rustc-hash 1.1.0",
"spirv",
"thiserror 2.0.21",
@@ -2649,6 +2668,15 @@ dependencies = [
"zerovec",
]
+[[package]]
+name = "pp-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
+dependencies = [
+ "unicode-xid",
+]
+
[[package]]
name = "presser"
version = "0.3.1"
@@ -4197,6 +4225,7 @@ dependencies = [
"hashbrown 0.17.1",
"js-sys",
"log",
+ "naga",
"parking_lot",
"portable-atomic",
"profiling",
diff --git a/Cargo.toml b/Cargo.toml
index c6f2bc581..294e93aa9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[workspace]
exclude = ["launcher", "crates/horizon-telemetry-server", "crates/horizon-mod-registry", "third_party/wgpu-hal"]
-members = ["crates/horizon-core", "crates/horizon-dualsense", "crates/horizon-threads", "crates/horizon-world", "crates/horizon-client", "crates/horizon-server-files", "crates/horizon-server", "crates/horizon-bots", "crates/horizon-assets", "crates/horizon-protocol", "crates/horizon-theme", "crates/horizon-prepare", "crates/horizon-telemetry", "crates/horizon-bench", "crates/horizon-friends", "crates/horizon-relay", "crates/horizon-mod-sdk", "crates/horizon-mods", "crates/horizon-mods/tests/guest", "crates/cargo-horizon-mod", "crates/horizon-port-pack", "crates/horizon-shaders", "crates/horizon-release-sign", "crates/horizon-mod-sdk/examples/coords-hud", "xtask"]
+members = ["crates/horizon-core", "crates/horizon-dualsense", "crates/horizon-threads", "crates/horizon-world", "crates/horizon-client", "crates/horizon-server-files", "crates/horizon-server", "crates/horizon-bots", "crates/horizon-assets", "crates/horizon-protocol", "crates/horizon-theme", "crates/horizon-prepare", "crates/horizon-telemetry", "crates/horizon-bench", "crates/horizon-friends", "crates/horizon-relay", "crates/horizon-mod-sdk", "crates/horizon-mods", "crates/horizon-mods/tests/guest", "crates/cargo-horizon-mod", "crates/horizon-port-pack", "crates/horizon-shaders", "crates/horizon-shader-api", "crates/horizon-release-sign", "crates/horizon-mod-sdk/examples/coords-hud", "xtask"]
resolver = "2"
[workspace.package]
diff --git a/README.md b/README.md
index 6dd192d5d..ceee29249 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
Download ·
Documentation ·
Release notes ·
+ Roadmap ·
Project status ·
Contributing
@@ -109,6 +110,10 @@ Everything prepared lands in the gitignored `.local/`. It is derived from the ga
The client starts on the title screen. Command-line options (`--world`, `--seed`, `--creative`, `--render-distance`, `--dedicated`), controls, scripting through `horizon-ctl` and the architecture are described in [the native client guide](docs/native-client.md). The rest of the developer documentation is indexed in [docs/README.md](docs/README.md), including [the parity workflow](docs/parity-workflow.md).
+## Roadmap
+
+What is being done now, what comes next and where you can help, in plain words and in technical detail: [ROADMAP.md](ROADMAP.md). [playhorizon.dev/hub](https://playhorizon.dev/hub) shows it with the work board, the journal of what shipped and how to help.
+
## Contributing
Issues and pull requests are welcome: see [CONTRIBUTING.md](CONTRIBUTING.md) for how we work (vanilla first, small pull requests, labels), or [the contributing guide](https://playhorizon.dev/docs/contributing) on the site. Questions and ideas: [Discord](https://discord.gg/HcTeMZxe5E). Before opening a pull request, run the self-check and paste the block it prints:
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 000000000..b433fad3a
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,341 @@
+# Horizon roadmap
+
+
+
+What is being done on Horizon, what comes next and where you can help. There are no dates: things are Now, Next or Later. Each item is said in plain words, with the technical picture folded under it. The same roadmap, with a Simple / Technical switch, the board, the journal and how to help, is on [playhorizon.dev/hub](https://playhorizon.dev/hub). Pull requests carry the `roadmap:` label of their item.
+
+## At a glance
+
+Horizon is Minecraft: Java Edition 26.3 rewritten from scratch in Rust, so it runs faster on the same computer. Single player, LAN, servers, resource packs and Horizon's own mods work today, on your own copy of the game.
+
+**Being done now**
+
+- **Steady frames at long render distances**: Making Horizon faster than vanilla on every computer, with smooth camera movement even at 32 chunks, by spreading the work better over the processor's cores.
+- **Modpacks' world generation, natively**: Making the world-generation mods of popular modpacks (new structures, YUNG's dungeons and mineshafts, packs built on Lithostitched) generate their worlds in Horizon, natively and fast.
+- **Playing on servers: everything shows as it should**: When you play on a server, other players, mobs, items and menus look and behave as in vanilla: skins, poses, item names, inventories and server networks.
+- **Single player as a server: the last differences**: Single player now runs a small server in the background, as vanilla does. We are fixing what still behaves differently there; every fix also works for LAN and server players.
+- **Horizon's mod registry**: One place for mods, modpacks and resource packs made for Horizon: browse them on the website and install them from the launcher in one click.
+
+**Next**: Microsoft sign-in (coming soon); CurseForge in the mod browser (coming soon); Fresh benchmarks against vanilla; Pistons push players and mobs; Horizon on Intel Macs.
+
+**How to help**: Play it and tell us what differs from vanilla (Discord or GitHub), run the benchmark on your computer, vote for what you want next, or pick one of the Help wanted items.
+
+**Developers**: Read CONTRIBUTING.md, pick a Help wanted item or a To do card, check vanilla's code for the behaviour, and paste the block `python3 tools/pr_ready.py` prints in your pull request.
+
+## Now
+
+### Performance
+
+#### Steady frames at long render distances
+
+Making Horizon faster than vanilla on every computer, with smooth camera movement even at 32 chunks, by spreading the work better over the processor's cores.
+
+Technical
+
+Frame pacing at render distance 32 ([#678](https://github.com/ludovic111/horizon/issues/678)): long frames come from work competing with the render thread. In review: world generation workers build free structure starts instead of queueing them ([#1760](https://github.com/ludovic111/horizon/issues/1760)), the worker pool leaves one core as vanilla does ([#1778](https://github.com/ludovic111/horizon/issues/1778)), and the terrain vertex arena is read as storage where flat draws run ([#1742](https://github.com/ludovic111/horizon/issues/1742)). Still open: far terrain at 48 to 64 chunks ([#718](https://github.com/ludovic111/horizon/issues/718)) and CPU-bound fields of block entities ([#717](https://github.com/ludovic111/horizon/issues/717)). Every change shows before and after numbers from `tools/perf_bench.py` against vanilla 26.3 ([docs/benchmark.md](docs/benchmark.md)).
+
+
+
+#### Faster block lookups
+
+Speeding up the code that reads and writes the blocks of the world, which almost everything in the game goes through: generation, lighting, meshing and ticking.
+
+Technical
+
+`PalettedContainer` and `PackedStorage` find an entry's word by multiply and shift instead of an integer division ([#1790](https://github.com/ludovic111/horizon/issues/1790), [#1794](https://github.com/ludovic111/horizon/issues/1794)); meshing looks up baked models by index, not by name ([#1747](https://github.com/ludovic111/horizon/issues/1747)). Each change keeps the paletted storage harnesses identical and shows its microbenchmark ([docs/performance/paletted-container-access-results.md](docs/performance/paletted-container-access-results.md)).
+
+
+
+### Modpacks
+
+#### Modpacks' world generation, natively
+
+Making the world-generation mods of popular modpacks (new structures, YUNG's dungeons and mineshafts, packs built on Lithostitched) generate their worlds in Horizon, natively and fast.
+
+Technical
+
+`horizon-port-pack` carries a pack's data-driven content over; structure mods that need code get a native port: YUNG's worldgen as written ([#1746](https://github.com/ludovic111/horizon/issues/1746)), Lithostitched's limited and guaranteed elements with pool and processor modifiers ([#1777](https://github.com/ludovic111/horizon/issues/1777)), its processors as the game's own types ([#1765](https://github.com/ludovic111/horizon/issues/1765)). Proved by the structure blocks and layout harnesses ([#1753](https://github.com/ludovic111/horizon/issues/1753), [#1757](https://github.com/ludovic111/horizon/issues/1757)). Mods whose Java code does more than world generation don't run ([docs/modpacks.md](docs/modpacks.md)).
+
+
+
+### Servers and multiplayer
+
+#### Playing on servers: everything shows as it should
+
+When you play on a server, other players, mobs, items and menus look and behave as in vanilla: skins, poses, item names, inventories and server networks.
+
+Technical
+
+Client-of-a-server fixes in `game/remote*.rs` and `horizon-protocol`: mobs' aggressive and item-use flags ([#1802](https://github.com/ludovic111/horizon/issues/1802), [#1798](https://github.com/ludovic111/horizon/issues/1798)), ghost items after a remote menu ([#1795](https://github.com/ludovic111/horizon/issues/1795)), skins ([#1652](https://github.com/ludovic111/horizon/issues/1652)), cookies and transfer packets for proxy networks ([#1650](https://github.com/ludovic111/horizon/issues/1650)), firework boosts ([#1671](https://github.com/ludovic111/horizon/issues/1671)), living-entity attributes and simulation distance ([#1731](https://github.com/ludovic111/horizon/issues/1731)), styled item names ([#1702](https://github.com/ludovic111/horizon/issues/1702)), primed TNT between updates ([#1710](https://github.com/ludovic111/horizon/issues/1710)).
+
+
+
+#### Server dialogs and login screens
+
+Servers that show dialogs, such as the register and login screens of AuthMe, will work in Horizon.
+
+Technical
+
+26.3's dialog packets and model ([#1720](https://github.com/ludovic111/horizon/issues/1720)), the dialog screen with its buttons and actions ([#1734](https://github.com/ludovic111/horizon/issues/1734)), then text and boolean inputs ([#1735](https://github.com/ludovic111/horizon/issues/1735)).
+
+
+
+### Mods and API
+
+#### Horizon's mod registry
+
+One place for mods, modpacks and resource packs made for Horizon: browse them on the website and install them from the launcher in one click.
+
+Technical
+
+Merged: the registry index (schema 1, `.hpack`, checks before install, [#1634](https://github.com/ludovic111/horizon/issues/1634)), `cargo horizon-mod check` ([#1642](https://github.com/ludovic111/horizon/issues/1642)) and the submission service (`crates/horizon-mod-registry`, [#1659](https://github.com/ludovic111/horizon/issues/1659)). In review: the website's /mods ([#1596](https://github.com/ludovic111/horizon/issues/1596)) and /mods/submit ([#1635](https://github.com/ludovic111/horizon/issues/1635)), and in the launcher the registry as a source ([#1636](https://github.com/ludovic111/horizon/issues/1636)), install, enable and takedowns ([#1637](https://github.com/ludovic111/horizon/issues/1637)), the Mods page ([#1638](https://github.com/ludovic111/horizon/issues/1638)) and modpacks as their own profiles ([#1640](https://github.com/ludovic111/horizon/issues/1640)).
+
+More: [docs/mods.md](docs/mods.md)
+
+
+
+### Gameplay parity
+
+#### Single player as a server: the last differences
+
+Single player now runs a small server in the background, as vanilla does. We are fixing what still behaves differently there; every fix also works for LAN and server players.
+
+Technical
+
+Since [#1514](https://github.com/ludovic111/horizon/issues/1514) single player runs on the server thread (`game/integrated.rs`) and the window joins it as a client; `--in-frame` keeps the old path. The open `[server-thread]` issues list the gaps. In review: a tool that changes a block ends the click ([#1797](https://github.com/ludovic111/horizon/issues/1797)), potions keep their potion over the connection ([#1796](https://github.com/ludovic111/horizon/issues/1796)), mobs' aggression and arm swings ([#1802](https://github.com/ludovic111/horizon/issues/1802)). [docs/server-levels.md](docs/server-levels.md).
+
+
+
+#### Play in your language
+
+Item names, container titles and server messages follow the language you pick, as in vanilla. Today parts of the game stay in English.
+
+Technical
+
+Translatable components resolved through the selected language for items, containers and server text ([#1806](https://github.com/ludovic111/horizon/issues/1806)), on top of the bundled languages the prepared resources carry ([#1594](https://github.com/ludovic111/horizon/issues/1594)). Left: the client's own screens ([#1672](https://github.com/ludovic111/horizon/issues/1672)) and the main menu with zh_cn ([#1774](https://github.com/ludovic111/horizon/issues/1774)).
+
+
+
+### Rendering
+
+#### Shader packs, written again from scratch
+
+Shader packs were removed and are being rebuilt from scratch. They come back, off by default, once the best-known packs draw properly.
+
+Technical
+
+A clean-room rewrite in `horizon-shaderpack`, from the packs' public format documentation only: reading packs, the preprocessor and `.properties` files are merged ([#1584](https://github.com/ludovic111/horizon/issues/1584), [#1585](https://github.com/ludovic111/horizon/issues/1585), [#1586](https://github.com/ludovic111/horizon/issues/1586)); translating programs to WGSL through naga, buffers, uniforms and the terrain, entity, sky, weather and hand stages are in review ([#1698](https://github.com/ludovic111/horizon/issues/1698) to [#1801](https://github.com/ludovic111/horizon/issues/1801)).
+
+More: [#1561](https://github.com/ludovic111/horizon/issues/1561) · [#1771](https://github.com/ludovic111/horizon/issues/1771) · [#1786](https://github.com/ludovic111/horizon/issues/1786)
+
+
+
+### Horizon extras
+
+#### Discord Rich Presence
+
+Your Discord profile can show that you are playing Horizon, with a switch to turn it off.
+
+Technical
+
+A Discord IPC client on its own thread ([#1787](https://github.com/ludovic111/horizon/issues/1787)) and the presence with its setting ([#1788](https://github.com/ludovic111/horizon/issues/1788)). Merged: it ships with the next release.
+
+
+
+### Code and tools
+
+#### A leaner codebase that builds faster
+
+Cleaning up Horizon's code: removing what nothing uses and making it quicker to build, so fixes and new features land faster.
+
+Technical
+
+A review of the whole tree: dead code and stubs removed ([#1432](https://github.com/ludovic111/horizon/issues/1432), [#1658](https://github.com/ludovic111/horizon/issues/1658)), one probe binary per crate ([#1453](https://github.com/ludovic111/horizon/issues/1453), [#1454](https://github.com/ludovic111/horizon/issues/1454)), shared harness helpers ([#1448](https://github.com/ludovic111/horizon/issues/1448)), clippy clean on the whole tree ([#1707](https://github.com/ludovic111/horizon/issues/1707)). [docs/architecture.md](docs/architecture.md) maps each feature to its files and harnesses.
+
+
+
+## Next
+
+### Performance
+
+#### Fresh benchmarks against vanilla
+
+New public numbers comparing Horizon with vanilla on many kinds of computers, measured the same way every time, on the website's Benchmarks page.
+
+Technical
+
+Redo the comparison after the current performance work ([#1073](https://github.com/ludovic111/horizon/issues/1073)); reliability, coverage and presentation ([#1346](https://github.com/ludovic111/horizon/issues/1346)); a scene must count as loaded only once its first chunk arrives ([#1749](https://github.com/ludovic111/horizon/issues/1749)). Players' reports come in through `--benchmark` and `horizon-launcher data benchmark` ([docs/benchmark.md](docs/benchmark.md)).
+
+
+
+### Modpacks
+
+#### CurseForge in the mod browser (coming soon)
+
+Coming soon: search and download CurseForge mods and modpacks from the launcher, as you can with Modrinth today.
+
+Technical
+
+The mod browser lists CurseForge as coming soon ([docs/mod-browser.md](docs/mod-browser.md)): it needs CurseForge API access. Meanwhile packs import from a CurseForge zip or instance folder, and jars only CurseForge hosts come from the player's own instance ([docs/modpacks.md](docs/modpacks.md)).
+
+
+
+### Gameplay parity
+
+#### Pistons push players and mobs
+
+Pistons and slime blocks will push players, mobs and items as in vanilla. Today moving blocks pass through them.
+
+Technical
+
+Port `PistonMovingBlockEntity.moveCollidedEntities` and `moveStuckEntities` (honey), the slime bounce and `Entity.limitPistonMovement` for `MoverType.PISTON`, in single player and for a server's players. Issues [#1496](https://github.com/ludovic111/horizon/issues/1496), [#1609](https://github.com/ludovic111/horizon/issues/1609), [#1608](https://github.com/ludovic111/horizon/issues/1608), [#1704](https://github.com/ludovic111/horizon/issues/1704), [#1758](https://github.com/ludovic111/horizon/issues/1758).
+
+
+
+### Launcher
+
+#### Microsoft sign-in (coming soon)
+
+Coming soon: sign in with your Microsoft account to play on online-mode servers. The code is ready; it waits for Microsoft's approval.
+
+Technical
+
+Device-code sign-in in the launcher and online-mode login in the client ([docs/microsoft-account.md](docs/microsoft-account.md)). It is turned on by setting the app's client id once Minecraft API access is approved; until then the launcher shows "Coming soon".
+
+More: [#1270](https://github.com/ludovic111/horizon/issues/1270)
+
+
+
+#### Horizon on Intel Macs
+
+Builds of the game and the launcher for Macs with an Intel processor.
+
+Technical
+
+x86_64 game and launcher builds, picked per processor ([#1171](https://github.com/ludovic111/horizon/issues/1171)). Before it ships it needs a run on a real Intel Mac: Rosetta on Apple Silicon only proves the CPU code. Requests: [#1161](https://github.com/ludovic111/horizon/issues/1161), [#1792](https://github.com/ludovic111/horizon/issues/1792).
+
+
+
+## Later
+
+### Gameplay parity
+
+#### Following new Minecraft versions
+
+When Mojang releases a new version of the game, Horizon follows it, and every system is checked against the new version again.
+
+Technical
+
+The port pipeline detects a release, diffs its classes against 26.3 and writes a port report ([docs/version-ports.md](docs/version-ports.md)); the harnesses then run against the new version.
+
+
+
+### Horizon extras
+
+#### An optional AI teammate
+
+An AI teammate that plays beside you and that you can talk to. It is off unless you turn it on, and the No AI switch hides it completely.
+
+Technical
+
+Draft pull requests: the companion ([#1068](https://github.com/ludovic111/horizon/issues/1068)), its safety modes and their evaluation ([#1069](https://github.com/ludovic111/horizon/issues/1069)), and a route that finishes the game ([#1070](https://github.com/ludovic111/horizon/issues/1070)). Local models first; it ships only once the safety evaluation passes.
+
+
+
+## Help wanted
+
+### Performance
+
+#### Benchmark your computer
+
+Run Horizon's built-in benchmark and share the report: every new computer makes the performance work more accurate. No coding needed.
+
+Technical
+
+`horizon-launcher play --arg=--benchmark --arg=standard` writes a JSON report; `horizon-launcher data benchmark ` shows what would be sent and uploads it ([website/docs/performance.md](website/docs/performance.md)). Results from three installs with the same hardware appear on the Benchmarks page. Example: [#1711](https://github.com/ludovic111/horizon/issues/1711).
+
+
+
+### Gameplay parity
+
+#### End city banners keep their pattern
+
+Banners in End cities show as plain magenta instead of with their pattern.
+
+Technical
+
+Compare the banner block entities the End city templates place with vanilla's (`EndCityPieces`, the templates' block entity NBT, `BannerBlockEntity`'s patterns), in `crates/horizon-world/src/worldgen/structure/`. Issue [#1438](https://github.com/ludovic111/horizon/issues/1438); possibly related: [#526](https://github.com/ludovic111/horizon/issues/526).
+
+
+
+#### Enchanted loot in End cities
+
+Armour and tools in End city chests should come enchanted, as in vanilla.
+
+Technical
+
+`loot.rs` implements `enchant_with_levels`: find why the End city chest table's rolls come out bare, and compare them with vanilla's for a few seeds. Issues [#1437](https://github.com/ludovic111/horizon/issues/1437), [#1660](https://github.com/ludovic111/horizon/issues/1660).
+
+
+
+#### Cooldowns drawn on items
+
+After you throw an ender pearl, its slot should show the cooldown sweeping away, as in vanilla.
+
+Technical
+
+Vanilla draws `ItemCooldowns`' percent as a white overlay over the slot (`GuiGraphicsExtractor.itemDecorations` and `itemCooldown`) in the hotbar and in inventories. Issue [#1763](https://github.com/ludovic111/horizon/issues/1763).
+
+
+
+#### Chat settings and team prefixes
+
+The Hidden and Commands Only chat settings should hide chat, and team prefixes should appear before names in chat.
+
+Technical
+
+Vanilla checks `ChatVisiblity` before it delivers chat and system messages ([#1376](https://github.com/ludovic111/horizon/issues/1376)), and chat uses the team-formatted display name ([#1378](https://github.com/ludovic111/horizon/issues/1378)). Both issues have exact steps to reproduce.
+
+
+
+#### A pointing hand over buttons
+
+The mouse pointer should turn into a pointing hand over menu buttons, as in vanilla 26.3.
+
+Technical
+
+26.3's `AbstractWidget` asks for a cursor from `CursorTypes` when it is hovered; winit's `CursorIcon::Pointer` gives the same shape. Issue [#1347](https://github.com/ludovic111/horizon/issues/1347).
+
+
+
+#### Ctrl+Backspace and scroll bars in menus
+
+Ctrl+Backspace should delete a whole word in the creative search, and every list's scroll bar should be draggable.
+
+Technical
+
+`EditBox` deletes by word with Ctrl ([#1764](https://github.com/ludovic111/horizon/issues/1764)); the Game Rules and Statistics lists' scroll bars can't be dragged ([#1782](https://github.com/ludovic111/horizon/issues/1782), after [#978](https://github.com/ludovic111/horizon/issues/978)).
+
+
+
+#### Chickens flap while they fall
+
+Chickens should flap their wings while they fall, not stand still in the air.
+
+Technical
+
+Vanilla's `Chicken.aiStep` updates `flap` and `flapSpeed` when the chicken isn't on the ground, and the model's wings follow them. Issue [#1706](https://github.com/ludovic111/horizon/issues/1706).
+
+
+
+## Recently shipped
+
+- **Server resource packs** (v0.2.48): Servers can send you their resource pack: Horizon asks, downloads it and applies it, like vanilla. [#1562](https://github.com/ludovic111/horizon/issues/1562) · [#1569](https://github.com/ludovic111/horizon/issues/1569) · [#1570](https://github.com/ludovic111/horizon/issues/1570)
+- **Single player on its own server thread** (v0.2.39): Single player runs on a server thread, as vanilla does, so the world keeps ticking smoothly while the window draws. [#1514](https://github.com/ludovic111/horizon/issues/1514) · [docs/server-levels.md](docs/server-levels.md)
+- **GPU occlusion culling on Macs** (v0.2.17): On Macs the GPU now skips terrain hidden behind hills and caves: 8 to 48% more frames per second at 32 chunks on an M4 Pro. [#1434](https://github.com/ludovic111/horizon/issues/1434)
+- **Animated textures on the GPU** (v0.2.5): Water, lava and other animated blocks are now animated by the graphics card: 1.7 to 2.4 times better 1% lows on Intel graphics. [#1239](https://github.com/ludovic111/horizon/issues/1239)
+- **Far Detail for integrated graphics** (v0.2.5): An optional Reduced setting for far terrain, suggested on integrated graphics, that saves 2 to 4 ms of GPU time per frame. [#1199](https://github.com/ludovic111/horizon/issues/1199) · [#1029](https://github.com/ludovic111/horizon/issues/1029)
+- **The launcher's mod browser** (launcher@0.2.0): Search Modrinth for mods, modpacks and resource packs from the launcher; it says before installing what works in Horizon. [#1154](https://github.com/ludovic111/horizon/issues/1154) · [#1242](https://github.com/ludovic111/horizon/issues/1242) · [#1243](https://github.com/ludovic111/horizon/issues/1243) · [#1246](https://github.com/ludovic111/horizon/issues/1246) · [docs/mod-browser.md](docs/mod-browser.md)
+- **A blocky, Minecraft-like launcher** (launcher@0.2.0): The launcher got a new blocky look in Horizon's purple, in dark and light. [#1269](https://github.com/ludovic111/horizon/issues/1269) · [docs/design-system.md](docs/design-system.md)
+- **Dynamic lights** (v2026.10.22): An optional extra: torches you hold, drop or set on fire light up what is around them. [#1162](https://github.com/ludovic111/horizon/issues/1162)
+- **Host a server from the launcher** (launcher-v0.15.0): The launcher's Servers page creates, starts, backs up and updates a Horizon server with buttons, and invites friends. [#1026](https://github.com/ludovic111/horizon/issues/1026) · [docs/hosting.md](docs/hosting.md)
diff --git a/crates/cargo-horizon-mod/src/check.rs b/crates/cargo-horizon-mod/src/check.rs
index 0294bec98..8a25d1a24 100644
--- a/crates/cargo-horizon-mod/src/check.rs
+++ b/crates/cargo-horizon-mod/src/check.rs
@@ -21,6 +21,8 @@ pub struct Report {
pub sha256: String,
pub size: u64,
pub signed: bool,
+ /// A mod has code to run (a content mod may have none).
+ pub code: bool,
/// A mod's component imports.
pub imports: Vec,
/// A mod's commands, each run once.
@@ -49,6 +51,7 @@ impl Report {
"sha256": self.sha256,
"size": self.size,
"signed": self.signed,
+ "code": self.code,
"imports": self.imports,
"commands": self.commands,
"output": self.output,
@@ -87,7 +90,9 @@ impl Report {
for r in &f.requires {
out += &format!(" needs {} {} ({})\n", r.id, r.version, &r.sha256[..12]);
}
- if self.kind == Kind::Mod {
+ if self.kind == Kind::Mod && !self.code {
+ out += " no code: content only, nothing to run\n";
+ } else if self.kind == Kind::Mod {
let commands = if self.commands.is_empty() {
String::new()
} else {
@@ -142,6 +147,7 @@ pub fn check(
sha256: index::sha256_file(path)?,
size,
signed,
+ code: false,
imports: Vec::new(),
commands: Vec::new(),
output: Vec::new(),
@@ -153,10 +159,14 @@ pub fn check(
}
/// Runs a mod in the sandbox, as the game does, from a scratch copy so its
-/// storage lands in a folder removed afterwards.
+/// storage lands in a folder removed afterwards. A content mod has no code to
+/// run: `inspect` already read its content as the game does.
fn trial_run(path: &Path, report: &mut Report) -> Result<(), String> {
let package = Package::read(path)?;
- let wasm = package.wasm.as_deref().ok_or("the .hmod has no mod.wasm")?;
+ let Some(wasm) = package.wasm.as_deref() else {
+ return Ok(());
+ };
+ report.code = true;
report.imports = component_imports(wasm)?;
package
.manifest
diff --git a/crates/cargo-horizon-mod/src/main.rs b/crates/cargo-horizon-mod/src/main.rs
index 925633930..a4585f680 100644
--- a/crates/cargo-horizon-mod/src/main.rs
+++ b/crates/cargo-horizon-mod/src/main.rs
@@ -1,14 +1,16 @@
//! `cargo horizon-mod`: make Horizon mods in Rust (`docs/mods.md`).
//!
-//! - `new [--name "Name"] [--sdk-path ]`: a mod crate from the template.
-//! - `build [--debug]`: the `.hmod` in `target/horizon-mod/`.
+//! - `new [--template code|content] [--name "Name"] [--sdk-path ]`:
+//! a mod from a template: a Rust crate, or a content mod (no code).
+//! - `build [--debug]`: the `.hmod` in `target/horizon-mod/`, with the mod's
+//! `assets/` and `data/`; a folder without `Cargo.toml` is content only.
//! - `run [--game ] [-- ]`: build, then play with
//! the mod; run `build` again and the game reloads it.
//! - `check [--json]`: what the registry checks of a submission
//! (`.hmod`, `.hpack`, resource pack `.zip`), with a trial run for a mod.
//! - `registry build|review|check|list`: the registry repository's CI.
use horizon_mods::{
- Manifest, Package,
+ Capability, Content, Manifest, Package,
manifest::{MANIFEST, component_imports, componentize},
};
mod check;
@@ -36,7 +38,7 @@ fn main() -> ExitCode {
Some("run") => run(&args[1..]),
Some("check") => check(&args[1..]),
Some("registry") => registry::main(&args[1..]),
- _ => Err("usage: cargo horizon-mod new | build [--debug] | run [--game ] [-- ] | check [--kind ] [--key --signature ] [--json] | registry build|review|check|list".into()),
+ _ => Err("usage: cargo horizon-mod new [--template code|content] | build [--debug] | run [--game ] [-- ] | check [--kind ] [--key --signature ] [--json] | registry build|review|check|list".into()),
};
match result {
Ok(()) => ExitCode::SUCCESS,
@@ -90,19 +92,68 @@ fn new(args: &[String]) -> Result<(), String> {
.replace("{name}", &name)
.replace("{sdk}", &sdk)
};
- let files = [
+ let code = [
("Cargo.toml", include_str!("../template/Cargo.toml.in")),
(MANIFEST, include_str!("../template/horizon-mod.toml")),
("src/lib.rs", include_str!("../template/src/lib.rs")),
(".gitignore", include_str!("../template/gitignore")),
];
- for (file, text) in files {
+ // A block copying a vanilla one, with its model, name, loot, recipe and tag.
+ let content = [
+ (
+ MANIFEST,
+ include_str!("../template/content/horizon-mod.toml"),
+ ),
+ (
+ "data/{id}/horizon/block/glowing_amethyst.json",
+ include_str!("../template/content/block.json"),
+ ),
+ (
+ "assets/{id}/blockstates/glowing_amethyst.json",
+ include_str!("../template/content/blockstate.json"),
+ ),
+ (
+ "assets/{id}/models/block/glowing_amethyst.json",
+ include_str!("../template/content/model.json"),
+ ),
+ (
+ "assets/{id}/items/glowing_amethyst.json",
+ include_str!("../template/content/item.json"),
+ ),
+ (
+ "assets/{id}/lang/en_us.json",
+ include_str!("../template/content/lang.json"),
+ ),
+ (
+ "data/{id}/loot_table/blocks/glowing_amethyst.json",
+ include_str!("../template/content/loot.json"),
+ ),
+ (
+ "data/{id}/recipe/glowing_amethyst.json",
+ include_str!("../template/content/recipe.json"),
+ ),
+ (
+ "data/minecraft/tags/block/mineable/pickaxe.json",
+ include_str!("../template/content/pickaxe.json"),
+ ),
+ (".gitignore", include_str!("../template/gitignore")),
+ ];
+ let files: &[(&str, &str)] = match flag(args, "--template").unwrap_or("code") {
+ "code" => &code,
+ "content" => &content,
+ other => return Err(format!("no template {other}: code or content")),
+ };
+ for &(file, text) in files {
+ let file = fill(file);
+ let file = file.as_str();
let to = dir.join(file);
std::fs::create_dir_all(to.parent().expect("a file in the mod"))
.map_err(|e| e.to_string())?;
std::fs::write(&to, fill(text)).map_err(|e| format!("{}: {e}", to.display()))?;
}
- Manifest::parse(&std::fs::read_to_string(dir.join(MANIFEST)).map_err(|e| e.to_string())?)?;
+ let manifest =
+ Manifest::parse(&std::fs::read_to_string(dir.join(MANIFEST)).map_err(|e| e.to_string())?)?;
+ Content::read(dir, &manifest)?;
println!(
"Created {} (mod id {id}). Next: cd {path} && cargo horizon-mod run",
dir.display()
@@ -110,14 +161,53 @@ fn new(args: &[String]) -> Result<(), String> {
Ok(())
}
-/// Builds the crate in the current folder and packs `target/horizon-mod/.hmod`.
+/// Builds the mod in the current folder and packs `target/horizon-mod/.hmod`:
+/// the manifest, the crate's component (none without a `Cargo.toml`: a
+/// content mod) and the files in `assets/` and `data/`.
fn build(release: bool) -> Result {
- let manifest_text = std::fs::read_to_string(MANIFEST)
+ build_in(Path::new("."), release)
+}
+
+fn build_in(root: &Path, release: bool) -> Result {
+ let manifest_text = std::fs::read_to_string(root.join(MANIFEST))
.map_err(|e| format!("{MANIFEST}: {e} (run this in a mod's folder)"))?;
let manifest = Manifest::parse(&manifest_text)?;
+ let (wasm, target_dir) = if root.join("Cargo.toml").exists() {
+ let (wasm, target) = compile(root, release)?;
+ // The game refuses a component importing capabilities the manifest lacks.
+ manifest.check_imports(component_imports(&wasm)?.iter().map(String::as_str))?;
+ (Some(wasm), target)
+ } else if manifest.capabilities.contains(&Capability::Registries) {
+ (None, root.join("target"))
+ } else {
+ return Err(format!(
+ "no Cargo.toml: only a content mod (capability registries in {MANIFEST}) has no code"
+ ));
+ };
+ // The same checks as the game's, and the files in the order it lists them.
+ let content = Content::read(root, &manifest)?;
+ let mut reader = content.reader()?;
+ let mut files = Vec::with_capacity(content.files.len());
+ for name in &content.files {
+ files.push((name.as_str(), reader.read(name)?));
+ }
+ let files: Vec<(&str, &[u8])> = files.iter().map(|(n, b)| (*n, b.as_slice())).collect();
+ let dir = target_dir.join("horizon-mod");
+ std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
+ let path = dir.join(format!("{}.hmod", manifest.id));
+ // Write then rename, so a running game never reads half a file.
+ let partial = path.with_extension("hmod.partial");
+ let bytes = Package::write_files(&manifest_text, wasm.as_deref(), &files)?;
+ std::fs::write(&partial, bytes).map_err(|e| e.to_string())?;
+ std::fs::rename(&partial, &path).map_err(|e| e.to_string())?;
+ Ok(path)
+}
+
+/// Builds the crate for WebAssembly: its component, and Cargo's target folder.
+fn compile(root: &Path, release: bool) -> Result<(Vec, PathBuf), String> {
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
let mut cmd = Command::new(cargo);
- cmd.args([
+ cmd.current_dir(root).args([
"build",
"--lib",
"--target",
@@ -145,17 +235,8 @@ fn build(release: bool) -> Result {
.rfind(|f| f.extension().is_some_and(|e| e == "wasm"))
.ok_or("the build made no .wasm: is the crate a cdylib?")?;
let wasm = componentize(&std::fs::read(&core).map_err(|e| e.to_string())?)?;
- // The game refuses a component importing capabilities the manifest lacks.
- manifest.check_imports(component_imports(&wasm)?.iter().map(String::as_str))?;
- let target_dir = core.ancestors().nth(3).ok_or("unexpected target folder")?;
- let dir = target_dir.join("horizon-mod");
- std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
- let path = dir.join(format!("{}.hmod", manifest.id));
- // Write then rename, so a running game never reads half a file.
- let partial = path.with_extension("hmod.partial");
- std::fs::write(&partial, Package::write(&manifest_text, &wasm)?).map_err(|e| e.to_string())?;
- std::fs::rename(&partial, &path).map_err(|e| e.to_string())?;
- Ok(path)
+ let target = core.ancestors().nth(3).ok_or("unexpected target folder")?;
+ Ok((wasm, target.to_path_buf()))
}
/// `check `: the registry's checks of a submission, printed; fails
@@ -237,4 +318,49 @@ mod tests {
);
std::fs::remove_dir_all(&dir).unwrap();
}
+
+ #[test]
+ fn the_content_template_builds_and_checks_with_no_code() {
+ let dir = std::env::temp_dir().join(format!("horizon-mod-content-{}", std::process::id()));
+ let path = dir.join("gems");
+ let new_args = [
+ path.display().to_string(),
+ "--template".into(),
+ "content".into(),
+ ];
+ new(&new_args).unwrap();
+ assert!(!path.join("Cargo.toml").exists());
+ let hmod = build_in(&path, true).unwrap();
+ assert_eq!(hmod, path.join("target/horizon-mod/gems.hmod"));
+ let package = Package::read(&hmod).unwrap();
+ assert!(package.wasm.is_none());
+ let content = Content::read(&hmod, &package.manifest).unwrap();
+ assert!(
+ content
+ .files
+ .contains(&"data/gems/horizon/block/glowing_amethyst.json".into())
+ );
+ assert_eq!(content.files.len(), 8, "{:?}", content.files);
+ let report = check::check(&hmod, check::kind_of(&hmod).unwrap(), None, None).unwrap();
+ assert!(!report.code);
+ assert!(
+ report.text().contains("no code: content only"),
+ "{}",
+ report.text()
+ );
+ // Without registries, a mod needs code.
+ let manifest = std::fs::read_to_string(path.join(MANIFEST)).unwrap();
+ let manifest = manifest.replace("[\"registries\"]", "[]");
+ std::fs::write(path.join(MANIFEST), manifest).unwrap();
+ assert!(build_in(&path, true).unwrap_err().contains("no Cargo.toml"));
+ assert!(
+ new(&[
+ dir.join("x").display().to_string(),
+ "--template".into(),
+ "lua".into()
+ ])
+ .is_err()
+ );
+ std::fs::remove_dir_all(&dir).unwrap();
+ }
}
diff --git a/crates/cargo-horizon-mod/template/content/block.json b/crates/cargo-horizon-mod/template/content/block.json
new file mode 100644
index 000000000..ea68a1a27
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/block.json
@@ -0,0 +1,4 @@
+{
+ "template": "minecraft:amethyst_block",
+ "properties": { "hardness": 2.0, "light": 7 }
+}
diff --git a/crates/cargo-horizon-mod/template/content/blockstate.json b/crates/cargo-horizon-mod/template/content/blockstate.json
new file mode 100644
index 000000000..ea472666e
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/blockstate.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "": { "model": "{id}:block/glowing_amethyst" }
+ }
+}
diff --git a/crates/cargo-horizon-mod/template/content/horizon-mod.toml b/crates/cargo-horizon-mod/template/content/horizon-mod.toml
new file mode 100644
index 000000000..4f133a905
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/horizon-mod.toml
@@ -0,0 +1,10 @@
+id = "{id}"
+name = "{name}"
+version = "0.1.0"
+description = ""
+authors = []
+# A content mod: blocks and items from data/ and assets/, no code (API 0.2).
+api = "0.2"
+side = "both"
+# registries: "May add blocks and items to your worlds".
+capabilities = ["registries"]
diff --git a/crates/cargo-horizon-mod/template/content/item.json b/crates/cargo-horizon-mod/template/content/item.json
new file mode 100644
index 000000000..411bc4499
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/item.json
@@ -0,0 +1,3 @@
+{
+ "model": { "type": "minecraft:model", "model": "{id}:block/glowing_amethyst" }
+}
diff --git a/crates/cargo-horizon-mod/template/content/lang.json b/crates/cargo-horizon-mod/template/content/lang.json
new file mode 100644
index 000000000..74baddab8
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/lang.json
@@ -0,0 +1,3 @@
+{
+ "block.{id}.glowing_amethyst": "Glowing Amethyst"
+}
diff --git a/crates/cargo-horizon-mod/template/content/loot.json b/crates/cargo-horizon-mod/template/content/loot.json
new file mode 100644
index 000000000..898111f1b
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/loot.json
@@ -0,0 +1,11 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "condition": { "type": "minecraft:survives_explosion" },
+ "entries": [{ "type": "minecraft:item", "name": "{id}:glowing_amethyst" }],
+ "rolls": 1
+ }
+ ],
+ "random_sequence": "{id}:blocks/glowing_amethyst"
+}
diff --git a/crates/cargo-horizon-mod/template/content/model.json b/crates/cargo-horizon-mod/template/content/model.json
new file mode 100644
index 000000000..5710fecb1
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/model.json
@@ -0,0 +1,4 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": { "all": "minecraft:block/amethyst_block" }
+}
diff --git a/crates/cargo-horizon-mod/template/content/pickaxe.json b/crates/cargo-horizon-mod/template/content/pickaxe.json
new file mode 100644
index 000000000..8725edebd
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/pickaxe.json
@@ -0,0 +1,3 @@
+{
+ "values": ["{id}:glowing_amethyst"]
+}
diff --git a/crates/cargo-horizon-mod/template/content/recipe.json b/crates/cargo-horizon-mod/template/content/recipe.json
new file mode 100644
index 000000000..5edb03d94
--- /dev/null
+++ b/crates/cargo-horizon-mod/template/content/recipe.json
@@ -0,0 +1,6 @@
+{
+ "type": "minecraft:crafting_shapeless",
+ "category": "building",
+ "ingredients": ["minecraft:amethyst_block", "minecraft:glowstone_dust"],
+ "result": { "id": "{id}:glowing_amethyst" }
+}
diff --git a/crates/horizon-bots/src/main.rs b/crates/horizon-bots/src/main.rs
index 090daeb4e..66326a74e 100644
--- a/crates/horizon-bots/src/main.rs
+++ b/crates/horizon-bots/src/main.rs
@@ -173,6 +173,11 @@ impl Random {
}
}
+/// One bot thread that panics poisons the locks it held; the others and the report go on.
+fn lock(m: &Mutex) -> std::sync::MutexGuard<'_, T> {
+ m.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
+}
+
fn raw(id: i32, write: impl FnOnce(&mut Writer)) -> Vec {
let mut w = Writer::new();
w.varint(id);
@@ -329,7 +334,7 @@ fn read(
) {
use ids::play::clientbound as cb;
use ids::play::serverbound as sb;
- let send = |body: Vec| writer.lock().unwrap().send(&body);
+ let send = |body: Vec| lock(&writer).send(&body);
let mut seen = HashSet::new();
let mut batch = BatchSize::new();
let mut teleports = 0u64;
@@ -338,7 +343,7 @@ fn read(
Ok(packet) => packet,
Err(e) => {
if bot.online.swap(false, Ordering::SeqCst) {
- *bot.error.lock().unwrap() = Some(e.to_string());
+ *lock(&bot.error) = Some(e.to_string());
}
return;
}
@@ -356,7 +361,7 @@ fn read(
cb::LEVEL_CHUNK_WITH_LIGHT => {
bot.chunks.fetch_add(1, Ordering::Relaxed);
if let (Ok(x), Ok(z)) = (r.i32(), r.i32()) {
- if !bot.held.lock().unwrap().insert((x, z)) {
+ if !lock(&bot.held).insert((x, z)) {
bot.resent.fetch_add(1, Ordering::Relaxed);
}
if seen.insert((x, z)) {
@@ -368,7 +373,7 @@ fn read(
cb::FORGET_LEVEL_CHUNK => {
if let Ok(play::Clientbound::ForgetLevelChunk(p)) =
play::Clientbound::decode(id, &body)
- && bot.held.lock().unwrap().remove(&(p.pos[0], p.pos[1]))
+ && lock(&bot.held).remove(&(p.pos[0], p.pos[1]))
{
bot.forgotten.fetch_add(1, Ordering::Relaxed);
}
@@ -389,7 +394,7 @@ fn read(
}
cb::PLAYER_POSITION => match play::Clientbound::decode(id, &body) {
Ok(play::Clientbound::PlayerPosition(p)) => {
- let mut at = bot.teleport.lock().unwrap();
+ let mut at = lock(&bot.teleport);
let previous = at.unwrap_or([0.0; 3]);
// Relative flags: X 1, Y 2, Z 4.
let pos: [f64; 3] = std::array::from_fn(|i| {
@@ -420,7 +425,7 @@ fn read(
},
cb::DISCONNECT | cb::START_CONFIGURATION => {
bot.online.store(false, Ordering::SeqCst);
- *bot.error.lock().unwrap() = Some(if id == cb::DISCONNECT {
+ *lock(&bot.error) = Some(if id == cb::DISCONNECT {
format!(
"disconnected: {}",
String::from_utf8_lossy(&body)
@@ -455,7 +460,7 @@ fn run_bot(
let connection = match join(&o, &name) {
Ok(c) => c,
Err(e) => {
- *bot.error.lock().unwrap() = Some(e);
+ *lock(&bot.error) = Some(e);
return;
}
};
@@ -469,12 +474,12 @@ fn run_bot(
use ids::play::serverbound as sb;
// Wait for the spawn position.
let spawn = loop {
- if let Some(at) = *bot.teleport.lock().unwrap() {
+ if let Some(at) = *lock(&bot.teleport) {
break at;
}
if !bot.online.load(Ordering::SeqCst) || asked.elapsed() > Duration::from_secs(60) {
- if bot.error.lock().unwrap().is_none() {
- *bot.error.lock().unwrap() = Some("no spawn position within 60 s".into());
+ if lock(&bot.error).is_none() {
+ *lock(&bot.error) = Some("no spawn position within 60 s".into());
}
return;
}
@@ -482,7 +487,7 @@ fn run_bot(
};
bot.joined_after_ms
.store(asked.elapsed().as_millis() as u64, Ordering::SeqCst);
- let send = |body: Vec| writer.lock().unwrap().send(&body).is_ok();
+ let send = |body: Vec| lock(&writer).send(&body).is_ok();
send(raw(sb::PLAYER_LOADED, |_| {}));
let mut random = Random(o.seed ^ (index as u64).wrapping_mul(0x2545_F491_4F6C_DD1D));
let mut pos = spawn;
@@ -491,17 +496,15 @@ fn run_bot(
let mut target = pos;
let mut next = Instant::now();
loop {
- if until.lock().unwrap().is_some_and(|u| Instant::now() >= u)
- || !bot.online.load(Ordering::SeqCst)
- {
+ if lock(&until).is_some_and(|u| Instant::now() >= u) || !bot.online.load(Ordering::SeqCst) {
break;
}
// A teleport from the server wins over where the bot thought it was.
- if let Some(at) = bot.teleport.lock().unwrap().take() {
+ if let Some(at) = lock(&bot.teleport).take() {
pos = at;
}
let here = ((pos[0].floor() as i32) >> 4, (pos[2].floor() as i32) >> 4);
- if !bot.held.lock().unwrap().contains(&here) {
+ if !lock(&bot.held).contains(&here) {
bot.waited.fetch_add(1, Ordering::Relaxed);
} else if pos[1] < cruise {
pos[1] = (pos[1] + 0.5).min(cruise);
@@ -558,7 +561,7 @@ fn run_bot(
}
// Offline first, so the reader doesn't count the closed connection as a failure.
bot.online.store(false, Ordering::SeqCst);
- writer.lock().unwrap().shutdown();
+ lock(&writer).shutdown();
}
fn behaviour_of(mode: &str, index: usize) -> Behaviour {
@@ -612,13 +615,10 @@ fn main() {
let total = |f: fn(&Bot) -> &AtomicU64| -> u64 {
bots.iter().map(|b| f(b).load(Ordering::Relaxed)).sum()
};
- let failed = bots
- .iter()
- .filter(|b| b.error.lock().unwrap().is_some())
- .count();
+ let failed = bots.iter().filter(|b| lock(&b.error).is_some()).count();
if first.is_none() && online > 0 {
first = Some(Instant::now());
- *until.lock().unwrap() = Some(Instant::now() + Duration::from_secs(o.seconds));
+ *lock(&until) = Some(Instant::now() + Duration::from_secs(o.seconds));
}
println!(
"{}",
@@ -636,10 +636,10 @@ fn main() {
})
);
previous_chunks = chunks;
- let over = until.lock().unwrap().is_some_and(|u| Instant::now() >= u);
+ let over = lock(&until).is_some_and(|u| Instant::now() >= u);
let all_failed = failed == o.bots;
if over || all_failed || (first.is_none() && start.elapsed() > Duration::from_secs(120)) {
- *until.lock().unwrap() = Some(Instant::now());
+ *lock(&until) = Some(Instant::now());
break;
}
}
@@ -669,7 +669,7 @@ fn main() {
"forgotten": b.forgotten.load(Ordering::Relaxed),
"pulled_back": b.pulled_back.load(Ordering::Relaxed),
"waited_ticks": b.waited.load(Ordering::Relaxed),
- "error": *b.error.lock().unwrap(),
+ "error": *lock(&b.error),
})).collect::>(),
});
if o.report.as_deref() == Some("-") {
diff --git a/crates/horizon-client/Cargo.toml b/crates/horizon-client/Cargo.toml
index 85373b288..ea5859c23 100644
--- a/crates/horizon-client/Cargo.toml
+++ b/crates/horizon-client/Cargo.toml
@@ -16,11 +16,13 @@ horizon-world = { path = "../horizon-world" }
horizon-protocol = { path = "../horizon-protocol" }
# server.properties, eula.txt and the user lists, shared with horizon-server.
horizon-server-files = { path = "../horizon-server-files" }
+# Shader packs: reading them and turning their GLSL into naga modules.
+horizon-shaders = { path = "../horizon-shaders" }
horizon-friends = { path = "../horizon-friends" }
# Horizon mods: sandboxed WebAssembly components, off unless installed and turned on (docs/mods.md).
# Their runtime is the `mods` feature.
horizon-mods = { path = "../horizon-mods", default-features = false }
-wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl"] }
+wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl", "naga-ir"] }
winit = "0.30.13"
pollster = "0.4"
bytemuck = { version = "1.24", features = ["derive"] }
diff --git a/crates/horizon-client/assets/horizon/lang/en_us.json b/crates/horizon-client/assets/horizon/lang/en_us.json
new file mode 100644
index 000000000..de02589e5
--- /dev/null
+++ b/crates/horizon-client/assets/horizon/lang/en_us.json
@@ -0,0 +1,15 @@
+{
+ "horizon.options.controller": "Controller",
+ "horizon.options.vibration": "Vibration",
+ "horizon.options.adaptive_triggers": "Adaptive Triggers",
+ "horizon.options.lightbar": "Lightbar",
+ "horizon.options.look_sensitivity": "Look Sensitivity",
+ "horizon.options.invert_x": "Invert Look X",
+ "horizon.options.invert_y": "Invert Look Y",
+ "horizon.options.sneak_button": "Sneak Button",
+ "horizon.options.move_deadzone": "Move Deadzone",
+ "horizon.options.look_deadzone": "Look Deadzone",
+ "horizon.options.button_glyphs": "Button Glyphs",
+ "horizon.options.menu_navigation": "Menu Navigation",
+ "horizon.options.on_screen_keyboard": "On-Screen Keyboard"
+}
diff --git a/crates/horizon-client/assets/horizon/lang/ru_ru.json b/crates/horizon-client/assets/horizon/lang/ru_ru.json
new file mode 100644
index 000000000..422fbbc1d
--- /dev/null
+++ b/crates/horizon-client/assets/horizon/lang/ru_ru.json
@@ -0,0 +1,15 @@
+{
+ "horizon.options.controller": "Геймпад",
+ "horizon.options.vibration": "Вибрация",
+ "horizon.options.adaptive_triggers": "Адаптивные триггеры",
+ "horizon.options.lightbar": "Подсветка",
+ "horizon.options.look_sensitivity": "Чувствительность обзора",
+ "horizon.options.invert_x": "Инверсия обзора по X",
+ "horizon.options.invert_y": "Инверсия обзора по Y",
+ "horizon.options.sneak_button": "Кнопка приседания",
+ "horizon.options.move_deadzone": "Мёртвая зона движения",
+ "horizon.options.look_deadzone": "Мёртвая зона обзора",
+ "horizon.options.button_glyphs": "Символы кнопок",
+ "horizon.options.menu_navigation": "Навигация по меню",
+ "horizon.options.on_screen_keyboard": "Экранная клавиатура"
+}
diff --git a/crates/horizon-client/src/boss_overlay.rs b/crates/horizon-client/src/boss_overlay.rs
new file mode 100644
index 000000000..12920e0d0
--- /dev/null
+++ b/crates/horizon-client/src/boss_overlay.rs
@@ -0,0 +1,243 @@
+//! `BossHealthOverlay` and `LerpingBossEvent`: the boss bars a client is
+//! showing, in the order their add packets arrived.
+use crate::{
+ hud_overlays::BossBar,
+ scoreboard::{comp_text, tag_to_json},
+ text::Text,
+};
+use horizon_protocol::packets::play::{BossAction, BossEvent};
+
+/// `LerpingBossEvent.LERP_MILLISECONDS`.
+const LERP_MS: u128 = 100;
+
+/// `Util.getMillis`.
+pub fn now_millis() -> u128 {
+ std::time::SystemTime::now()
+ .duration_since(std::time::UNIX_EPOCH)
+ .map(|d| d.as_millis())
+ .unwrap_or(0)
+}
+
+/// One `LerpingBossEvent`.
+#[derive(Clone, Debug)]
+struct Event {
+ id: u128,
+ name: Text,
+ /// The progress the lerp started from (`progress`).
+ progress: f32,
+ /// `targetPercent`.
+ target: f32,
+ /// `setTime`.
+ set_at: u128,
+ color: u8,
+ overlay: u8,
+ darken: bool,
+ music: bool,
+ fog: bool,
+}
+impl Event {
+ /// `LerpingBossEvent.getProgress`.
+ fn displayed(&self, now: u128) -> f32 {
+ let t = ((now.saturating_sub(self.set_at)) as f32 / LERP_MS as f32).clamp(0.0, 1.0);
+ self.progress + (self.target - self.progress) * t
+ }
+ /// `LerpingBossEvent.setProgress`: the bar starts the next lerp from
+ /// whatever it is showing now.
+ fn set_progress(&mut self, progress: f32, now: u128) {
+ self.progress = self.displayed(now);
+ self.target = progress;
+ self.set_at = now;
+ }
+}
+
+/// `BossHealthOverlay`: the events, plus `GameRenderer`'s world darkening.
+#[derive(Clone, Debug, Default)]
+pub struct BossOverlay {
+ events: Vec,
+ /// `bossOverlayWorldDarkening` and the previous tick's value.
+ darken: f32,
+ darken_o: f32,
+}
+impl BossOverlay {
+ pub fn reset(&mut self) {
+ *self = Self::default();
+ }
+ /// `ClientboundBossEventPacket.dispatch` into `BossHealthOverlay`'s
+ /// handler. An id already shown keeps its place when added again.
+ pub fn apply(&mut self, packet: &BossEvent, now: u128) {
+ // An ordinal past the enum shows as its last value.
+ let color = |c: i32| c.clamp(0, 6) as u8;
+ let overlay = |o: i32| o.clamp(0, 4) as u8;
+ let id = packet.id;
+ if let BossAction::Add {
+ name,
+ progress,
+ color: c,
+ overlay: o,
+ darken,
+ music,
+ fog,
+ } = &packet.action
+ {
+ let event = Event {
+ id,
+ name: comp_text(&tag_to_json(name)),
+ progress: *progress,
+ target: *progress,
+ set_at: now,
+ color: color(*c),
+ overlay: overlay(*o),
+ darken: *darken,
+ music: *music,
+ fog: *fog,
+ };
+ match self.events.iter_mut().find(|e| e.id == id) {
+ Some(slot) => *slot = event,
+ None => self.events.push(event),
+ }
+ return;
+ }
+ if let BossAction::Remove = packet.action {
+ self.events.retain(|e| e.id != id);
+ return;
+ }
+ let Some(e) = self.events.iter_mut().find(|e| e.id == id) else {
+ return;
+ };
+ match &packet.action {
+ BossAction::UpdateProgress { progress } => e.set_progress(*progress, now),
+ BossAction::UpdateName { name } => e.name = comp_text(&tag_to_json(name)),
+ BossAction::UpdateStyle {
+ color: c,
+ overlay: o,
+ } => {
+ e.color = color(*c);
+ e.overlay = overlay(*o);
+ }
+ BossAction::UpdateProperties { darken, music, fog } => {
+ (e.darken, e.music, e.fog) = (*darken, *music, *fog);
+ }
+ BossAction::Add { .. } | BossAction::Remove => {}
+ }
+ }
+ /// `GameRenderer.tick` while the level runs.
+ pub fn tick_darken(&mut self, running: bool) {
+ if !running {
+ return;
+ }
+ self.darken_o = self.darken;
+ if self.should_darken() {
+ self.darken = (self.darken + 0.05).min(1.0);
+ } else if self.darken > 0.0 {
+ self.darken = (self.darken - 0.0125).max(0.0);
+ }
+ }
+ /// `GameRenderer.bossOverlayWorldDarkening`.
+ pub fn darken_amount(&self, partial: f32) -> f32 {
+ let t = partial.clamp(0.0, 1.0);
+ self.darken_o + (self.darken - self.darken_o) * t
+ }
+ pub fn should_darken(&self) -> bool {
+ self.events.iter().any(|e| e.darken)
+ }
+ pub fn should_play_music(&self) -> bool {
+ self.events.iter().any(|e| e.music)
+ }
+ pub fn should_create_world_fog(&self) -> bool {
+ self.events.iter().any(|e| e.fog)
+ }
+ /// The bars `extractRenderState` walks, with the lerped progress.
+ pub fn bars(&self, now: u128) -> Vec {
+ self.events
+ .iter()
+ .map(|e| BossBar {
+ name: e.name.clone(),
+ progress: e.displayed(now),
+ color: e.color as usize,
+ overlay: e.overlay as usize,
+ })
+ .collect()
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use horizon_world::nbt::Tag;
+
+ fn add(id: u128, name: &str, progress: f32, darken: bool, fog: bool) -> BossEvent {
+ BossEvent {
+ id,
+ action: BossAction::Add {
+ name: Tag::String(name.into()),
+ progress,
+ color: 5,
+ overlay: 0,
+ darken,
+ music: false,
+ fog,
+ },
+ }
+ }
+ fn progress(id: u128, progress: f32) -> BossEvent {
+ BossEvent {
+ id,
+ action: BossAction::UpdateProgress { progress },
+ }
+ }
+
+ #[test]
+ fn progress_lerps_over_a_tenth_of_a_second() {
+ let mut overlay = BossOverlay::default();
+ overlay.apply(&add(1, "W", 0.0, true, false), 0);
+ overlay.apply(&progress(1, 1.0), 0);
+ assert!((overlay.bars(50)[0].progress - 0.5).abs() < 1.0e-5);
+ assert!((overlay.bars(100)[0].progress - 1.0).abs() < 1.0e-5);
+ // A new target starts from the value on screen.
+ overlay.apply(&progress(1, 0.0), 50);
+ assert!((overlay.bars(150)[0].progress - 0.0).abs() < 1.0e-5);
+ }
+
+ #[test]
+ fn darken_ramps_and_fades() {
+ let mut overlay = BossOverlay::default();
+ overlay.apply(&add(1, "W", 1.0, true, false), 0);
+ overlay.tick_darken(true);
+ assert!((overlay.darken_amount(1.0) - 0.05).abs() < 1.0e-5);
+ overlay.apply(
+ &BossEvent {
+ id: 1,
+ action: BossAction::Remove,
+ },
+ 0,
+ );
+ overlay.tick_darken(true);
+ assert!((overlay.darken - 0.0375).abs() < 1.0e-5);
+ assert!(!overlay.should_play_music());
+ }
+
+ #[test]
+ fn bars_keep_arrival_order() {
+ let mut overlay = BossOverlay::default();
+ overlay.apply(&add(2, "b", 1.0, false, true), 0);
+ overlay.apply(&add(1, "a", 1.0, false, false), 0);
+ overlay.apply(&add(2, "c", 0.5, false, true), 0);
+ // An update for a bar this client never got is ignored.
+ overlay.apply(&progress(9, 0.5), 0);
+ let names: Vec<_> = overlay
+ .bars(0)
+ .into_iter()
+ .map(|b| b.name.plain())
+ .collect();
+ assert_eq!(names, ["c", "a"]);
+ assert!(overlay.should_create_world_fog());
+ overlay.apply(
+ &BossEvent {
+ id: 2,
+ action: BossAction::Remove,
+ },
+ 0,
+ );
+ assert!(!overlay.should_create_world_fog());
+ }
+}
diff --git a/crates/horizon-client/src/bossbar.rs b/crates/horizon-client/src/bossbar.rs
index eab31a5e5..2ecdb25e9 100644
--- a/crates/horizon-client/src/bossbar.rs
+++ b/crates/horizon-client/src/bossbar.rs
@@ -14,40 +14,64 @@ pub const STYLES: [&str; 5] = [
"notched_12",
"notched_20",
];
-/// `BossBarColor.getFormatting`.
+/// `BossBarColor.getFormatting`. Purple is dark blue in 26.3.
pub fn color_rgb(color: &str) -> u32 {
let name = match color {
"pink" => "red",
"red" => "dark_red",
- "purple" => "dark_purple",
+ "purple" => "dark_blue",
other => other,
};
text::named_color(name).unwrap_or(text::WHITE)
}
+/// A version-4 shaped id from a resource id. Saved boss events do not keep
+/// their UUID (`CustomBossEvents` mints a new one on load).
+pub fn stable_uuid(id: &str) -> u128 {
+ let mut h = 0xcbf29ce484222325u64;
+ for b in id.as_bytes() {
+ h ^= u64::from(*b);
+ h = h.wrapping_mul(0x100000001b3);
+ }
+ let most = (h as i64) & -61441 | 16384;
+ let least = (h.rotate_left(17) as i64) & 4_611_686_018_427_387_903 | i64::MIN;
+ ((most as u64 as u128) << 64) | (least as u64 as u128)
+}
+
#[derive(Clone, Debug, PartialEq)]
pub struct BossBar {
pub id: String,
+ /// The `ServerBossEvent` UUID. Not saved.
+ pub uuid: u128,
pub name: Comp,
pub color: String,
pub style: String,
pub value: i32,
pub max: i32,
+ /// `ServerBossEvent.visible`. A new bar is visible; nobody sees it until
+ /// a player is added.
pub visible: bool,
- /// Whether the (single) local player is in the bar's player set.
- pub player: bool,
+ pub darken: bool,
+ pub music: bool,
+ pub fog: bool,
+ /// `CustomBossEvent.players`, the UUIDs told about the bar.
+ pub players: Vec<[i32; 4]>,
}
impl BossBar {
pub fn new(id: &str, name: Comp) -> Self {
Self {
id: id.to_owned(),
+ uuid: stable_uuid(id),
name,
color: "white".into(),
style: "progress".into(),
value: 0,
max: 100,
visible: true,
- player: false,
+ darken: false,
+ music: false,
+ fog: false,
+ players: Vec::new(),
}
}
/// `CustomBossEvent.getDisplayName`.
@@ -91,31 +115,34 @@ impl BossBars {
pub fn ids(&self) -> Vec {
self.bars.iter().map(|b| b.id.clone()).collect()
}
- /// The saved compound; the player's UUID stands for "the local player".
- pub fn pack(&self, player: Option<[i32; 4]>) -> Tag {
+ /// The saved compound (`CustomBossEvent.Packed`).
+ pub fn pack(&self) -> Tag {
let mut c = Compound::new();
for b in &self.bars {
- let mut e = vec![
- ("Name", json_to_tag(&b.name)),
- ("Visible", Tag::Byte(i8::from(b.visible))),
- ("Value", Tag::Int(b.value)),
- ("Max", Tag::Int(b.max)),
- ("Color", Tag::String(b.color.as_str().into())),
- ("Overlay", Tag::String(b.style.as_str().into())),
- ("DarkenScreen", Tag::Byte(0)),
- ("PlayBossMusic", Tag::Byte(0)),
- ("CreateWorldFog", Tag::Byte(0)),
- ];
- let players = match (b.player, player) {
- (true, Some(u)) => vec![Tag::IntArray(u.to_vec())],
- _ => Vec::new(),
- };
- e.push(("Players", Tag::List(players)));
- c.insert(b.id.as_str().into(), Tag::compound(e));
+ let players = b
+ .players
+ .iter()
+ .map(|u| Tag::IntArray(u.to_vec()))
+ .collect();
+ c.insert(
+ b.id.as_str().into(),
+ Tag::compound([
+ ("Name", json_to_tag(&b.name)),
+ ("Visible", Tag::Byte(i8::from(b.visible))),
+ ("Value", Tag::Int(b.value)),
+ ("Max", Tag::Int(b.max)),
+ ("Color", Tag::String(b.color.as_str().into())),
+ ("Overlay", Tag::String(b.style.as_str().into())),
+ ("DarkenScreen", Tag::Byte(i8::from(b.darken))),
+ ("PlayBossMusic", Tag::Byte(i8::from(b.music))),
+ ("CreateWorldFog", Tag::Byte(i8::from(b.fog))),
+ ("Players", Tag::List(players)),
+ ]),
+ );
}
Tag::Compound(c)
}
- pub fn unpack(data: &Tag, player: Option<[i32; 4]>) -> Self {
+ pub fn unpack(data: &Tag) -> Self {
let mut bars = Vec::new();
if let Tag::Compound(c) = data {
for (id, e) in c {
@@ -130,21 +157,30 @@ impl BossBars {
Some(Tag::Byte(v)) => i32::from(*v),
_ => d,
};
- let in_players = match (get("Players"), player) {
- (Some(Tag::List(l)), Some(u)) => l
+ let players = match get("Players") {
+ Some(Tag::List(l)) => l
.iter()
- .any(|t| matches!(t, Tag::IntArray(a) if a.as_slice() == u)),
- _ => false,
+ .filter_map(|t| match t {
+ Tag::IntArray(a) if a.len() == 4 => Some([a[0], a[1], a[2], a[3]]),
+ _ => None,
+ })
+ .collect(),
+ _ => Vec::new(),
};
+ let id = id.to_string_lossy();
bars.push(BossBar {
- id: id.to_string_lossy(),
+ uuid: stable_uuid(&id),
+ id,
name: get("Name").map_or_else(|| literal(""), tag_to_json),
color: text("Color", "white"),
style: text("Overlay", "progress"),
value: num("Value", 0),
max: num("Max", 100),
visible: num("Visible", 0) != 0,
- player: in_players,
+ darken: num("DarkenScreen", 0) != 0,
+ music: num("PlayBossMusic", 0) != 0,
+ fog: num("CreateWorldFog", 0) != 0,
+ players,
});
}
}
@@ -167,17 +203,15 @@ mod tests {
bar.value = 25;
bar.max = 50;
bar.visible = true;
- bar.player = true;
- let uuid = Some([1, 2, 3, 4]);
- let back = BossBars::unpack(&b.pack(uuid), uuid);
+ bar.darken = true;
+ bar.players = vec![[1, 2, 3, 4]];
+ let back = BossBars::unpack(&b.pack());
assert_eq!(back, b);
- // Another player's UUID does not include the local player.
- assert!(!BossBars::unpack(&b.pack(uuid), Some([9, 9, 9, 9])).bars[0].player);
let bar = b.get("test:x").unwrap();
assert_eq!(bar.progress(), 0.5);
assert_eq!(bar.display_name().plain(), "chat.square_brackets");
assert_eq!(color_rgb("pink"), text::RED);
- assert_eq!(color_rgb("purple"), 0xAA00AA);
+ assert_eq!(color_rgb("purple"), text::named_color("dark_blue").unwrap());
b.remove("test:x");
assert!(b.bars.is_empty());
}
diff --git a/crates/horizon-client/src/command_storage.rs b/crates/horizon-client/src/command_storage.rs
index ce6e88f5c..560423e90 100644
--- a/crates/horizon-client/src/command_storage.rs
+++ b/crates/horizon-client/src/command_storage.rs
@@ -55,7 +55,7 @@ impl CommandStorage {
.iter()
.map(|(k, v)| (k.as_str().into(), v.clone()))
.collect();
- let _ = save::write_dat(
+ if let Err(e) = save::write_dat(
&file(root, namespace),
Tag::compound([
(
@@ -64,7 +64,9 @@ impl CommandStorage {
),
("DataVersion", Tag::Int(horizon_world::DATA_VERSION)),
]),
- );
+ ) {
+ log::warn!("command storage {namespace} was not written: {e}");
+ }
}
}
/// `get`: an empty compound when unset.
diff --git a/crates/horizon-client/src/discord_presence.rs b/crates/horizon-client/src/discord_presence.rs
new file mode 100644
index 000000000..5f8cc5837
--- /dev/null
+++ b/crates/horizon-client/src/discord_presence.rs
@@ -0,0 +1,623 @@
+//! Discord Rich Presence: "Playing Horizon" on the player's Discord profile, with what they are
+//! doing (docs/native-client.md). A thread of its own talks to the Discord app on this computer
+//! through its local IPC socket (Discord's RPC docs: `discord-ipc-N`, frames of opcode u32 LE +
+//! length u32 LE + JSON). The game only calls [`set`] each frame: a change wakes the thread,
+//! which connects when Discord runs, retries every 15 s when it doesn't, keeps under Discord's
+//! update limit and clears the activity on quit. Nothing is sent with the setting off,
+//! or with `HORIZON_NO_DISCORD=1`.
+use std::collections::VecDeque;
+use std::io::{self, Read, Write};
+use std::path::PathBuf;
+use std::sync::{Condvar, Mutex, OnceLock};
+use std::thread::Thread;
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+
+use serde_json::{Value, json};
+
+use crate::command::args::GameMode;
+
+/// The "Horizon" application on Discord's developer portal (public: it names the game). Its
+/// Rich Presence assets: `horizon`, the logo.
+pub const DISCORD_APP_ID: &str = "1563857609738690560";
+/// Whether the application has the game-mode images (`survival`, `creative`, `adventure`,
+/// `spectator`) beside the logo; it doesn't yet.
+const MODE_IMAGES: bool = false;
+/// Points the game at a test's fake Discord (a folder holding `discord-ipc-0`).
+const IPC_DIR_ENV: &str = "HORIZON_DISCORD_IPC_DIR";
+
+/// Discord drops activity updates beyond 5 in 20 seconds.
+const BURST: usize = 5;
+const WINDOW: Duration = Duration::from_secs(20);
+/// Between two tries to reach Discord while it isn't running.
+const RETRY: Duration = Duration::from_secs(15);
+/// The activity is sent again this often, so a Discord restarted meanwhile gets it back.
+const REFRESH: Duration = Duration::from_secs(60);
+
+const HANDSHAKE: u32 = 0;
+const FRAME: u32 = 1;
+const CLOSE: u32 = 2;
+const PING: u32 = 3;
+const PONG: u32 = 4;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Dimension {
+ Overworld,
+ Nether,
+ End,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Play {
+ Singleplayer,
+ /// A server or someone else's LAN world. Its address and name are never shown.
+ Multiplayer,
+ /// This world is open to LAN or friends; `players` counts the host.
+ Hosting {
+ players: usize,
+ },
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Status {
+ /// The player turned Rich Presence off: the activity is cleared.
+ Off,
+ Menus,
+ World {
+ play: Play,
+ dimension: Dimension,
+ mode: GameMode,
+ },
+}
+
+/// What the game wants shown, and since when it has been in a world.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct Wanted {
+ status: Status,
+ /// Unix seconds: when the player entered the world (dimension changes keep it).
+ since: Option,
+}
+impl Wanted {
+ /// A new status at `now`; false if it is the one already wanted.
+ fn update(&mut self, status: Status, now: u64) -> bool {
+ if self.status == status {
+ return false;
+ }
+ let in_world = |s: Status| matches!(s, Status::World { .. });
+ if !in_world(status) {
+ self.since = None;
+ } else if !in_world(self.status) {
+ self.since = Some(now);
+ }
+ self.status = status;
+ true
+ }
+}
+
+struct Shared {
+ wanted: Wanted,
+ stop: bool,
+ stopped: bool,
+}
+static SHARED: Mutex = Mutex::new(Shared {
+ wanted: Wanted {
+ status: Status::Menus,
+ since: None,
+ },
+ stop: false,
+ stopped: false,
+});
+static STOPPED: Condvar = Condvar::new();
+static THREAD: OnceLock = OnceLock::new();
+
+/// Starts the presence thread, once: when the game starts, never for a dedicated server.
+/// `automated` runs (offscreen, benchmarks) only talk to a test's fake Discord.
+pub fn start(enabled: bool, automated: bool) {
+ let fake_discord = std::env::var_os(IPC_DIR_ENV).is_some();
+ if THREAD.get().is_some()
+ || std::env::var_os("HORIZON_NO_DISCORD").is_some_and(|v| v != "0")
+ || (automated && !fake_discord)
+ {
+ return;
+ }
+ if !enabled {
+ lock().wanted.status = Status::Off;
+ }
+ match std::thread::Builder::new()
+ .name("Discord presence".into())
+ .spawn(run)
+ {
+ Ok(handle) => {
+ let _ = THREAD.set(handle.thread().clone());
+ }
+ Err(e) => log::warn!("Horizon: no Discord presence: {e}"),
+ }
+}
+
+/// What the player does now; only a change wakes the thread. Free without [`start`].
+pub fn set(status: Status) {
+ let Some(thread) = THREAD.get() else {
+ return;
+ };
+ if lock().wanted.update(status, unix_now()) {
+ thread.unpark();
+ }
+}
+
+/// On quit: clears the activity, waiting at most a moment for Discord.
+pub fn stop() {
+ let Some(thread) = THREAD.get() else {
+ return;
+ };
+ let mut shared = lock();
+ shared.stop = true;
+ thread.unpark();
+ let _ = STOPPED.wait_timeout_while(shared, Duration::from_millis(300), |s| !s.stopped);
+}
+
+fn lock() -> std::sync::MutexGuard<'static, Shared> {
+ SHARED.lock().unwrap_or_else(|e| e.into_inner())
+}
+
+fn unix_now() -> u64 {
+ SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .map_or(0, |d| d.as_secs())
+}
+
+fn run() {
+ let mut client: Option = None;
+ let mut sent: Option<(Wanted, Instant)> = None;
+ let mut last_try: Option = None;
+ let mut limit = RateLimit::default();
+ loop {
+ let (wanted, stop) = {
+ let s = lock();
+ (s.wanted, s.stop)
+ };
+ if stop || wanted.status == Status::Off {
+ if let Some(mut c) = client.take() {
+ let _ = c.set_activity(None);
+ c.close();
+ }
+ sent = None;
+ if stop {
+ lock().stopped = true;
+ STOPPED.notify_all();
+ return;
+ }
+ std::thread::park();
+ continue;
+ }
+ let now = Instant::now();
+ if client.is_none() {
+ if let Some(wait) = last_try.and_then(|t| RETRY.checked_sub(now - t)) {
+ std::thread::park_timeout(wait);
+ continue;
+ }
+ last_try = Some(now);
+ client = Client::connect();
+ if client.is_none() {
+ continue;
+ }
+ }
+ let due = sent.is_none_or(|(w, at)| w != wanted || now - at >= REFRESH);
+ if !due {
+ let (_, at) = sent.expect("sent");
+ std::thread::park_timeout(REFRESH - (now - at));
+ continue;
+ }
+ let wait = limit.wait(now);
+ if !wait.is_zero() {
+ std::thread::park_timeout(wait);
+ continue;
+ }
+ limit.record(now);
+ let c = client.as_mut().expect("connected");
+ match c.set_activity(activity(wanted.status, wanted.since)) {
+ Ok(()) => sent = Some((wanted, now)),
+ Err(e) => {
+ log::info!("Horizon: Discord presence disconnected ({e})");
+ client = None;
+ sent = None;
+ }
+ }
+ }
+}
+
+/// The activity Discord shows for `status`; `None` clears it.
+fn activity(status: Status, since: Option) -> Option {
+ let mut assets = json!({"large_image": "horizon", "large_text": "Horizon"});
+ let (details, state, party) = match status {
+ Status::Off => return None,
+ Status::Menus => ("In the menus", None, None),
+ Status::World {
+ play,
+ dimension,
+ mode,
+ } => {
+ if MODE_IMAGES {
+ let (key, text) = match mode {
+ GameMode::Survival => ("survival", "Survival"),
+ GameMode::Creative => ("creative", "Creative"),
+ GameMode::Adventure => ("adventure", "Adventure"),
+ GameMode::Spectator => ("spectator", "Spectator"),
+ };
+ assets["small_image"] = key.into();
+ assets["small_text"] = text.into();
+ }
+ let place = match dimension {
+ Dimension::Overworld => "In the Overworld",
+ Dimension::Nether => "In the Nether",
+ Dimension::End => "In the End",
+ };
+ let (details, party) = match play {
+ Play::Singleplayer => ("Singleplayer", None),
+ Play::Multiplayer => ("Multiplayer", None),
+ Play::Hosting { players } => ("Hosting a world", Some(players)),
+ };
+ (details, Some(place), party)
+ }
+ };
+ let mut a = json!({"details": details, "assets": assets});
+ if let Some(state) = state {
+ a["state"] = state.into();
+ }
+ if let Some(start) = since {
+ a["timestamps"] = json!({"start": start});
+ }
+ if let Some(players) = party {
+ let max = crate::lan::MAX_PLAYERS;
+ a["party"] = json!({
+ "id": format!("horizon-{}", std::process::id()),
+ "size": [players.clamp(1, max), max],
+ });
+ }
+ Some(a)
+}
+
+/// At most [`BURST`] updates in any [`WINDOW`].
+#[derive(Default)]
+struct RateLimit {
+ sent: VecDeque,
+}
+impl RateLimit {
+ /// How long until the next update may go.
+ fn wait(&self, now: Instant) -> Duration {
+ if self.sent.len() < BURST {
+ return Duration::ZERO;
+ }
+ (self.sent[0] + WINDOW).saturating_duration_since(now)
+ }
+ fn record(&mut self, now: Instant) {
+ if self.sent.len() == BURST {
+ self.sent.pop_front();
+ }
+ self.sent.push_back(now);
+ }
+}
+
+fn encode(op: u32, payload: &Value) -> Vec {
+ let body = payload.to_string();
+ let mut frame = Vec::with_capacity(8 + body.len());
+ frame.extend_from_slice(&op.to_le_bytes());
+ frame.extend_from_slice(&(body.len() as u32).to_le_bytes());
+ frame.extend_from_slice(body.as_bytes());
+ frame
+}
+
+fn read_frame(r: &mut impl Read) -> io::Result<(u32, Value)> {
+ let mut header = [0; 8];
+ r.read_exact(&mut header)?;
+ let op = u32::from_le_bytes(header[..4].try_into().expect("4 bytes"));
+ let len = u32::from_le_bytes(header[4..].try_into().expect("4 bytes")) as usize;
+ if len > 1 << 20 {
+ return Err(io::Error::new(
+ io::ErrorKind::InvalidData,
+ "frame too large",
+ ));
+ }
+ let mut body = vec![0; len];
+ r.read_exact(&mut body)?;
+ Ok((op, serde_json::from_slice(&body)?))
+}
+
+trait Pipe: Read + Write + Send {}
+impl Pipe for T {}
+
+struct Client {
+ pipe: Box,
+ nonce: u64,
+}
+impl Client {
+ /// The first Discord socket that answers the handshake with READY.
+ fn connect() -> Option {
+ sockets().into_iter().find_map(|path| {
+ let mut client = Client {
+ pipe: open(&path).ok()?,
+ nonce: 0,
+ };
+ match client.handshake() {
+ Ok(()) => {
+ log::info!("Horizon: connected to Discord for Rich Presence");
+ Some(client)
+ }
+ Err(e) => {
+ log::debug!("Horizon: Discord at {} refused: {e}", path.display());
+ None
+ }
+ }
+ })
+ }
+ fn handshake(&mut self) -> io::Result<()> {
+ let hello = json!({"v": 1, "client_id": DISCORD_APP_ID});
+ self.pipe.write_all(&encode(HANDSHAKE, &hello))?;
+ self.reply(|frame| frame["evt"] == "READY")
+ }
+ fn set_activity(&mut self, activity: Option) -> io::Result<()> {
+ self.nonce += 1;
+ let nonce = self.nonce.to_string();
+ let command = json!({
+ "cmd": "SET_ACTIVITY",
+ "args": {"pid": std::process::id(), "activity": activity},
+ "nonce": nonce,
+ });
+ self.pipe.write_all(&encode(FRAME, &command))?;
+ self.reply(|frame| frame["nonce"] == nonce.as_str())
+ }
+ /// Reads until the frame `ours` picks, answering pings; an ERROR is logged, not fatal.
+ fn reply(&mut self, ours: impl Fn(&Value) -> bool) -> io::Result<()> {
+ loop {
+ match read_frame(&mut self.pipe)? {
+ (FRAME, frame) if ours(&frame) => {
+ if frame["evt"] == "ERROR" {
+ log::info!("Horizon: Discord presence: {}", frame["data"]["message"]);
+ }
+ return Ok(());
+ }
+ (PING, frame) => self.pipe.write_all(&encode(PONG, &frame))?,
+ (CLOSE, frame) => {
+ return Err(io::Error::new(
+ io::ErrorKind::ConnectionAborted,
+ frame["message"].as_str().unwrap_or("closed").to_owned(),
+ ));
+ }
+ _ => {}
+ }
+ }
+ }
+ fn close(mut self) {
+ let _ = self.pipe.write_all(&encode(CLOSE, &json!({})));
+ }
+}
+
+/// Where Discord listens: `discord-ipc-0..9` in the temporary folders (and Flatpak's and
+/// Snap's subfolders) on Linux and macOS, named pipes on Windows.
+fn sockets() -> Vec {
+ sockets_with(|key| std::env::var_os(key), cfg!(windows))
+}
+
+fn sockets_with(var: impl Fn(&str) -> Option, windows: bool) -> Vec {
+ let names = (0..10).map(|n| format!("discord-ipc-{n}"));
+ if let Some(dir) = var(IPC_DIR_ENV) {
+ return names.map(|n| PathBuf::from(&dir).join(n)).collect();
+ }
+ if windows {
+ return names.map(|n| PathBuf::from(r"\\?\pipe\").join(n)).collect();
+ }
+ let mut dirs: Vec = ["XDG_RUNTIME_DIR", "TMPDIR", "TMP", "TEMP"]
+ .into_iter()
+ .filter_map(&var)
+ .map(PathBuf::from)
+ .collect();
+ dirs.push("/tmp".into());
+ dirs.dedup();
+ let mut paths = Vec::new();
+ for dir in dirs {
+ for sub in ["", "app/com.discordapp.Discord", "snap.discord"] {
+ paths.extend(names.clone().map(|n| dir.join(sub).join(n)));
+ }
+ }
+ paths
+}
+
+#[cfg(unix)]
+fn open(path: &std::path::Path) -> io::Result> {
+ let stream = std::os::unix::net::UnixStream::connect(path)?;
+ // A Discord that stops answering costs this thread a few seconds, never the game.
+ stream.set_read_timeout(Some(Duration::from_secs(5)))?;
+ Ok(Box::new(stream))
+}
+
+#[cfg(windows)]
+fn open(path: &std::path::Path) -> io::Result> {
+ let pipe = std::fs::OpenOptions::new()
+ .read(true)
+ .write(true)
+ .open(path)?;
+ Ok(Box::new(pipe))
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ fn world(play: Play, dimension: Dimension) -> Status {
+ Status::World {
+ play,
+ dimension,
+ mode: GameMode::Survival,
+ }
+ }
+
+ /// The folders a real Discord listens in: `$TMPDIR` on macOS, `$XDG_RUNTIME_DIR` on Linux (and its
+ /// Flatpak and Snap subfolders), named pipes on Windows.
+ #[test]
+ fn sockets_cover_where_discord_listens() {
+ let env = |pairs: &'static [(&'static str, &'static str)]| {
+ move |key: &str| {
+ pairs
+ .iter()
+ .find(|(k, _)| *k == key)
+ .map(|(_, v)| std::ffi::OsString::from(v))
+ }
+ };
+ let macos = sockets_with(env(&[("TMPDIR", "/var/folders/xy/abc/T/")]), false);
+ assert_eq!(
+ macos[0],
+ PathBuf::from("/var/folders/xy/abc/T/discord-ipc-0")
+ );
+ assert!(macos.contains(&PathBuf::from("/var/folders/xy/abc/T/discord-ipc-9")));
+ assert!(macos.contains(&PathBuf::from("/tmp/discord-ipc-0")));
+
+ let linux = sockets_with(
+ env(&[("XDG_RUNTIME_DIR", "/run/user/1000"), ("TMPDIR", "/tmp")]),
+ false,
+ );
+ assert_eq!(linux[0], PathBuf::from("/run/user/1000/discord-ipc-0"));
+ for path in [
+ "/run/user/1000/app/com.discordapp.Discord/discord-ipc-0",
+ "/run/user/1000/snap.discord/discord-ipc-0",
+ "/tmp/discord-ipc-0",
+ ] {
+ assert!(linux.contains(&PathBuf::from(path)), "{path}");
+ }
+ assert_eq!(linux.len(), 2 * 3 * 10, "/tmp is listed once");
+
+ let bare = sockets_with(env(&[]), false);
+ assert_eq!(bare[0], PathBuf::from("/tmp/discord-ipc-0"));
+
+ let windows = sockets_with(env(&[("TEMP", r"C:\Temp")]), true);
+ assert_eq!(windows.len(), 10);
+ // `Path::join` only uses `\` as the separator on Windows itself.
+ #[cfg(windows)]
+ assert_eq!(windows[0], PathBuf::from(r"\\?\pipe\discord-ipc-0"));
+
+ let fake = sockets_with(
+ env(&[("HORIZON_DISCORD_IPC_DIR", "/tmp/hz"), ("TMPDIR", "/x")]),
+ false,
+ );
+ assert_eq!(fake.len(), 10);
+ assert_eq!(fake[0], PathBuf::from("/tmp/hz/discord-ipc-0"));
+ }
+
+ #[test]
+ fn frames_round_trip() {
+ let frame = encode(FRAME, &json!({"cmd": "SET_ACTIVITY"}));
+ assert_eq!(&frame[..4], &[1, 0, 0, 0]);
+ assert_eq!(frame[4..8], (frame.len() as u32 - 8).to_le_bytes());
+ let (op, value) = read_frame(&mut frame.as_slice()).unwrap();
+ assert_eq!((op, value), (FRAME, json!({"cmd": "SET_ACTIVITY"})));
+ assert!(read_frame(&mut &frame[..6]).is_err());
+ let huge = [1, 0, 0, 0, 0, 0, 0, 2];
+ assert!(read_frame(&mut huge.as_slice()).is_err());
+ }
+
+ #[test]
+ fn activities_say_what_the_player_does_and_nothing_private() {
+ assert_eq!(activity(Status::Off, None), None);
+ let menus = activity(Status::Menus, None).unwrap();
+ assert_eq!(menus["details"], "In the menus");
+ assert!(menus.get("state").is_none() && menus.get("timestamps").is_none());
+ assert_eq!(menus["assets"]["large_image"], "horizon");
+
+ let single = activity(world(Play::Singleplayer, Dimension::Nether), Some(1000)).unwrap();
+ assert_eq!(single["details"], "Singleplayer");
+ assert_eq!(single["state"], "In the Nether");
+ assert_eq!(single["timestamps"]["start"], 1000);
+ assert!(single.get("party").is_none());
+ assert!(single["assets"].get("small_image").is_none());
+
+ let multi = activity(world(Play::Multiplayer, Dimension::End), Some(5)).unwrap();
+ assert_eq!(multi["details"], "Multiplayer");
+ assert_eq!(multi["state"], "In the End");
+
+ let host = world(Play::Hosting { players: 3 }, Dimension::Overworld);
+ let host = activity(host, Some(5)).unwrap();
+ assert_eq!(host["details"], "Hosting a world");
+ assert_eq!(host["state"], "In the Overworld");
+ assert_eq!(host["party"]["size"], json!([3, 8]));
+ }
+
+ #[test]
+ fn time_counts_from_entering_the_world() {
+ let mut w = Wanted {
+ status: Status::Menus,
+ since: None,
+ };
+ assert!(!w.update(Status::Menus, 10));
+ assert!(w.update(world(Play::Singleplayer, Dimension::Overworld), 20));
+ assert_eq!(w.since, Some(20));
+ // Another dimension, opening to LAN: the same visit.
+ assert!(w.update(world(Play::Singleplayer, Dimension::Nether), 30));
+ assert!(w.update(world(Play::Hosting { players: 1 }, Dimension::Nether), 40));
+ assert_eq!(w.since, Some(20));
+ assert!(w.update(Status::Menus, 50));
+ assert_eq!(w.since, None);
+ assert!(w.update(world(Play::Multiplayer, Dimension::Overworld), 60));
+ assert_eq!(w.since, Some(60));
+ assert!(w.update(Status::Off, 70));
+ assert_eq!(w.since, None);
+ }
+
+ #[test]
+ fn at_most_five_updates_in_twenty_seconds() {
+ let t = Instant::now();
+ let mut limit = RateLimit::default();
+ for i in 0..5 {
+ let now = t + Duration::from_secs(i);
+ assert_eq!(limit.wait(now), Duration::ZERO);
+ limit.record(now);
+ }
+ assert_eq!(
+ limit.wait(t + Duration::from_secs(5)),
+ Duration::from_secs(15)
+ );
+ assert_eq!(limit.wait(t + WINDOW), Duration::ZERO);
+ limit.record(t + WINDOW);
+ assert_eq!(limit.wait(t + WINDOW), Duration::from_secs(1));
+ }
+
+ /// A fake Discord: answers the handshake with READY, each command with its nonce, after a ping.
+ #[cfg(unix)]
+ #[test]
+ fn talks_to_discord_over_its_socket() {
+ let dir = std::env::temp_dir().join(format!("horizon-discord-{}", std::process::id()));
+ std::fs::create_dir_all(&dir).unwrap();
+ let path = dir.join("discord-ipc-0");
+ let _ = std::fs::remove_file(&path);
+ let listener = std::os::unix::net::UnixListener::bind(&path).unwrap();
+ let server = std::thread::spawn(move || {
+ let (mut s, _) = listener.accept().unwrap();
+ let (op, hello) = read_frame(&mut s).unwrap();
+ assert_eq!((op, &hello["v"]), (HANDSHAKE, &json!(1)));
+ let ready = json!({"cmd": "DISPATCH", "evt": "READY", "data": {"v": 1}});
+ s.write_all(&encode(FRAME, &ready)).unwrap();
+ let mut got = Vec::new();
+ for _ in 0..2 {
+ let (op, cmd) = read_frame(&mut s).unwrap();
+ assert_eq!(op, FRAME);
+ s.write_all(&encode(PING, &json!({"n": 1}))).unwrap();
+ assert_eq!(read_frame(&mut s).unwrap(), (PONG, json!({"n": 1})));
+ let reply = json!({"cmd": "SET_ACTIVITY", "nonce": cmd["nonce"], "data": null});
+ s.write_all(&encode(FRAME, &reply)).unwrap();
+ got.push(cmd);
+ }
+ got
+ });
+ let mut client = Client {
+ pipe: open(&path).unwrap(),
+ nonce: 0,
+ };
+ client.handshake().unwrap();
+ let shown = activity(world(Play::Singleplayer, Dimension::End), Some(7));
+ client.set_activity(shown.clone()).unwrap();
+ client.set_activity(None).unwrap();
+ let got = server.join().unwrap();
+ assert_eq!(got[0]["cmd"], "SET_ACTIVITY");
+ assert_eq!(got[0]["args"]["pid"], std::process::id());
+ assert_eq!(got[0]["args"]["activity"], shown.unwrap());
+ assert_eq!(got[1]["args"]["activity"], Value::Null);
+ assert_ne!(got[0]["nonce"], got[1]["nonce"]);
+ let _ = std::fs::remove_dir_all(dir);
+ }
+}
diff --git a/crates/horizon-client/src/entity_nbt.rs b/crates/horizon-client/src/entity_nbt.rs
index 49ea776ba..bf0764a6b 100644
--- a/crates/horizon-client/src/entity_nbt.rs
+++ b/crates/horizon-client/src/entity_nbt.rs
@@ -1155,6 +1155,72 @@ pub fn arrow_from_nbt(
Some((p, tag.get("inBlockState").cloned()))
}
+/// `LargeFireball` and `SmallFireball`: `AbstractHurtingProjectile`'s
+/// `acceleration_power`, `Projectile`'s owner and flags, `ExplosionPower`.
+pub fn fireball_to_nbt(
+ p: &Projectile,
+ uuid: [i32; 4],
+ owner: Option<[i32; 4]>,
+ raw: Option<&Tag>,
+) -> Option {
+ let power = match p.kind {
+ ProjectileKind::LargeFireball { power } => Some(power),
+ ProjectileKind::SmallFireball => None,
+ _ => return None,
+ };
+ let base = Base {
+ id: p.kind.id(),
+ uuid,
+ position: p.position,
+ motion: p.velocity,
+ rotation: [p.yaw, p.pitch],
+ on_ground: false,
+ fall_distance: 0.0,
+ };
+ let mut tag = base.tag(raw);
+ put(
+ &mut tag,
+ "acceleration_power",
+ Tag::Double(p.acceleration.to_bits()),
+ );
+ // Projectile: LeftOwner only when set; HasBeenShot once it has ticked
+ // (a fireball saved before its first tick keeps what it was loaded with).
+ if let Tag::Compound(map) = &mut tag {
+ map.remove(&"LeftOwner".into());
+ }
+ if p.left_owner {
+ put(&mut tag, "LeftOwner", Tag::Byte(1));
+ }
+ if p.age > 0 || tag.get("HasBeenShot").is_none() {
+ put(&mut tag, "HasBeenShot", Tag::Byte(i8::from(p.age > 0)));
+ }
+ if let Some(power) = power {
+ put(&mut tag, "ExplosionPower", Tag::Byte(power as i8));
+ }
+ if let Some(owner) = owner {
+ put(&mut tag, "Owner", Tag::IntArray(owner.to_vec()));
+ }
+ Some(tag)
+}
+
+pub fn fireball_from_nbt(tag: &Tag, player: Option<[i32; 4]>) -> Option {
+ let kind = match kind(tag)?.as_str() {
+ "minecraft:fireball" => ProjectileKind::LargeFireball {
+ power: number(tag.get("ExplosionPower")).unwrap_or(1) as i32,
+ },
+ "minecraft:small_fireball" => ProjectileKind::SmallFireball,
+ _ => return None,
+ };
+ let owner = uuid_from_tag(tag.get("Owner"));
+ let from_player = player.is_some() && owner == player;
+ let mut p = Projectile::new(kind, position(tag)?, from_player.then_some(Who::Player));
+ p.velocity = motion(tag);
+ [p.yaw, p.pitch] = rotation(tag);
+ p.left_owner = flag(tag, "LeftOwner");
+ p.acceleration = float(tag.get("acceleration_power")).unwrap_or(0.1);
+ Some(p)
+}
+
/// `FallingBlockEntity`: BlockState, Time, DropItem, HurtEntities.
#[allow(clippy::too_many_arguments)]
pub fn falling_block_to_nbt(
@@ -2139,3 +2205,41 @@ mod sheep_nbt_tests {
assert_eq!((back.extra.color, back.extra.sheared), (14, true));
}
}
+
+#[cfg(test)]
+mod fireball_nbt_tests {
+ use super::*;
+ #[test]
+ fn a_fireball_round_trips_its_flight() {
+ let raw = Tag::compound([
+ ("id", Tag::String("minecraft:fireball".into())),
+ ("Pos", doubles(&[1.0, 70.0, -2.5])),
+ ("Motion", doubles(&[0.0, -0.5, 1.0])),
+ ("ExplosionPower", Tag::Byte(4)),
+ ("acceleration_power", Tag::Double(0.0f64.to_bits())),
+ ]);
+ let p = fireball_from_nbt(&raw, None).unwrap();
+ assert_eq!(p.kind, ProjectileKind::LargeFireball { power: 4 });
+ assert_eq!((p.velocity.z, p.acceleration), (1.0, 0.0));
+ let back = fireball_to_nbt(&p, [1, 2, 3, 4], None, None).unwrap();
+ assert_eq!(number(back.get("ExplosionPower")), Some(4));
+ assert_eq!(float(back.get("acceleration_power")), Some(0.0));
+ // Projectile.addAdditionalSaveData: no LeftOwner unless set, HasBeenShot always.
+ assert!(back.get("LeftOwner").is_none());
+ assert_eq!(number(back.get("HasBeenShot")), Some(0));
+ assert_eq!(
+ read_doubles::<3>(back.get("Motion")),
+ Some([0.0, -0.5, 1.0])
+ );
+ // A default fireball keeps vanilla's power and acceleration.
+ let plain = Tag::compound([
+ ("id", Tag::String("minecraft:fireball".into())),
+ ("Pos", doubles(&[0.0, 0.0, 0.0])),
+ ]);
+ let p = fireball_from_nbt(&plain, None).unwrap();
+ assert_eq!(
+ (p.kind, p.acceleration),
+ (ProjectileKind::LargeFireball { power: 1 }, 0.1)
+ );
+ }
+}
diff --git a/crates/horizon-client/src/extras.rs b/crates/horizon-client/src/extras.rs
index 698741846..40e87214e 100644
--- a/crates/horizon-client/src/extras.rs
+++ b/crates/horizon-client/src/extras.rs
@@ -1,7 +1,8 @@
//! Horizon's optional extras (zoom, FPS counter, keystroke overlay): their
//! settings, kept in `horizon-extras.txt` next to `options.txt` so that file
//! stays exactly vanilla's, and the logic behind them. Every extra is off by
-//! default; see `docs/extras.md`.
+//! default; see `docs/extras.md`. Horizon's own switches outside the Extras page
+//! (No AI, Agent Control, Discord Rich Presence) are kept here too.
use std::{collections::VecDeque, fs, path::Path};
pub const FILE: &str = "horizon-extras.txt";
@@ -112,6 +113,8 @@ pub struct Extras {
/// Agents may control the game the player starts: it opens its control socket for
/// horizon-ctl and MCP clients (off by default; an agent's own launch always opens it).
pub agent_control: bool,
+ /// "Playing Horizon" on the player's Discord profile (`discord_presence`; on by default).
+ pub discord_presence: bool,
}
impl Default for Extras {
fn default() -> Self {
@@ -142,6 +145,7 @@ impl Default for Extras {
sort_key: "key.keyboard.unknown".into(),
no_ai: false,
agent_control: false,
+ discord_presence: true,
}
}
}
@@ -207,6 +211,7 @@ impl Extras {
"sortKey" if value.starts_with("key.") => e.sort_key = value.to_owned(),
horizon_core::no_ai::KEY => e.no_ai = flag(e.no_ai),
"agentControl" => e.agent_control = flag(e.agent_control),
+ "discordPresence" => e.discord_presence = flag(e.discord_presence),
_ => {}
}
}
@@ -214,7 +219,7 @@ impl Extras {
}
pub fn serialize(&self) -> String {
format!(
- "fullbright:{}\ndynamicLights:{}\nzoom:{}\nzoomKey:{}\nzoomLevel:{}\nzoomSmooth:{}\nzoomSensitivity:{}\nfps:{}\nfpsCorner:{}\nfpsLows:{}\nkeystrokes:{}\nkeystrokesCorner:{}\nkeystrokesCps:{}\nminimap:{}\nminimapCorner:{}\nminimapSize:{}\nminimapShape:{}\nminimapZoom:{}\nminimapRotate:{}\nautoReconnect:{}\nmouseTweaks:{}\nmouseTweaksWheel:{}\nsort:{}\nsortKey:{}\n{}:{}\nagentControl:{}\n",
+ "fullbright:{}\ndynamicLights:{}\nzoom:{}\nzoomKey:{}\nzoomLevel:{}\nzoomSmooth:{}\nzoomSensitivity:{}\nfps:{}\nfpsCorner:{}\nfpsLows:{}\nkeystrokes:{}\nkeystrokesCorner:{}\nkeystrokesCps:{}\nminimap:{}\nminimapCorner:{}\nminimapSize:{}\nminimapShape:{}\nminimapZoom:{}\nminimapRotate:{}\nautoReconnect:{}\nmouseTweaks:{}\nmouseTweaksWheel:{}\nsort:{}\nsortKey:{}\n{}:{}\nagentControl:{}\ndiscordPresence:{}\n",
bool_text(self.fullbright),
bool_text(self.dynamic_lights),
bool_text(self.zoom),
@@ -246,6 +251,7 @@ impl Extras {
horizon_core::no_ai::KEY,
bool_text(self.no_ai),
bool_text(self.agent_control),
+ bool_text(self.discord_presence),
)
}
/// Binds the extra key `name` (`ZOOM_KEY`, `SORT_KEY`); false for
@@ -466,6 +472,8 @@ pub enum Item {
/// Not on the Extras page: Horizon Settings shows No AI, its AI Agent page Agent Control.
NoAi,
AgentControl,
+ /// On the Horizon Settings page.
+ DiscordPresence,
}
/// The Extras page: headers and items.
pub fn rows() -> Vec> {
@@ -546,6 +554,7 @@ impl Item {
Item::KeystrokesCps => "Clicks per second",
Item::NoAi => "No AI",
Item::AgentControl => "Agent Control",
+ Item::DiscordPresence => "Discord Rich Presence",
}
}
/// The switch this setting belongs to: it does nothing while that is off.
@@ -559,7 +568,7 @@ impl Item {
MouseTweaksWheel => MouseTweaks,
SortKey => Sort,
Fullbright | DynamicLights | Zoom | Minimap | Fps | Keystrokes | MouseTweaks | Sort
- | AutoReconnect | NoAi | AgentControl => {
+ | AutoReconnect | NoAi | AgentControl | DiscordPresence => {
return None;
}
})
@@ -606,6 +615,9 @@ impl Item {
Item::NoAi => {
"Hides and turns off every AI feature: agent control, horizon-ctl and the MCP servers. The launcher's switch too."
}
+ Item::DiscordPresence => {
+ "Shows Playing Horizon on your Discord profile while Discord runs: menus, single player or multiplayer, the dimension and the time played. Never a world's name or a server's address."
+ }
Item::AgentControl => {
"Your own AI agent can play this game through horizon-ctl or an MCP client, on this computer only."
}
@@ -641,6 +653,7 @@ impl Item {
Item::Sort => e.sort,
Item::NoAi => e.no_ai,
Item::AgentControl => e.agent_control,
+ Item::DiscordPresence => e.discord_presence,
_ => return None,
})
}
@@ -698,6 +711,7 @@ impl Item {
Item::MinimapZoom => e.minimap_zoom = next(&MINIMAP_ZOOMS, e.minimap_zoom, back),
Item::NoAi => e.no_ai = !e.no_ai,
Item::AgentControl => e.agent_control = !e.agent_control,
+ Item::DiscordPresence => e.discord_presence = !e.discord_presence,
Item::ZoomKey | Item::SortKey => {}
}
}
@@ -721,6 +735,7 @@ mod tests {
assert!(!d.fullbright && !d.dynamic_lights);
assert!(!d.zoom && !d.fps && !d.keystrokes && !d.minimap && !d.auto_reconnect);
assert!(!d.mouse_tweaks && !d.sort);
+ assert!(d.discord_presence);
assert_eq!(Extras::parse(""), d);
assert_eq!(Extras::parse(&d.serialize()), d);
let mut e = d.clone();
@@ -746,6 +761,7 @@ mod tests {
e.mouse_tweaks_wheel = false;
e.sort = true;
e.sort_key = "key.keyboard.r".into();
+ e.discord_presence = false;
assert_eq!(Extras::parse(&e.serialize()), e);
}
diff --git a/crates/horizon-client/src/fog.rs b/crates/horizon-client/src/fog.rs
index 942bae556..11ffda151 100644
--- a/crates/horizon-client/src/fog.rs
+++ b/crates/horizon-client/src/fog.rs
@@ -198,6 +198,8 @@ pub struct FogInputs<'a> {
pub blindness: Option<(i32, bool)>,
/// The darkness effect's blend factor, while the effect is on.
pub darkness: Option,
+ /// `GameRenderer.bossOverlayWorldDarkening`: a wither's bar dims the fog.
+ pub darken_world: f32,
/// `BossHealthOverlay.shouldCreateWorldFog`: a boss bar with
/// `createWorldFog` is shown (the Ender Dragon's).
pub boss_world_fog: bool,
@@ -263,6 +265,13 @@ pub fn setup_fog(tables: &FogTables, state: &FogState, input: &FogInputs) -> Fog
let brightness = (1.0 - darkness) * (1.0 - darkness);
color = color.map(|c| c * brightness);
}
+ // FogRenderer.computeFogColor: a boss bar's world darkening.
+ if input.darken_world > 0.0 {
+ let t = input.darken_world;
+ color[0] += (color[0] * 0.7 - color[0]) * t;
+ color[1] += (color[1] * 0.6 - color[1]) * t;
+ color[2] += (color[2] * 0.6 - color[2]) * t;
+ }
let brighten = if eye_in_water { water_vision } else { 0.0 };
if color.iter().all(|&c| c != 0.0) {
let scale = 1.0 / color[0].max(color[1]).max(color[2]);
@@ -394,6 +403,7 @@ mod tests {
skybox: true,
blindness: None,
darkness: None,
+ darken_world: 0.0,
boss_world_fog: false,
}
}
@@ -422,6 +432,25 @@ mod tests {
assert_eq!(water.environmental_start, -8.0);
}
#[test]
+ fn boss_darkening_dims_fog_color() {
+ // FogRenderer.computeFogColor: lerp toward 70/60/60% of each channel.
+ let sky = Sky {
+ fog_color: [1.0, 1.0, 1.0],
+ sky_color: [1.0, 1.0, 1.0],
+ ..Sky::default()
+ };
+ let tables = FogTables {
+ water_fog_end: vec![1.0],
+ };
+ let mut input = inputs(&sky);
+ input.skybox = false;
+ input.darken_world = 1.0;
+ let fog = setup_fog(&tables, &FogState::default(), &input);
+ assert!((fog.color[0] - 0.7).abs() < 1.0e-5);
+ assert!((fog.color[1] - 0.6).abs() < 1.0e-5);
+ assert!((fog.color[2] - 0.6).abs() < 1.0e-5);
+ }
+ #[test]
fn void_darkness_starts_32_above_the_floor() {
let sky = Sky {
fog_end: 1024.0,
diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs
index 676f1aea6..7fcb3be89 100644
--- a/crates/horizon-client/src/game.rs
+++ b/crates/horizon-client/src/game.rs
@@ -36,6 +36,7 @@ mod debug_keys;
mod decorated_pot;
mod dedicated;
mod deflect;
+mod discord;
mod dispense_fixture;
mod dispenser;
mod dragon;
@@ -141,6 +142,7 @@ mod sculk;
mod sculk_fixture;
mod server_packs;
mod server_travel;
+mod shader_packs;
mod shield;
mod sign_edit;
mod sniffers;
@@ -1571,6 +1573,8 @@ struct Game<'a> {
score: scoreboard::ScoreState,
fns: functions::FnState,
bosses: bossbars::BossState,
+ /// `Hud.bossOverlay`: the bars this window is showing.
+ boss_overlay: horizon_client::boss_overlay::BossOverlay,
exec: commands::execute::ExecState,
rand_sequences: horizon_client::random_sequences::RandomSequences,
border: horizon_client::worldborder::WorldBorder,
@@ -4083,6 +4087,8 @@ impl Game<'_> {
self.track_experience_display();
// `/tick freeze` stops the world but not the player.
let running = self.clock.world_runs();
+ // GameRenderer.tick: a wither's bar darkens the world, then fades.
+ self.boss_overlay.tick_darken(running);
if running {
self.world.game_time += 1;
if self.ui.rules.bool("advance_weather") {
@@ -4442,6 +4448,8 @@ impl Game<'_> {
});
horizon_client::spans::time("tick_particles", || self.tick_particles());
}
+ // ServerBossEvent broadcasts, after this level's entities have ticked.
+ self.publish_boss_bars();
// Minecraft.handleKeybinds: held use repeats only while no item is in
// use (a raised shield or a drawn bow places and uses nothing).
if self.right
@@ -7976,6 +7984,8 @@ impl Game<'_> {
self.session_lock = None;
horizon_client::crash::clear_detail("World");
self.debug_charts.reset();
+ self.boss_overlay.reset();
+ self.bosses = Default::default();
self.streaming.paused = true;
self.world = World::new(self.res.facts().air, 0);
self.player = None;
@@ -9554,13 +9564,13 @@ impl Game<'_> {
let (x, y) = (ox + 9.0 + c as f32 * 18.0, oy + 112.0);
let stack = self.inventory[c].clone();
self.draw_slot_item(batch, drag.as_ref(), c, stack.clone(), x, y);
- if let Some(stack) = stack
- && self.cursor.0 >= x
+ if self.cursor.0 >= x
&& self.cursor.0 < x + 16.0
&& self.cursor.1 >= y
&& self.cursor.1 < y + 16.0
{
- hovered = Some(stack);
+ batch.fill(&self.gui.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128));
+ hovered = stack;
}
}
let scrollable = self.creative_screen.rows(&self.pack.names) > 5;
@@ -10077,6 +10087,11 @@ impl Game<'_> {
} else {
self.gather_dynamic_lights(camera, alpha);
}
+ let pack_inputs = if title {
+ Default::default()
+ } else {
+ self.shader_pack_inputs(camera, alpha as f32)
+ };
let frame = Frame {
weather: &weather,
weather_time: horizon_client::weather::Time::new(self.world.game_time, alpha as f32),
@@ -10109,7 +10124,7 @@ impl Game<'_> {
if !self.settings.horizon.fog
&& !underwater
&& self.darkness_fog().is_none()
- && !self.dragon_bar_shown()
+ && !self.boss_overlay.should_create_world_fog()
&& self.potions.effects.get("blindness").is_none()
&& fog.environmental_end >= (self.streaming.radius * 16) as f32
{
@@ -10160,6 +10175,7 @@ impl Game<'_> {
hand: &hand,
hand_fov_degrees: self.hud_fov_degrees(camera_alpha as f32, camera.to_array()),
screen: &screen,
+ pack: pack_inputs,
border,
game_time: self.world.game_time as f32,
shader_game_time: ((self.world.game_time % 24000) as f32 + alpha as f32) / 24000.0,
@@ -10180,6 +10196,9 @@ impl Game<'_> {
darkness: self.darkness_lighting(alpha as f32),
night_vision: self.night_vision_intensity(),
block_flicker: self.fog.block_light_flicker,
+ boss_darken: self
+ .boss_overlay
+ .darken_amount(self.clock.fraction() as f32),
menu_blur: self.menu_blur(),
};
let result = match self.renderer.as_mut() {
@@ -11407,6 +11426,7 @@ impl ApplicationHandler for Game<'_> {
self.track_toggle_screens();
// For the "I'm playing" ping: an atomic, sent on when it changes.
horizon_client::heartbeat::set_lan(self.is_published());
+ self.update_discord_presence();
let steps = self.clock.advance(elapsed);
// The world ticking in the frame: once its ticks took a
// tick's length, the rest are dropped (`FixedStep::tick_fits`).
@@ -11986,6 +12006,7 @@ impl<'a> Game<'a> {
score: Default::default(),
fns: Default::default(),
bosses: Default::default(),
+ boss_overlay: Default::default(),
exec: Default::default(),
rand_sequences: Default::default(),
border: Default::default(),
@@ -12077,6 +12098,8 @@ enum PendingWorldEntry {
Server {
address: String,
name: String,
+ /// A transfer's carried-over server cookies (`TransferState`).
+ cookies: Option,
},
}
@@ -12151,8 +12174,12 @@ impl Game<'_> {
}) => {
self.open_world(&folder, name.as_deref(), seed, creative, create.as_deref())?;
}
- Some(PendingWorldEntry::Server { address, name }) => {
- self.connect_server(&address, &name)?;
+ Some(PendingWorldEntry::Server {
+ address,
+ name,
+ cookies,
+ }) => {
+ self.connect_server_with_cookies(&address, &name, cookies)?;
}
None => {}
}
@@ -12704,6 +12731,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> {
hand: &[],
hand_fov_degrees: 70.0,
screen: &[],
+ pack: Default::default(),
border: None,
game_time: 0.0,
shader_game_time: 0.0,
@@ -12713,6 +12741,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> {
darkness: (0.0, 0.0),
night_vision: 0.0,
block_flicker: 0.0,
+ boss_darken: 0.0,
menu_blur: None,
}
}
@@ -12875,6 +12904,7 @@ fn write_report(game: &Game<'_>) -> Result<()> {
fn run_event_loop(mut game: Game<'_>) -> Result<()> {
EventLoop::new()?.run_app(&mut game)?;
+ horizon_client::discord_presence::stop();
write_report(&game)?;
if let Some(e) = game.error.take() {
return Err(e);
@@ -13232,6 +13262,7 @@ fn run_loading(
};
let mut app = App::Loading(Box::new(loading));
EventLoop::new()?.run_app(&mut app)?;
+ horizon_client::discord_presence::stop();
match app {
App::Ready(mut game) => {
write_report(&game)?;
@@ -13282,6 +13313,14 @@ pub fn run() -> Result<()> {
horizon_client::spans::enable(options.spikes.is_some());
let vanilla_root = options.resources.clone();
let early_settings = Settings::load(&std::env::current_dir()?.join("options.txt"));
+ // "Playing Horizon" on Discord: never for a server; an automated run only talks to a test's fake Discord.
+ if options.dedicated.is_none() {
+ let automated = options.benchmark.is_some()
+ || options.offscreen
+ || options.frames.is_some()
+ || options.world_frames.is_some();
+ horizon_client::discord_presence::start(early_settings.extras.discord_presence, automated);
+ }
// Snapshots of derived tables live in the game folder, never beside the
// shared resources.
Behaviours::set_cache_dir(std::env::current_dir()?.join(".horizon-cache"));
diff --git a/crates/horizon-client/src/game/agent.rs b/crates/horizon-client/src/game/agent.rs
index f6b68aa74..57c12da97 100644
--- a/crates/horizon-client/src/game/agent.rs
+++ b/crates/horizon-client/src/game/agent.rs
@@ -469,7 +469,8 @@ impl Game<'_> {
"flying": p.flying,
"fall_flying": p.fall_flying,
"sneaking": self.keys.contains(&KeyCode::ShiftLeft),
- "sprinting": self.keys.contains(&KeyCode::ControlLeft),
+ "sprinting": p.sprinting,
+ "fov_modifier": self.view.fov_modifier,
"health": p.health.health(),
"absorption": p.health.absorption(),
// The hurt animation's ticks left (the camera's hurt tilt).
diff --git a/crates/horizon-client/src/game/bossbars.rs b/crates/horizon-client/src/game/bossbars.rs
index ec7b72632..c6acb9616 100644
--- a/crates/horizon-client/src/game/bossbars.rs
+++ b/crates/horizon-client/src/game/bossbars.rs
@@ -1,22 +1,29 @@
//! `/bossbar` (BossBarCommands) and drawing the custom boss bars.
use super::{
- Game,
- commands::{R, err},
+ Dim, Game,
+ commands::{R, Target, err},
};
use horizon_client::{
+ boss_overlay,
bossbar::{self, BossBars},
command::{Arg, Context},
- hud_overlays, save,
- scoreboard::{self as sb, Comp, comp_text},
+ mobs::Species,
+ save,
+ scoreboard::{self as sb, Comp, json_to_tag},
scoreboard_cmd::format_list,
text::Text,
};
+use horizon_core::random::RandomSource;
+use horizon_protocol::packets::play::{self, BossAction, Clientbound as C};
use horizon_world::nbt::Tag;
+use std::collections::{HashMap, HashSet};
#[derive(Default)]
pub(super) struct BossState {
pub bars: BossBars,
loaded: bool,
+ /// What each viewer was last sent, so a change becomes one packet.
+ sent: HashMap>,
}
fn num(n: impl std::fmt::Display) -> Text {
@@ -36,7 +43,7 @@ impl Game<'_> {
if let Some(root) = save::read_dat(&self.bossbar_path())
&& let Some(data) = root.get("data")
{
- self.bosses.bars = BossBars::unpack(data, self.level.player_uuid);
+ self.bosses.bars = BossBars::unpack(data);
}
self.ui.registries.bossbars = self.bosses.bars.ids();
}
@@ -47,13 +54,15 @@ impl Game<'_> {
if self.bosses.bars.bars.is_empty() && !self.bossbar_path().exists() {
return;
}
- let _ = save::write_dat(
+ if let Err(e) = save::write_dat(
&self.bossbar_path(),
Tag::compound([
- ("data", self.bosses.bars.pack(self.level.player_uuid)),
+ ("data", self.bosses.bars.pack()),
("DataVersion", Tag::Int(horizon_world::DATA_VERSION)),
]),
- );
+ ) {
+ log::warn!("boss bars were not written: {e}");
+ }
}
pub(in crate::game) fn bossbar_exists(&self, id: &str) -> bool {
self.bosses.bars.get(id).is_some()
@@ -68,6 +77,7 @@ impl Game<'_> {
b.value = b.value.min(b.max);
}
}
+ self.publish_boss_bars();
}
fn bar_id(ctx: &Context) -> String {
match ctx.get("id") {
@@ -86,6 +96,7 @@ impl Game<'_> {
self.load_bossbars();
let result = self.bossbar_command(id, ctx);
self.ui.registries.bossbars = self.bosses.bars.ids();
+ self.publish_boss_bars();
result
}
fn bossbar_command(&mut self, id: &str, ctx: &Context) -> R {
@@ -97,6 +108,10 @@ impl Game<'_> {
}
let name = self.component_json(ctx, "name")?;
self.bosses.bars.add(&bar, name);
+ if let Some(b) = self.bosses.bars.get_mut(&bar) {
+ // CustomBossEvents.create: Mth.createInsecureUUID(level.random).
+ b.uuid = insecure_uuid(&mut self.world.random);
+ }
let shown = self
.bosses
.bars
@@ -173,19 +188,20 @@ impl Game<'_> {
i32::from(b.visible)
}
_ => {
- if b.player {
- let name = self.target_name(super::commands::Target::Player);
- self.feedback(Text::translate(
- "commands.bossbar.get.players.some",
- &[s, num(1), format_list(vec![name])],
- ));
- } else {
+ let names = self.bossbar_player_names(&b.players);
+ let n = names.len();
+ if n == 0 {
self.feedback(Text::translate(
"commands.bossbar.get.players.none",
&[s],
));
+ } else {
+ self.feedback(Text::translate(
+ "commands.bossbar.get.players.some",
+ &[s, num(n), format_list(names)],
+ ));
}
- i32::from(b.player)
+ n as i32
}
})
}
@@ -295,31 +311,46 @@ impl Game<'_> {
Ok(0)
}
_ => {
- // players []
- let include = if ctx.get("targets").is_some() {
- !self.entities(ctx, "targets", true)?.is_empty()
+ // players []: replace the set. No argument clears it.
+ let targets = if ctx.get("targets").is_some() {
+ self.entities(ctx, "targets", true)?
} else {
- false
+ Vec::new()
};
+ let mut uuids = Vec::new();
+ let mut names = Vec::new();
+ for t in &targets {
+ let Some(uuid) = self.player_target_uuid(*t) else {
+ continue;
+ };
+ if !uuids.contains(&uuid) {
+ uuids.push(uuid);
+ names.push(self.target_name(*t));
+ }
+ }
let b = self.bosses.bars.get_mut(bar).expect("checked");
- if b.player == include {
+ let mut had = b.players.clone();
+ had.sort();
+ let mut next = uuids.clone();
+ next.sort();
+ if had == next {
return Err(err("commands.bossbar.set.players.unchanged", &[]));
}
- b.player = include;
+ b.players = uuids;
+ let n = b.players.len();
let s = shown(self);
- if include {
- let name = self.target_name(super::commands::Target::Player);
- self.feedback(Text::translate(
- "commands.bossbar.set.players.success.some",
- &[s, num(1), format_list(vec![name])],
- ));
- } else {
+ if n == 0 {
self.feedback(Text::translate(
"commands.bossbar.set.players.success.none",
&[s],
));
+ } else {
+ self.feedback(Text::translate(
+ "commands.bossbar.set.players.success.some",
+ &[s, num(targets.len()), format_list(names)],
+ ));
}
- Ok(i32::from(include))
+ Ok(n as i32)
}
}
}
@@ -333,29 +364,316 @@ impl Game<'_> {
Ok(self.resolve_component(value))
}
- // ---- drawing ------------------------------------------------------------------
-
- /// The visible custom bars (`/bossbar`), after the built-in ones.
- pub(super) fn custom_bossbars(&self, bars: &mut Vec) {
- for b in self
- .bosses
- .bars
- .bars
- .iter()
- .filter(|b| b.visible && b.player)
- {
- bars.push(hud_overlays::BossBar {
- name: comp_text(&b.name),
- progress: b.progress(),
- color: bossbar::COLORS
+ /// Names of the online players in a boss bar's set, in join order.
+ fn bossbar_player_names(&self, players: &[[i32; 4]]) -> Vec {
+ self.known_boss_players()
+ .into_iter()
+ .filter(|(uuid, _)| players.contains(uuid))
+ .map(|(_, name)| name)
+ .collect()
+ }
+ /// The players who can be told about a bar: the one in place, then guests.
+ fn known_boss_players(&self) -> Vec<([i32; 4], Text)> {
+ let mut out = Vec::new();
+ if self.player.is_some() {
+ out.push((self.acting_uuid(), self.target_name(Target::Player)));
+ }
+ if let Some(host) = &self.lan {
+ for g in host.hub.guests.iter().filter(|g| g.placed) {
+ let ints = horizon_client::lan::playerdata::uuid_ints(g.uuid);
+ if out.iter().any(|(uuid, _)| *uuid == ints) {
+ continue;
+ }
+ out.push((ints, Text::literal(g.name.clone())));
+ }
+ }
+ out
+ }
+ fn player_target_uuid(&self, target: Target) -> Option<[i32; 4]> {
+ match target {
+ Target::Player => Some(self.acting_uuid()),
+ Target::Guest(conn) => self.lan.as_ref().and_then(|h| {
+ h.hub
+ .guests
.iter()
- .position(|c| *c == b.color)
- .unwrap_or(0),
- overlay: bossbar::STYLES
- .iter()
- .position(|s| *s == b.style)
- .unwrap_or(0),
- });
+ .find(|g| g.conn == conn)
+ .map(|g| horizon_client::lan::playerdata::uuid_ints(g.uuid))
+ }),
+ _ => None,
}
}
+
+ // ---- ServerBossEvent delivery ------------------------------------------------
+
+ /// Tell every viewer the boss events they should be seeing. The window
+ /// that simulates the world applies them to its own overlay; everyone
+ /// else gets `ClientboundBossEventPacket`s.
+ pub(super) fn publish_boss_bars(&mut self) {
+ if self.remote.is_some() {
+ return;
+ }
+ self.load_bossbars();
+ let now = boss_overlay::now_millis();
+ let viewers = self.boss_viewers();
+ let live: HashSet = viewers.iter().map(|v| v.uuid).collect();
+ self.bosses.sent.retain(|id, _| live.contains(id));
+ let mut packets = Vec::new();
+ for viewer in &viewers {
+ let desired = self.boss_events_for(viewer);
+ for event in self.diff_boss_events(viewer, desired) {
+ if viewer.local {
+ self.boss_overlay.apply(&event, now);
+ } else if let Some(conn) = viewer.conn {
+ packets.push((conn, C::BossEvent(event)));
+ }
+ }
+ }
+ if packets.is_empty() {
+ return;
+ }
+ let Some(host) = self.lan.as_ref() else {
+ return;
+ };
+ for (conn, packet) in &packets {
+ host.hub.send_to(*conn, packet);
+ }
+ }
+ fn boss_viewers(&self) -> Vec {
+ let mut out = Vec::new();
+ // While `as_guest` has swapped a guest in, the host's own position
+ // is not in place. Their overlay updates once the tick puts it back.
+ let local =
+ self.serving.is_none() && self.options.dedicated.is_none() && self.lan_acting.is_none();
+ if local && let Some(p) = &self.player {
+ let ints = self.level.player_uuid.unwrap_or_else(|| self.acting_uuid());
+ out.push(Viewer {
+ uuid: horizon_client::lan::playerdata::ints_uuid(ints),
+ ints,
+ at: [p.position.x, p.position.y, p.position.z],
+ alive: !p.health.dead_or_dying(),
+ here: true,
+ local: true,
+ conn: None,
+ view_chunks: self.settings.render_distance,
+ });
+ }
+ if let Some(host) = &self.lan {
+ for g in host.hub.guests.iter().filter(|g| g.placed) {
+ if out.iter().any(|v| v.uuid == g.uuid) {
+ continue;
+ }
+ out.push(Viewer {
+ uuid: g.uuid,
+ ints: horizon_client::lan::playerdata::uuid_ints(g.uuid),
+ at: g.position,
+ alive: !g.dead,
+ here: g.dimension == self.dim.id(),
+ local: false,
+ conn: Some(g.conn),
+ view_chunks: g.view_distance,
+ });
+ }
+ }
+ out
+ }
+ /// Custom bars (`CustomBossEvents.onPlayerConnect` sends them as a player
+ /// joins), then the dragon, withers and the raid.
+ fn boss_events_for(&self, viewer: &Viewer) -> Vec {
+ let mut out = Vec::new();
+ for b in &self.bosses.bars.bars {
+ if !b.visible || !b.players.contains(&viewer.ints) {
+ continue;
+ }
+ out.push(Offer {
+ id: b.uuid,
+ name: json_to_tag(&b.name),
+ progress: b.progress(),
+ color: color_index(&b.color),
+ overlay: style_index(&b.style),
+ darken: b.darken,
+ music: b.music,
+ fog: b.fog,
+ scope: Scope::Global,
+ });
+ }
+ if viewer.here
+ && let Some(progress) = self.dragon_boss_progress(viewer.at, viewer.alive)
+ {
+ out.push(Offer {
+ id: bossbar::stable_uuid("minecraft:ender_dragon"),
+ name: translate_tag("entity.minecraft.ender_dragon"),
+ progress,
+ color: 0,
+ overlay: 0,
+ darken: false,
+ music: true,
+ fog: true,
+ scope: Scope::Level(self.dim),
+ });
+ }
+ if viewer.here {
+ let range = f64::from(10.min(viewer.view_chunks.max(0)) * 16);
+ for m in self
+ .mobs
+ .iter()
+ .filter(|m| m.species() == Species::Wither && m.alive() && !m.removed)
+ {
+ let (dx, dz) = (m.position.x - viewer.at[0], m.position.z - viewer.at[2]);
+ if dx * dx + dz * dz > range * range {
+ continue;
+ }
+ let progress = if m.extra.counter > 0 {
+ 1.0 - m.extra.counter as f32 / horizon_client::mobs::wither::INVULNERABLE as f32
+ } else {
+ (m.health / m.attrs.max_health).clamp(0.0, 1.0)
+ };
+ let name = if let Some(text) = &m.custom_name_text {
+ json_to_tag(&text.component())
+ } else if let Some(name) = &m.custom_name {
+ Tag::String(name.as_str().into())
+ } else {
+ translate_tag("entity.minecraft.wither")
+ };
+ out.push(Offer {
+ id: super::lan::entity_uuid(m.id),
+ name,
+ progress,
+ color: 5,
+ overlay: 0,
+ darken: true,
+ music: false,
+ fog: false,
+ scope: Scope::Level(self.dim),
+ });
+ }
+ }
+ if viewer.here
+ && let Some((id, name, progress)) = self.raid_boss_at(viewer.at, viewer.alive)
+ {
+ out.push(Offer {
+ id: bossbar::stable_uuid(&format!("raid:{id}")),
+ name,
+ progress,
+ color: 2,
+ overlay: 2,
+ darken: false,
+ music: false,
+ fog: false,
+ scope: Scope::Level(self.dim),
+ });
+ }
+ out
+ }
+ /// The packets that take `viewer` from what it was last sent to `desired`
+ /// (`ServerBossEvent`'s broadcasts).
+ fn diff_boss_events(&mut self, viewer: &Viewer, desired: Vec) -> Vec {
+ let full = viewer.local;
+ let dim = self.dim;
+ let sent = self.bosses.sent.entry(viewer.uuid).or_default();
+ let mut out = Vec::new();
+ let event = |id, action| play::BossEvent { id, action };
+ sent.retain(|id, prev| {
+ let owned = full || prev.scope == Scope::Global || prev.scope == Scope::Level(dim);
+ let keep = !owned || desired.iter().any(|e| e.id == *id);
+ if !keep {
+ out.push(event(*id, BossAction::Remove));
+ }
+ keep
+ });
+ for offer in desired {
+ let Some(prev) = sent.get(&offer.id) else {
+ out.push(event(
+ offer.id,
+ BossAction::Add {
+ name: offer.name.clone(),
+ progress: offer.progress,
+ color: offer.color,
+ overlay: offer.overlay,
+ darken: offer.darken,
+ music: offer.music,
+ fog: offer.fog,
+ },
+ ));
+ sent.insert(offer.id, offer);
+ continue;
+ };
+ let id = offer.id;
+ if prev.progress != offer.progress {
+ let progress = offer.progress;
+ out.push(event(id, BossAction::UpdateProgress { progress }));
+ }
+ if prev.name != offer.name {
+ let name = offer.name.clone();
+ out.push(event(id, BossAction::UpdateName { name }));
+ }
+ if (prev.color, prev.overlay) != (offer.color, offer.overlay) {
+ let (color, overlay) = (offer.color, offer.overlay);
+ out.push(event(id, BossAction::UpdateStyle { color, overlay }));
+ }
+ if (prev.darken, prev.music, prev.fog) != (offer.darken, offer.music, offer.fog) {
+ let (darken, music, fog) = (offer.darken, offer.music, offer.fog);
+ out.push(event(
+ id,
+ BossAction::UpdateProperties { darken, music, fog },
+ ));
+ }
+ sent.insert(id, offer);
+ }
+ out
+ }
+ /// `ClientPacketListener.handleBossUpdate`.
+ pub(super) fn apply_boss_event(&mut self, packet: &play::BossEvent) {
+ self.boss_overlay.apply(packet, boss_overlay::now_millis());
+ }
+}
+
+/// `Mth.createInsecureUUID`.
+fn insecure_uuid(random: &mut impl RandomSource) -> u128 {
+ let most = random.next_long() & -61441 | 16384;
+ let least = random.next_long() & 4_611_686_018_427_387_903 | i64::MIN;
+ ((most as u64 as u128) << 64) | (least as u64 as u128)
+}
+fn translate_tag(key: &str) -> Tag {
+ Tag::compound([("translate", Tag::String(key.into()))])
+}
+fn color_index(color: &str) -> i32 {
+ bossbar::COLORS
+ .iter()
+ .position(|c| *c == color)
+ .unwrap_or(6) as i32
+}
+fn style_index(style: &str) -> i32 {
+ bossbar::STYLES
+ .iter()
+ .position(|s| *s == style)
+ .unwrap_or(0) as i32
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Scope {
+ Global,
+ Level(Dim),
+}
+struct Viewer {
+ uuid: u128,
+ ints: [i32; 4],
+ at: [f64; 3],
+ alive: bool,
+ here: bool,
+ local: bool,
+ conn: Option,
+ view_chunks: i32,
+}
+/// A boss event as one viewer should see it, and as it was last sent.
+struct Offer {
+ id: u128,
+ name: Tag,
+ progress: f32,
+ /// `BossBarColor` and `BossBarOverlay` ordinals.
+ color: i32,
+ overlay: i32,
+ darken: bool,
+ music: bool,
+ fog: bool,
+ scope: Scope,
}
diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs
index f760bd82f..ec85732ae 100644
--- a/crates/horizon-client/src/game/chat.rs
+++ b/crates/horizon-client/src/game/chat.rs
@@ -570,8 +570,14 @@ impl Game<'_> {
/// ChatScreen.handleChatInput: history, then a command or a chat line.
pub(super) fn handle_chat_input(&mut self, message: &str) {
self.ui.chat.add_recent(message);
- // On a server (single player's own included) the server runs it.
+ // On a server (single player's own included) the server runs it,
+ // unless a client mod owns the command.
if self.remote.is_some() {
+ if let Some(command) = message.strip_prefix('/')
+ && self.mod_command(command)
+ {
+ return;
+ }
self.send_chat(message);
return;
}
@@ -816,8 +822,12 @@ impl Game<'_> {
("data", data),
("DataVersion", Tag::Int(horizon_world::DATA_VERSION)),
]);
- let _ = horizon_client::save::write_dat(&path, root);
- let _ = write_difficulty(&self.world_root, self.ui.difficulty);
+ if let Err(e) = horizon_client::save::write_dat(&path, root) {
+ log::warn!("the world clocks were not written: {e}");
+ }
+ if let Err(e) = write_difficulty(&self.world_root, self.ui.difficulty) {
+ log::warn!("the difficulty was not written: {e}");
+ }
}
/// Death message in chat (CombatTracker.getDeathMessage, as far as the
/// cause is known to the client).
diff --git a/crates/horizon-client/src/game/commands.rs b/crates/horizon-client/src/game/commands.rs
index 2e551f440..19a16e261 100644
--- a/crates/horizon-client/src/game/commands.rs
+++ b/crates/horizon-client/src/game/commands.rs
@@ -42,7 +42,8 @@ pub(super) enum Target {
Mob(u32),
Item(u32),
Orb(usize),
- Arrow(usize),
+ /// By index in `creatures.projectiles`.
+ Projectile(usize),
Stand(u32),
Frame(u32),
Painting(u32),
@@ -327,7 +328,7 @@ impl Game<'_> {
.orbs
.get(i)
.map(|o| [o.position.x, o.position.y, o.position.z]),
- Target::Arrow(i) => self
+ Target::Projectile(i) => self
.creatures
.projectiles
.get(i)
@@ -382,7 +383,11 @@ impl Game<'_> {
}),
Target::Item(_) => "minecraft:item".into(),
Target::Orb(_) => "minecraft:experience_orb".into(),
- Target::Arrow(_) => "minecraft:arrow".into(),
+ Target::Projectile(i) => self
+ .creatures
+ .projectiles
+ .get(i)
+ .map_or_else(String::new, |p| p.kind.id().into()),
Target::Stand(_) => "minecraft:armor_stand".into(),
Target::Frame(id) => {
if self.item_frames.iter().any(|f| f.id == id && f.glow) {
@@ -503,6 +508,7 @@ impl Game<'_> {
_ => {}
}
if s.kind != 's' {
+ use horizon_client::projectiles::ProjectileKind as K;
candidates.extend(self.player_candidates(s));
candidates.extend(
self.mobs
@@ -517,8 +523,12 @@ impl Game<'_> {
.projectiles
.iter()
.enumerate()
- .filter(|(_, p)| p.arrow.is_some())
- .map(|(i, _)| Target::Arrow(i)),
+ // The kinds /data can write (entity_nbt).
+ .filter(|(_, p)| {
+ p.arrow.is_some()
+ || matches!(p.kind, K::LargeFireball { .. } | K::SmallFireball)
+ })
+ .map(|(i, _)| Target::Projectile(i)),
);
candidates.extend(self.armor_stands.iter().map(|a| Target::Stand(a.id)));
candidates.extend(self.item_frames.iter().map(|f| Target::Frame(f.id)));
@@ -1100,9 +1110,15 @@ impl Game<'_> {
if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) {
m.position = v;
m.previous = v;
- if let Some([yaw, _]) = rotation {
+ // Entity.teleportSetPosition: setYRot, setYHeadRot, setXRot
+ // (clamped to -90..90), then setOldRot.
+ if let Some([yaw, pitch]) = rotation {
m.yaw = yaw;
m.body_yaw = yaw;
+ m.head_yaw = yaw;
+ m.head_pitch = pitch.clamp(-90.0, 90.0);
+ m.previous_yaw = m.yaw;
+ m.previous_head_pitch = m.head_pitch;
}
}
}
@@ -1118,7 +1134,7 @@ impl Game<'_> {
o.previous = v;
}
}
- Target::Arrow(i) => {
+ Target::Projectile(i) => {
if let Some(a) = self.creatures.projectiles.get_mut(i) {
a.position = v;
a.previous = v;
@@ -1542,14 +1558,10 @@ impl Game<'_> {
self.orbs[i].age = u32::MAX / 2;
}
}
- Target::Arrow(i) => {
- if let Some(a) = self
- .creatures
- .projectiles
- .get_mut(i)
- .and_then(|p| p.arrow.as_mut())
- {
- a.removed = true;
+ // cmd_kill goes from the highest index down.
+ Target::Projectile(i) => {
+ if i < self.creatures.projectiles.len() {
+ self.creatures.projectiles.remove(i);
}
}
Target::Stand(id) => self.armor_stands.retain(|a| a.id != id),
@@ -1571,7 +1583,7 @@ impl Game<'_> {
let mut ordered = targets.clone();
ordered.sort_by_key(|t| {
std::cmp::Reverse(match t {
- Target::Orb(i) | Target::Arrow(i) => *i,
+ Target::Orb(i) | Target::Projectile(i) => *i,
_ => 0,
})
});
@@ -1579,9 +1591,6 @@ impl Game<'_> {
self.kill_target(t);
}
self.orbs.retain(|o| o.age < u32::MAX / 2);
- self.creatures
- .projectiles
- .retain(|p| !p.arrow.as_ref().is_some_and(|a| a.removed));
let message = if targets.len() == 1 {
Text::translate("commands.kill.success.single", &[names[0].clone()])
} else {
diff --git a/crates/horizon-client/src/game/commands/data.rs b/crates/horizon-client/src/game/commands/data.rs
index 6e4c9825f..18035ddd7 100644
--- a/crates/horizon-client/src/game/commands/data.rs
+++ b/crates/horizon-client/src/game/commands/data.rs
@@ -114,7 +114,7 @@ impl Game<'_> {
self.other_to_nbt(&o, uuid)
}
Target::Orb(i) => entity_nbt::orb_to_nbt(self.orbs.get(i)?, random_uuid()),
- Target::Arrow(i) => {
+ Target::Projectile(i) => {
let p = self.creatures.projectiles.get(i)?;
let owner = if p.owner == Some(horizon_client::mobs::Who::Player) {
player_uuid
@@ -126,7 +126,8 @@ impl Game<'_> {
.as_ref()
.and_then(|a| a.last_state)
.map(|s| self.state_to_nbt(s));
- entity_nbt::arrow_to_nbt(p, random_uuid(), owner, in_block, None)?
+ entity_nbt::arrow_to_nbt(p, random_uuid(), owner, in_block, None)
+ .or_else(|| entity_nbt::fireball_to_nbt(p, random_uuid(), owner, None))?
}
})
}
diff --git a/crates/horizon-client/src/game/control.rs b/crates/horizon-client/src/game/control.rs
index 3c80a0f32..a0d8987d8 100644
--- a/crates/horizon-client/src/game/control.rs
+++ b/crates/horizon-client/src/game/control.rs
@@ -513,7 +513,10 @@ impl Game<'_> {
if self.pending_screenshot.is_some() {
return Err("a screenshot is already pending".into());
}
- renderer.screenshot = Some(arg(1)?.into());
+ arg(1)?;
+ // The rest of the line: a path may hold spaces.
+ let path = line.trim_start().strip_prefix("screenshot").unwrap_or("");
+ renderer.screenshot = Some(path.trim().into());
self.pending_screenshot = Some(reply.clone());
Ok(None)
}
diff --git a/crates/horizon-client/src/game/debug_keys.rs b/crates/horizon-client/src/game/debug_keys.rs
index e0ad706de..61e2b2f05 100644
--- a/crates/horizon-client/src/game/debug_keys.rs
+++ b/crates/horizon-client/src/game/debug_keys.rs
@@ -185,7 +185,9 @@ impl Game<'_> {
// Minecraft.emergencySaveAndCrash: the world is saved, then the
// game stops; main writes the crash report.
let crash = horizon_client::crash::DebugCrash::new();
- let _ = self.save_game();
+ if let Err(e) = self.save_game() {
+ log::error!("the emergency save before the crash failed: {e}");
+ }
return Err(crash.into());
}
}
diff --git a/crates/horizon-client/src/game/dedicated.rs b/crates/horizon-client/src/game/dedicated.rs
index 4c436c60c..9cc892fe0 100644
--- a/crates/horizon-client/src/game/dedicated.rs
+++ b/crates/horizon-client/src/game/dedicated.rs
@@ -218,21 +218,22 @@ impl Lists {
use_whitelist: false,
enforce_whitelist: false,
};
+ // DedicatedPlayerList's constructor order and its LOGGER.warn lines.
let warn = |what: &str, r: std::result::Result<(), String>| {
if let Err(e) = r {
- log("WARN", &format!("Failed to load {what}: {e}"));
+ log("WARN", &format!("Failed to {what}: {e}"));
}
};
- // DedicatedPlayerList's constructor order.
- warn("user banlist", l.bans.load());
- let _ = l.bans.save();
- warn("ip banlist", l.ip_bans.load());
- let _ = l.ip_bans.save();
- warn("operators list", l.ops.load());
- warn("white-list", l.white.load());
- let _ = l.ops.save();
+ let saved = |r: std::io::Result<()>| r.map_err(|e| e.to_string());
+ warn("load user banlist", l.bans.load());
+ warn("save user banlist", saved(l.bans.save()));
+ warn("load ip banlist", l.ip_bans.load());
+ warn("save ip banlist", saved(l.ip_bans.save()));
+ warn("load operators list", l.ops.load());
+ warn("load white-list", l.white.load());
+ warn("save operators list", saved(l.ops.save()));
if !l.white.file.exists() {
- let _ = l.white.save();
+ warn("save white-list", saved(l.white.save()));
}
l
}
diff --git a/crates/horizon-client/src/game/discord.rs b/crates/horizon-client/src/game/discord.rs
new file mode 100644
index 000000000..23fd3edda
--- /dev/null
+++ b/crates/horizon-client/src/game/discord.rs
@@ -0,0 +1,43 @@
+//! What the player is doing, for Discord Rich Presence (`horizon_client::discord_presence`).
+use super::*;
+use horizon_client::discord_presence::{self as presence, Dimension, Play, Status};
+
+impl Game<'_> {
+ /// Each frame: only a change reaches the presence thread.
+ pub(super) fn update_discord_presence(&self) {
+ presence::set(self.discord_status());
+ }
+ fn discord_status(&self) -> Status {
+ if !self.settings.extras.discord_presence {
+ return Status::Off;
+ }
+ if self.title.is_some() {
+ return Status::Menus;
+ }
+ let play = if let Some(host) = &self.lan {
+ Play::Hosting {
+ players: 1 + host.hub.guests.len(),
+ }
+ } else if let Some(server) = &self.integrated {
+ match (server.published(), &self.remote) {
+ (Some(_), Some(remote)) => Play::Hosting {
+ players: remote.player_count(),
+ },
+ _ => Play::Singleplayer,
+ }
+ } else if self.remote.is_some() {
+ Play::Multiplayer
+ } else {
+ Play::Singleplayer
+ };
+ Status::World {
+ play,
+ dimension: match self.dim {
+ Dim::Overworld => Dimension::Overworld,
+ Dim::Nether => Dimension::Nether,
+ Dim::End => Dimension::End,
+ },
+ mode: self.mode,
+ }
+ }
+}
diff --git a/crates/horizon-client/src/game/dragon.rs b/crates/horizon-client/src/game/dragon.rs
index c6f5d419b..54b260c67 100644
--- a/crates/horizon-client/src/game/dragon.rs
+++ b/crates/horizon-client/src/game/dragon.rs
@@ -12,7 +12,6 @@ use horizon_client::{
hud_layout, hud_overlays,
mesher::Vertex,
particles::{ParticleOptions, ParticleType},
- text::Text,
};
use horizon_core::{
geometry::{Aabb, Vec3},
@@ -2157,23 +2156,12 @@ impl Game<'_> {
});
}
}
- /// `BossHealthOverlay`: the dragon's pink bar, then the withers', the
- /// raids' and the custom bars, in that order.
+ /// `BossHealthOverlay.extractRenderState`: whatever `publish_boss_bars`
+ /// (or a server's packets) put on this client's overlay.
pub(super) fn draw_boss_bars(&self, batch: &mut HudBatch) {
- let mut bars = Vec::new();
- if let Some(d) = self.dragon.as_ref().filter(|_| self.dragon_bar_shown()) {
- bars.push(hud_overlays::BossBar {
- name: Text::literal(
- self.translate("entity.minecraft.ender_dragon", "Ender Dragon"),
- ),
- progress: (d.health / MAX_HEALTH).clamp(0.0, 1.0),
- color: 0,
- overlay: 0,
- });
- }
- self.wither_bars(&mut bars);
- self.raid_bars(&mut bars);
- self.custom_bossbars(&mut bars);
+ let bars = self
+ .boss_overlay
+ .bars(horizon_client::boss_overlay::now_millis());
let draws = hud_overlays::boss_overlay(
batch.width as i32,
batch.height as i32,
@@ -2182,14 +2170,26 @@ impl Game<'_> {
);
hud_layout::paint(batch, &self.gui.atlas, &draws);
}
- /// The dragon fight's boss bar shows (`EnderDragonFight.dragonEvent`,
- /// with `setCreateWorldFog`).
- pub(super) fn dragon_bar_shown(&self) -> bool {
- self.dim == Dim::End && self.dragon.is_some()
+ /// The dragon fight's bar for a player at `at`
+ /// (`EnderDragonFight.dragonEvent`, visible while the fight is not won
+ /// and the player is alive within 192 blocks of (0, 128, 0)).
+ pub(super) fn dragon_boss_progress(&self, at: [f64; 3], alive: bool) -> Option {
+ if self.dim != Dim::End || !alive || !self.fight.loaded || self.fight.killed {
+ return None;
+ }
+ let near = at[0].powi(2) + (at[1] - 128.0).powi(2) + at[2].powi(2) <= 192.0 * 192.0;
+ if !near {
+ return None;
+ }
+ Some(
+ self.dragon
+ .as_ref()
+ .map_or(1.0, |d| (d.health / MAX_HEALTH).clamp(0.0, 1.0)),
+ )
}
- /// `music.dragon` while the boss bar plays music.
+ /// `BossHealthOverlay.shouldPlayMusic`.
pub(super) fn boss_music(&self) -> bool {
- self.dim == Dim::End && self.dragon.is_some() || self.wither_near()
+ self.boss_overlay.should_play_music()
}
}
pub(super) struct DragonFireball {
diff --git a/crates/horizon-client/src/game/fov.rs b/crates/horizon-client/src/game/fov.rs
index 37796c8c3..27d3fb61e 100644
--- a/crates/horizon-client/src/game/fov.rs
+++ b/crates/horizon-client/src/game/fov.rs
@@ -74,7 +74,7 @@ impl Game<'_> {
})
}
/// The fluid at the camera, as `Camera.getFluidInCamera` reports it.
- fn camera_fluid(&self, camera: [f64; 3]) -> CameraFluid {
+ pub(super) fn camera_fluid(&self, camera: [f64; 3]) -> CameraFluid {
match fog_type(&self.world, self.res.facts(), camera, self.forward()) {
FogType::Water => CameraFluid::Water,
FogType::Lava => CameraFluid::Lava,
diff --git a/crates/horizon-client/src/game/lan_entities.rs b/crates/horizon-client/src/game/lan_entities.rs
index db0c3e8b2..dd272719a 100644
--- a/crates/horizon-client/src/game/lan_entities.rs
+++ b/crates/horizon-client/src/game/lan_entities.rs
@@ -321,20 +321,7 @@ impl Game<'_> {
}
for p in self.creatures.projectiles.iter().filter(|p| p.id != 0) {
use horizon_client::projectiles::ProjectileKind as K;
- let kind = match &p.kind {
- K::Arrow { .. } => "minecraft:arrow",
- K::Snowball => "minecraft:snowball",
- K::Egg => "minecraft:egg",
- K::EnderPearl => "minecraft:ender_pearl",
- K::SmallFireball => "minecraft:small_fireball",
- K::LargeFireball { .. } => "minecraft:fireball",
- K::LlamaSpit => "minecraft:llama_spit",
- K::WindCharge => "minecraft:wind_charge",
- K::BreezeWindCharge => "minecraft:breeze_wind_charge",
- K::ShulkerBullet { .. } => "minecraft:shulker_bullet",
- K::WitherSkull { .. } => "minecraft:wither_skull",
- K::Potion { .. } => "minecraft:splash_potion",
- };
+ let kind = p.kind.id();
let mut e = state(p.id, kind, at(p.position), p.yaw, false);
e.pitch = p.pitch;
e.velocity = at(p.velocity);
diff --git a/crates/horizon-client/src/game/persist.rs b/crates/horizon-client/src/game/persist.rs
index ad9d7fe7e..d3afbf6ce 100644
--- a/crates/horizon-client/src/game/persist.rs
+++ b/crates/horizon-client/src/game/persist.rs
@@ -156,6 +156,8 @@ impl Game<'_> {
kind.as_str(),
"minecraft:experience_orb"
| "minecraft:arrow"
+ | "minecraft:fireball"
+ | "minecraft:small_fireball"
| "minecraft:falling_block"
| "minecraft:end_crystal"
| "minecraft:ender_dragon"
@@ -195,6 +197,11 @@ impl Game<'_> {
self.creatures.projectiles.push(p);
}
}
+ "minecraft:fireball" | "minecraft:small_fireball" => {
+ if let Some(p) = entity_nbt::fireball_from_nbt(&tag, player_uuid) {
+ self.creatures.projectiles.push(p);
+ }
+ }
"minecraft:falling_block" => {
if let Some((state, position, velocity, age, fall_distance)) =
entity_nbt::falling_block_from_nbt(&tag)
@@ -642,13 +649,15 @@ impl Game<'_> {
} else {
None
};
- let (uuid, raw) = anon(&self.persist, "minecraft:arrow", p.position);
+ let (uuid, raw) = anon(&self.persist, p.kind.id(), p.position);
let in_block = p
.arrow
.as_ref()
.and_then(|a| a.last_state)
.map(|s| self.state_to_nbt(s));
- if let Some(tag) = entity_nbt::arrow_to_nbt(p, uuid, owner, in_block, raw.as_ref()) {
+ let tag = entity_nbt::arrow_to_nbt(p, uuid, owner, in_block, raw.as_ref())
+ .or_else(|| entity_nbt::fireball_to_nbt(p, uuid, owner, raw.as_ref()));
+ if let Some(tag) = tag {
out.entry(chunk_of(p.position)).or_default().push(tag);
}
}
diff --git a/crates/horizon-client/src/game/raids.rs b/crates/horizon-client/src/game/raids.rs
index bff4a9918..bedca5708 100644
--- a/crates/horizon-client/src/game/raids.rs
+++ b/crates/horizon-client/src/game/raids.rs
@@ -6,7 +6,6 @@ use super::{Dim, Game};
use horizon_client::mobs::villager as mobs_villager;
use horizon_client::{
effects::{EffectInstance, OmenTick},
- hud_overlays,
mobs::{
Mob, Species, raider,
spawn_rules::{self, SpawnLevel},
@@ -15,9 +14,9 @@ use horizon_client::{
},
patrol::{GameplayAttributes, Member, PatrolLevel, PatrolSpawner},
raid::{self, Action, BarName, RaidLevel, RaidPlayer, RaiderInfo, RaiderType, Raids, Spawn},
- text::Text,
};
use horizon_core::{geometry::Vec3, random::RandomSource};
+use horizon_world::nbt::Tag;
use std::collections::{HashMap, HashSet};
/// Patrol and raid state owned by the game.
@@ -1063,37 +1062,18 @@ impl Game<'_> {
}
}
- /// The raid boss bars: red and notched in tens, with the raid's title.
- pub(super) fn raid_bars(&self, bars: &mut Vec) {
- for raid in self.raiding.raids.map.values() {
- if !raid.bar.visible || !raid.bar.player || raid.is_stopped() {
- continue;
- }
- let title = self.translate("event.minecraft.raid", "Raid");
- let name = match raid.bar.name {
- BarName::Raid => title,
- BarName::Remaining(n) => format!(
- "{title} - {}",
- self.translate(
- "event.minecraft.raid.raiders_remaining",
- "Raiders Remaining: %s"
- )
- .replace("%s", &n.to_string())
- ),
- BarName::Victory => {
- self.translate("event.minecraft.raid.victory.full", "Raid - Victory")
- }
- BarName::Defeat => {
- self.translate("event.minecraft.raid.defeat.full", "Raid - Defeat")
- }
- };
- bars.push(hud_overlays::BossBar {
- name: Text::literal(name),
- progress: raid.bar.progress,
- color: 2,
- overlay: 2,
- });
+ /// The raid bar a living player at `at` is in (`Raid.getPlayers`): red,
+ /// notched in tens. The name is the translate component the client draws.
+ pub(super) fn raid_boss_at(&self, at: [f64; 3], alive: bool) -> Option<(i32, Tag, f32)> {
+ if !alive || self.dim != Dim::Overworld {
+ return None;
}
+ let block = block_of(Vec3::new(at[0], at[1], at[2]));
+ let (id, raid) = self.raiding.raids.nearby(block)?;
+ if !raid.bar.visible || raid.is_stopped() {
+ return None;
+ }
+ Some((id, raid_name_tag(raid.bar.name), raid.bar.progress))
}
/// A firework a villager launches to celebrate (`CelebrateVillagersSurvivedRaid`).
pub(super) fn villager_firework(&mut self, at: [f64; 3], color: usize, flight: u8) {
@@ -1239,6 +1219,36 @@ impl Game<'_> {
}
}
+/// `Raid.raidEvent`'s name: the raid title, the remaining-raiders line, or
+/// the victory and defeat lines.
+fn raid_name_tag(name: BarName) -> Tag {
+ let key = |k: &str| Tag::compound([("translate", Tag::String(k.into()))]);
+ match name {
+ BarName::Raid => key("event.minecraft.raid"),
+ BarName::Victory => key("event.minecraft.raid.victory.full"),
+ BarName::Defeat => key("event.minecraft.raid.defeat.full"),
+ BarName::Remaining(n) => Tag::compound([
+ ("translate", Tag::String("event.minecraft.raid".into())),
+ (
+ "extra",
+ Tag::List(vec![
+ Tag::String(" - ".into()),
+ Tag::compound([
+ (
+ "translate",
+ Tag::String("event.minecraft.raid.raiders_remaining".into()),
+ ),
+ (
+ "with",
+ Tag::List(vec![Tag::String(n.to_string().as_str().into())]),
+ ),
+ ]),
+ ]),
+ ),
+ ]),
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs
index 5a71b13a8..a3ab8d281 100644
--- a/crates/horizon-client/src/game/remote.rs
+++ b/crates/horizon-client/src/game/remote.rs
@@ -193,6 +193,9 @@ pub(super) struct Remote {
/// the oldest of them first waited (`poll_remote`).
backlog: VecDeque,
backlog_since: Option,
+ /// `ClientboundTransferPacket`'s target: when the connection ends the
+ /// game connects here, the stored cookies carried over (`TransferState`).
+ transfer: Option,
}
/// The time a frame spends on chunk packets before it leaves the rest of
@@ -257,14 +260,25 @@ fn number_format(f: &play::NumberFormat) -> horizon_client::scoreboard::NumberFo
impl Game<'_> {
/// Leave the title for a server (ConnectScreen): an empty world fed by the connection.
pub(super) fn connect_server(&mut self, address: &str, name: &str) -> Result<()> {
+ self.connect_server_with_cookies(address, name, None)
+ }
+ /// `connect_server` carrying a transfer's stored server cookies
+ /// (`TransferState`); None on an ordinary join.
+ pub(super) fn connect_server_with_cookies(
+ &mut self,
+ address: &str,
+ name: &str,
+ cookies: Option,
+ ) -> Result<()> {
if self.defer_world_entry(super::PendingWorldEntry::Server {
address: address.to_owned(),
name: name.to_owned(),
+ cookies: cookies.clone(),
})? {
return Ok(());
}
self.join_world_rest()?;
- if let Err(error) = self.join_server(address, name, None) {
+ if let Err(error) = self.join_server(address, name, None, cookies) {
log::warn!("Horizon: could not join server: {error}");
if self.title.is_none() {
self.title = Some(horizon_client::title::Title::new(
@@ -285,13 +299,14 @@ impl Game<'_> {
pipe: horizon_protocol::connection::Pipe,
name: &str,
) -> Result<()> {
- self.join_server("local", name, Some(pipe))
+ self.join_server("local", name, Some(pipe), None)
}
fn join_server(
&mut self,
address: &str,
name: &str,
local: Option,
+ cookies: Option,
) -> Result<()> {
self.perf.world_opening();
let root = self.options.resources.clone();
@@ -323,7 +338,17 @@ impl Game<'_> {
Some(pipe) => Session::connect_local(pipe, name, view, lang.clone()),
None => {
self.extras_connecting(address, name);
- Session::connect(address, name, auth.clone(), view, lang.clone())
+ match cookies {
+ Some(cookies) => Session::connect_transferred(
+ address,
+ name,
+ auth.clone(),
+ view,
+ lang.clone(),
+ cookies,
+ ),
+ None => Session::connect(address, name, auth.clone(), view, lang.clone()),
+ }
}
};
let player_type = super::perspective::player_type(&root);
@@ -383,6 +408,7 @@ impl Game<'_> {
}
self.apply_settings();
self.clear_waypoints();
+ self.boss_overlay.reset();
self.remote = Some(Remote {
session,
brand: "unknown".into(),
@@ -445,6 +471,7 @@ impl Game<'_> {
chunk_center: (0, 0),
backlog: VecDeque::new(),
backlog_since: None,
+ transfer: None,
});
// The level's TickRateManager follows the server's ticking packets.
self.clock = horizon_client::clock::FixedStep::client();
@@ -465,6 +492,7 @@ impl Game<'_> {
self.extras_left();
}
self.clear_waypoints();
+ self.boss_overlay.reset();
if let Some(mut r) = self.remote.take() {
r.session.disconnect();
}
@@ -753,6 +781,9 @@ impl Game<'_> {
self.ticks,
self.screen == Screen::Chat,
);
+ if self.mods.running() {
+ self.mods_chat(&text);
+ }
if let Some(r) = self.remote.as_mut() {
r.chat.push((text, Instant::now()));
r.chat_received += 1;
@@ -849,7 +880,11 @@ impl Game<'_> {
r.joined = true;
r.profile = uuid;
r.profile_name = name.clone();
- r.status = format!("Joined as {name}; loading terrain...");
+ // LevelLoadingScreen's line: no player name.
+ r.status = horizon_client::lang::get_or(
+ "multiplayer.downloadingTerrain",
+ "Loading terrain...",
+ );
}
}
Event::Brand(brand) => {
@@ -858,6 +893,15 @@ impl Game<'_> {
}
}
Event::Reconfigured(registries) => self.set_registries(registries),
+ // handleTransfer: "Cannot transfer to server from
+ // singleplayer" (no ServerData), so the world just closes.
+ Event::Transfer { host, port } => {
+ if let Some(r) = self.remote.as_mut()
+ && r.session.address != "local"
+ {
+ r.transfer = Some(format!("{host}:{port}"));
+ }
+ }
Event::PackPush(p) => self.handle_pack_push(p),
Event::PackPop(id) => self.handle_pack_pop(id),
Event::DecodeError(e) => {
@@ -873,6 +917,20 @@ impl Game<'_> {
from_server,
} => {
log::info!("Horizon: disconnected: {reason}");
+ // ClientboundTransferPacket left a target: connect there
+ // instead of showing the disconnect, the stored cookies
+ // carried over (ClientCommonPacketListenerImpl.
+ // handleTransfer → ConnectScreen.startConnecting).
+ let transfer = self.remote.as_mut().and_then(|r| {
+ r.transfer.take().map(|address| {
+ (address, r.session.name.clone(), r.session.cookies.clone())
+ })
+ });
+ if let Some((address, name, cookies)) = transfer {
+ self.leave_server(None)?;
+ self.connect_server_with_cookies(&address, &name, Some(cookies))?;
+ return Ok(());
+ }
let retry = self.reconnect_after(&reason, from_server);
self.leave_server(Some(reason))?;
self.offer_reconnect(retry);
@@ -1006,6 +1064,9 @@ impl Game<'_> {
r.stepped.clear();
r.head_lerps.clear();
r.pending_items.clear();
+ // The entity ids are the old world's; the new dimension's
+ // player entities re-map to their profiles on AddEntity.
+ r.level_players.clear();
// A new ClientLevel: a new chunk storage, centred on 0, 0.
r.chunk_center = (0, 0);
}
@@ -2717,6 +2778,7 @@ impl Game<'_> {
}
// ClientPacketListener.setActionBarText, setTitleText,
// setSubtitleText, setTitlesAnimation and handleTitlesClear.
+ C::BossEvent(p) => self.apply_boss_event(&p),
C::SetActionBarText(p) => self.titles.set_overlay(remote_text(&p.text), false),
C::SetTitleText(p) => self.titles.set_title(remote_text(&p.text)),
C::SetSubtitleText(p) => self.titles.set_subtitle(remote_text(&p.text)),
@@ -3126,6 +3188,8 @@ impl Game<'_> {
/// One client tick while connected (Minecraft.tick with a ClientLevel).
pub(super) fn tick_remote(&mut self) -> Result<()> {
self.tick_remote_level()?;
+ // Client mods tick on any server, single player's own included.
+ self.tick_mods();
// Minecraft.tick sends this even when the player cannot tick yet,
// including while waiting for chunks. Keep it outside early returns.
if self.remote.as_ref().is_some_and(|r| r.joined) {
@@ -3151,6 +3215,7 @@ impl Game<'_> {
// Minecraft.tick: TickRateManager.tick; ClientLevel.tickTime advances
// the time only while the level runs normally.
let running = self.clock.world_runs();
+ self.boss_overlay.tick_darken(running);
if running {
self.world.game_time += 1;
self.remote_clock_tick();
@@ -3914,7 +3979,7 @@ impl Game<'_> {
let sneaking = self.keys.contains(&KeyCode::ShiftLeft);
// A boat, minecart, item frame, armor stand or painting nearer than
// any mob: the server uses it (AbstractBoat.interact boards it).
- if let Some(hit) = self.remote_object_hit()
+ if let Some(hit) = self.remote_object_hit(false)
&& self.mob_hit().is_none_or(|(_, d)| hit.distance < d)
&& self.before_block(hit.distance)
{
@@ -4423,12 +4488,12 @@ impl Game<'_> {
id: self.creatures.projectiles[i].id as i32,
}));
self.reset_attack_strength();
- } else if let Some(hit) = self.remote_object_hit()
+ } else if let Some(hit) = self.remote_object_hit(true)
&& self.mob_hit().is_none_or(|(_, d)| hit.distance < d)
&& self.before_block(hit.distance)
{
// VehicleEntity.hurtServer, ItemFrame and ArmorStand hurtServer,
- // a painting broken: the server decides.
+ // a painting broken or an EndCrystal hurtServer: the server decides.
self.send(S::Attack(play::Attack { id: hit.id }));
self.reset_attack_strength();
} else if let Some((i, distance)) = self.mob_hit()
@@ -4783,6 +4848,11 @@ impl Game<'_> {
self.mount_menu_reset();
// The client's menu has no level access: what it holds is the server's.
self.station = None;
+ // AbstractContainerMenu.removed: the server gives the grid and the
+ // carried stack back to the inventory and syncs it; the copies here
+ // are stale the moment the window closes.
+ self.craft_grid.fill(None);
+ self.carried = None;
self.craft_size = 2;
if let Some(key) = self.container.take() {
// Server containers stay renderable but lose their copied slots.
@@ -5437,6 +5507,10 @@ impl horizon_client::interaction_input::InteractionWorld for RemoteInputWorld<'_
}
impl Remote {
+ /// Players in the server's player list, this one included.
+ pub(super) fn player_count(&self) -> usize {
+ self.players.len()
+ }
/// The local player's profile UUID.
pub(super) fn profile(&self) -> u128 {
self.profile
diff --git a/crates/horizon-client/src/game/remote_vehicles.rs b/crates/horizon-client/src/game/remote_vehicles.rs
index cf1b2d683..620aff97c 100644
--- a/crates/horizon-client/src/game/remote_vehicles.rs
+++ b/crates/horizon-client/src/game/remote_vehicles.rs
@@ -9,8 +9,8 @@
//! server (`LocalPlayer.tick`: `ServerboundMoveVehiclePacket`,
//! `AbstractBoat.tick`: `ServerboundPaddleBoatPacket`). A minecart moves on
//! the server with the rider's input, and the rider sits in it.
-use super::{Game, Keys, view_vector};
-use horizon_core::geometry::Vec3;
+use super::{Game, Keys, ray_box, view_vector};
+use horizon_core::geometry::{Aabb, Vec3};
use horizon_protocol::packets::play::{self, Serverbound as S};
/// An object under the crosshair: its entity id, how far along the view it
@@ -24,8 +24,8 @@ pub(super) struct ObjectHit {
impl Game<'_> {
/// The nearest boat, minecart, item frame, armor stand or painting the
- /// view hits within reach.
- pub(super) fn remote_object_hit(&self) -> Option {
+ /// view hits within reach; also End crystals when attacking.
+ pub(super) fn remote_object_hit(&self, attacking: bool) -> Option {
let eye = self.eye_position()?;
let dir = view_vector(self.yaw, self.pitch);
let at = |d: f64| {
@@ -64,6 +64,22 @@ impl Game<'_> {
let p = self.carts[i].position;
hits.push((self.carts[i].id as i32, d, [p.x, p.y, p.z]));
}
+ if attacking {
+ // EndCrystal.isPickable: its 2 x 2 box, with the server's entity
+ // id, not special_targets' local projectile target id.
+ // Entity.interact passes on a crystal, so right clicks use the item.
+ let reach = if self.creative { 5.0 } else { 3.0 };
+ for c in self.crystals.iter().filter(|c| c.id != 0) {
+ let p = c.position;
+ let bounds = Aabb::new(
+ Vec3::new(p.x - 1.0, p.y, p.z - 1.0),
+ Vec3::new(p.x + 1.0, p.y + 2.0, p.z + 1.0),
+ );
+ if let Some(d) = ray_box(eye, dir, reach, bounds) {
+ hits.push((c.id as i32, d, [p.x, p.y, p.z]));
+ }
+ }
+ }
let (id, distance, origin) = hits.into_iter().min_by(|a, b| a.1.total_cmp(&b.1))?;
let point = at(distance);
Some(ObjectHit {
diff --git a/crates/horizon-client/src/game/render_tick.rs b/crates/horizon-client/src/game/render_tick.rs
index 331db8833..e013c8d29 100644
--- a/crates/horizon-client/src/game/render_tick.rs
+++ b/crates/horizon-client/src/game/render_tick.rs
@@ -100,7 +100,10 @@ impl Game<'_> {
skybox: self.dim == Dim::Overworld,
blindness: None,
darkness: self.darkness_fog(),
- boss_world_fog: self.dragon_bar_shown(),
+ darken_world: self
+ .boss_overlay
+ .darken_amount(self.clock.fraction() as f32),
+ boss_world_fog: self.boss_overlay.should_create_world_fog(),
},
)
}
diff --git a/crates/horizon-client/src/game/scoreboard.rs b/crates/horizon-client/src/game/scoreboard.rs
index 4905fb80f..227a09a6c 100644
--- a/crates/horizon-client/src/game/scoreboard.rs
+++ b/crates/horizon-client/src/game/scoreboard.rs
@@ -180,7 +180,7 @@ impl Game<'_> {
| Target::Cart(id)
| Target::Other(id) => self.persist.raw.get(&id),
Target::Player => self.level.player_extra.as_ref(),
- Target::Guest(_) | Target::Orb(_) | Target::Arrow(_) => None,
+ Target::Guest(_) | Target::Orb(_) | Target::Projectile(_) => None,
};
match raw.and_then(|r| r.get("Tags")) {
Some(Tag::List(l)) => l
diff --git a/crates/horizon-client/src/game/shader_packs.rs b/crates/horizon-client/src/game/shader_packs.rs
new file mode 100644
index 000000000..04af297b6
--- /dev/null
+++ b/crates/horizon-client/src/game/shader_packs.rs
@@ -0,0 +1,84 @@
+//! Shader packs, for development until the Shader Packs page exists: `HORIZON_SHADER_PACK=`
+//! runs `shaderpacks/` (a folder or a zip beside `options.txt`) over the world. The
+//! programs of the current dimension's folder are loaded when the dimension changes (spec 1.2).
+
+use horizon_client::camera::CameraFluid;
+use horizon_client::gfx::pack_uniforms::PackInputs;
+use horizon_shaders::{Macros, Pack, Properties, dimension_folder, load_post};
+
+use super::{Dim, Game};
+
+impl Game<'_> {
+ /// Loads the pack for the current dimension when it changed, and returns this frame's
+ /// inputs to the pack's uniforms.
+ pub(super) fn shader_pack_inputs(&mut self, camera: glam::DVec3, partial: f32) -> PackInputs {
+ let Some(name) = std::env::var_os("HORIZON_SHADER_PACK") else {
+ return PackInputs::default();
+ };
+ let dimension = match self.dim {
+ Dim::Overworld => 0,
+ Dim::Nether => -1,
+ Dim::End => 1,
+ };
+ if let Some(renderer) = &mut self.renderer
+ && renderer.shader_pack_dimension() != Some(dimension)
+ {
+ let name = name.to_string_lossy();
+ let started = std::time::Instant::now();
+ let path = std::env::current_dir()
+ .unwrap_or_default()
+ .join("shaderpacks")
+ .join(&*name);
+ match Pack::open(&path) {
+ Ok(pack) => {
+ let macros = Macros::standard();
+ let text = pack.read_text("shaders.properties").unwrap_or_default();
+ let properties = Properties::parse(&text, ¯os);
+ for note in &properties.notes {
+ log::warn!(
+ "shader pack {name}: shaders.properties:{}: {}",
+ note.line,
+ note.message
+ );
+ }
+ let folder = dimension_folder(&pack, dimension);
+ let post = load_post(&pack, &folder, &properties, ¯os, None);
+ if let Some((programs, notes)) = renderer.set_shader_pack(dimension, Some(post))
+ {
+ for note in notes {
+ log::warn!("shader pack {name}: {note}");
+ }
+ log::info!(
+ "shader pack {name}: folder `{folder}`, {} programs ({}) in {} ms",
+ programs.len(),
+ programs.join(" "),
+ started.elapsed().as_millis()
+ );
+ }
+ }
+ Err(e) => {
+ log::warn!("shader pack {name}: {e}");
+ renderer.set_shader_pack(dimension, None);
+ }
+ }
+ }
+ let lerp = |(old, new): (f32, f32)| old + (new - old) * partial;
+ let at = camera.floor().as_ivec3();
+ let light = self.world.light(at.x, at.y, at.z);
+ PackInputs {
+ day_time: self.world.day_time,
+ rain: lerp(self.world.weather.rain_level),
+ thunder: lerp(self.world.weather.thunder_level),
+ eye_in: match self.camera_fluid(camera.to_array()) {
+ CameraFluid::None => 0,
+ CameraFluid::Water => 1,
+ CameraFluid::Lava => 2,
+ CameraFluid::PowderSnow => 3,
+ },
+ blindness: f32::from(u8::from(self.potions.effects.get("blindness").is_some())),
+ eye_light: [i32::from(light & 15), i32::from(light >> 4)],
+ hide_gui: self.ui.hide_gui,
+ brightness: self.settings.gamma,
+ }
+ }
+}
diff --git a/crates/horizon-client/src/game/startup_menu.rs b/crates/horizon-client/src/game/startup_menu.rs
index 96af99bbc..fe568fe71 100644
--- a/crates/horizon-client/src/game/startup_menu.rs
+++ b/crates/horizon-client/src/game/startup_menu.rs
@@ -33,6 +33,7 @@ impl StartupMenu {
Some(PendingWorldEntry::Server {
address: address.clone(),
name: options.player_name(),
+ cookies: None,
})
} else {
options
@@ -125,6 +126,7 @@ impl StartupMenu {
Action::Connect { address } => PendingWorldEntry::Server {
address,
name: player_name,
+ cookies: None,
},
_ => return,
};
@@ -762,7 +764,7 @@ mod tests {
"Guest".into(),
);
assert!(
- matches!(menu.pending.take(), Some(PendingWorldEntry::Server { address, name })
+ matches!(menu.pending.take(), Some(PendingWorldEntry::Server { address, name, .. })
if address == "localhost:25565" && name == "Guest")
);
assert!(menu.pending.take().is_none(), "an entry is consumed once");
diff --git a/crates/horizon-client/src/game/wither.rs b/crates/horizon-client/src/game/wither.rs
index 7b86dc527..91fe91b00 100644
--- a/crates/horizon-client/src/game/wither.rs
+++ b/crates/horizon-client/src/game/wither.rs
@@ -2,10 +2,8 @@
//! its boss bar, and its skulls hitting and exploding.
use super::Game;
use horizon_client::{
- hud_overlays,
mobs::{Damage, DamageKind, Species, Who},
projectiles::{Projectile, ProjectileKind},
- text::Text,
};
impl Game<'_> {
@@ -78,45 +76,6 @@ impl Game<'_> {
}
Ok(())
}
- /// The wither boss bars (purple), within range.
- pub(super) fn wither_bars(&self, bars: &mut Vec) {
- let Some(p) = self.player.as_ref() else {
- return;
- };
- for m in self
- .mobs
- .iter()
- .filter(|m| m.species() == Species::Wither && m.alive())
- {
- if m.position.distance_squared(p.position) > 64.0 * 64.0 {
- continue;
- }
- let progress = if m.extra.counter > 0 {
- 1.0 - m.extra.counter as f32 / horizon_client::mobs::wither::INVULNERABLE as f32
- } else {
- (m.health / m.attrs.max_health).clamp(0.0, 1.0)
- };
- let name = m
- .custom_name
- .clone()
- .unwrap_or_else(|| self.translate("entity.minecraft.wither", "Wither"));
- bars.push(hud_overlays::BossBar {
- name: Text::literal(name),
- progress,
- color: 5,
- overlay: 0,
- });
- }
- }
- pub(super) fn wither_near(&self) -> bool {
- self.player.as_ref().is_some_and(|p| {
- self.mobs.iter().any(|m| {
- m.species() == Species::Wither
- && m.alive()
- && m.position.distance_squared(p.position) <= 64.0 * 64.0
- })
- })
- }
/// `WitherSkull.onHitEntity` / `onHit`: 8 damage (healing the wither 5
/// when it kills), withering for 10 seconds, then a power 1 blast.
pub(super) fn wither_skull_hit(
diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs
index a848d36a5..31853ad92 100644
--- a/crates/horizon-client/src/gfx.rs
+++ b/crates/horizon-client/src/gfx.rs
@@ -68,6 +68,9 @@ mod flat;
pub mod lightning;
mod lod;
mod occlusion;
+mod pack_atlas;
+mod pack_post;
+pub mod pack_uniforms;
mod page_runs;
pub mod panorama;
mod resident;
@@ -87,6 +90,7 @@ fn world_pass_after_culling<'e>(
encoder: &'e mut wgpu::CommandEncoder,
view: &wgpu::TextureView,
depth: &wgpu::TextureView,
+ keep_depth: bool,
) -> wgpu::RenderPass<'e> {
encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Horizon world, after culling"),
@@ -103,7 +107,12 @@ fn world_pass_after_culling<'e>(
view: depth,
depth_ops: Some(wgpu::Operations {
load: wgpu::LoadOp::Load,
- store: wgpu::StoreOp::Discard,
+ // A shader pack reads it as depthtex0.
+ store: if keep_depth {
+ wgpu::StoreOp::Store
+ } else {
+ wgpu::StoreOp::Discard
+ },
}),
stencil_ops: None,
}),
@@ -249,6 +258,8 @@ pub struct Frame<'a> {
pub hand_fov_degrees: f32,
/// Full-screen camera effects drawn over the world and hand, under the HUD.
pub screen: &'a [crate::screen_effects::ScreenQuad],
+ /// What a shader pack's uniforms need from the game.
+ pub pack: pack_uniforms::PackInputs,
/// The world border wall, when near enough to be drawn.
pub border: Option,
pub game_time: f32,
@@ -268,6 +279,8 @@ pub struct Frame<'a> {
pub night_vision: f32,
/// Torch flicker added to the block light factor of 1.4.
pub block_flicker: f32,
+ /// `lightmap.fsh` BossOverlayWorldDarkeningFactor (a wither's bar).
+ pub boss_darken: f32,
/// `Screen.extractBlurredBackground`: blur the frame by this radius
/// (`menuBackgroundBlurriness`) before the screen is drawn over it.
pub menu_blur: Option,
@@ -458,6 +471,10 @@ pub struct Renderer {
occlusion: occlusion::Occlusion,
/// Resolution scale and FXAA (Horizon settings).
world_post: world_post::Post,
+ /// The shader pack's post-processing, and the dimension (legacy id) it was loaded for.
+ pack_post: Option<(i32, Option)>,
+ /// The block sprites as one atlas, while a shader pack is loaded.
+ pack_atlas: Option,
pub hud: HudRenderer,
/// Vanilla's menu background blur, made on first use.
menu_blur: Option,
@@ -1306,6 +1323,8 @@ impl Renderer {
format: wgpu::TextureFormat::Rgba8Unorm,
usage: wgpu::TextureUsages::TEXTURE_BINDING
| wgpu::TextureUsages::COPY_DST
+ // Shader packs' atlas copies them (pack_atlas.rs).
+ | wgpu::TextureUsages::COPY_SRC
| wgpu::TextureUsages::STORAGE_BINDING,
view_formats: &[],
},
@@ -2303,6 +2322,8 @@ impl Renderer {
block_entity_revision: next_block_entity_revision(),
occlusion: occlusion::Occlusion::new(crate::chunk::MIN_Y, crate::chunk::HEIGHT / 16),
world_post,
+ pack_post: None,
+ pack_atlas: None,
hud,
menu_blur: None,
info,
@@ -2733,6 +2754,51 @@ impl Renderer {
self.world_post.scale = scale.clamp(0.25, 2.0);
self.world_post.antialias = antialias;
}
+ /// Runs `post` over the world from now on (`None`: no pack), for the dimension `dimension`.
+ /// Returns the programs that run and the notes of loading them.
+ pub fn set_shader_pack(
+ &mut self,
+ dimension: i32,
+ pack: Option,
+ ) -> Option<(Vec, Vec)> {
+ let post = pack.map(|post| {
+ pack_post::PackPost::new(
+ &self.device,
+ &self.queue,
+ post,
+ self.config.format.remove_srgb_suffix(),
+ )
+ });
+ if post.is_none() {
+ self.pack_atlas = None;
+ } else if self.pack_atlas.is_none() {
+ let mut encoder = self.device.create_command_encoder(&Default::default());
+ let layers = self
+ .sprite_textures
+ .iter()
+ .map(|t| t.depth_or_array_layers())
+ .sum();
+ self.pack_atlas = pack_atlas::PackAtlas::new(
+ &self.device,
+ &mut encoder,
+ &self.sprite_textures,
+ sprite_split(),
+ layers,
+ self.sprite_textures[0].width(),
+ );
+ self.queue.submit([encoder.finish()]);
+ }
+ let report = post.as_ref().map(|p| {
+ let programs = p.programs().into_iter().map(str::to_owned).collect();
+ (programs, p.notes.clone())
+ });
+ self.pack_post = Some((dimension, post));
+ report
+ }
+ /// The dimension the shader pack was last set for.
+ pub fn shader_pack_dimension(&self) -> Option {
+ self.pack_post.as_ref().map(|p| p.0)
+ }
/// The Mipmap Levels option: block textures sample at most `levels`
/// reduced copies (0: none).
pub fn set_mipmap_levels(&mut self, levels: u32) {
@@ -2793,6 +2859,7 @@ impl Renderer {
gamma: f32,
night_vision: f32,
flicker: f32,
+ boss_darken: f32,
) {
// lightmap.fsh: per (block, sky) level.
let brightness = |level: f32| level / (4.0 - 3.0 * level);
@@ -2810,6 +2877,8 @@ impl Renderer {
let parabolic = (2.0 * block_level - 1.0).powi(2);
let block_color = Vec3::from(sky.block_light_tint).lerp(Vec3::ONE, 0.9 * parabolic);
color += block_color * block_brightness;
+ // lightmap.fsh: a boss bar mixes the light toward 70/60/60%.
+ color = color.lerp(color * Vec3::new(0.7, 0.6, 0.6), boss_darken);
color -= Vec3::splat(darkness);
color = color.clamp(Vec3::ZERO, Vec3::ONE);
let max = color.max_element().max(1e-6);
@@ -2849,6 +2918,13 @@ impl Renderer {
}
fn animate(&mut self, encoder: &mut wgpu::CommandEncoder, tick: u64) {
self.animations.animate(encoder, &mut self.uploads, tick);
+ if let Some(atlas) = &self.pack_atlas {
+ atlas.copy(
+ encoder,
+ &self.sprite_textures,
+ self.animations.changed().iter().copied(),
+ );
+ }
}
pub fn render(&mut self, frame: &Frame) -> Result {
let rendered = self.draw_frame(frame);
@@ -2924,6 +3000,7 @@ impl Renderer {
(self.gamma - frame.darkness.0).max(0.0),
frame.night_vision,
frame.block_flicker,
+ frame.boss_darken,
);
let view_proj = self.view_projection(frame);
if frame.title {
@@ -3594,9 +3671,12 @@ impl Renderer {
timer.begin(&mut encoder);
}
// The world's targets: the screen, or the scaled target of `post`.
- let scaled = self
- .world_post
- .prepare(&self.device, [self.config.width, self.config.height]);
+ let pack_post = !frame.title && self.pack_post.as_ref().is_some_and(|p| p.1.is_some());
+ let scaled = self.world_post.prepare(
+ &self.device,
+ [self.config.width, self.config.height],
+ pack_post,
+ );
let (world_view, world_depth) = match &scaled {
Some((color, depth)) => (color, depth),
None => (&view_target, &self.depth),
@@ -3633,8 +3713,8 @@ impl Renderer {
view: world_depth,
depth_ops: Some(wgpu::Operations {
load: wgpu::LoadOp::Clear(0.0),
- // Phase 2 of occlusion culling draws over it.
- store: if cull.is_some() {
+ // Phase 2 of occlusion culling draws over it; a shader pack reads it.
+ store: if cull.is_some() || pack_post {
wgpu::StoreOp::Store
} else {
wgpu::StoreOp::Discard
@@ -3693,7 +3773,12 @@ impl Renderer {
drop(pass);
cull.test_pass(&mut encoder);
flat.flatten_phase2(&mut encoder);
- pass = world_pass_after_culling(&mut encoder, world_view, world_depth);
+ pass = world_pass_after_culling(
+ &mut encoder,
+ world_view,
+ world_depth,
+ pack_post,
+ );
pass.set_bind_group(0, &self.group, &[]);
pass.set_pipeline(&flat.solid);
flat.draw_phase2(&mut pass, vertices);
@@ -3717,7 +3802,12 @@ impl Renderer {
cull.test(&mut pass);
drop(pass);
cull.test_pass(&mut encoder);
- pass = world_pass_after_culling(&mut encoder, world_view, world_depth);
+ pass = world_pass_after_culling(
+ &mut encoder,
+ world_view,
+ world_depth,
+ pack_post,
+ );
pass.set_bind_group(0, &self.group, &[]);
pass.set_pipeline(&self.solid);
pass.set_index_buffer(
@@ -3876,7 +3966,24 @@ impl Renderer {
);
}
}
- if scaled.is_some() {
+ if let Some((color, depth)) = &scaled
+ && pack_post
+ && let Some((_, Some(post))) = &mut self.pack_post
+ {
+ let size = self.world_post.size().unwrap_or([1, 1]);
+ post.run(
+ &self.device,
+ &self.queue,
+ &mut encoder,
+ color,
+ depth,
+ &view_target,
+ frame,
+ &frame.pack,
+ size,
+ [self.config.width, self.config.height],
+ );
+ } else if scaled.is_some() {
self.world_post.finish(&mut encoder, &view_target);
}
if hand_quads > 0 {
diff --git a/crates/horizon-client/src/gfx/animate.rs b/crates/horizon-client/src/gfx/animate.rs
index f4528902b..b7c44429b 100644
--- a/crates/horizon-client/src/gfx/animate.rs
+++ b/crates/horizon-client/src/gfx/animate.rs
@@ -51,6 +51,8 @@ pub(super) struct SpriteAnimator {
pipeline: wgpu::ComputePipeline,
/// Edge of the arrays' layers.
size: u32,
+ /// The layers the last `animate` rewrote, counted over all arrays.
+ changed: Vec,
}
impl SpriteAnimator {
@@ -205,9 +207,15 @@ impl SpriteAnimator {
jobs,
pipeline,
size,
+ changed: Vec::new(),
}
}
+ /// The layers the last `animate` rewrote (for the shader pack atlas).
+ pub fn changed(&self) -> &[u32] {
+ &self.changed
+ }
+
/// Show every sprite's frame at `tick`, rewriting only the sprites whose
/// frame or mix changed (`SpriteContents.AnimationState.tick`).
pub fn animate(
@@ -245,12 +253,14 @@ impl SpriteAnimator {
/// its layer shows; the number of jobs.
fn collect(&mut self, tick: u64) -> usize {
let mut count = 0;
+ self.changed.clear();
for sprite in &mut self.sprites {
let blend = sprite.animation.blend(tick);
if sprite.shown == Some(blend) {
continue;
}
sprite.shown = Some(blend);
+ self.changed.push(sprite.animation.layer);
let job = [
sprite.layer,
sprite.frames[blend.frame],
diff --git a/crates/horizon-client/src/gfx/pack_atlas.rs b/crates/horizon-client/src/gfx/pack_atlas.rs
new file mode 100644
index 000000000..c90fa6ac1
--- /dev/null
+++ b/crates/horizon-client/src/gfx/pack_atlas.rs
@@ -0,0 +1,197 @@
+//! The block atlas of shader packs (spec 5.1, `atlasSize` in 5.2): packs sample one 2D atlas
+//! with atlas coordinates, Horizon keeps block sprites in texture arrays. With a pack, every
+//! layer is copied into a grid, row by row from the top left, and an animated layer again
+//! whenever its frame changes.
+
+#[expect(dead_code, reason = "the gbuffers pass binds it (next slice)")]
+pub(super) struct PackAtlas {
+ texture: wgpu::Texture,
+ pub view: wgpu::TextureView,
+ /// Sprites per row.
+ pub columns: u32,
+ /// A sprite's edge in pixels, at the first level.
+ pub sprite: u32,
+ /// Layers per sprite array.
+ split: u32,
+}
+
+impl PackAtlas {
+ /// Copies `layers` layers of `arrays` (`split` per array, `sprite` pixels wide, `levels`
+ /// mip levels); `None` when the grid is larger than the device allows.
+ pub fn new(
+ device: &wgpu::Device,
+ encoder: &mut wgpu::CommandEncoder,
+ arrays: &[wgpu::Texture],
+ split: u32,
+ layers: u32,
+ sprite: u32,
+ ) -> Option {
+ let layers = layers.max(1);
+ let columns = (f64::from(layers).sqrt().ceil() as u32).max(1);
+ let rows = layers.div_ceil(columns);
+ let max = device.limits().max_texture_dimension_2d;
+ if columns * sprite > max || rows * sprite > max {
+ return None;
+ }
+ // Levels past a sprite's single pixel would mix neighbours: stop there.
+ let levels = arrays[0].mip_level_count().min(sprite.ilog2() + 1);
+ let texture = device.create_texture(&wgpu::TextureDescriptor {
+ label: Some("Shader pack block atlas"),
+ size: wgpu::Extent3d {
+ width: columns * sprite,
+ height: rows * sprite,
+ depth_or_array_layers: 1,
+ },
+ mip_level_count: levels,
+ sample_count: 1,
+ dimension: wgpu::TextureDimension::D2,
+ format: wgpu::TextureFormat::Rgba8Unorm,
+ usage: wgpu::TextureUsages::TEXTURE_BINDING
+ | wgpu::TextureUsages::COPY_DST
+ | wgpu::TextureUsages::COPY_SRC,
+ view_formats: &[],
+ });
+ let view = texture.create_view(&Default::default());
+ let atlas = Self {
+ texture,
+ view,
+ columns,
+ sprite,
+ split,
+ };
+ atlas.copy(encoder, arrays, 0..layers);
+ Some(atlas)
+ }
+
+ /// The atlas's size in pixels (`atlasSize`).
+ #[cfg_attr(
+ not(test),
+ expect(dead_code, reason = "the gbuffers pass reads it (next slice)")
+ )]
+ pub fn size(&self) -> [u32; 2] {
+ [self.texture.width(), self.texture.height()]
+ }
+
+ /// Copies `layers` from the sprite arrays again, every level.
+ pub fn copy(
+ &self,
+ encoder: &mut wgpu::CommandEncoder,
+ arrays: &[wgpu::Texture],
+ layers: impl IntoIterator- ,
+ ) {
+ for layer in layers {
+ let Some(array) = arrays.get((layer / self.split) as usize) else {
+ continue;
+ };
+ let (column, row) = (layer % self.columns, layer / self.columns);
+ for level in 0..self.texture.mip_level_count() {
+ let edge = self.sprite >> level;
+ encoder.copy_texture_to_texture(
+ wgpu::TexelCopyTextureInfo {
+ texture: array,
+ mip_level: level,
+ origin: wgpu::Origin3d {
+ x: 0,
+ y: 0,
+ z: layer % self.split,
+ },
+ aspect: wgpu::TextureAspect::All,
+ },
+ wgpu::TexelCopyTextureInfo {
+ texture: &self.texture,
+ mip_level: level,
+ origin: wgpu::Origin3d {
+ x: column * edge,
+ y: row * edge,
+ z: 0,
+ },
+ aspect: wgpu::TextureAspect::All,
+ },
+ wgpu::Extent3d {
+ width: edge,
+ height: edge,
+ depth_or_array_layers: 1,
+ },
+ );
+ }
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ /// Two arrays of 2x2 sprites, one layer split; each layer a colour of its own.
+ #[test]
+ fn layers_land_in_their_cells() {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::new_without_display_handle());
+ let Ok(adapter) = pollster::block_on(instance.request_adapter(&Default::default())) else {
+ return;
+ };
+ let (device, queue) =
+ pollster::block_on(adapter.request_device(&Default::default())).unwrap();
+ let (split, layers, sprite) = (3u32, 5u32, 2u32);
+ let arrays: Vec = (0..2)
+ .map(|a| {
+ let count = (layers - a * split).min(split);
+ let pixels: Vec = (0..count)
+ .flat_map(|l| [(a * split + l) as u8 * 40, 0, 0, 255].repeat(4))
+ .collect();
+ wgpu::util::DeviceExt::create_texture_with_data(
+ &device,
+ &queue,
+ &wgpu::TextureDescriptor {
+ label: None,
+ size: wgpu::Extent3d {
+ width: sprite,
+ height: sprite,
+ depth_or_array_layers: count,
+ },
+ mip_level_count: 1,
+ sample_count: 1,
+ dimension: wgpu::TextureDimension::D2,
+ format: wgpu::TextureFormat::Rgba8Unorm,
+ usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_SRC,
+ view_formats: &[],
+ },
+ wgpu::util::TextureDataOrder::LayerMajor,
+ &pixels,
+ )
+ })
+ .collect();
+ let mut encoder = device.create_command_encoder(&Default::default());
+ let atlas = PackAtlas::new(&device, &mut encoder, &arrays, split, layers, sprite).unwrap();
+ assert_eq!((atlas.columns, atlas.size()), (3, [6, 4]));
+ let read = device.create_buffer(&wgpu::BufferDescriptor {
+ label: None,
+ size: 256 * 4,
+ usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
+ mapped_at_creation: false,
+ });
+ encoder.copy_texture_to_buffer(
+ atlas.texture.as_image_copy(),
+ wgpu::TexelCopyBufferInfo {
+ buffer: &read,
+ layout: wgpu::TexelCopyBufferLayout {
+ offset: 0,
+ bytes_per_row: Some(256),
+ rows_per_image: None,
+ },
+ },
+ wgpu::Extent3d {
+ width: 6,
+ height: 4,
+ depth_or_array_layers: 1,
+ },
+ );
+ queue.submit([encoder.finish()]);
+ read.slice(..).map_async(wgpu::MapMode::Read, |_| {});
+ device.poll(wgpu::PollType::wait_indefinitely()).unwrap();
+ let data = read.slice(..).get_mapped_range().unwrap();
+ let red = |x: usize, y: usize| data[y * 256 + x * 4];
+ // Layer 4 (second array, its second layer) is in row 1, column 1.
+ assert_eq!([red(0, 0), red(2, 0), red(4, 0)], [0, 40, 80]);
+ assert_eq!([red(1, 3), red(3, 2), red(5, 2)], [120, 160, 0]);
+ }
+}
diff --git a/crates/horizon-client/src/gfx/pack_post.rs b/crates/horizon-client/src/gfx/pack_post.rs
new file mode 100644
index 000000000..d5aa9fb7c
--- /dev/null
+++ b/crates/horizon-client/src/gfx/pack_post.rs
@@ -0,0 +1,929 @@
+//! A shader pack's post-processing over Horizon's own world (spec 2.1 rows 4, 6, 8, 9; 6.1; 6.2;
+//! 6.4): the world renders into its own target as with a resolution scale, its colour becomes
+//! colortex0 and its depth `depthtex0`, then the pack's `prepare`, `deferred`, `composite` and
+//! `final` programs run in order, and `final` draws onto the screen under the hand and HUD.
+//! Gbuffers programs come later; until then the pack's composites read Horizon's picture.
+//!
+//! Every colortex buffer a program reads or writes has two textures, A and B. Programs read
+//! "main" and write "alt", and each buffer a program wrote flips afterwards (6.1.6). The
+//! mapping carries over to the next frame, so a buffer that is not cleared reads back what was
+//! written last (OQ-8). Buffers are cleared at the start of the frame, "main" only.
+//! Pack buffers store rows as GL does (row 0 at the bottom: the translator negates clip y), so
+//! the world is copied in upside down, and its reverse-Z depth becomes GL window depth.
+
+use std::collections::HashMap;
+
+use horizon_shaders::{Format, Group, Kind, Post};
+
+use super::pack_uniforms::{self, FrameUniforms, PackInputs};
+
+const BUFFERS: usize = horizon_shaders::BUFFERS;
+
+/// The texture behind a pack sampler name.
+#[derive(Clone, Copy, PartialEq)]
+enum Source {
+ Color(usize),
+ Depth,
+ Noise,
+ /// A 1×1 stand-in for names this slice does not provide yet (custom textures...).
+ Dummy,
+ /// A 1×1 depth of 1.0 behind a comparison sampler, until shadow maps exist: no shadow.
+ Shadow,
+}
+
+struct Binding {
+ source: Source,
+ binding: u32,
+ /// A filtering sampler (the texture is filterable).
+ filtering: bool,
+}
+
+struct Pass {
+ name: String,
+ group: Group,
+ pipeline: wgpu::RenderPipeline,
+ layout: wgpu::BindGroupLayout,
+ ubo: wgpu::Buffer,
+ block: Vec,
+ /// (index into `pack_uniforms::NAMES`, declared type, offset).
+ uniforms: Vec<(Option, String, u32)>,
+ samplers: Vec,
+ /// (location, buffer) of each output that reaches a buffer.
+ writes: Vec<(u32, usize)>,
+ /// Buffers flipped after the pass.
+ flip: u16,
+ /// Buffers sampled, for the bind group cache key.
+ reads: u16,
+ /// Buffers written.
+ written: u16,
+ groups: HashMap,
+}
+
+struct Targets {
+ size: [u32; 2],
+ /// A and B of each buffer used.
+ color: [Option<[wgpu::TextureView; 2]>; BUFFERS],
+ depth: wgpu::TextureView,
+}
+
+pub struct PackPost {
+ pub notes: Vec,
+ passes: Vec,
+ deferred_pre: u16,
+ composite_pre: u16,
+ formats: [wgpu::TextureFormat; BUFFERS],
+ clears: [Option<[f32; 4]>; BUFFERS],
+ used: u16,
+ /// Bit n set: B is buffer n's "main".
+ main: u16,
+ targets: Option,
+ noise: wgpu::TextureView,
+ dummy: wgpu::TextureView,
+ /// The stand-in shadow map and its comparison sampler; cleared on the first frame.
+ shadow: (wgpu::TextureView, wgpu::Sampler),
+ shadow_cleared: bool,
+ linear: wgpu::Sampler,
+ nearest: wgpu::Sampler,
+ repeat: wgpu::Sampler,
+ blit: (wgpu::RenderPipeline, wgpu::BindGroupLayout),
+ /// The blit also writes depthtex0 (some program reads it) and clears these buffers.
+ blit_depth: bool,
+ blit_clears: Vec,
+ /// Buffers cleared in passes of their own (more than the blit's eight attachments).
+ other_clears: Vec,
+ /// The blit's bindings, for the world target of this size.
+ blit_group: Option<([u32; 2], wgpu::BindGroup)>,
+ /// Shows colortex0 when the pack has no `final` (OQ-5).
+ copy: (wgpu::RenderPipeline, wgpu::BindGroupLayout),
+ uniforms: FrameUniforms,
+}
+
+/// The wgpu format of a pack format (6.7), the nearest one wgpu can render to.
+fn texture_format(f: Format, features: wgpu::Features) -> wgpu::TextureFormat {
+ use wgpu::TextureFormat as T;
+ let pick = |r, rg, rgba| match f.channels {
+ 1 => r,
+ 2 => rg,
+ _ => rgba,
+ };
+ let half = pick(T::R16Float, T::Rg16Float, T::Rgba16Float);
+ match (f.kind, f.bits) {
+ (Kind::Unorm, 10) => T::Rgb10a2Unorm,
+ (Kind::Unorm, 16) if features.contains(wgpu::Features::TEXTURE_FORMAT_16BIT_NORM) => {
+ pick(T::R16Unorm, T::Rg16Unorm, T::Rgba16Unorm)
+ }
+ (Kind::Unorm, b) if b <= 8 => pick(T::R8Unorm, T::Rg8Unorm, T::Rgba8Unorm),
+ (Kind::Float, 32) => pick(T::R32Float, T::Rg32Float, T::Rgba32Float),
+ (Kind::Float, 11) if features.contains(wgpu::Features::RG11B10UFLOAT_RENDERABLE) => {
+ T::Rg11b10Ufloat
+ }
+ (Kind::Int, 8) => pick(T::R8Sint, T::Rg8Sint, T::Rgba8Sint),
+ (Kind::Int, 16) => pick(T::R16Sint, T::Rg16Sint, T::Rgba16Sint),
+ (Kind::Int, _) => pick(T::R32Sint, T::Rg32Sint, T::Rgba32Sint),
+ (Kind::Uint, 8) => pick(T::R8Uint, T::Rg8Uint, T::Rgba8Uint),
+ (Kind::Uint, 10) => T::Rgb10a2Uint,
+ (Kind::Uint, 16) => pick(T::R16Uint, T::Rg16Uint, T::Rgba16Uint),
+ (Kind::Uint, _) => pick(T::R32Uint, T::Rg32Uint, T::Rgba32Uint),
+ // Snorm, 16-bit norm without the feature, RGB9_E5: half floats hold them.
+ _ => half,
+ }
+}
+
+fn source(name: &str) -> Source {
+ match name {
+ "depthtex0" | "gdepthtex" | "depthtex1" | "depthtex2" => Source::Depth,
+ "noisetex" => Source::Noise,
+ n => horizon_shaders::buffer_index(n).map_or(Source::Dummy, Source::Color),
+ }
+}
+
+/// 256×256 RGB white noise (6.4), from a fixed seed so every run looks the same.
+fn noise(device: &wgpu::Device, queue: &wgpu::Queue) -> wgpu::TextureView {
+ let mut state = 0x2545_f491_4f6c_dd1du64;
+ let texels: Vec = (0..256 * 256 * 4)
+ .map(|i| {
+ state ^= state << 13;
+ state ^= state >> 7;
+ state ^= state << 17;
+ if i % 4 == 3 { 255 } else { (state >> 56) as u8 }
+ })
+ .collect();
+ texture(device, queue, "Shader pack noisetex", 256, &texels)
+}
+
+fn texture(
+ device: &wgpu::Device,
+ queue: &wgpu::Queue,
+ label: &str,
+ side: u32,
+ texels: &[u8],
+) -> wgpu::TextureView {
+ let size = wgpu::Extent3d {
+ width: side,
+ height: side,
+ depth_or_array_layers: 1,
+ };
+ let tex = device.create_texture(&wgpu::TextureDescriptor {
+ label: Some(label),
+ size,
+ mip_level_count: 1,
+ sample_count: 1,
+ dimension: wgpu::TextureDimension::D2,
+ format: wgpu::TextureFormat::Rgba8Unorm,
+ usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
+ view_formats: &[],
+ });
+ queue.write_texture(
+ tex.as_image_copy(),
+ texels,
+ wgpu::TexelCopyBufferLayout {
+ offset: 0,
+ bytes_per_row: Some(side * 4),
+ rows_per_image: None,
+ },
+ size,
+ );
+ tex.create_view(&Default::default())
+}
+
+fn sampler(
+ device: &wgpu::Device,
+ filter: wgpu::FilterMode,
+ address: wgpu::AddressMode,
+) -> wgpu::Sampler {
+ device.create_sampler(&wgpu::SamplerDescriptor {
+ label: Some("Shader pack"),
+ address_mode_u: address,
+ address_mode_v: address,
+ address_mode_w: address,
+ mag_filter: filter,
+ min_filter: filter,
+ ..Default::default()
+ })
+}
+
+/// Runs `create` and returns its validation error, if any.
+fn checked(device: &wgpu::Device, create: impl FnOnce() -> T) -> Result {
+ let scope = device.push_error_scope(wgpu::ErrorFilter::Validation);
+ let value = create();
+ match pollster::block_on(scope.pop()) {
+ Some(e) => {
+ // The details are in the error's sources.
+ let mut message = e.to_string();
+ let mut source = std::error::Error::source(&e);
+ while let Some(s) = source {
+ message = format!("{message}: {s}");
+ source = s.source();
+ }
+ Err(message)
+ }
+ None => Ok(value),
+ }
+}
+
+/// A full-screen helper pipeline of ours (`pack_post.wgsl`).
+fn helper(
+ device: &wgpu::Device,
+ vertex: &str,
+ entry: &str,
+ entries: &[wgpu::BindGroupLayoutEntry],
+ targets: &[Option],
+) -> (wgpu::RenderPipeline, wgpu::BindGroupLayout) {
+ let module = device.create_shader_module(wgpu::ShaderModuleDescriptor {
+ label: Some("Shader pack helpers"),
+ source: wgpu::ShaderSource::Wgsl(include_str!("pack_post.wgsl").into()),
+ });
+ let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+ label: Some(entry),
+ entries,
+ });
+ let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+ label: Some(entry),
+ bind_group_layouts: &[Some(&layout)],
+ ..Default::default()
+ });
+ let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+ label: Some(entry),
+ layout: Some(&pipeline_layout),
+ vertex: wgpu::VertexState {
+ module: &module,
+ entry_point: Some(vertex),
+ compilation_options: Default::default(),
+ buffers: &[],
+ },
+ primitive: Default::default(),
+ depth_stencil: None,
+ multisample: Default::default(),
+ fragment: Some(wgpu::FragmentState {
+ module: &module,
+ entry_point: Some(entry),
+ compilation_options: Default::default(),
+ targets,
+ }),
+ multiview_mask: None,
+ cache: None,
+ });
+ (pipeline, layout)
+}
+
+fn entry(binding: u32, ty: wgpu::BindingType) -> wgpu::BindGroupLayoutEntry {
+ wgpu::BindGroupLayoutEntry {
+ binding,
+ visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,
+ ty,
+ count: None,
+ }
+}
+
+fn texture_entry(binding: u32, sample_type: wgpu::TextureSampleType) -> wgpu::BindGroupLayoutEntry {
+ entry(
+ binding,
+ wgpu::BindingType::Texture {
+ sample_type,
+ view_dimension: wgpu::TextureViewDimension::D2,
+ multisampled: false,
+ },
+ )
+}
+
+fn target(format: wgpu::TextureFormat) -> Option {
+ Some(wgpu::ColorTargetState {
+ format,
+ blend: None,
+ write_mask: wgpu::ColorWrites::ALL,
+ })
+}
+
+fn attach(
+ view: &wgpu::TextureView,
+ ops: wgpu::Operations,
+) -> Option> {
+ Some(wgpu::RenderPassColorAttachment {
+ view,
+ resolve_target: None,
+ depth_slice: None,
+ ops,
+ })
+}
+
+impl PackPost {
+ /// Builds the pipelines of `post` for a screen of `screen` format.
+ pub fn new(
+ device: &wgpu::Device,
+ queue: &wgpu::Queue,
+ post: Post,
+ screen: wgpu::TextureFormat,
+ ) -> Self {
+ let features = device.features();
+ let formats: [wgpu::TextureFormat; BUFFERS] =
+ std::array::from_fn(|i| texture_format(post.config.buffers[i].format, features));
+ let clears = std::array::from_fn(|i| {
+ let b = &post.config.buffers[i];
+ b.clear.then(|| {
+ b.clear_color
+ .unwrap_or(if i == 1 { [1.0; 4] } else { [0.0; 4] })
+ })
+ });
+ let mut notes = post.notes;
+ notes.extend(post.config.notes);
+ let mask =
+ |flips: &[(u32, bool)]| flips.iter().filter(|f| f.1).fold(0u16, |m, f| m | 1 << f.0);
+ let mut used = 1u16;
+ let mut passes = Vec::new();
+ for p in post.programs {
+ let interface = &p.program.interface;
+ let mut entries = vec![entry(
+ 0,
+ wgpu::BindingType::Buffer {
+ ty: wgpu::BufferBindingType::Uniform,
+ has_dynamic_offset: false,
+ min_binding_size: None,
+ },
+ )];
+ let mut samplers = Vec::new();
+ let mut reads = 0u16;
+ for s in &interface.samplers {
+ let mut src = source(&s.name);
+ let float = wgpu::TextureSampleType::Float { filterable: true };
+ let mut sample_type = match src {
+ Source::Color(n) => formats[n]
+ .sample_type(None, Some(features))
+ .unwrap_or(float),
+ Source::Depth => wgpu::TextureSampleType::Float { filterable: false },
+ _ => float,
+ };
+ let int = !matches!(sample_type, wgpu::TextureSampleType::Float { .. });
+ if s.ty == "sampler2DShadow" {
+ (src, sample_type) = (Source::Shadow, wgpu::TextureSampleType::Depth);
+ }
+ let wanted = match s.ty.as_str() {
+ "sampler2DShadow" => true,
+ "sampler2D" => !int,
+ "isampler2D" => sample_type == wgpu::TextureSampleType::Sint,
+ "usampler2D" => sample_type == wgpu::TextureSampleType::Uint,
+ _ => false,
+ };
+ if !wanted {
+ notes.push(format!(
+ "{}: `{} {}` is not provided yet",
+ p.name, s.ty, s.name
+ ));
+ (src, sample_type) = (Source::Dummy, float);
+ }
+ let filtering = sample_type == float;
+ if let Source::Color(n) = src {
+ reads |= 1 << n;
+ }
+ entries.push(texture_entry(s.binding, sample_type));
+ entries.push(entry(
+ s.binding + 1,
+ wgpu::BindingType::Sampler(if src == Source::Shadow {
+ wgpu::SamplerBindingType::Comparison
+ } else if filtering {
+ wgpu::SamplerBindingType::Filtering
+ } else {
+ wgpu::SamplerBindingType::NonFiltering
+ }),
+ ));
+ samplers.push(Binding {
+ source: src,
+ binding: s.binding,
+ filtering,
+ });
+ }
+ let final_pass = p.group == Group::Final;
+ let mut targets = Vec::new();
+ let mut writes = Vec::new();
+ for &location in &interface.outputs {
+ let l = location as usize;
+ if targets.len() <= l {
+ targets.resize(l + 1, None);
+ }
+ if final_pass {
+ if location == 0 {
+ targets[0] = target(screen);
+ }
+ } else if let Some(&buffer) = p.buffers.get(l) {
+ targets[l] = target(formats[buffer as usize]);
+ writes.push((location, buffer as usize));
+ }
+ }
+ if !final_pass && writes.is_empty() {
+ notes.push(format!("{}: writes no buffer; skipped", p.name));
+ continue;
+ }
+ let written = writes.iter().fold(0u16, |m, w| m | 1 << w.1);
+ let kept = p
+ .flips
+ .iter()
+ .filter(|f| !f.1)
+ .fold(0u16, |m, f| m | 1 << f.0);
+ let flip = if final_pass {
+ 0
+ } else {
+ (written & !kept) | mask(&p.flips)
+ };
+ used |= reads | written | flip;
+ let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+ label: Some(&p.name),
+ entries: &entries,
+ });
+ let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
+ label: Some(&p.name),
+ bind_group_layouts: &[Some(&layout)],
+ ..Default::default()
+ });
+ let created = checked(device, || {
+ let module = |m: naga::Module| {
+ device.create_shader_module(wgpu::ShaderModuleDescriptor {
+ label: Some(&p.name),
+ source: wgpu::ShaderSource::Naga(std::borrow::Cow::Owned(m)),
+ })
+ };
+ let (vs, fs) = (module(p.program.vertex), module(p.program.fragment));
+ device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+ label: Some(&p.name),
+ layout: Some(&pipeline_layout),
+ vertex: wgpu::VertexState {
+ module: &vs,
+ entry_point: Some("main"),
+ compilation_options: Default::default(),
+ buffers: &[],
+ },
+ primitive: Default::default(),
+ depth_stencil: None,
+ multisample: Default::default(),
+ fragment: Some(wgpu::FragmentState {
+ module: &fs,
+ entry_point: Some("main"),
+ compilation_options: Default::default(),
+ targets: &targets,
+ }),
+ multiview_mask: None,
+ cache: None,
+ })
+ });
+ let pipeline = match created {
+ Ok(p) => p,
+ Err(e) => {
+ notes.push(format!("{}: skipped: {e}", p.name));
+ continue;
+ }
+ };
+ let interface = &p.program.interface;
+ passes.push(Pass {
+ ubo: device.create_buffer(&wgpu::BufferDescriptor {
+ label: Some(&p.name),
+ size: u64::from(interface.uniform_size.max(16)),
+ usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
+ mapped_at_creation: false,
+ }),
+ block: vec![0; interface.uniform_size as usize],
+ uniforms: interface
+ .uniforms
+ .iter()
+ .map(|u| (pack_uniforms::index(&u.name), u.ty.clone(), u.offset))
+ .collect(),
+ name: p.name,
+ group: p.group,
+ pipeline,
+ layout,
+ samplers,
+ writes,
+ flip,
+ reads,
+ written,
+ groups: HashMap::new(),
+ });
+ }
+ // A clear only matters when a program reads the buffer before one writes all of it
+ // (composite passes cover their whole target); the others are skipped.
+ let mut cleared = Vec::new();
+ for b in 1..BUFFERS {
+ let bit = 1u16 << b;
+ let first = passes
+ .iter()
+ .find(|p| (p.reads | p.flip | p.written) & bit != 0);
+ if clears[b].is_some()
+ && first.is_some_and(|p| p.reads & bit != 0 || p.written & bit == 0)
+ {
+ cleared.push(b);
+ }
+ }
+ let blit_depth = passes
+ .iter()
+ .any(|p| p.samplers.iter().any(|s| s.source == Source::Depth));
+ let room = 8 - 1 - usize::from(blit_depth);
+ let other_clears = cleared.split_off(room.min(cleared.len()));
+ let float = wgpu::TextureSampleType::Float { filterable: true };
+ let mut blit_targets = vec![target(formats[0])];
+ if blit_depth {
+ blit_targets.push(target(wgpu::TextureFormat::R32Float));
+ }
+ // Cleared by the pass's load operation; the shader writes nothing there.
+ blit_targets.extend(cleared.iter().map(|&b| {
+ Some(wgpu::ColorTargetState {
+ format: formats[b],
+ blend: None,
+ write_mask: wgpu::ColorWrites::empty(),
+ })
+ }));
+ let blit = helper(
+ device,
+ "vs_full",
+ if blit_depth {
+ "fs_blit"
+ } else {
+ "fs_blit_color"
+ },
+ &[
+ texture_entry(0, float),
+ texture_entry(1, wgpu::TextureSampleType::Depth),
+ ],
+ &blit_targets,
+ );
+ let copy = helper(
+ device,
+ "vs_uv",
+ "fs_copy",
+ &[
+ texture_entry(0, float),
+ entry(
+ 2,
+ wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
+ ),
+ ],
+ &[target(screen)],
+ );
+ let white = [255u8; 4];
+ Self {
+ notes,
+ passes,
+ deferred_pre: mask(&post.deferred_pre),
+ composite_pre: mask(&post.composite_pre),
+ formats,
+ clears,
+ used,
+ blit_depth,
+ blit_clears: cleared,
+ other_clears,
+ blit_group: None,
+ main: 0,
+ targets: None,
+ noise: noise(device, queue),
+ dummy: texture(device, queue, "Shader pack stand-in", 1, &white),
+ shadow: (
+ device
+ .create_texture(&wgpu::TextureDescriptor {
+ label: Some("Shader pack shadow stand-in"),
+ size: wgpu::Extent3d {
+ width: 1,
+ height: 1,
+ depth_or_array_layers: 1,
+ },
+ mip_level_count: 1,
+ sample_count: 1,
+ dimension: wgpu::TextureDimension::D2,
+ format: wgpu::TextureFormat::Depth32Float,
+ usage: wgpu::TextureUsages::TEXTURE_BINDING
+ | wgpu::TextureUsages::RENDER_ATTACHMENT,
+ view_formats: &[],
+ })
+ .create_view(&Default::default()),
+ device.create_sampler(&wgpu::SamplerDescriptor {
+ label: Some("Shader pack shadow"),
+ compare: Some(wgpu::CompareFunction::LessEqual),
+ ..Default::default()
+ }),
+ ),
+ shadow_cleared: false,
+ linear: sampler(
+ device,
+ wgpu::FilterMode::Linear,
+ wgpu::AddressMode::ClampToEdge,
+ ),
+ nearest: sampler(
+ device,
+ wgpu::FilterMode::Nearest,
+ wgpu::AddressMode::ClampToEdge,
+ ),
+ repeat: sampler(device, wgpu::FilterMode::Linear, wgpu::AddressMode::Repeat),
+ blit,
+ copy,
+ uniforms: FrameUniforms::default(),
+ }
+ }
+
+ /// The names of the programs that run, in order.
+ pub fn programs(&self) -> Vec<&str> {
+ self.passes.iter().map(|p| p.name.as_str()).collect()
+ }
+
+ fn resize(&mut self, device: &wgpu::Device, size: [u32; 2]) {
+ if self.targets.as_ref().is_some_and(|t| t.size == size) {
+ return;
+ }
+ let make = |label: &str, format| {
+ device
+ .create_texture(&wgpu::TextureDescriptor {
+ label: Some(label),
+ size: wgpu::Extent3d {
+ width: size[0],
+ height: size[1],
+ depth_or_array_layers: 1,
+ },
+ mip_level_count: 1,
+ sample_count: 1,
+ dimension: wgpu::TextureDimension::D2,
+ format,
+ usage: wgpu::TextureUsages::RENDER_ATTACHMENT
+ | wgpu::TextureUsages::TEXTURE_BINDING,
+ view_formats: &[],
+ })
+ .create_view(&Default::default())
+ };
+ let color = std::array::from_fn(|i| {
+ (self.used & 1 << i != 0).then(|| {
+ let label = format!("colortex{i}");
+ [make(&label, self.formats[i]), make(&label, self.formats[i])]
+ })
+ });
+ self.targets = Some(Targets {
+ size,
+ color,
+ depth: make("depthtex0", wgpu::TextureFormat::R32Float),
+ });
+ for pass in &mut self.passes {
+ pass.groups.clear();
+ }
+ }
+
+ /// Runs the pack over the world drawn into `world` (colour) and `world_depth`, then draws
+ /// the result onto `screen`.
+ #[allow(clippy::too_many_arguments)]
+ pub fn run(
+ &mut self,
+ device: &wgpu::Device,
+ queue: &wgpu::Queue,
+ encoder: &mut wgpu::CommandEncoder,
+ world: &wgpu::TextureView,
+ world_depth: &wgpu::TextureView,
+ screen: &wgpu::TextureView,
+ frame: &super::Frame,
+ inputs: &PackInputs,
+ size: [u32; 2],
+ window: [u32; 2],
+ ) {
+ self.resize(device, size);
+ self.uniforms.update(frame, inputs, size);
+ let Some(targets) = &self.targets else { return };
+ let main = |m: u16, i: usize| usize::from(m & 1 << i != 0);
+ let view = |m: u16, i: usize, alt: bool| {
+ targets.color[i]
+ .as_ref()
+ .map(|t| &t[main(m, i) ^ usize::from(alt)])
+ };
+
+ if !self.shadow_cleared {
+ self.shadow_cleared = true;
+ encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+ label: Some("Shader pack shadow stand-in"),
+ depth_stencil_attachment: Some(wgpu::RenderPassDepthStencilAttachment {
+ view: &self.shadow.0,
+ depth_ops: Some(wgpu::Operations {
+ load: wgpu::LoadOp::Clear(1.0),
+ store: wgpu::StoreOp::Store,
+ }),
+ stencil_ops: None,
+ }),
+ ..Default::default()
+ });
+ }
+ let clear_op = |b: usize| {
+ let c = self.clears[b].unwrap_or_default();
+ wgpu::Operations {
+ load: wgpu::LoadOp::Clear(wgpu::Color {
+ r: c[0].into(),
+ g: c[1].into(),
+ b: c[2].into(),
+ a: c[3].into(),
+ }),
+ store: wgpu::StoreOp::Store,
+ }
+ };
+ // Overwritten whole: clearing lets a tiled GPU skip loading the old content.
+ let overwrite = wgpu::Operations {
+ load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+ store: wgpu::StoreOp::Store,
+ };
+ for chunk in self.other_clears.chunks(8) {
+ let attachments: Vec<_> = chunk
+ .iter()
+ .map(|&b| attach(view(self.main, b, false).expect("used buffer"), clear_op(b)))
+ .collect();
+ encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+ label: Some("Shader pack clear"),
+ color_attachments: &attachments,
+ ..Default::default()
+ });
+ }
+
+ // The world into colortex0 and depthtex0, flipped to GL's rows, and the clears.
+ if self.blit_group.as_ref().is_none_or(|g| g.0 != size) {
+ let group = device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: Some("Shader pack world"),
+ layout: &self.blit.1,
+ entries: &[
+ wgpu::BindGroupEntry {
+ binding: 0,
+ resource: wgpu::BindingResource::TextureView(world),
+ },
+ wgpu::BindGroupEntry {
+ binding: 1,
+ resource: wgpu::BindingResource::TextureView(world_depth),
+ },
+ ],
+ });
+ self.blit_group = Some((size, group));
+ }
+ {
+ let mut attachments = vec![attach(
+ view(self.main, 0, false).expect("colortex0"),
+ overwrite,
+ )];
+ if self.blit_depth {
+ attachments.push(attach(&targets.depth, overwrite));
+ }
+ for &b in &self.blit_clears {
+ attachments.push(attach(
+ view(self.main, b, false).expect("used buffer"),
+ clear_op(b),
+ ));
+ }
+ let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+ label: Some("Shader pack world"),
+ color_attachments: &attachments,
+ ..Default::default()
+ });
+ pass.set_pipeline(&self.blit.0);
+ pass.set_bind_group(0, self.blit_group.as_ref().map(|g| &g.1), &[]);
+ pass.draw(0..3, 0..1);
+ }
+
+ let fog = self.uniforms.fog();
+ let mut seen = (false, false);
+ let mut shown = false;
+ for pass in &mut self.passes {
+ if pass.group == Group::Deferred && !seen.0 {
+ seen.0 = true;
+ self.main ^= self.deferred_pre;
+ }
+ if pass.group == Group::Composite && !seen.1 {
+ seen.1 = true;
+ self.main ^= self.composite_pre;
+ }
+ let final_pass = pass.group == Group::Final;
+ let out = if final_pass { window } else { size };
+ // Our block members first (`hz_target`, `hz_fog_color`, `hz_fog`), then the pack's.
+ let ours = [
+ [
+ out[0] as f32,
+ out[1] as f32,
+ 1.0 / out[0] as f32,
+ 1.0 / out[1] as f32,
+ ],
+ fog[0].to_array(),
+ fog[1].to_array(),
+ ];
+ let head: &[u8] = bytemuck::cast_slice(&ours);
+ let n = head.len().min(pass.block.len());
+ pass.block[..n].copy_from_slice(&head[..n]);
+ for (index, ty, offset) in &pass.uniforms {
+ if let Some(v) = index.and_then(|i| self.uniforms.values.get(i)) {
+ v.write(ty, &mut pass.block, *offset as usize);
+ }
+ }
+ if !pass.block.is_empty() {
+ queue.write_buffer(&pass.ubo, 0, &pass.block);
+ }
+ let key = self.main & pass.reads;
+ let group = pass.groups.entry(key).or_insert_with(|| {
+ let mut entries = vec![wgpu::BindGroupEntry {
+ binding: 0,
+ resource: pass.ubo.as_entire_binding(),
+ }];
+ for s in &pass.samplers {
+ let filter = if s.filtering {
+ &self.linear
+ } else {
+ &self.nearest
+ };
+ let (texture, sampler) = match s.source {
+ Source::Color(i) => (view(key, i, false).unwrap_or(&self.dummy), filter),
+ Source::Depth => (&targets.depth, &self.nearest),
+ Source::Noise => (&self.noise, &self.repeat),
+ Source::Dummy => (&self.dummy, &self.linear),
+ Source::Shadow => (&self.shadow.0, &self.shadow.1),
+ };
+ entries.push(wgpu::BindGroupEntry {
+ binding: s.binding,
+ resource: wgpu::BindingResource::TextureView(texture),
+ });
+ entries.push(wgpu::BindGroupEntry {
+ binding: s.binding + 1,
+ resource: wgpu::BindingResource::Sampler(sampler),
+ });
+ }
+ device.create_bind_group(&wgpu::BindGroupDescriptor {
+ label: Some(&pass.name),
+ layout: &pass.layout,
+ entries: &entries,
+ })
+ });
+ let mut attachments: Vec