mirror of
https://github.com/horizon-rust/horizon-mods.git
synced 2026-11-07 11:05:58 -10:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
253c37dc45 | ||
|
|
57b2a3a785 | ||
|
|
c58ba98d51 |
No files matched your search
@@ -3,4 +3,5 @@
|
||||
# (Ludovic decides who is in it). /.github/ and takedowns stay Ludovic's.
|
||||
* @ludovic111 @horizon-rust/horizon-team
|
||||
/.github/ @ludovic111
|
||||
/scripts/ @ludovic111
|
||||
/revoked.toml @ludovic111
|
||||
@@ -78,9 +78,7 @@ jobs:
|
||||
names = zipfile.ZipFile(path).namelist()
|
||||
manifest = json.loads(zipfile.ZipFile(path).read("horizon-native.json"))
|
||||
assert manifest["hooks"] >= 1, manifest
|
||||
bundle = f"mixins/{manifest['id']}/"
|
||||
assert all(n == "horizon-native.json" or n == bundle + "LICENSE" or (n.startswith(bundle) and n.endswith((".rs", ".toml"))) for n in names), names
|
||||
assert bundle + "LICENSE" in names, "the mod's LICENSE travels in its package"
|
||||
assert all(n == "horizon-native.json" or (n.startswith(f"mixins/{manifest['id']}/") and n.endswith((".rs", ".toml"))) for n in names), names
|
||||
print(path, manifest)
|
||||
PY
|
||||
- uses: actions/upload-artifact@v4
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
# Merges an owner's update of their own project without a reviewer: the submission form's pull request
|
||||
# (opened by the form's account, signed with an HMAC trailer in its body, label `owner-update`) whose diff is
|
||||
# one new [[versions]] table in mods/<id>.toml, by someone in that entry's `owners`. scripts/owner_update.py
|
||||
# verifies all of it and waits for the other workflows (check, and native when it ran) to pass on the head commit.
|
||||
# Anything else is a reviewer's, as before. Setup (Ludovic's): README.md, "Owner updates".
|
||||
#
|
||||
# pull_request_target: it runs main's copy of this file and script, with secrets, and never checks out or runs the
|
||||
# pull request's code: the script only reads the pull request through the API, as data. Merging needs the
|
||||
# secret REGISTRY_MERGE_TOKEN, an account allowed to bypass the review rule; a merge by GITHUB_TOKEN would not
|
||||
# start publish.yml either.
|
||||
name: owner-update
|
||||
on:
|
||||
pull_request_target:
|
||||
branches: [main]
|
||||
types: [opened, reopened, labeled, synchronize]
|
||||
permissions:
|
||||
contents: read
|
||||
actions: read
|
||||
pull-requests: read
|
||||
concurrency:
|
||||
group: owner-update-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
owner-update:
|
||||
# The label only keeps this off other pull requests; the signed trailer is the proof.
|
||||
if: contains(github.event.pull_request.labels.*.name, 'owner-update')
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.base.sha }}
|
||||
persist-credentials: false
|
||||
- run: python3 scripts/test_owner_update.py
|
||||
- name: Verify, wait for the checks, merge
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
MERGE_TOKEN: ${{ secrets.REGISTRY_MERGE_TOKEN }}
|
||||
UPDATE_KEY: ${{ secrets.REGISTRY_UPDATE_KEY }}
|
||||
REPO: ${{ github.repository }}
|
||||
PR: ${{ github.event.pull_request.number }}
|
||||
BOT: ${{ vars.REGISTRY_BOT || 'horizon-mods-bot' }}
|
||||
SELF: ${{ github.workflow }}
|
||||
run: python3 scripts/owner_update.py
|
||||
@@ -3,3 +3,4 @@
|
||||
/bootstrap/
|
||||
/native/target/
|
||||
/native/*/target/
|
||||
__pycache__/
|
||||
@@ -36,21 +36,6 @@ Submitting a project, through the form or a pull request, means you confirm that
|
||||
You alone are responsible for what you publish and for any claim about it. The Horizon project may refuse, hide or
|
||||
remove any project, at any time, without having to give a reason.
|
||||
|
||||
## Licences reviewers can read
|
||||
|
||||
Reviewers read a project's source before each version is listed; that is how they check it holds nothing harmful.
|
||||
They may only read source under a licence that lets them, so a new project, and every new version of a listed one,
|
||||
needs source under one of:
|
||||
|
||||
- MIT, MIT-0, BSD-2-Clause, BSD-3-Clause, 0BSD, Apache-2.0, ISC, zlib, Unlicense or CC0-1.0;
|
||||
- or any licence, with a written grant from its authors that lets the Horizon reviewers read the source to review it
|
||||
(say so in the pull request, with a link to the grant).
|
||||
|
||||
Source under GPL, LGPL, MPL or all rights reserved, without such a grant, can't be reviewed, so it can't be listed or
|
||||
updated. The projects already listed under other licences when this rule was written (classic_zoom,
|
||||
distant_horizons, fly_speed, serverify) stay listed as they are; their next version needs a licence above or a
|
||||
grant. A port also has to follow promise 2 above.
|
||||
|
||||
## Copyright and takedowns
|
||||
|
||||
If a project in this registry uses your work without your permission:
|
||||
|
||||
@@ -18,8 +18,8 @@ and the launcher to have shipped first.
|
||||
|
||||
**Who is responsible.** Except the projects marked Official (made by the Horizon project), everything here is made and
|
||||
owned by its own authors, not by the Horizon project or its maintainers. A listing is not an endorsement. See the
|
||||
[mod policy](MOD-POLICY.md): what authors promise when they submit (ports of other mods included), the licences
|
||||
whose source reviewers can read, and how to have a project taken down.
|
||||
[mod policy](MOD-POLICY.md): what authors promise when they submit (ports of other mods included) and how to have
|
||||
a project taken down.
|
||||
|
||||
## Submit
|
||||
|
||||
@@ -41,9 +41,39 @@ cargo install --git https://github.com/horizon-rust/horizon cargo-horizon-mod
|
||||
cargo horizon-mod check target/horizon-mod/my_mod.hmod
|
||||
```
|
||||
|
||||
**Updates** come the same way: the form adds a version to your entry, and a reviewer reads it before it is
|
||||
published. Only an entry's `owners` can add versions, and every version of a native mod is reviewed, owner or
|
||||
not: its code runs with the player's account permissions. A published file never changes: publish a new version.
|
||||
**Updates** come the same way: the form adds a version to your entry. Only an entry's `owners` publish its updates
|
||||
without a reviewer's extra look (below). A published file never changes: publish a new version.
|
||||
|
||||
### Owner updates
|
||||
|
||||
When an owner of a project updates it through the form, and **only a new version is added** (the entry's key, owners,
|
||||
icon, kind, id and page text are exactly as on `main`; the version is signed if the entry has a key), no reviewer is
|
||||
needed. The flow:
|
||||
|
||||
1. The form checks that your GitHub login is in the entry's `owners` on `main` and that nothing else of the entry
|
||||
changed, and opens the pull request as the registry's account with the label `owner-update` and, at the end of its
|
||||
body, a trailer holding the id, version, SHA-256, file, your login and an HMAC-SHA256 over them with the secret
|
||||
`REGISTRY_UPDATE_KEY` (only the form and this repository know it). Anyone else's pull request cannot carry a valid one.
|
||||
2. [`owner-update.yml`](.github/workflows/owner-update.yml) runs [`scripts/owner_update.py`](scripts/owner_update.py)
|
||||
from `main` (never the pull request's code) and verifies: the HMAC; the author is the form's account (variable
|
||||
`REGISTRY_BOT`); the diff is exactly `mods/<id>.toml` with one new `[[versions]]` table matching the signed
|
||||
id, version, SHA-256 and file, every other field unchanged and `main`'s copy unchanged since; the submitter is in
|
||||
`owners` on `main`; the id is not in `revoked.toml`.
|
||||
3. It waits for the other workflows on the pull request's head commit (`check`, and `native` when it ran) to succeed.
|
||||
4. It merges (a merge commit pinned to the verified head) with `REGISTRY_MERGE_TOKEN`, which is how `publish.yml` runs
|
||||
on the merge.
|
||||
|
||||
A new project, a changed page, key, owners or icon, a missing signature, a failed check or anything that does not verify
|
||||
leaves the pull request to a reviewer as before (a red `owner-update` run says why). Tests of the verification:
|
||||
`python3 scripts/test_owner_update.py`.
|
||||
|
||||
**Setup** (Ludovic, once; the changes under `.github/` and `scripts/` are his to review):
|
||||
|
||||
| What | Where |
|
||||
| --- | --- |
|
||||
| `REGISTRY_UPDATE_KEY`: the same random secret (32+ characters) | the secret of this repository, and the variable of the Railway service `horizon-mod-registry` (see its README); unset on either side, nothing merges by itself |
|
||||
| `REGISTRY_MERGE_TOKEN`: a fine-grained token (or a GitHub App's) of an account that may bypass the review rule, with Contents and Pull requests read and write on this repository | the secret of this repository; add the account to the bypass list of the ruleset (or "Allow specified actors to bypass required pull requests" of the branch protection). Required status checks stay required for everyone |
|
||||
| `REGISTRY_BOT`: the login of the form's account (`GITHUB_BOT_TOKEN`'s owner) | the variable of this repository (also read by `check.yml`; default `horizon-mods-bot`) |
|
||||
|
||||
**Signing** is optional and recommended: put your [minisign](https://jedisct1.github.io/minisign/) public key in your
|
||||
entry, and every later version must be signed with it, so nobody else can publish an update in your name.
|
||||
@@ -64,6 +94,7 @@ why.
|
||||
| `revoked.toml` | Files taken down |
|
||||
| `.github/workflows/check.yml` | A pull request's checks |
|
||||
| `.github/workflows/publish.yml` | On merge: releases, then `index.json` on Pages |
|
||||
| `.github/workflows/owner-update.yml`, `scripts/owner_update.py` | Merges an owner's update of their own project when it verifies |
|
||||
| `.github/workflows/cleanup.yml` | Weekly: staging files nobody needs any more |
|
||||
| `.github/workflows/native.yml` | Horizon's native mods: each changed one's tests, `.hnmod` and game check, all of them together, and weekly on the newest Nightly |
|
||||
| `native/<name>/` | Horizon's own native mods (Zoom, FPS Counter, Keystrokes, Minimap, Recipes, Coordinates HUD): the source of their `.hnmod` files |
|
||||
@@ -83,8 +114,7 @@ The index: `https://horizon-rust.github.io/horizon-mods/index.json`.
|
||||
[horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundles on Horizon's native hook points
|
||||
([docs/native-mods.md](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md)). Each folder keeps the
|
||||
history of the repository it came from. A mod builds on any Horizon whose hook points are at least the version its
|
||||
`compatibility.json` names; `horizon_revision` is the commit it was last tested on. `smp` and `voicechat-server`
|
||||
are server mods, built into the official server's engine (see their READMEs).
|
||||
`compatibility.json` names; `horizon_revision` is the commit it was last tested on.
|
||||
|
||||
```sh
|
||||
python3 native/tools/native.py check zoom # apply on the tested Horizon and cargo check the game
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 855 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
@@ -1,31 +0,0 @@
|
||||
id = "accurate_block_placement"
|
||||
kind = "native-mod"
|
||||
name = "Accurate Block Placement"
|
||||
summary = "Hold right click with a block and every new spot you look at gets one, however fast you move."
|
||||
description = """
|
||||
Placing blocks fast is all about timing: vanilla places a block every four ticks while you hold right click, so moving fast skips spots and moving slowly stacks extra blocks. **Accurate Block Placement** times it for you: hold right click and every *new* spot you look at gets a block at once.
|
||||
|
||||
- **A new spot, a block**: bridging, building walls and floors, or sweeping along a row; no spot skipped, however fast you move.
|
||||
- **No extra blocks**: staring at one spot places nothing more.
|
||||
- **A single click stays a single block**: right after the click it waits as vanilla does, unless you turn the view.
|
||||
- **Building backwards**: walking backwards while placing toward yourself places one block per step.
|
||||
- Doors, chests, buttons and other blocks you click still work as usual.
|
||||
|
||||
**Settings** (Options > Mods > Accurate Block Placement): turn it on or off, bind a key to toggle it (unbound by default), and choose whether it works on servers.
|
||||
|
||||
Some servers see fast, accurate placing as a cheat: check their rules, or turn "Allowed on servers" off.
|
||||
|
||||
A port of [Accurate Block Placement: Reborn](https://modrinth.com/mod/accurate-block-placement-reborn) (MIT) by Clayborn, Flourick, schwar and KadTheHunter, rewritten in Rust for Horizon."""
|
||||
authors = ["Lutziano888"]
|
||||
owners = ["Lutziano888"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Lutziano888/horizon-accurate-block-placement"
|
||||
icon = "https://raw.githubusercontent.com/Lutziano888/horizon-accurate-block-placement/main/icon.png"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "accurate_block_placement-1.0.0.hnmod"
|
||||
sha256 = "e631745f6d267360de6eb51995ee995bf1ab3d64393d287b7b93c332b85939ce"
|
||||
changelog = "First release."
|
||||
+1
-14
@@ -13,22 +13,9 @@ authors = ["soufi"]
|
||||
owners = ["soufied"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/soufied/AppleSkin-Horizon"
|
||||
icon = "https://raw.githubusercontent.com/soufied/AppleSkin-Horizon/refs/heads/main/icons/appleskin.png"
|
||||
icon = "icons/appleskin.png"
|
||||
key = "RWT6eNq4e5WfVDA2lzOOi6XCm/+jJgilqT1+HUUM33ie5MCjcRfSg760"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.2"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "appleskin-0.1.2.hnmod"
|
||||
sha256 = "627d1e7c4b4fa3dd191a4ff5887fe38b20ceb7d7d7f1197c1e03d1f25b6b6b92"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key
|
||||
RUT6eNq4e5WfVJqiP4tt8vQGW6sVLSxiLXLeVunyGuyfS9aZWqPilg77biu/2B+HUDS1FlBE31F/HOhBR2YWy0GSmdwhUO7xNAs=
|
||||
trusted comment: timestamp:1793633868\tfile:appleskin-0.1.2.hnmod\thashed
|
||||
IW9M2qJIktmQDlARS6ZTJ1IA9BoGCfMZvatnjIlSpVPkpeG/Qpr5QKRRRPFhnZa93a5KcUG34ok+cgFxipRjBg=="""
|
||||
changelog = "animation fix"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.1"
|
||||
published = "2026-10-31"
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
id = "appleskin_horizon"
|
||||
kind = "native-mod"
|
||||
name = "AppleSkin"
|
||||
summary = "1:1 Minecraft Java parity food value preview & saturation HUD overlay."
|
||||
description = """
|
||||
1:1 Minecraft Java parity port of AppleSkin for the native Horizon Rust client.
|
||||
|
||||
Features
|
||||
Saturation Overlay: Golden border and glow around active saturation drumsticks matching original icons.png pixel art.
|
||||
Food Value Preview: Pulsing preview drumsticks and preview saturation border when holding edible items.
|
||||
Clean Integration: Easily toggled via Options > Mods > AppleSkin."""
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/appleskin"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "appleskin_horizon-1.0.0.hnmod"
|
||||
sha256 = "38a729f1aad00f6148f29578a2725cb5e7f9aea79a870fcf3cee76f39838c5ff"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTNzxiQEELascXv6v/RXLycX9k/IkVf5ggI7lL2qjyDEVxdDl5nPxbdCJ3epwwHIE6D8ZHw6QGXCFQjRz3I6Z/UA0=\r
|
||||
trusted comment: timestamp:1793440355\tfile:appleskin_horizon-1.0.0.hnmod\thashed\r
|
||||
6kGj1vQ1DJypzS0iDdvwksQ2FFAB1jBcycZL83OgBgQgUzbQzKRhGtleKwqAuIrRLdpQO93ale4hSMAv1z/EDg=="""
|
||||
changelog = "Initial release for Horizon 26.3."
|
||||
@@ -1,30 +0,0 @@
|
||||
id = "armor_status"
|
||||
kind = "native-mod"
|
||||
name = "Armor Status"
|
||||
summary = "Displays equipped armor & held items with authentic Java durability colors."
|
||||
description = """
|
||||
A native ArmorStatusHUD mod for the Horizon Rust client.
|
||||
|
||||
Features
|
||||
Displays all 4 armor slots plus main and off-hand items on the HUD.
|
||||
Authentic Java durability color coding (Green > Yellow > Orange > Red).
|
||||
Item count display for non-damageable held items (torches, food, blocks).
|
||||
Default position: Bottom Right (freely customizable in Options > Mods)."""
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/armor-status"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "armor_status-1.0.0.hnmod"
|
||||
sha256 = "82c8672fa2c43d7946a26a560fd56fdd8f34beecf4bcb459c2d508b3d09eeee6"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTN+dR+lW2uDL5+FJfKRnHJvelJnWmhWGQeS/p0lNFVDFfq3BjZ2LCuNEtza8cZvcuKuuYF5asmxsnbtB/MMykYQA=\r
|
||||
trusted comment: timestamp:1793439927\tfile:armor_status-1.0.0.hnmod\thashed\r
|
||||
LTwf1kuPLucJIBfHPdx1nsp0YuHSlxbFG6PYKG2HnMxMf4acAsZbWR0QdQnzkn+7Oc/T60iQPh3X14RBST3+Bg=="""
|
||||
changelog = "Initial release for Horizon 26.3."
|
||||
@@ -1,32 +0,0 @@
|
||||
id = "astral_cruiser"
|
||||
kind = "native-mod"
|
||||
name = "Astral Cruiser"
|
||||
summary = "A huge pilotable starship with a walkable interior, lasers, dash and live portals between dimensions."
|
||||
description = """
|
||||
A huge starship you fly yourself, with a large walkable interior that moves with it.
|
||||
|
||||
- **Flight:** WASD with the ship following your view, and F5 views including the ship's own.
|
||||
- **Weapons:** turrets, nose guns and two beams.
|
||||
- **Travel:** coordinate dash and jump. Long dashes show only a small strip of far terrain around the ship.
|
||||
- **Portals:** a portal shows the real destination dimension live, and you cross it aboard or on foot.
|
||||
- **Start:** `/astral spawn`, then `/astral board`. N opens the control panel; keys are in Options > Mods > Settings.
|
||||
|
||||
**What it does as a native mod.** It is compiled into the game with no sandbox. It changes the game's rendering, ticking and chunk loading for the ship and portals, and registers a thread-exit callback in builds made with MinGW so the allocator frees finished threads' memory.
|
||||
|
||||
**What it does not do.** It adds no network access of its own beyond the game's own, and it reads no accounts or files outside the game's data. It keeps the ship in the world's own folder (`astral_cruiser/ship.json`). It holds no Minecraft code or assets.
|
||||
|
||||
Weapons hurt the mobs they hit. With blasting turned on in the control panel (off by default), the nose guns and beams also blow up the blocks they hit. Portals can hang in the air, so a player on foot falls if there is no ground at the exit, including into the End's void.
|
||||
|
||||
Built for this Horizon commit only: `68ac6f647e7022b2c696e81863d7cface28c9416`."""
|
||||
authors = ["repositorykreml1n"]
|
||||
owners = ["repositorykreml1n"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/repositorykreml1n/astral-cruiser"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-11-01"
|
||||
game = "26.3"
|
||||
file = "astral_cruiser-0.1.0.hnmod"
|
||||
sha256 = "69100219f92307f9190712da2854bfd43f15cf81773d89d89d6dd22411caa2f2"
|
||||
changelog = "First release, built for Horizon 68ac6f6."
|
||||
@@ -1,73 +0,0 @@
|
||||
id = "basic_hud"
|
||||
kind = "native-mod"
|
||||
name = "The Basic HUD"
|
||||
summary = "A visual HUD editor with movable widgets, FPS, coordinates, effect timers, cooldowns, mini armour and a customizable Tab list."
|
||||
description = """
|
||||

|
||||
|
||||
## Your HUD, your layout
|
||||
|
||||
Arrange 13 independent widgets directly over the game. Drag, resize and style each block with colours, opacity, padding and shadows. Use full labels or compact icons with useful values such as ×16 and 1:45.
|
||||
|
||||
Includes effects, consumables, durability, observed totem uses, available player-health data, item cooldowns, coordinates, FPS, ping, optional speed/CPS/clock, and mini armour next to the hotbar. Customize the Tab list with coloured numeric ping, bars, counts, sorting, scale and opacity.
|
||||
|
||||
Ten interface languages plus Auto. A short first-visit guide can be replayed through ?. Reset requires confirmation; leaving unsaved edits offers Save / Discard changes / Stay. Failed writes retain the draft.
|
||||
|
||||
## Install and compatibility
|
||||
|
||||
Native .hnmod for Minecraft 26.3, pinned to Horizon **68ac6f647e7022b2c696e81863d7cface28c9416**. Install through the launcher and select **Performance**. Dev can overflow the startup stack on this Windows baseline. Other Nightlies require separate verification.
|
||||
|
||||
Client-side only. Unknown player health remains unknown, unseen totem uses cannot be counted and server-plugin-only timers are unavailable. No server mod is required. No FPS improvement is promised. Native mods compile into the game and run with the player’s rights, without a sandbox. Tested on Windows; other platforms were not tested.
|
||||
|
||||
## Other languages
|
||||
|
||||
**Русский:** редактор поверх игры, размер и оформление каждого блока, значки с числами, FPS, координаты, кулдауны, мини-броня и настройка Tab. Обучение один раз; подтверждение сброса и выхода с правками.
|
||||
|
||||
**Українська:** редактор поверх гри, розмір і стиль кожного віджета, значки зі значеннями, FPS, координати, час відновлення, мініброня та налаштування Tab. Навчання під час першого входу й захист незбережених змін.
|
||||
|
||||
**Deutsch:** Editor direkt im Spiel, frei verschiebbare und skalierbare Widgets, Symbole mit Werten, FPS, Koordinaten, Abklingzeiten, Rüstungsanzeige und anpassbare Tab-Liste. Einführung beim ersten Besuch und Schutz ungespeicherter Änderungen.
|
||||
|
||||
**Français :** éditeur superposé au jeu, widgets déplaçables et redimensionnables, icônes avec valeurs, FPS, coordonnées, délais de récupération, petite vue de l’armure et liste Tab personnalisable. Tutoriel initial et protection des modifications non enregistrées.
|
||||
|
||||
**Español:** editor superpuesto al juego, widgets movibles y ajustables, iconos con valores, FPS, coordenadas, tiempos de recarga, vista pequeña de la armadura y lista Tab personalizable. Tutorial inicial y protección de cambios sin guardar.
|
||||
|
||||
[Full update notes in six languages](https://github.com/repositorykreml1n/the-basic-hud/blob/main/CHANGELOG.md)
|
||||
|
||||
MIT. Not an official Horizon, Mojang or Microsoft product. Cover is a generated promotional illustration, not a gameplay screenshot or measured FPS claim."""
|
||||
authors = ["repositorykreml1n"]
|
||||
owners = ["repositorykreml1n"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/repositorykreml1n/the-basic-hud"
|
||||
icon = "https://raw.githubusercontent.com/repositorykreml1n/the-basic-hud/main/icon.png"
|
||||
|
||||
[[versions]]
|
||||
version = "0.4.1"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "basic_hud-0.4.1.hnmod"
|
||||
sha256 = "36431d3a2d810e2aefbd8611767a80f9184e3df032e4cc2b9b9fd9398f794560"
|
||||
changelog = """
|
||||
Major update from 0.1.0 to 0.4.1.
|
||||
|
||||
- Visual in-game editor: drag, individual scale, colours, opacity, shadows, padding and snap.
|
||||
- 13 widgets, including FPS, coordinates, available player health and actual item cooldowns.
|
||||
- Icons + values: ×16, 1:45 and durability without long labels.
|
||||
- Mini armour beside the hotbar, including elytra.
|
||||
- Custom Tab list: numeric ping, bars, player counts, sorting and scale.
|
||||
- Smoothed optional speed; single-player ping labelled Local.
|
||||
- Ten UI languages plus Auto; first-visit tutorial, replay through ?.
|
||||
- Reset confirmation; Save / Discard changes / Stay on leaving with edits; failed-save recovery.
|
||||
|
||||
Pinned to Minecraft 26.3 / Horizon 68ac6f6. Use the Performance build profile on Windows; Dev can overflow the startup stack on this baseline. No compatibility with other Nightlies or FPS gain is claimed.
|
||||
|
||||
Validated: 67 Rust test executions, native build, isolated gameplay/editor tests, restart persistence and ordinary asynchronous startup.
|
||||
|
||||
Full notes (English + Russian, Ukrainian, German, French and Spanish summaries): https://github.com/repositorykreml1n/the-basic-hud/blob/main/CHANGELOG.md"""
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-11-01"
|
||||
game = "26.3"
|
||||
file = "basic_hud-0.1.0.hnmod"
|
||||
sha256 = "fe2c5d9da681b4f575bff867df70d6e2f61614b0215a206fb7a0c3b0027db994"
|
||||
changelog = "First release."
|
||||
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "BiomeCompass"
|
||||
summary = "Craft a Biome Compass, pick a biome and its needle points to the nearest one."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
Craft a **Biome Compass** (a compass with a sapling on each of its four sides, any kinds), right-click it and pick a biome from the list (with a search box). The world generator is searched around you, a little every tick, and the compass's needle then points to the nearest one, with its distance and direction on the action bar.
|
||||
|
||||
|
||||
+3
-19
@@ -1,30 +1,14 @@
|
||||
id = "blockscope"
|
||||
kind = "native-mod"
|
||||
kind = "mod"
|
||||
name = "Blockscope"
|
||||
summary = "The block under your crosshair: its name, id, distance and icon, plus hardness, states and a container's slots."
|
||||
description = "A Jade-style tooltip for Horizon: the block under your crosshair with its name in your language, block id, distance and icon, plus its hardness and the tool it wants, its state properties, a crop's growth and, for a container, its slots. Ten switches on its own settings page."
|
||||
summary = "The block under your crosshair: its name, id, distance and icon, with reach, placement and opacity on its own settings page. A Jade-style tooltip for Horizon."
|
||||
description = "Jade-style block info for Horizon: the block under your crosshair, its name in your language, its block id, how far it is and its icon."
|
||||
authors = ["Domanffe"]
|
||||
owners = ["Domanffe"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Domanffe/blockscope"
|
||||
icon = "https://horizon-rust.github.io/horizon-mods/icons/blockscope.png"
|
||||
|
||||
[[versions]]
|
||||
version = "0.3.1"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "blockscope-0.3.1.hnmod"
|
||||
sha256 = "4fea94e5337aa82df3d981fc6231fecc80161262add577b596bb6661e0e303d1"
|
||||
changelog = "Rebuilt on the 2026-11-01 Nightly (Horizon `4aa6854`). All five hook points are named now — `mods`, `settings`, `settings_click`, `hud`, `tick` — so the bundle still applies when the game moves them."
|
||||
|
||||
[[versions]]
|
||||
version = "0.3.0"
|
||||
published = "2026-10-30"
|
||||
game = "26.3"
|
||||
file = "blockscope-0.3.0.hnmod"
|
||||
sha256 = "ba4a1c887ab26a2a9189c671cbdbea3ce2ed212a6e3d32f1fffaa60386198358"
|
||||
changelog = "Native: the WebAssembly mod rewritten as a mixin bundle for the launcher's native mods, with hardness and the tool's icon, block states, crop growth, a container's slots and a creature's health, each on its own switch. Its settings carry over from 0.2.0."
|
||||
|
||||
[[versions]]
|
||||
version = "0.2.0"
|
||||
published = "2026-10-29"
|
||||
|
||||
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "Carry Block"
|
||||
summary = "Sneak and right-click with an empty hand to pick up a chest (with its items) or a small mob, carry it and put it down."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
Sneak and right-click with an empty hand to pick up a block with its contents (chests, furnaces, barrels...) or a small, friendly mob, and carry it; right-click to put it down where you want, with everything it held.
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
id = "chop"
|
||||
kind = "native-mod"
|
||||
name = "Chop!"
|
||||
summary = "Cut one log and the whole tree tips over, crashes down and breaks apart, with soft vanilla sounds and particles."
|
||||
description = """
|
||||
Cut one log with an axe: the whole tree tips over like a real falling tree, crashes to the ground, and breaks apart from the base to the top in little pops. Everything is made of vanilla sounds and particles: no resource pack.
|
||||
|
||||
- **The log shakes while you cut it**, then pops when it gives way.
|
||||
- **A physical fall**: the trunk drops onto the stump, creaks, tips over with gravity and stops where it meets the ground. Leaves in the way are crushed.
|
||||
- **Falls in front of you**, within an adjustable angle, toward the clearest side.
|
||||
- **A cute break-up** from the base to the top, with clouds, sparkles and hearts.
|
||||
- **Replants a sapling** of the tree's kind (from its loot, or always).
|
||||
- **Chain reactions**: a falling trunk can knock over the next tree.
|
||||
- **Adjustable damage**: hurts monsters by default; animals, allies and players are spared unless you turn them on.
|
||||
- Vanilla loot (Fortune, Silk Touch), honest axe wear, fall preview, shaking trees with an empty hand, giant mushrooms and Nether fungi, angry bees, birds, apples, biome-tinted leaves, optional loot into your inventory.
|
||||
- **Everything is configurable in game**, with commands or by clicking in the chat: `/chop config` (operators), `/chop perso` (each player's sounds, particles and preview), `/chop stats`, `/chop aide`. The menus are in French.
|
||||
|
||||
**What it does and doesn't do.** It runs server-side, where the world runs: players who join install nothing. No network access, no telemetry, never runs a program. It reads and writes one file, `<world>/data/chop.txt` (settings, stats, player-placed logs). It only touches trees, the sapling it replants, its own `block_display` entities and what a falling tree hits. Besides the game's functions, it runs a few vanilla commands as the server: `kill` on its own tagged displays, `item modify` for the axe's wear, `damage` on a player the tree hits (off by default), and `summon item` / `setblock … keep` for loot and replanting when the tree is in another dimension.
|
||||
|
||||
Native source mod: install it on the launcher's Mods page, press Build there, and confirm the native-code warning. The launcher builds a separate game with it, and it runs with your account's permissions. Each version is pinned to one Horizon Nightly and Horizon Mixins revision, named in its changelog; the launcher builds those exact revisions.
|
||||
|
||||
Original mod by Mayonesu0. All rights reserved, except the grants in its [LICENSE](https://github.com/Mayonesu0/chop/blob/main/LICENSE): players may use it unchanged, Horizon's registry may distribute it, and Horizon's reviewers may read it to review it."""
|
||||
authors = ["Mayonesu0", "Claude"]
|
||||
owners = ["Mayonesu0"]
|
||||
license = "LicenseRef-Chop-1.0"
|
||||
source = "https://github.com/Mayonesu0/chop"
|
||||
icon = "https://raw.githubusercontent.com/Mayonesu0/chop/main/registry/icon.png"
|
||||
key = "RWSwx1v4zUCUjQ8rssfZCXvXkvgVc9TbA60RJyCtVCeMx4lSTanIleIs"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.1"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "chop-1.0.1.hnmod"
|
||||
sha256 = "5abac195c54da7716f35f641489c0dba780444c91b0b3e4f3387ecd4cb2b260b"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUSwx1v4zUCUjfR+WYS97be0UecaBcKGyNXNsCQAPVG0j2U2yeMfnNPkWMEU9CMOobMI6nKaPj/Kqv0EPAuw2xiPnRaduNgI8wA=\r
|
||||
trusted comment: timestamp:1793711491\tfile:chop-1.0.1.hnmod\thashed\r
|
||||
eOi2t+LMQ4LOM/nsJqmpvAraWsLcgdRZA4OJotjBkgxcANkG3MeZ9tbAKbEaidIy1kBSZyc4Dri+3MtOsd+xBA=="""
|
||||
changelog = "First release (1.0.0 was never published: its package carried a LICENSE file the registry's checker refuses; the code is the same). Pinned to Horizon Nightly 2026-11-01 (c9d474d) and Horizon Mixins ddd9700; the launcher builds those exact revisions."
|
||||
@@ -32,7 +32,7 @@ Both can be installed at once: they use different keys.
|
||||
- Written from scratch for Horizon's mod API. Not affiliated with Wurst-Imperium.
|
||||
- Some servers forbid zoom mods: check the rules before you join.
|
||||
|
||||
**Now a native mod (2.0.0)**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's permissions, so read the source before you build it: it is one small bundle on Horizon's native hook points (key, wheel, zoom, mods list). Tested against Horizon `6f8c7a0e5d531d3834c4d0be4659a1db8e7e5c2a` with Horizon Mixins `0d6b103c70633d8fd9443d8d0acd3aadaacedb06`. A key set in 1.0.0 carries over.
|
||||
**Now a native mod (2.0.0)**: the launcher builds it into the game (Settings → Game → Native mods (experimental), then Build). Native mods are not sandboxed and run with your account's permissions, so read the source before you build it: it is one small bundle on Horizon's native hook points (key, wheel, zoom, mods list). Tested against Horizon `6f8c7a0e5d531d3834c4d0be4659a1db8e7e5c2a` with Horizon Mixins `0d6b103c70633d8fd9443d8d0acd3aadaacedb06`. A key set in 1.0.0 carries over. 1.0.0 is the WebAssembly version.
|
||||
|
||||
Source and issues: [github.com/SU4G3/classic-zoom](https://github.com/SU4G3/classic-zoom)"""
|
||||
authors = ["Surge"]
|
||||
|
||||
@@ -11,7 +11,7 @@ Your block position and the direction you face in the top-left corner of the scr
|
||||
It reads the player's position, draws on the HUD and writes to chat: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). The time of
|
||||
(Settings → Game → Native mods (experimental), then Build). It was the WebAssembly SDK's example mod; the time of
|
||||
day line is gone, since Horizon's hook points don't give the game's clock yet. Turn it off in Options > Mods: it
|
||||
rests at once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/coords-hud](https://github.com/horizon-rust/horizon-mods/tree/main/native/coords-hud).
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
id = "crosshair_indicator"
|
||||
kind = "native-mod"
|
||||
name = "Crosshair Indicator"
|
||||
summary = "Dynamic target reach awareness: visual feedback on your crosshair when hovering over an entity in attack range."
|
||||
description = """
|
||||
Crosshair Indicator
|
||||
|
||||
A native Horizon mod by CayMac that ports the popular Java Crosshair Indicator mod into Horizon:
|
||||
|
||||
Dynamic Target Reach Awareness: Real-time visual feedback directly on your crosshair when hovering over an entity in attack reach (<= 3.0 blocks).
|
||||
Iconic PvP Target Reticle: Default crisp white corner brackets [ + ] hugging the crosshair, matching classic competitive PvP clients.
|
||||
Multiple Styles: Choose between Brackets [ + ], Center Dot, Diamond, and Tactical Chevron.
|
||||
Custom Color Themes: Classic White (Default), Dynamic (Green/Orange cooldown awareness), Combat Red, Pink Aesthetic, Diamond Cyan, and Gold.
|
||||
Cooldown Bar: Optional subtle weapon cooldown progress indicator below the crosshair.
|
||||
Configurable: Easily customize styles, themes, and keybinds in Options > Mods > Crosshair Indicator."""
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/crosshair-indicator"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "crosshair_indicator-1.0.0.hnmod"
|
||||
sha256 = "96beba1f7c94fca492b552fb12af0d20047dc1799f0801607841d56b12786226"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTNz67XDjUwaJ8if7+jDk+qXnJLdhtyjh8mk04UuZ2bme/Tzcpi1Od4ppYmvqzfZ+rEAeG2hb9Lytn+J2nFy1u8gc=\r
|
||||
trusted comment: timestamp:1793461576\tfile:crosshair_indicator-1.0.0.hnmod\thashed\r
|
||||
zF7EJHDjJPwVG+cYcSgvGJv4kjjYRMdMZipUQyABH0DEMIZ2Fe13hb2nbYYRZlNDG1j4kjhgEYQTODFiAlaCBQ=="""
|
||||
changelog = "Initial release for 26.3 Horizon."
|
||||
@@ -1,41 +0,0 @@
|
||||
id = "crossversion"
|
||||
kind = "native-mod"
|
||||
name = "Cross Version"
|
||||
summary = "Allows version hopping offline."
|
||||
description = """
|
||||
Hop versions, offline.
|
||||
Uses ViaProxy as an inbetween for now."""
|
||||
authors = ["JustKarkat"]
|
||||
owners = ["JustKarkat"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/JustKarkat/horizon-crossversion/"
|
||||
icon = "https://github.com/JustKarkat/horizon-crossversion/blob/master/icon.png?raw=true"
|
||||
key = "RWTcPJHJYjPW0pV3lPwr45crCu0wJxW5HbDLc3fr3Eom1TzxO++kHOo4"
|
||||
|
||||
[[versions]]
|
||||
version = "0.8.0"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "crossversion-0.8.0.hnmod"
|
||||
sha256 = "5b371f1b7b3582e0c92aa1dc22b491b50c024fe95833aa2bd9457189631caafd"
|
||||
signature = """
|
||||
untrusted comment: signature from rsign secret key
|
||||
RUTcPJHJYjPW0vc8h9pG+LC/9EkYg60UM28gNkxJ31iDOXapyV80qqnB9H12OuOtzBmPkbB33fkh0IKE5O8zcCzat0jyj6Tpqw8=
|
||||
trusted comment: timestamp:1793679858\tfile:crossversion-0.8.0.hnmod\thashed
|
||||
3hY5NK517bzva/2q54Pmj9QXO3z6WF0WWMfuA8T9H8qCuOe6TYnmYB5eEagRMpZUNK/ICcrfPEx+DE303XIOAQ=="""
|
||||
changelog = "Offline mode only. "
|
||||
|
||||
[[versions]]
|
||||
version = "0.7.1"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "crossversion-0.7.1.hnmod"
|
||||
sha256 = "deb9cf8a84838e6c48999f70fbd3c81db90992c456d6e85a0e0746b088c5b8fa"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key
|
||||
RUTcPJHJYjPW0nmeON4u6rxOS7AxK+s/e3kPaLkJ3lm618iPPc8oP8nWdJQ8k9yYriSZSu091TZ5m7qX56nNovAjeZyTcOdrUAk=
|
||||
trusted comment: timestamp:1793657606\tfile:crossversion-0.7.1.hnmod\thashed
|
||||
q2Oy6yVv5T+GHc2iM+HxNDImfPcaKGV/XPToNCTQFHSTKJ8+rz5IV4LfJnOBwBp1rZQZoGkExopDrXfZyQybCQ=="""
|
||||
changelog = """
|
||||
Version: 0.7.1
|
||||
Changelog: The MIT notice now ships inside the .hnmod (it is the header of the bundled engine source). The settings page's 'Delete the downloaded ViaProxy' deletes the jars only, so the account added to ViaProxy and its refresh token in saves.json stay. Also: a version switch on Edit Server and Direct Connect: choose what version ViaProxy tells that server it is (auto, 1.8, 1.9, 1.12.2, 1.16.5, 1.20.1, 1.21.1, 1.21.4, 26.3), kept per address, for servers whose status reports the wrong version."""
|
||||
@@ -12,7 +12,7 @@ An unofficial Rust port of [Distant Horizons](https://gitlab.com/distant-horizon
|
||||
|
||||
Settings: Options > Mods > Distant Horizons. In chat: `/dh` for status, `/dh distance 512`, `/dh quality high`, `/dh debug on` and more (Tab completes them).
|
||||
|
||||
Native source mod: install it on the launcher's Mods page, press Build there and confirm the native-code warning. The launcher downloads its own Rust and builds a separate game (10–30 minutes the first time). It runs with your account's permissions.
|
||||
Native source mod: enable Settings → Game → Native mods (experimental), choose Build and confirm the native-code warning. The launcher downloads its own Rust and builds a separate game (10–30 minutes the first time). It runs with your account's permissions.
|
||||
|
||||
Pinned to Horizon nightly `d009ebd140476b5bdc958c00f56a75e82abec691` (2026-10-29) and Horizon Mixins `0d6b103c70633d8fd9443d8d0acd3aadaacedb06`; the launcher builds these exact revisions. Other Horizon revisions have not been validated. It builds together with Horizon's official native mods; it can't be built with a native mod pinned to a different Horizon commit. Turn Video Settings > LOD Distance off: Horizon's own far terrain draws in the same place.
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "Enchantment Hints"
|
||||
summary = "A short description under every enchantment in item tooltips, in English and Russian."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
Every enchantment on books and gear gets a one-line description in its tooltip: what it does, in plain words. Our own text for every 26.3 enchantment, in English and Russian.
|
||||
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
id = "fair_freecam"
|
||||
kind = "native-mod"
|
||||
name = "Fair Freecam"
|
||||
summary = "Fly the camera freely while your player stays where it is, with an optional fair play mode."
|
||||
description = """
|
||||
Press **F4** to leave your body and fly the camera anywhere. Your player stays where it is and you see it from outside. Press **F4** again to snap back.
|
||||
|
||||
**Controls while flying:**
|
||||
- **W A S D**: fly where you look
|
||||
- **Space / Shift**: up / down
|
||||
- **Ctrl**: 2.5x faster
|
||||
- **Mouse wheel**: change the speed
|
||||
|
||||
**Settings** (Options > Mods > Fair Freecam):
|
||||
- **Speed**: 2, 5, 10, 20, 40 or 80 blocks per second.
|
||||
- **Fair play**: the camera can't fly through blocks, so no peeking into caves or bases through walls. Glass, fences and doors stop it, grass and flowers don't.
|
||||
- **Allowed on servers**: turn it off to only use freecam in your own worlds.
|
||||
|
||||
While flying, your player doesn't move, attack, mine or use items.
|
||||
|
||||
Some servers don't allow freecam, so check their rules first."""
|
||||
authors = ["Lutziano888"]
|
||||
owners = ["Lutziano888"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Lutziano888/horizon-freecam"
|
||||
icon = "icons/fair_freecam.png"
|
||||
|
||||
[[versions]]
|
||||
version = "1.2.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "fair_freecam-1.2.0.hnmod"
|
||||
sha256 = "4fdd0b3067a00d23fe30ee4d594293ef0705325bb5e6e5b292f90c1e8b8a5f8a"
|
||||
changelog = "First release as Fair Freecam (id fair_freecam), so it doesn't clash with other freecam mods."
|
||||
@@ -1,24 +0,0 @@
|
||||
id = "flair"
|
||||
kind = "native-mod"
|
||||
name = "flair"
|
||||
summary = "Custom accessory mod"
|
||||
description = "A cosmetics catalog for Horizon. Open it from the title screen or the pause menu and wear HD capes that move like cloth, animated bandanas with Japanese script, hats, wings, shoulder pets and auras with colour themes. Turn your player in a live preview, hide your armor, and add your own capes and Blockbench cosmetics with animations. Only you see them."
|
||||
authors = ["_idom_"]
|
||||
owners = ["umbx-dot"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/umbx-dot/horizon-flair"
|
||||
icon = "https://raw.githubusercontent.com/umbx-dot/horizon-flair/main/icon.png"
|
||||
key = "RWT9Ujo/oCprPGHHiSLHFNOJV1ZzoJdAU6EdZyiQcBwT2iMXfiYms4hD"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "flair-1.0.0.hnmod"
|
||||
sha256 = "64e4d645d5bda3c363603d483af2095d6d3673d91803954f338d54265bf4fab5"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUT9Ujo/oCprPBIbqV9rmrjRgpF9gnCIL+4FlZXSTq0Qi4kkklSKfjNDx9YFIw1DuufGVSL3+lOieSX4Fx0nRl7j/CCUNjiWIQs=\r
|
||||
trusted comment: timestamp:1793723044\tfile:flair-1.0.0.hnmod\thashed\r
|
||||
QPCGNEAWFCaZLdZLgkUVY9v+hRP4/gJe4H2hCMh7YT7k/V4tynkQ0AM3hZqEdrBoPn4q5SFHDVIcloGkqCTzDw=="""
|
||||
changelog = "Initial Release."
|
||||
@@ -12,7 +12,7 @@ Horizon's own FPS counter, formerly an extra in Options > Horizon Extras.
|
||||
It reads the game's own frame counter and draws on the HUD: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). Your settings carry over from 1.0.0. Turn it off in
|
||||
(Settings → Game → Native mods (experimental), then Build). Your settings carry over from 1.0.0. Turn it off in
|
||||
Options > Mods: it rests at once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/fps-overlay](https://github.com/horizon-rust/horizon-mods/tree/main/native/fps-overlay).
|
||||
"""
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
id = "freecam"
|
||||
kind = "native-mod"
|
||||
name = "Freecam"
|
||||
summary = "Freecam mod ported for Horizon"
|
||||
description = "A rewrite for Horizon of the Freecam mod by the Freecam authors (https://github.com/MinecraftFreecam/Freecam, MIT; on Modrinth as freecam). Its licence notice is kept in the source."
|
||||
authors = ["hakergeniusz"]
|
||||
owners = ["hakergeniusz"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/hakergeniusz/freecam"
|
||||
key = "RWR4cJC6Jj3EWGi26o29Rs3hAIPWqf8koFdXV4bBLF/Tm84QPfRAYjO5"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "freecam-0.1.0.hnmod"
|
||||
sha256 = "6314ed87d3b58ed0244bed388201c64bffb8deab4f5ff7beed2a3791b391a6da"
|
||||
signature = """
|
||||
untrusted comment: signature from rsign secret key
|
||||
RUR4cJC6Jj3EWN7yDLuEFss9Xir36oWeHI3yyIK+PlIffoXzHXcZ4eBAN/UcOwGpniH+lJl9uU1vzg8yRe9i6SKNMFhI6qbHkAQ=
|
||||
trusted comment: freecam 0.1.0 for Horizon (Minecraft 26.3), built from github.com/hakergeniusz/freecam commit 78d8f05
|
||||
6sfFvM54vZFE+02rwu0EJVbCnv5dJAJ7PDEWp64QnyEjlWYEnzXDzDAyLzKdZAfXwtvX+igaCS2KJKCk5UY5CA=="""
|
||||
changelog = "Release."
|
||||
@@ -1,27 +0,0 @@
|
||||
id = "freecam_plus"
|
||||
kind = "native-mod"
|
||||
name = "Freecam+"
|
||||
summary = "Fly the camera anywhere while your player stays perfectly still."
|
||||
description = """
|
||||
Press U and your camera leaves your body. Fly it with WASD, Space and Shift, hold Ctrl to go faster and use the mouse wheel to change the speed. Your player does not move or turn, so the server sees you standing still. Through walls and speed can be changed in Options, Mods, Freecam.
|
||||
|
||||
Since this is a native mod it will not work in v0.2.97 as there are no native hooks possible. This works on all nightly releases and LIKELY on version upwards from v0.2.97."""
|
||||
authors = ["_idom_"]
|
||||
owners = ["umbx-dot"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/umbx-dot/horizon-freecam"
|
||||
icon = "icons/freecam_plus.png"
|
||||
key = "RWT9Ujo/oCprPGHHiSLHFNOJV1ZzoJdAU6EdZyiQcBwT2iMXfiYms4hD"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "freecam_plus-1.0.0.hnmod"
|
||||
sha256 = "264218191c32e7107982eab297b30a43076c5f1467d4e292cb844213258b5eb1"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUT9Ujo/oCprPAR7aucj7Ez3exPIc7MGDVH8ns9azj3ilxe+G4JTWb0PnF0YYxAm0FQJJs3DcmHxHjEEfiiWymsAnTG/cdggrQI=\r
|
||||
trusted comment: timestamp:1793450278\tfile:freecam_plus-1.0.0.hnmod\thashed\r
|
||||
/4Di5+zUUSOmYB56u/GDYran5upJjtmfdUff5uKER6lknPGYjsgeLfENH8trB+d8g2hhn70b5+lGxy9mrBfJBg=="""
|
||||
changelog = "Initial Release. "
|
||||
@@ -1,19 +0,0 @@
|
||||
id = "freelook"
|
||||
kind = "native-mod"
|
||||
name = "Freelook"
|
||||
summary = "Hold a key for a third person camera you can look around in"
|
||||
description = """
|
||||
Freelook is a Freelook/Perspective Mod for Fabric, allowing you to move your camera freely without changing your player's rotation.
|
||||
Camera distance can be adjusted by scrolling."""
|
||||
authors = ["Krzysix17"]
|
||||
owners = ["Krzysix17"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Krzysix17/horizon-freelook"
|
||||
|
||||
[[versions]]
|
||||
version = "0.3.1"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "freelook-0.3.1.hnmod"
|
||||
sha256 = "9c0c92ce9f0fc8e7bc1bd34349e26d42b32b8abd2c7a09ec710936f9b6ce9aaf"
|
||||
changelog = "First release"
|
||||
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "MoreGamma"
|
||||
summary = "Brightness past 100%: set your own gamma with /gamma, or toggle full brightness with /fullbright."
|
||||
description = """
|
||||
A native Horizon mod: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Uses only Horizon's native hook points (hooks 1); tested on Horizon 41672b1 and horizon-mixins 0d6b103.
|
||||
A native Horizon mod: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Uses only Horizon's native hook points (hooks 1); tested on Horizon 41672b1 and horizon-mixins 0d6b103.
|
||||
|
||||
See in the dark without torches or night vision. MoreGamma lets you set the brightness (gamma) far past the video settings' 100% "Bright" limit, with a chat command, and switch full brightness on and off.
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
id = "fullbright_horizon"
|
||||
kind = "native-mod"
|
||||
name = "Fullbright"
|
||||
summary = "Toggle maximum 1000% gamma cave and night brightness with smooth fade via keybind G."
|
||||
description = """
|
||||
Maximum brightness and night illumination for the Horizon Rust client.
|
||||
|
||||
Features
|
||||
Press G (rebindable in Options > Mods > Fullbright) to immediately toggle 1000% Gamma cave and night illumination without shadows.
|
||||
Smooth 250ms brightness fade transition and HUD status notification.
|
||||
100% client-side lightmap modification, safe for multiplayer."""
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/fullbright"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "fullbright_horizon-1.0.0.hnmod"
|
||||
sha256 = "db6175eec1711dbc5ab2a2edc40eee9cbc4080ec1d706a3cef688e54ba9cb017"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTN70A+lNWzZF2M2MiOMfjOIqVnTGNY05bQXW47Ov/mHp8io8o9HZiOYQXOYbxhazjWOfGU3WWuRzqj05swkoG/QY=\r
|
||||
trusted comment: timestamp:1793440355\tfile:fullbright_horizon-1.0.0.hnmod\thashed\r
|
||||
mJGiv7YnJHRGreiX5K3mx6zwEtRTC4rAygoIC+rkp1tjUeazIwyehtojb6T+iQBQaq2p97PTor410KnbK675BA=="""
|
||||
changelog = "Initial release for Horizon 26.3."
|
||||
@@ -1,25 +0,0 @@
|
||||
id = "fullbright_nofog"
|
||||
kind = "native-mod"
|
||||
name = "Fullbright & NoFog"
|
||||
summary = "Toggle full brightness and the world's fog with a key (G / N), /fullbright or /nofog."
|
||||
description = """
|
||||
A native Horizon mod: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Uses only Horizon's native hook points (hooks 80, for `render_fog`); tested on Nightly 2026-11-01 (c9d474d) and horizon-mixins 0d6b103.
|
||||
|
||||
- **Fullbright**: press G (or `/fullbright`, `/fb`) to toggle full brightness (gamma 1500%). Your brightness slider and `options.txt` are never changed; turning it off gives your own brightness back.
|
||||
- **NoFog**: press N (or `/nofog`) to remove the world's fog. `/nofog fluids` also clears water, lava and powder snow fog.
|
||||
- `/fullbright on|off` and `/nofog on|off` set them directly.
|
||||
- Options → Mods → Fullbright & NoFog: a button for each toggle and both keys, rebindable.
|
||||
|
||||
Toggling is silent (no chat messages). Client-side: works in single player, on LAN and on servers. Settings are remembered between sessions."""
|
||||
authors = ["Nirokx"]
|
||||
owners = ["Nirokx"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Nirokx/horizon-fullbright-nofog"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "fullbright_nofog-1.0.0.hnmod"
|
||||
sha256 = "07a13abd8af2405343241f8985db7595a03bfb8ced2f1dfab8a105848eb1b7d7"
|
||||
changelog = "First release."
|
||||
@@ -1,38 +0,0 @@
|
||||
id = "hitbox_plus"
|
||||
kind = "native-mod"
|
||||
name = "Hitbox+"
|
||||
summary = "Customizable entity hitboxes with exact weapon & spear in-reach colors, thickness, eye rays, and sprint HUD."
|
||||
description = """
|
||||
Hitbox+ for Horizon
|
||||
|
||||
Hitbox+ is a high-performance native mod ported to Horizon that revamps vanilla F3+B debug hitboxes with full customization and PvP reach indicators.
|
||||
|
||||
Key Features:
|
||||
Dynamic In-Reach Detection: Hitboxes automatically change to your chosen reach color when your crosshair is within hitting distance.
|
||||
Spear Reach: Accurately extends reach to 4.5 blocks (survival) and 6.5 blocks (creative).
|
||||
Melee Reach: Standard 3.0 blocks for swords, axes, maces, and fists.
|
||||
11 Selectable Reach Colors: Choose between Bright Green, Neon Cyan, Aqua Mint, Gold Yellow, Sunset Orange, Hot Pink, Neon Purple, Electric Blue, Crimson Red, Pure White, or smooth dynamic Rainbow.
|
||||
Hitbox Styles & Thickness: Custom styles (White, Cyan, Yellow, Red, Rainbow) and 3 thickness modes (1.5px Thin, 2.5px Default, 4.0px Thick).
|
||||
Eye-Ray & Looking Direction: Toggle looking direction lines and forehead level markers.
|
||||
Always-On Sprint HUD: Built-in sprint status indicator with customizable screen corner placement (Top-Left, Top-Right, Bottom-Left, Bottom-Right).
|
||||
Zero FPS Cost: Pure lock-free atomic architecture.
|
||||
Controls:
|
||||
Press H to toggle hitboxes on/off.
|
||||
Access Options > Mods > Hitbox+ to customize all colors, thickness, and HUD positions."""
|
||||
authors = ["taxtii", "itzglecni"]
|
||||
owners = ["taxtii"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/taxtii/hitbox_plus.git"
|
||||
|
||||
[[versions]]
|
||||
version = "1.3.0"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "hitbox_plus-1.3.0.hnmod"
|
||||
sha256 = "8d1b95e7461e38fc40994b35a82c1f753a58e9751ce27af1dc101a4717dba8a4"
|
||||
changelog = """
|
||||
- Added dynamic spear attack reach support (4.5 blocks in survival, 6.5 blocks in creative with 0.125 hitbox margin).
|
||||
- Standard melee weapons (swords, axes, fists) use exact 3.0-block in-reach detection.
|
||||
- Added 11 selectable reach color options (Bright Green, Neon Cyan, Aqua Mint, Gold Yellow, Sunset Orange, Hot Pink, Neon Purple, Electric Blue, Crimson Red, Pure White, Rainbow).
|
||||
- Removed red hit flashing when attacking entities.
|
||||
- Zero-overhead lock-free atomic rendering with configurable line thickness, eye rays, and always-on toggle sprint HUD."""
|
||||
@@ -1,64 +0,0 @@
|
||||
id = "horizonmatica"
|
||||
kind = "native-mod"
|
||||
name = "Horizonmatica"
|
||||
summary = "Litematica for Horizon: schematics as ghost blocks, a verifier, material lists and a printer that builds the missing blocks for you."
|
||||
description = """
|
||||
Horizonmatica is a re-creation of **Litematica** (with its **printer**) for Horizon. Load a schematic, see it as ghost blocks in your world, check your build against it, get a material list, and let the printer place the missing blocks.
|
||||
|
||||
## Features
|
||||
- **Formats:** `.litematic` (versions 1–7, several regions), `.schem` (Sponge v1–v3: WorldEdit, FAWE, Amulet, Axiom), `.schematic` (MCEdit / WorldEdit up to 1.12) and vanilla structure `.nbt`. Older files are upgraded with Horizon's data fixer, the same way old worlds are.
|
||||
- **Overlay:** missing blocks as translucent real block models (chests, banners, heads and other block entities included), optionally visible through walls.
|
||||
- **Verifier:** wrong block (red), wrong state (orange), extra block (pink), plus a progress HUD.
|
||||
- **Layers:** all / one layer / above / below / range.
|
||||
- **Placement:** move, rotate, mirror; a move mode for mouse wheel and arrow keys. Each placement is remembered per world and dimension and restored when you join again.
|
||||
- **Material list:** missing, total and carried, with item icons, in the HUD, in chat or in the menu.
|
||||
- **Menu (M):** a screen of its own, drawn with the game's widgets.
|
||||
- **Printer:** places one missing block within reach every few ticks, from the bottom up. It only clicks when Horizon's own placement logic says the click produces exactly the wanted state (stairs, slabs, logs, furnaces…). Redstone-aware order, repeater, comparator and note block setup after placing, double slabs and stacks, chests, falling blocks. The camera never moves.
|
||||
|
||||
Usage: put schematics into `schematics/` next to `options.txt` of your instance (`/hm folder` shows the path), then `/hm load <name>` or press **M**. All commands and keys are in the [README](https://github.com/keksi2k/horizonmatica#usage).
|
||||
|
||||
## What it does and doesn't do
|
||||
- **Reads** only files in the instance's `schematics/` folder, and creates that folder if it's missing.
|
||||
- **Writes** nothing itself: settings and remembered placements go through Horizon's mod settings.
|
||||
- **Network:** no connections of its own. The only thing sent to a server is what the printer does: the same block-placing clicks a player would make (with the matching look direction), and hotbar slot changes.
|
||||
- **"Open folder"** in the menu opens the schematics folder in your file manager through Horizon's own function.
|
||||
- No telemetry, no downloads, no code run from schematic files. Schematics are parsed as data only.
|
||||
|
||||
⚠️ On other people's servers, automatic placing may break the rules or trip anti-cheat. The printer is off until you turn it on (`K` or `/hm printer on`). Its *air place* option (on by default) is noticed by anti-cheat plugins such as Grim.
|
||||
|
||||
**Version:** native mods use game internals, so Horizonmatica is pinned to one Horizon commit (currently Nightly 2026-11-01, `4aa6854`). A new Nightly needs a new release.
|
||||
|
||||
## Credits
|
||||
The idea, the way it's used, the file format and the behaviour come from **[Litematica](https://github.com/maruohon/litematica)** by masa (maruohon), maintained by **[Sakura-Ryoko](https://github.com/sakura-ryoko/litematica)**, and from **[Litematica Printer](https://github.com/aleksilassila/litematica-printer)** by aleksilassila. Horizonmatica is not an official project of these authors, isn't made or endorsed by them, and contains none of their code. Only the file format and the behaviour are re-created. If you like it, go and support the originals.
|
||||
|
||||
Menus built with [horizon-menus](https://github.com/keksi2k/horizon-menus). MIT licensed."""
|
||||
authors = ["keksi2k"]
|
||||
owners = ["keksi2k"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/keksi2k/horizonmatica"
|
||||
icon = "https://raw.githubusercontent.com/keksi2k/horizonmatica/main/icon.png"
|
||||
key = "RWS+BRoCJslNCFapck3cbG2VFQcjlr1MUH5m3+CWA8zhJecoBoja7X94"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.1"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "horizonmatica-0.1.1.hnmod"
|
||||
sha256 = "2ddc562dd2ea0f9a76a47eb761c64c803def68a8c81b92cb5d15ec26c5d432aa"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS+BRoCJslNCOkWo88+wHXYmMr1C6TzXpxZIGwzFuUN+K4lbd9RT6tLC8sIQQ5uD3QZQZx2rawTHRJvUvRhCgUNDoqhIek18w4=\r
|
||||
trusted comment: timestamp:1793599192\tfile:horizonmatica-0.1.1.hnmod\thashed\r
|
||||
BmryY+OjbG0qZnnFappBEO2tR8zx+a5BmqBFA4AVytjqvLnuvDWYE0PUwZLLodqbN218NM0JluVGpstnI3DvBQ=="""
|
||||
changelog = """
|
||||
First release in the registry.
|
||||
|
||||
- Loads .litematic, .schem (Sponge v1–v3), .schematic (MCEdit, 1.12 ids) and structure .nbt; older files are upgraded with Horizon's data fixer
|
||||
- Ghost overlay with real block models, see-through mode, verifier colours and layer modes
|
||||
- Placements remembered per world and dimension; move mode, rotate, mirror
|
||||
- Own menu screen (M) and a material list with item icons
|
||||
- Printer: places missing blocks within reach, checked against the game's own placement logic; the camera never moves
|
||||
|
||||
Since 0.1.0 on GitHub: loading another schematic no longer shows the previous one's blocks.
|
||||
|
||||
Built for Horizon Nightly 2026-11-01 (c9d474d, hook API 80)."""
|
||||
@@ -1,23 +0,0 @@
|
||||
id = "inventory_profiles"
|
||||
kind = "native-mod"
|
||||
name = "Inventory Profiles"
|
||||
summary = "R-key & UI sorting (Category, A-Z, Count, ID), Auto-Refill depleted stacks, Tool Break Protection, and Quick-Stack to chests."
|
||||
description = "A 1:1 native Rust port of Inventory Profiles Next & Inventory Sorter for Horizon. Press R or click the UI sort buttons to merge partial stacks and sort chests or your inventory using 4 selectable modes: Category (Creative Tab), Alphabetical (A-Z), Stack Count (High-Low), or Item ID. Includes automatic hand stack refilling when placing blocks or consuming items, Tool Break Protection that swaps out low-durability tools before they break, and G-key Quick-Stacking to move matching items into open containers."
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/inventory-profiles"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "inventory_profiles-1.0.0.hnmod"
|
||||
sha256 = "1e5d1c75d05230172820b5bc016d7d3ac792adf473de7dbfb84394d8b795a633"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTNzTcNlnhp0xG8ZqxNqwzpSnc+ghT4/m+aR0dga48gdD04aioDSIPK5DBUtd4i2Vf+e4r7LKX3zb6T90aDdYJjgI=\r
|
||||
trusted comment: timestamp:1793443789\tfile:inventory_profiles-1.0.0.hnmod\thashed\r
|
||||
RcTkkWUMpp4nRQ4uXRFCD4m67ir4J0y3lo2nhOVUgriLIMndinAsVjnNsrfAoJLvKN9DO5vT/xp2+oW1iW7xAQ=="""
|
||||
changelog = "Initial release for 26.3 Horizon. "
|
||||
@@ -1,39 +0,0 @@
|
||||
id = "inventory_wizard"
|
||||
kind = "native-mod"
|
||||
name = "InventoryWizard"
|
||||
summary = "InventoryWizard's one-click sorting as a native mod for Horizon"
|
||||
description = """
|
||||
## Features
|
||||
|
||||
- **Smart sorting** by category (stone, earth, wood, ores, blocks, tools, weapons, armor, food, redstone,
|
||||
transportation, decoration), from item tags and components, so other mods' items are sorted too
|
||||
- **Survival-friendly hotbar**: weapons, tools, food, building blocks, utility items, then the rest
|
||||
- **Stacks merged**, but enchanted or named items are never combined
|
||||
- **Three modes**: Default, Alphabetical and Stack-based
|
||||
- **Sort buttons** by the inventory and container titles, plus a mode button (it shows the mode's letter)
|
||||
- **Locked slots**: **Alt+Click** a hotbar or inventory slot to lock it, and sorting leaves it alone
|
||||
- **Keys**: **R** (or **Shift+Right Click**) sorts the part under the cursor: the hotbar sorts everything, the
|
||||
inventory the inventory, a container the container. Outside a screen, R sorts the whole inventory.
|
||||
**Shift+Right Click** on the middle hotbar slot cycles the mode. The mode also has its own key, unbound by default.
|
||||
- **Commands**: `/iwiz [hotbar|inventory|all|mode]` (also `/inventorywizard`)
|
||||
- **Works on** the inventory, hotbar, chests, barrels, shulker boxes and ender chests, **in singleplayer and on any
|
||||
server**: every sort is made of ordinary left clicks, as a player could click them, so a vanilla server accepts it"""
|
||||
authors = ["VanishingTacos"]
|
||||
owners = ["VanishingTacos"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/VanishingTacos/InventoryWizard-Horizon"
|
||||
icon = "https://cdn.modrinth.com/data/cU0ynk3p/21b58402405493964af438e3e3b9551676b68433.png"
|
||||
key = "RWTos7ZtiqwDTrtjtHk3WhMJJc1+sSTTyTu9CaDtIYWSQvww2D9WrAN1"
|
||||
|
||||
[[versions]]
|
||||
version = "2.3.3"
|
||||
published = "2026-11-01"
|
||||
game = "26.3"
|
||||
file = "inventory_wizard-2.3.3.hnmod"
|
||||
sha256 = "03a7c8a528148611e5f309f3d05294a97b6766ca5e3bda9b3f1f79458fe65a42"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUTos7ZtiqwDTmRp04qx/n5ZXozvaeOig3nJZFeNqmfmZ1PjB/2JUcfiF0JLZZJBkqpwm6sZQAvrt4HNce0juB5KaxJUOQJtAAo=\r
|
||||
trusted comment: timestamp:1793498930\tfile:inventory_wizard-2.3.3.hnmod\thashed\r
|
||||
Q0SE4CMnaFQHCmizFD0JcIPkUfiYQVs3KyGCCpS99m3OfFNhnS0gQt20ul0QlyYDAC8bAPJRjyrSIgcD1KzPAQ=="""
|
||||
changelog = "Full native port of InventoryWizard for Horizon "
|
||||
+1
-1
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "Item New"
|
||||
summary = "Newly picked-up items glow in your hotbar and inventory until you look at them."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
Items you just got (picked up, crafted, taken from a chest, given) get a soft glow in the hotbar and in inventory and container screens, until you point at them or close the screen.
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Horizon's own keystrokes overlay, formerly an extra in Options > Horizon Extras.
|
||||
It reads which keys you hold and your clicks, and draws on the HUD: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). Your settings carry over from 1.0.0. Turn it off in
|
||||
(Settings → Game → Native mods (experimental), then Build). Your settings carry over from 1.0.0. Turn it off in
|
||||
Options > Mods: it rests at once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/keystrokes](https://github.com/horizon-rust/horizon-mods/tree/main/native/keystrokes).
|
||||
"""
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
id = "light_overlay"
|
||||
kind = "native-mod"
|
||||
name = "Light Overlay"
|
||||
summary = "1:1 Light Overlay & MiniHUD (F7): visualizes mob-spawnable blocks with 3D Yellow (night spawn) and Red (always/cave spawn) crosses (X) or 3D light level numbers"
|
||||
description = "A 1:1 native Rust port of Light Overlay and MiniHUD's F7 Light Level Overlay for Horizon. Press F7 during gameplay to scan nearby spawnable block surfaces and render depth-tested 3D markers directly on block tops. Red markers indicate blocks where hostile mobs can spawn at any time (caves/indoor darkness), Yellow markers indicate blocks where hostile mobs can spawn at night, and optional Green markers show safe blocks. Supports Crosses (X), 3D Numbers (0-15), or Both, with configurable scan radius (8 to 20 blocks) and Modern (== 0) or Legacy (<= 7) spawn thresholds."
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/light-overlay"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "light_overlay-1.0.0.hnmod"
|
||||
sha256 = "b4aeb56b13d9c73df267a1dc7b1f588f4db39bfd55f7beaef97a014fffb5b076"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTNy4CWemZ33Twp2eJ5FybX79KHuEbkVXRfv1C8+lWasqO1vOdx2A+8oN9eTR9XIh+QKjjw6xwrkG1u2nDoYkk5ww=\r
|
||||
trusted comment: timestamp:1793444149\tfile:light_overlay-1.0.0.hnmod\thashed\r
|
||||
3mGbUejwekJoW98TqQVK9QKS0aXMamM9rfCVOEwot/Xq/ZbaT1kUdDJMo6mn0iJIeodvdAFd7TnDEoguj7jkCA=="""
|
||||
changelog = "Initial release for 26.3 Horizon. "
|
||||
+1
-1
@@ -11,7 +11,7 @@ The block or entity under your crosshair at the top of the screen, drawn as a va
|
||||
|
||||
**Settings** (Options → Mods → LookAt): range, position (top, top left, top right), size, background opacity, item icon, where it comes from, position and distance, entities, health, harvest tool. Boxes keep clear of F3, boss bars, the minimap and effect icons.
|
||||
|
||||
**Now a native mod (0.2.1)**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's permissions, so read the source before you build it. Tested against Horizon `142388e1c136e622652ec7505af15d8ad195e041` with Horizon Mixins `0d6b103c70633d8fd9443d8d0acd3aadaacedb06`; the launcher builds these exact pinned revisions. Settings from 0.1.0 carry over."""
|
||||
**Now a native mod (0.2.1)**: the launcher builds it into the game (Settings → Game → Native mods (experimental), then Build). Native mods are not sandboxed and run with your account's permissions, so read the source before you build it. Tested against Horizon `142388e1c136e622652ec7505af15d8ad195e041` with Horizon Mixins `0d6b103c70633d8fd9443d8d0acd3aadaacedb06`; the launcher builds these exact pinned revisions. Settings from 0.1.0 carry over. 0.1.0 is the WebAssembly version."""
|
||||
authors = ["d3grando"]
|
||||
owners = ["d3grando"]
|
||||
license = "MIT"
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
id = "menu_panorama"
|
||||
kind = "resourcepack"
|
||||
name = "Menu Panorama"
|
||||
summary = "Put your own wallpaper behind the main menu in Horizon — Minecraft 26.3, rewritten in Rust."
|
||||
description = """
|
||||
Menu Panorama is a resource pack for **Horizon** — Minecraft: Java Edition 26.3, rewritten from scratch in **Rust**.
|
||||
|
||||
It replaces the six textures of the main-menu background with a picture you choose. It is a plain resource pack, not a Java mod: no mod loader, no Java, and no code from the pack is executed. Horizon loads it natively.
|
||||
|
||||
- **Any photo** in the `room` mode: the picture is shown whole on the four walls, with mirrored seams and soft colours above and below.
|
||||
- **A 360° equirectangular panorama** in the `360` mode: the sphere is cut into six cube faces, so the view stays seamless when the camera turns.
|
||||
- **Auto** picks the mode from the image's aspect ratio.
|
||||
|
||||
Build a pack in the browser with `panorama-maker.html`: drop an image, choose a face size, download the `.zip`. Everything runs locally; the picture never leaves the computer. `make_panorama.py` does the same from the command line.
|
||||
|
||||
The pack only changes `assets/minecraft/textures/gui/title/background/panorama_0..5.png`; gameplay, sounds and other textures are untouched. `pack.mcmeta` is made for Horizon 26.3 (resource format 97) and also declares formats 15–999, so the same file loads in Minecraft Java 1.21+. A demo pack is attached to every release.
|
||||
|
||||
MIT licensed. Source, the browser generator and the CLI are in the repository."""
|
||||
authors = ["form1t"]
|
||||
owners = ["form1t"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/form1t/menu-panorama"
|
||||
icon = "icons/menu_panorama.png"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "menu_panorama-1.0.0.zip"
|
||||
sha256 = "e0403b003e6c93dec683037202cebb47880025cfe21e2d8fc7818321ee362401"
|
||||
changelog = """
|
||||
First release.
|
||||
|
||||
- Demo sunset pack: six 1024×1024 faces and a 128×128 icon.
|
||||
- `panorama-maker.html`: browser generator with drag & drop, auto/room/360 modes and 512/1024/2048 face sizes.
|
||||
- `make_panorama.py`: CLI with the same modes, preview output and `--description`.
|
||||
- `pack.mcmeta` for Horizon 26.3: resource format 97, `pack_format` 34, formats 15–999.
|
||||
- MIT licence."""
|
||||
+1
-1
@@ -12,7 +12,7 @@ Horizon's own minimap, formerly an extra in Options > Horizon Extras.
|
||||
It shows a map in a corner of the screen: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). Your settings carry over from 1.0.0. Turn it off in
|
||||
(Settings → Game → Native mods (experimental), then Build). Your settings carry over from 1.0.0. Turn it off in
|
||||
Options > Mods: it rests at once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/minimap](https://github.com/horizon-rust/horizon-mods/tree/main/native/minimap).
|
||||
"""
|
||||
|
||||
+34
-14
@@ -1,22 +1,42 @@
|
||||
id = "mod_menu"
|
||||
kind = "native-mod"
|
||||
kind = "mod"
|
||||
name = "Mod Menu"
|
||||
summary = "ModMenu For Horizon"
|
||||
summary = "Browse installed mods, including native mods, with versions, enabled states, filters and search."
|
||||
description = """
|
||||
Adds a Mods button next to Accessibility on the title screen. It opens a Mod Menu style screen that lists every mod you have installed, with its icon, name, version and description.
|
||||
An independent, sandboxed mod browser by levzzz5154.
|
||||
|
||||
- Search by name, id or description, and filter by on, off, native or content mods.
|
||||
- Pick a mod to see its details, turn it on or off, or open its own settings page.
|
||||
- Open Mods Folder and Done at the bottom, as in the Java mod."""
|
||||
authors = ["tariksabanuz"]
|
||||
owners = ["tariksabanuz"]
|
||||
Press **M** while playing, run **`/modmenu`**, or open
|
||||
**Options → Mods → Mod Menu → Settings**. Use `/modmenu text` to search names,
|
||||
ids and mod types. Filter all/enabled/disabled mods, browse pages, select a row
|
||||
for details, and refresh after changing mods in the launcher.
|
||||
|
||||
Lists installed sandboxed, content and native source mods in the current instance.
|
||||
Enabled means the launcher's selected state, not proof a mod is running. This is
|
||||
a read-only menu: it does not toggle other mods, run commands, or start native builds.
|
||||
|
||||
**Requires a launcher with the schema-1 Mod Menu inventory feed**
|
||||
([Horizon #3112](https://github.com/horizon-rust/horizon/pull/3112)). On a launcher
|
||||
without it, the menu shows an explicit update message. The launcher supplies display
|
||||
metadata through this mod's own sandbox storage; the mod has no general filesystem
|
||||
or network access. Direct external `--dev-mod` paths and runtime failure status
|
||||
are not included in the feed.
|
||||
|
||||
Tested on Horizon nightly `83f15fa27` (Minecraft 26.3), mod API 0.1 / API level 0.
|
||||
Other Horizon revisions have unverified support. This `.hmod` does not require Rust,
|
||||
Git, Horizon Mixins or any native build to install.
|
||||
|
||||
Independently written, not a port of another project's Mod Menu. No Minecraft code
|
||||
or artwork is included. MIT licensed; source, tests and feed specification are linked below.
|
||||
"""
|
||||
authors = ["levzzz5154"]
|
||||
owners = ["levzzz5154"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/tariksabanuz/ModMenuHorizon"
|
||||
icon = "https://raw.githubusercontent.com/tariksabanuz/ModMenuHorizon/main/icon.png"
|
||||
source = "https://github.com/levzzz5154/horizon-mod-menu"
|
||||
|
||||
[[versions]]
|
||||
version = "0.3.0"
|
||||
published = "2026-11-03"
|
||||
version = "0.1.1"
|
||||
published = "2026-10-28"
|
||||
game = "26.3"
|
||||
file = "mod_menu-0.3.0.hnmod"
|
||||
sha256 = "7896b3b5ad727ef6e2bc56039796713809483fb157daa385f78ebd3353d653bd"
|
||||
file = "mod_menu-0.1.1.hmod"
|
||||
sha256 = "3833b79bbb9607c5cab6dbdc4a6d3e31754c2ed183b1c6bf431f3615b93ef3b5"
|
||||
changelog = "First release: installed mods, enabled states, native/content/sandboxed types, paging, filters, search and refresh. Requires the launcher inventory feed."
|
||||
@@ -1,22 +0,0 @@
|
||||
id = "motion_blur"
|
||||
kind = "native-mod"
|
||||
name = "Motion Blur"
|
||||
summary = "Blurs what moves: mobs, players, items and vehicles along their own motion, with optional camera blur."
|
||||
description = """
|
||||
Moving mobs, players, items, minecarts and boats blur along their own motion. The camera's motion (turning, walking) can blur too, and is off by default.
|
||||
|
||||
Each frame the mod works out every pixel's motion since the last frame (the world's from the depth buffer and the camera, entities from last frame's vertices), finds the largest motion near each tile, and gathers along it with depth-aware weights (McGuire et al., "A Reconstruction Filter for Plausible Motion Blur", 2012).
|
||||
|
||||
Settings are in Options → Mods → Motion Blur: strength for moving things and the camera, shutter angle or a fixed exposure, the longest blur, quality, blurring yourself in third person, and a view that shows each pixel's motion."""
|
||||
authors = ["levzzz5154"]
|
||||
owners = ["levzzz5154"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/levzzz5154/horizon-motion-blur"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "motion_blur-0.1.0.hnmod"
|
||||
sha256 = "4cdaa6369fffea8116b013edfc618358ca989f48ed65c83306d2102f0e506c47"
|
||||
changelog = "First release, built against Nightly 2026-11-01: motion blur for moving mobs, players, items and vehicles, with optional camera blur."
|
||||
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "Mouse Tricks"
|
||||
summary = "Inventory mouse tricks: drag to spread or gather, the wheel moves items one by one, and R sorts."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
- **Right-drag**: one item into each slot you pass.
|
||||
- **Left-drag**: gather the same items; with Shift, quick-move many stacks.
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
id = "radiant"
|
||||
kind = "shader"
|
||||
repo = "expensiverest/radiant"
|
||||
owners = ["expensiverest"]
|
||||
+1
-1
@@ -15,7 +15,7 @@ Horizon's own recipe viewer.
|
||||
It reads the game's items and recipes, hears its own keys and your clicks on the panel, and places recipes or gives items only when you ask: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). It needs Horizon's native hook points version 2, in the
|
||||
(Settings → Game → Native mods (experimental), then Build). It needs Horizon's native hook points version 2, in the
|
||||
Nightlies from 4baa571 on. Your settings and keys carry over from 1.0.0. Turn it off in Options > Mods: it rests at
|
||||
once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/recipes](https://github.com/horizon-rust/horizon-mods/tree/main/native/recipes).
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
id = "resourcify"
|
||||
kind = "native-mod"
|
||||
name = "Resourcify"
|
||||
summary = "Download resource packs in Horizon"
|
||||
description = """
|
||||
Resourcify lets you browse and download resource packs without ever leaving Horizon.
|
||||
|
||||
Features:
|
||||
- Browse resource packs right inside the game
|
||||
- One-click download and install
|
||||
- Search to find the pack you want quickly
|
||||
- Native Horizon mod, fast and lightweight"""
|
||||
authors = ["tariksabanuz"]
|
||||
owners = ["tariksabanuz"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/tariksabanuz/ResourcifyHorizon"
|
||||
icon = "https://github.com/tariksabanuz/ResourcifyHorizon/blob/364648324ac0e67489a3f06faa716d96d24668ed/icon.png"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-11-03"
|
||||
game = "26.3"
|
||||
file = "resourcify-0.1.0.hnmod"
|
||||
sha256 = "789447fb454864af2a711ad8204f395331248d70dba570016b248766b959a2a2"
|
||||
@@ -2,21 +2,16 @@ id = "rightharvest"
|
||||
kind = "native-mod"
|
||||
name = "RightClickHarvest"
|
||||
summary = "Right-click a ripe crop to pick it and sow it again."
|
||||
description = "With an empty hand, right-click a ripe wheat, carrot, potato, beetroot or nether wart: the crop is harvested with the game's own drops, sound and statistics, and sown again from a seed in your inventory."
|
||||
description = """
|
||||
With an empty hand, right-click a ripe wheat, carrot, potato, beetroot or nether wart: the crop is harvested with the game's own drops, sound and statistics, and sown again from a seed in your inventory.
|
||||
|
||||
No settings: turn it off in Options > Mods."""
|
||||
authors = ["Domanffe"]
|
||||
owners = ["Domanffe"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Domanffe/rightharvest"
|
||||
icon = "https://horizon-rust.github.io/horizon-mods/icons/rightharvest.png"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.1"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "rightharvest-0.1.1.hnmod"
|
||||
sha256 = "2f70f3a5abaca35f1ff8df7b198f0fd616eacaa5229f5113f75935e16f50255b"
|
||||
changelog = "Rebuilt on the 2026-11-01 Nightly (Horizon `4aa6854`); the `mods` hook is named instead of pinned to a source target, so it survives an update that moves that point."
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.0"
|
||||
published = "2026-10-30"
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ Horizon cannot join servers that check Minecraft accounts yet, which is most pub
|
||||
|
||||
## Install
|
||||
|
||||
Install it from the launcher's Mods page, then press Build there, and play that instance. Guide: https://github.com/Louchatfroff/serverify/tree/main/horizon/serverify#readme
|
||||
Install it from the launcher's Mods page, then Settings > Native mods (experimental) > Build, and play the Native mods instance. Guide: https://github.com/Louchatfroff/serverify/tree/main/horizon/serverify#readme
|
||||
|
||||
Native mods are not sandboxed. The source is public and licensed GPL-3.0-only: https://github.com/Louchatfroff/serverify/tree/main/horizon/serverify"""
|
||||
authors = ["Louchatfroff"]
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ kind = "native-mod"
|
||||
name = "SmartF3"
|
||||
summary = "A tidier, configurable F3 debug screen: the same information in modules you can colour, reorder and turn off."
|
||||
description = """
|
||||
**A native Horizon mod**: the launcher builds it into the game (install it on the launcher's Mods page, then press Build there). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
**A native Horizon mod**: the launcher builds it into the game (Settings → Game → Native mods, then Build). Native mods are not sandboxed and run with your account's rights, so read the source before you build it. Pinned to Horizon 142388e and horizon-mixins 0d6b103.
|
||||
|
||||
The F3 debug screen, grouped into 14 modules: FPS, server, coordinates, chunk, facing, world, biome, light, chart keys, system, rendering, and the targeted block, fluid and entity.
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
id = "status_effect_hud"
|
||||
kind = "native-mod"
|
||||
name = "Status Effect HUD"
|
||||
summary = "1:1 Status Effect Bars & Inventory HUD+ Potion HUD: displays active potion/beacon effects with icons, Roman numeral amplifiers, color-coded mm:ss countdown time"
|
||||
description = "A 1:1 native Rust port of Status Effect Bars and Inventory HUD+ (Potion HUD) for Horizon. Renders all active potion and beacon status effects directly on the HUD during gameplay with their official mob_effect sprites, translated effect names, and Roman numeral potency levels (II, III, IV). Includes color-coded mm:ss countdown timers (White for >30s, Yellow for 10-30s, Flashing Red for <=10s urgent expiration warning, and Aqua infinity symbol for permanent effects) alongside smooth duration progress bars colored in each effect's authentic vanilla potion color."
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/status-effect-hud"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "status_effect_hud-1.0.0.hnmod"
|
||||
sha256 = "afa30125bb8b402892f1719e550b66d4eb4d7264895f71bb9c98a4caf5c7b432"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTNzV+wcfmnupP9b3ECNs7/D2jW8vAV9eAd1rxLpETdSVxvuPpnbTPB/W9APouT8uLbsZLrB9wFsOoBtrhuUPmCw0=\r
|
||||
trusted comment: timestamp:1793443789\tfile:status_effect_hud-1.0.0.hnmod\thashed\r
|
||||
MkNOcfvQQP8dWwvaSdoGIasz6tYOCB13U0OVFIApxz9VzhCUGRZXTYaSitlSSoBfGqYCQk87zvliwvklR0lbDQ=="""
|
||||
changelog = "Initial release for 26.3 Horizon. "
|
||||
@@ -1,23 +0,0 @@
|
||||
id = "toggle_sprint"
|
||||
kind = "native-mod"
|
||||
name = "Toggle Sprint"
|
||||
summary = "1:1 Better Sprinting & Lunar ToggleSprint HUD: toggle sprint and toggle sneak with [Sprinting (Toggled)] / [Key Held] / [Flying] status HUD and configurable Cre"
|
||||
description = "A 1:1 native Rust port of Better Sprinting and the Lunar/Badlion ToggleSprint HUD for Horizon. Allows toggling continuous sprint (V or vanilla Sprint key) and sneak (C) without holding keys down, while automatically pausing toggled sneak inside inventory and chest screens so Shift-clicking items works normally. Renders the classic movement status HUD ([Sprinting (Toggled)], [Sprinting (Key Held)], [Sneaking (Toggled)], [Sneaking (Key Held)], [Flying (2.0x Boost)], [Swimming], [Gliding (Elytra)], [Riding]) and includes a configurable Creative Fly Speed Boost multiplier (1.0x to 4.0x)."
|
||||
authors = ["CayMac"]
|
||||
owners = ["CayMac97"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/CayMac97/toggle-sprint"
|
||||
key = "RWS411U2KXdTN4/y5bQhqBYxNlZvCtSZ5lNy46eeSAcgy0cxSJo2+Sm3"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "toggle_sprint-1.0.0.hnmod"
|
||||
sha256 = "b2a4190f9c19adbceae4a639342b7630bfc3047339eabf57673b7807db5edc6a"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key\r
|
||||
RUS411U2KXdTN3mUUTEw+mmiuQhcddYpNrjRnGA43/GS3y/qgY1EnL0kGp4NTBouTlVJbiThEkQfOrqIjnwlshUB18PrQloxAAw=\r
|
||||
trusted comment: timestamp:1793443789\tfile:toggle_sprint-1.0.0.hnmod\thashed\r
|
||||
2kNF92yIivWMWhgUH7ypwU3pciKG3ouiHhpZrQmX8fWZHay2da9HgdOYFAUp5KaHJ1NAgBuwL1zMfwVf61X+Cw=="""
|
||||
changelog = "Initial release for 26.3 Horizon. "
|
||||
+6
-13
@@ -7,15 +7,16 @@ An unofficial Rust port by levzzz5154. Mines connected veins, including diagonal
|
||||
through Horizon's player-mining code, preserving loot, XP, tool wear and server block events.
|
||||
Includes per-player toggles, configurable block/tool groups, a block limit and cooldown.
|
||||
|
||||
Native source mod: install it on the launcher's Mods page, press Build there,
|
||||
Native source mod: enable Settings → Game → Native mods (experimental), choose Build,
|
||||
and confirm the native-code warning. A supported launcher downloads its own Rust toolchain
|
||||
and builds a separate game using Horizon Mixins. Requires Git and Horizon's platform build
|
||||
dependencies, and runs with your account's permissions.
|
||||
|
||||
Each version is pinned to one Horizon Nightly and Horizon Mixins revision, named in its
|
||||
changelog; the launcher builds those exact revisions. Other Horizon revisions have not
|
||||
been validated. Ordinary Play does not compile mods; rebuild after changing the enabled
|
||||
native-mod combination.
|
||||
Tested against Horizon nightly `83f15fa276c44711276b6ceb5f0fe0c9c534dc66`
|
||||
(`nightly/build-2026-10-28-3`) with Horizon Mixins 0.5.0 at
|
||||
`0500ff24aa5933fca95a877ef41125353c4b4fe3`. The launcher builds these exact pinned revisions.
|
||||
Other Horizon revisions have not been validated. Ordinary Play does not compile mods;
|
||||
rebuild after changing the enabled native-mod combination.
|
||||
|
||||
Use `/veinminer toggle`, `/veinminer on`, `/veinminer off` or `/veinminer status`.
|
||||
`/veinminer reload` requires operator permission. Survival mining only; install on the
|
||||
@@ -36,11 +37,3 @@ game = "26.3"
|
||||
file = "veinminer-0.3.0.hnmod"
|
||||
sha256 = "ec308c02c65bad64043828a19ef6254d1eb9d422bb1123cd065cb9e6e7b126c8"
|
||||
changelog = "Native launcher bundle, pinned to nightly 83f15fa27 and Horizon Mixins 0.5.0."
|
||||
|
||||
[[versions]]
|
||||
version = "0.3.2"
|
||||
published = "2026-10-31"
|
||||
game = "26.3"
|
||||
file = "veinminer-0.3.2.hnmod"
|
||||
sha256 = "31a4249da1b35972ae8b34201373c86352f4adc2f5cb3e015749d1fbfecf00a0"
|
||||
changelog = "Pinned to Nightly 2026-10-31 (d91cab6) and Horizon Mixins 4342a0b. Reads each level's height from the loaded world, so data-pack dimension heights are respected."
|
||||
@@ -1,42 +0,0 @@
|
||||
id = "voicechat"
|
||||
kind = "native-mod"
|
||||
name = "Horizon Voice Chat"
|
||||
summary = "Talk with Simple Voice Chat players: proximity voice, groups, push to talk and a menu (V)."
|
||||
description = """
|
||||
An unofficial client for the [Simple Voice Chat](https://github.com/henkelmax/simple-voice-chat) protocol. On a server with the Simple Voice Chat mod or plugin, you can talk with players who use the Java mod on the regular launcher.
|
||||
|
||||
## What it does
|
||||
|
||||
- **Menu (V):** connection status, microphone and voice chat on/off, push to talk or voice activation, voice volume, microphone gain and activation level with a live meter, and every hotkey as it is bound now. The right side lists the server's groups with their members: join (with a password if needed), leave, or create a group.
|
||||
- **Talking:** hold Caps Lock (push to talk) or use voice activation. Voices come from where players stand, getting quieter with distance and panned left or right.
|
||||
- **Groups:** each player's group shows above their head. `/vc join <group> [password]`, `/vc leave`, `/vc create <name> [password] [normal|open|isolated]` and `/vc groups` work too.
|
||||
- **Keys** (Options > Mods > Horizon Voice Chat): menu (V), push to talk (Caps Lock), whisper (unbound), mute (J), voice chat off/on (K).
|
||||
- **Protocols:** Simple Voice Chat 2.6.x (compatibility 20) and 2.7 (21).
|
||||
|
||||
## What it touches
|
||||
|
||||
- It reads the server's `voicechat:*` custom payloads and other players' positions inside `game::remote`, so it is pinned to Horizon `c9d474d`.
|
||||
- It opens one UDP connection to the server's voice chat port, encrypted with AES-128-GCM using the secret the server sends.
|
||||
- It uses the default microphone and speakers through cpal, and loads the system **libopus** at run time (the `opus` package must be installed).
|
||||
- It keeps its settings in Horizon's own mod settings. It contacts no host other than the Minecraft server you are on (and DNS, for the server's SRV record).
|
||||
|
||||
## Not affiliated
|
||||
|
||||
This project is not made, endorsed or supported by Max Henkel or the Simple Voice Chat project. It contains none of Simple Voice Chat's code: everything is written from scratch in Rust.
|
||||
|
||||
## Tested
|
||||
|
||||
The engine's unit tests pass, and the modded client type-checks. Live, against Paper 26.3 with the Simple Voice Chat 2.6.27 plugin, it authenticated and connected, a test tone was heard through the server, and groups and labels came from the server. Not tested yet: the menu in the real game, a real microphone, 2.7 servers, and talking with the Java mod itself.
|
||||
"""
|
||||
authors = ["Nirokx"]
|
||||
owners = ["Nirokx"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Nirokx/horizon-voice-chat"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "voicechat-1.0.0.hnmod"
|
||||
sha256 = "7a12ef9e691d10128ea081906a313d597c67f22897380618871477f9dd8eabf1"
|
||||
changelog = "First release."
|
||||
@@ -1,31 +0,0 @@
|
||||
id = "waymap"
|
||||
kind = "native-mod"
|
||||
name = "Waymap"
|
||||
summary = "Native Horizon waypoint mod with per-context storage, minimap dots, world markers, and full command suite."
|
||||
description = """
|
||||
Waymap — Native client-side waypoints for Horizon.
|
||||
Features:
|
||||
- World markers (3D, camera-projected)
|
||||
- Minimap dots (rotation-aware)
|
||||
- Waypoint list panel (bottom-left, 6 nearest)
|
||||
- Per-context storage (per server server_<host:port>.txt / world world_<folder>.txt)
|
||||
- Atomic saves (temp + atomic rename), legacy migration
|
||||
- Commands: /wp add|del|list|rename|color|clear|edit|help
|
||||
- Keys: N = add, B = toggle list"""
|
||||
authors = ["Aron"]
|
||||
owners = ["Lauch2"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Lauch2/horizon-waymap-mod"
|
||||
key = "RWS1B1QZPeYaSNKJr9rffnfHDSvB0AZj/Ul1B2pKrJ2XFBgKXL0FC96u"
|
||||
|
||||
[[versions]]
|
||||
version = "0.1.4"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "waymap-0.1.4.hnmod"
|
||||
sha256 = "61bf573af5b2711453ca37a41b4ac2abc78ab827863bcafb9bfabe7dbf19ccd5"
|
||||
signature = """
|
||||
untrusted comment: signature from minisign secret key
|
||||
RUS1B1QZPeYaSBV67KshMqdN7e9tTtnd0aJ2j2hE0IOvZNQpo896FjvOETBrxu0OhB738CE44moftY8pvDMvF8o+dxXsfxQduAU=
|
||||
trusted comment: timestamp:1793662341\tfile:waymap-0.1.4.hnmod\thashed
|
||||
j0dStr7Yhq33q3uA+wVGhfiEfjdNx0XBCUIHiZ5AfD7vPhcCqtVnrnYx8KKcliC2UOMNBP0Kl3gOz2MyiqJSAQ=="""
|
||||
@@ -1,27 +0,0 @@
|
||||
id = "waypoints"
|
||||
kind = "native-mod"
|
||||
name = "Waypoints"
|
||||
summary = "Place waypoints with N, manage them with M, and see their name and distance in the world."
|
||||
description = """
|
||||
Waypoints for Horizon.
|
||||
|
||||
- **N**: create a waypoint where you stand: name, X/Y/Z, dimension, colour, visible or hidden. Enter saves, Tab moves between fields, Esc cancels.
|
||||
- **M**: the waypoint list, filtered by All / Overworld / Nether / End. Each row shows its colour, name, coordinates, dimension and distance, with Hide/Show, Edit and Delete buttons.
|
||||
- **In the world**: each visible waypoint in your current dimension shows its name, its distance and a marker in its colour.
|
||||
- **Options > Mods > Waypoints**: rebind both keys and turn the in-world labels on or off.
|
||||
|
||||
**What it does and doesn't do:** it only reads the game's own state (player position, dimension, camera, world folder name, server address) and draws on the HUD and its own screen. It stores waypoints as a text file per world and per server in `horizon-mods/.horizon-mod-data/waypoints/` inside the game folder. It uses only the Rust standard library, opens no network connections, and reads or writes no other files.
|
||||
|
||||
Pinned to Horizon `c9d474d`, because it reads the world folder, server address and last frame's camera from the game itself."""
|
||||
authors = ["Nirokx"]
|
||||
owners = ["Nirokx"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/Nirokx/horizon-waypoints"
|
||||
|
||||
[[versions]]
|
||||
version = "1.0.0"
|
||||
published = "2026-11-02"
|
||||
game = "26.3"
|
||||
file = "waypoints-1.0.0.hnmod"
|
||||
sha256 = "9c0e670f1205c23fed0fe0b0eaf8f0b90a01f3cbb883a8eee445ebc03f4d90a4"
|
||||
changelog = "First release for Horizon 26.3 (Nightly c9d474d)."
|
||||
@@ -1,19 +0,0 @@
|
||||
id = "worldedit"
|
||||
kind = "native-mod"
|
||||
name = "WorldEdit"
|
||||
summary = "working port of java world edit"
|
||||
description = """
|
||||
//we for commands
|
||||
|
||||
working schematics."""
|
||||
authors = ["_cykoo_"]
|
||||
owners = ["XnotCykoX"]
|
||||
license = "MIT"
|
||||
source = "https://github.com/XnotCykoX/WorldEdit-Horizon"
|
||||
|
||||
[[versions]]
|
||||
version = "1.2.1"
|
||||
published = "2026-10-30"
|
||||
game = "26.3"
|
||||
file = "worldedit-1.2.1.hnmod"
|
||||
sha256 = "b2bb3019ecd4d5392644c54c70a87d6c3277538a6e18d0c311f3a051f7d2f015"
|
||||
+1
-1
@@ -13,7 +13,7 @@ Horizon's own zoom, formerly an extra in Options > Horizon Extras.
|
||||
It hears its own key and the mouse wheel while you hold it, and zooms the camera: nothing else.
|
||||
|
||||
Now a native mod (2.0.0): built into the game by the launcher, on the Horizon you play, like any native mod
|
||||
(install it on the launcher's Mods page, then press Build there). Your settings carry over from 1.0.0. Turn it off in
|
||||
(Settings → Game → Native mods (experimental), then Build). Your settings carry over from 1.0.0. Turn it off in
|
||||
Options > Mods: it rests at once, and the next build leaves it out. Its source is
|
||||
[horizon-mods/native/zoom](https://github.com/horizon-rust/horizon-mods/tree/main/native/zoom).
|
||||
"""
|
||||
|
||||
@@ -6,13 +6,12 @@ Your block position and the direction you face in a box in the top-left corner o
|
||||
- `/coords` hides or shows the box, and the game keeps your choice (also Options > Mods > Coordinates HUD > Settings).
|
||||
|
||||
It is a [horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundle (`mixins/coords_hud/`) that the Horizon
|
||||
launcher builds into the game. It is a small example mod.
|
||||
launcher builds into the game. It replaces the WebAssembly Coordinates HUD 0.1.0, the WebAssembly SDK's example mod.
|
||||
The time of day line is gone: Horizon's hook points don't give the game's clock yet.
|
||||
|
||||
## Install
|
||||
|
||||
In the Horizon launcher: Mods → Coordinates HUD → Install, then **Build** on the same page (once built, switch it
|
||||
on or off in the game under Options → Mods). The
|
||||
In the Horizon launcher: Mods → Coordinates HUD → Install, then Settings → Game → Native mods (experimental) → Build. The
|
||||
launcher downloads its own Rust and builds the game with your native mods; see Horizon's
|
||||
[native mods](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md).
|
||||
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "4baa571566e39bfd6594988d3bb2bc85440c30e7",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
@@ -3,12 +3,11 @@
|
||||
Horizon's official FPS counter: frames per second in a box in a corner of the screen, and, if you like, the slowest frame and the 1% low of the last 5 seconds. Its settings page (Options > Mods > FPS Counter > Settings) picks the corner and the lows.
|
||||
|
||||
It is a [horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundle (`mixins/fps_overlay/`) that the Horizon
|
||||
launcher builds into the game. It keeps the settings of earlier versions: the same files (`horizon-mods/.horizon-mod-data/fps_overlay/corner`, `lows`).
|
||||
launcher builds into the game. It replaces the WebAssembly FPS Counter 1.x and keeps its settings: the same files (`horizon-mods/.horizon-mod-data/fps_overlay/corner`, `lows`).
|
||||
|
||||
## Install
|
||||
|
||||
In the Horizon launcher: Mods → FPS Counter → Install, then **Build** on the same page (once built, switch it
|
||||
on or off in the game under Options → Mods). The
|
||||
In the Horizon launcher: Mods → FPS Counter → Install, then Settings → Game → Native mods (experimental) → Build. The
|
||||
launcher downloads its own Rust and builds the game with your native mods; see Horizon's
|
||||
[native mods](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md).
|
||||
|
||||
@@ -39,6 +38,6 @@ python3 native/tools/native.py proof fps-overlay --resources /path/to/.local/hor
|
||||
```
|
||||
|
||||
The proof needs resources prepared from your own Minecraft 26.3 (`horizon-prepare`); none are in this repository.
|
||||
It seeds an earlier version's settings (bottom right, lows on) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the box to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
It seeds the WebAssembly mod's settings (bottom right, lows on) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the box to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
|
||||
License: MIT.
|
||||
@@ -4,5 +4,5 @@
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "6f8c7a0e5d531d3834c4d0be4659a1db8e7e5c2a",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
@@ -3,12 +3,11 @@
|
||||
Horizon's official Keystrokes: your movement keys, mouse buttons and space bar in a corner, lit while held, with clicks per second. Its settings page (Options > Mods > Keystrokes > Settings) picks the corner and the clicks per second.
|
||||
|
||||
It is a [horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundle (`mixins/keystrokes/`) that the Horizon
|
||||
launcher builds into the game. It keeps the settings of earlier versions: the same files (`horizon-mods/.horizon-mod-data/keystrokes/corner`, `cps`).
|
||||
launcher builds into the game. It replaces the WebAssembly Keystrokes 1.x and keeps its settings: the same files (`horizon-mods/.horizon-mod-data/keystrokes/corner`, `cps`).
|
||||
|
||||
## Install
|
||||
|
||||
In the Horizon launcher: Mods → Keystrokes → Install, then **Build** on the same page (once built, switch it
|
||||
on or off in the game under Options → Mods). The
|
||||
In the Horizon launcher: Mods → Keystrokes → Install, then Settings → Game → Native mods (experimental) → Build. The
|
||||
launcher downloads its own Rust and builds the game with your native mods; see Horizon's
|
||||
[native mods](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md).
|
||||
|
||||
@@ -39,6 +38,6 @@ python3 native/tools/native.py proof keystrokes --resources /path/to/.local/hori
|
||||
```
|
||||
|
||||
The proof needs resources prepared from your own Minecraft 26.3 (`horizon-prepare`); none are in this repository.
|
||||
It seeds an earlier version's settings (bottom right, no clicks per second) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the keys to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
It seeds the WebAssembly mod's settings (bottom right, no clicks per second) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the keys to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
|
||||
License: MIT.
|
||||
@@ -4,5 +4,5 @@
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "6f8c7a0e5d531d3834c4d0be4659a1db8e7e5c2a",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
@@ -3,12 +3,11 @@
|
||||
Horizon's official Minimap: a map of the terrain around you in a corner, in map colours, square or round, north up or turning with you, drawn by Horizon's own minimap. Its settings page (Options > Mods > Minimap > Settings) picks the corner, size, shape, zoom and turning.
|
||||
|
||||
It is a [horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundle (`mixins/minimap/`) that the Horizon
|
||||
launcher builds into the game. It keeps the settings of earlier versions: the same files (`horizon-mods/.horizon-mod-data/minimap/corner`, `size`, `shape`, `zoom`, `rotate`).
|
||||
launcher builds into the game. It replaces the WebAssembly Minimap 1.x and keeps its settings: the same files (`horizon-mods/.horizon-mod-data/minimap/corner`, `size`, `shape`, `zoom`, `rotate`).
|
||||
|
||||
## Install
|
||||
|
||||
In the Horizon launcher: Mods → Minimap → Install, then **Build** on the same page (once built, switch it
|
||||
on or off in the game under Options → Mods). The
|
||||
In the Horizon launcher: Mods → Minimap → Install, then Settings → Game → Native mods (experimental) → Build. The
|
||||
launcher downloads its own Rust and builds the game with your native mods; see Horizon's
|
||||
[native mods](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md).
|
||||
|
||||
@@ -39,6 +38,6 @@ python3 native/tools/native.py proof minimap --resources /path/to/.local/horizon
|
||||
```
|
||||
|
||||
The proof needs resources prepared from your own Minecraft 26.3 (`horizon-prepare`); none are in this repository.
|
||||
It seeds an earlier version's settings (bottom right, round, 2 blocks per pixel) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the map to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
It seeds the WebAssembly mod's settings (bottom right, round, 2 blocks per pixel) in a temporary game folder, then checks that Options > Mods shows them, and that the Corner button moves the map to the top left and writes the same file. CI runs `cargo test`, packages the `.hnmod` and checks the game on the tested commit, and every Monday on the newest Nightly.
|
||||
|
||||
License: MIT.
|
||||
@@ -4,5 +4,5 @@
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "6f8c7a0e5d531d3834c4d0be4659a1db8e7e5c2a",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
@@ -7,14 +7,13 @@ Settings): a click on an item in the panel gives you one, a right click a stack.
|
||||
Options > Mods.
|
||||
|
||||
It is a [horizon-mixins](https://github.com/horizon-rust/horizon-mixins) bundle (`mixins/recipes/`) that the Horizon
|
||||
launcher builds into the game. It keeps the settings of earlier versions: the same file
|
||||
launcher builds into the game. It replaces the WebAssembly Recipes 1.x and keeps its settings: the same file
|
||||
(`horizon-mods/.horizon-mod-data/recipes/give`) and the same keys (`key.recipes.recipe`, `key.recipes.uses` in
|
||||
`horizon-mods.txt`).
|
||||
|
||||
## Install
|
||||
|
||||
In the Horizon launcher: Mods → Recipes → Install, then **Build** on the same page (once built, switch it
|
||||
on or off in the game under Options → Mods). The
|
||||
In the Horizon launcher: Mods → Recipes → Install, then Settings → Game → Native mods (experimental) → Build. The
|
||||
launcher downloads its own Rust and builds the game with your native mods; see Horizon's
|
||||
[native mods](https://github.com/horizon-rust/horizon/blob/main/docs/native-mods.md).
|
||||
|
||||
@@ -45,7 +44,7 @@ python3 native/tools/native.py proof recipes --resources /path/to/.local/horizon
|
||||
```
|
||||
|
||||
The proof needs resources prepared from your own Minecraft 26.3 (`horizon-prepare`); none are in this repository.
|
||||
It seeds an earlier version's setting ("Click gives items" on) in a temporary game folder, checks that Options > Mods
|
||||
It seeds the WebAssembly mod's setting ("Click gives items" on) in a temporary game folder, checks that Options > Mods
|
||||
shows the mod, its keys and the setting, then opens the inventory: the panel shows items, a click on one in creative
|
||||
mode gives it, and with the setting turned off the same click opens its recipe page.
|
||||
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "4baa571566e39bfd6594988d3bb2bc85440c30e7",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
Generated
+1
-1
@@ -4,7 +4,7 @@ version = 4
|
||||
|
||||
[[package]]
|
||||
name = "horizon-mod-smp"
|
||||
version = "0.31.0"
|
||||
version = "0.5.0"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "horizon-mod-smp"
|
||||
version = "0.31.0"
|
||||
version = "0.5.0"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
publish = false
|
||||
|
||||
+13
-273
@@ -8,26 +8,15 @@ Players install nothing: it speaks only what a stock Horizon client already show
|
||||
lines, vanilla chest menus the server fills with ordinary items (the trade menu); later sounds, titles, the action
|
||||
bar, boss bars and the sidebar).
|
||||
|
||||
This version: the economy, the auction house, the server market and its `/shop` menu, player trades, the coinflip, the lottery, places (spawn, homes, warps,
|
||||
teleport requests, the rules), land claims, and the scoreboard (a sidebar with your balance, playtime and the richest players, the Tab list's
|
||||
header and footer).
|
||||
This version: the economy, the server market, player trades, the coinflip and the lottery.
|
||||
|
||||
| Command | Does |
|
||||
|---|---|
|
||||
| `/balance [player]`, `/bal` | your balance, or another player's |
|
||||
| `/pay <player> <amount>` | gives money to a player who has an account (anyone who has played since the mod was on) |
|
||||
| `/baltop [page]` | the richest players, 10 a page |
|
||||
| `/eco give <player> <amount> <reason>`, `/money give ...` | operators of level 3: makes money for a player (an event prize, a bug refund); everyone reads it with the reason, and the audit log keeps it |
|
||||
| `/eco take <player> <amount> [reason]`, `/money take ...` | operators of level 3: takes a cheat's gains out of the game, logged with the reason |
|
||||
| `/eco stats` | the money supply and where it sits, what the server made and destroyed today, how evenly money is spread |
|
||||
| `/ah` | the auction house: a chest menu of listings by category, cheapest a unit first; click one to buy it or bid; your listings (click to take one back) and your mail |
|
||||
| `/ah sell <price> [count]` | lists the stack in your hand (or part of it), whole (enchantments, name, contents...), at a fixed price, for `listing_hours` (48); listing is free |
|
||||
| `/ah auction <start> [hours]` | auctions the stack in your hand from a starting bid, for 1 to 24 hours (12) |
|
||||
| `/ah bid <listing> <amount>`, `/ah buy <listing>` | bids (the money is held until someone bids more or it ends), buys a fixed-price listing |
|
||||
| `/ah cancel <listing>`, `/ah claim`, `/ah search <words>`, `/ah mine`, `/ah mail` | takes back a listing nobody bid on; gives you your mail; the menu on a search, your listings, your mail |
|
||||
| `/shop` | the market as a chest menu: categories, a click buys one, a shift-click 64, a click on a stack of yours sells it, "Sell all" |
|
||||
| `/market [item]` | the moving market as a chest menu: categories, each item's price, its move over 1 h and 24 h and its volume; an item's page buys or sells 1, 16 or 64, sells all you carry, and gives its price chart as a map |
|
||||
| `/worth [item]` | an item's price, the same to buy and to sell (the one in your hand without a name), and what you may still sell today |
|
||||
| `/eco give\|take\|set <player> <amount>` | operators of level 3: corrections, logged |
|
||||
| `/worth [item]` | what the market pays and asks for an item (the one in your hand without a name) |
|
||||
| `/sell hand [count]`, `/sell <item> [count]`, `/sell all` | sells to the market: the stack in your hand, an item, or everything it buys |
|
||||
| `/buy <item> [count]` | buys from the market, only what fits in your inventory |
|
||||
| `/trade <player>` | asks a player to trade (60 s to answer) |
|
||||
@@ -36,131 +25,12 @@ header and footer).
|
||||
| `/trade cancel` | ends your trade, or withdraws your request |
|
||||
| `/coinflip <amount> [player]` | stakes an amount for anyone (or one player) to match; off unless `gambling.enabled` |
|
||||
| `/lottery`, `/lottery buy <tickets>` | the pot, your tickets and the time to the draw; buys tickets (off unless `gambling.enabled`) |
|
||||
| `/casino`, `/casino roulette\|slots\|crash\|blackjack` | the casino's lobby menu, or a game's table (needs `gambling.enabled` and `casino.enabled`) |
|
||||
| `/casino help`, `/casino top`, `/casino stats` | every game's odds and house edge and the limits; today's biggest wins; what you bet, won and may still lose today |
|
||||
| `/coinflip accept <player>`, `/coinflip cancel`, `/coinflip list` | takes an offer (a fair coin decides, the winner gets both stakes), withdraws yours, lists those waiting |
|
||||
| `/spawn` | to a safe spot within `places.spawn_radius` of the server's spawn; `/setspawn` (operators of level 3) sets it where you stand |
|
||||
| `/home [name]`, `/sethome [name]`, `/delhome [name]`, `/homes` | your homes (`home` when unnamed): go, set or move one where you stand, delete, list |
|
||||
| `/warp <name>`, `/warps` | to a warp, the list; `/setwarp <name>`, `/delwarp <name>` for operators of level 3 |
|
||||
| `/tpa <player>`, `/tpaccept [player]`, `/tpdeny [player]` | asks to go to a player (60 s to answer); answers a request |
|
||||
| `/rules` | the server's rules |
|
||||
| `/back` | back to where you died, or where your last teleport took you from (warmup and cooldown as any teleport) |
|
||||
| `/afk` | marks you away from the keyboard until you move, turn or run a command |
|
||||
| `/playtime [player]` | how long you (or a player who is on) have played here |
|
||||
| `/claim`, `/claim info`, `/unclaim` | claims the chunk you stand in (all its height), says whose it is, frees it (operators of level 3: anyone's) |
|
||||
| `/claim show` | draws the border of the chunk you stand in for 10 s, for you only: green yours or a trusting owner's, red someone else's, white free |
|
||||
| `/claims` | your chunks, how many you may hold, and who you trust |
|
||||
| `/trust <player>`, `/untrust <player>` | lets a player (or no longer) build and use things on all your land |
|
||||
| `/nick <name>`, `/nick off`, `/nick` | operators of level 3 (with `ops_only`, the default): another name for you in chat and the Tab list, shown as `~name` (hovering it gives your real one); `/nick off` (anyone with a nickname) takes it off; `/nick` alone says how |
|
||||
| `/nick <player> <name\|off>` | operators of level 3: sets or takes off a player's nickname |
|
||||
| `/realname <nick>` | who goes by that nickname |
|
||||
| `/invsee <player>`, `/endersee <player>` | operators of level 3: the player's inventory (main, hotbar, armour, off hand) or ender chest in a chest menu, on or off the server; click one of theirs to take it, one of yours to give it; every move in `audit.log`, a summary in `staff.log` |
|
||||
| `/sidebar off`, `/sidebar on`, `/sidebar` | hides the scoreboard sidebar for you (remembered), shows it again |
|
||||
|
||||
The market trades only plain items (not worn, named or enchanted), and only with players in survival or adventure
|
||||
mode. Items move first, then money, both logged; a sale the log refuses gives the items back, and a purchase checks the
|
||||
money and the room before anything moves.
|
||||
|
||||
**No way to get rich from the market.** The market makes money only from what players gather, and only so much a day:
|
||||
- One price per item, to buy and to sell (since 0.29): a config that still has two (`buy` 400, `sell` 100) gets
|
||||
their geometric mean (200) at load, logged ("one price now"); `buy` or `sell` 0 still closes that side. A trade
|
||||
of N items is priced along the curve it moves the price on (below), so buying N and selling them back gives back
|
||||
exactly what was paid (less whole-coin rounding): a round trip never earns (tested for 1, 64 and past the minute's band, and
|
||||
over thousands of random trades with the drift in between).
|
||||
- No chain of recipes turns what the market sells into something it buys for more: the cheapest way to get each item
|
||||
from the market (bought, or crafted, smelted, cut from bought items, through any number of recipes) is worked out,
|
||||
and an item the market would buy for more than that isn't bought. The tests walk every vanilla recipe
|
||||
(`SMP_VANILLA_DATA=<.local/horizon-client/26.3/data/minecraft> cargo test`); the server checks the iron, gold,
|
||||
copper, diamond, emerald, coal, redstone, lapis, wheat, wood and food chains at each start.
|
||||
- Items a recipe links (an ingot and its block, wheat and hay...) share one moving price, the block moving it as
|
||||
its 9 ingots do, so crafting never beats the market however prices move; the vanilla-recipe test checks every item
|
||||
at the worst drift (what makes it at 0.6 times its price, it at 1.6) too.
|
||||
- Each player sells at most `daily_sell_coins` (2,000 coins) and `daily_sell_items` (640 of each item) a UTC day,
|
||||
`/worth` and the shop show what is left, and `market.json` keeps the day's count across restarts.
|
||||
- Money received with `/pay` counts toward the receiver's same `daily_sell_coins`: selling up to the limit on alts
|
||||
and paying it all to a main is refused once the main's limit is reached ("can only receive N more today").
|
||||
Trades (`/trade`) and auction house sales are not counted.
|
||||
- Amounts are checked: no price above 1,000,000,000,000, no sum that overflows.
|
||||
- The coinflip and the lottery give the winner all the stakes: they move money between players and never make any.
|
||||
|
||||
Default prices (coins; "buy only": the market sells it but doesn't buy it, "sell only" the other way):
|
||||
|
||||
| Category | Items |
|
||||
|---|---|
|
||||
| Farming | wheat 2, carrot 2, potato 2, beetroot 2, sugar cane 2, pumpkin 5, melon slice 1, cactus 2; buy only: wheat seeds 2, bone meal 3 |
|
||||
| Mining | coal 4, copper ingot 3, iron ingot 15, gold ingot 20, redstone 2, lapis 4, quartz 4, emerald 40, diamond 200 |
|
||||
| Wood | the eight logs 2 |
|
||||
| Mob drops | bone 2, string 2, gunpowder 4, spider eye 2, slime ball 4, blaze rod 15, leather 3, feather 1; sell only: rotten flesh 1 |
|
||||
| Building (buy only) | cobblestone 1, stone 2, dirt 1, sand 2, gravel 2, glass 3, bricks 4, stone bricks 3 |
|
||||
| Food (buy only) | bread 5, cooked beef 6, cooked porkchop 6, cooked chicken 5, baked potato 4, apple 4, golden carrot 40 |
|
||||
| Tools (buy only) | torch 1, ladder 2, crafting table 4, chest 6, furnace 6 |
|
||||
|
||||
A `config.json` still holding the 18 prices of versions 0.1 to 0.11, never edited, gets these at the first start of
|
||||
0.12.0; edited prices are kept. Only items that stack to 64 belong in the market: a shift-click buys 64, and what
|
||||
doesn't fit falls at the player's feet for them.
|
||||
|
||||
**/invsee and /endersee.** For operators of level 3 (luzW, bunchy7s...). The menu shows the main inventory in its
|
||||
first three rows, the hotbar in the fourth, then the armour (head to feet) and the off hand; the ender chest fills
|
||||
three rows. A click on one of the player's stacks moves it whole into the operator's inventory; a click on one of the
|
||||
operator's own moves it into the player's (main inventory or ender chest, where it fits whole). A stack moves only if
|
||||
it is still exactly what the menu showed: the game checks it and moves it, or nothing (no copy, no loss). A player who
|
||||
isn't on is read from and written to their saved file; while they log in or are dead nothing moves and the menu says
|
||||
why. The menu is read again once a second while open; nothing runs when none is open. Each move is in `audit.log`
|
||||
before it is made (`invsee_take`, `invsee_put`: operator, player, inventory, item, count; a refused one again with
|
||||
its reason); closing the menu writes one line to the server log (`[smp] staff: ...`), `staff.log`, and the chat of
|
||||
the other operators on. Needs horizon#6106 (`native_inventory`, `native_move_stack`).
|
||||
|
||||
**Nicknames.** With `ops_only` (the default since 0.22) only operators of level 3 set nicknames: their own, or a
|
||||
player's with `/nick <player> <name>`; a player may take off the one given to them (`/nick off`). At each start, a
|
||||
nickname a player who isn't an operator picked themselves is taken off and logged (`for operators only`). 3 to 16 letters, digits or `_`, shown with a `~` in front (`~Rocky`) so a nickname never passes for
|
||||
a real name. Names are compared case-insensitively with `_` dropped and look-alikes folded (`0`→o, `1`/`i`→l, `3`→e,
|
||||
`4`→a, `5`→s, `7`→t, `8`→b, `9`→g). Refused: a nickname equal to, or containing (from 4 letters), the name of anyone
|
||||
who has played here (the economy's accounts and `usercache.json`), an operator (`ops.json`), the Team (`protected`)
|
||||
or another player's nickname; one that reads as a reserved word (`reserved`: server, console, admin, mod, owner,
|
||||
staff, op, horizon, kira, notch, mojang, herobrine...); one the server's chat filter refuses. A player needs
|
||||
`min_playtime_minutes` of play before their first nickname (operators don't). At each start, nicknames that break
|
||||
these rules are taken off, each logged (`[smp] nickname X of <uuid> taken off: why`). The change is made at the next
|
||||
second. The nickname shows in chat (messages, `/me`, `/msg`) and the Tab list, and hovering it gives the real name;
|
||||
the real name stays everywhere else: the server's log, the anticheat, selectors, the Discord bridge. `/pay`, `/tpa`,
|
||||
`/trade`, `/playtime`, `/tpaccept`, `/tpdeny` and `/eco` take a nickname (with or without `~`) wherever they take a
|
||||
player's name. The player's profile (name, UUID) never changes.
|
||||
`config.json`'s `nicks`: `enabled`, `ops_only` (true), `cooldown_seconds` (600), `min_playtime_minutes` (60), `protected` (the Team's
|
||||
names), `reserved` (the words above).
|
||||
|
||||
**Moving prices** (`market.dynamic`, on by default since 0.26). Each item has one price: its base price (`items`)
|
||||
times a factor that supply and demand move as each trade happens. Every item bought raises the log of the factor by
|
||||
`1% / depth`, every item sold lowers it as much, where the depth follows the item's rarity (400 / its price, between
|
||||
2 and 400: a diamond moves 50 times faster per item than cobblestone; `depth` overrides it per item). A trade of N is
|
||||
worth the area under that curve (`price / step × (e^(N × step) - 1)`), rounded up to whole coins when buying and down
|
||||
when selling: one diamond at 200 costs 201 and sells for 199, 64 cobblestone at 1 cost 65, and a sale walks back the
|
||||
exact path of the purchase. All trades together move an item at most `max_minute_move_percent` (5%) a minute from
|
||||
where it started that minute: past that, a purchase is cut short and a sale keeps the rest ("sell them in a
|
||||
minute"). The factor goes back to 1 with a half-life of `half_life_hours` (6) and stays within `min_factor` (0.6)
|
||||
and `max_factor` (1.6), where the rest of a trade goes at that price. There is no tax on trades (an older config's
|
||||
`tax_percent` is ignored): the receipt is the price ("Sold 3 diamond at 198 coins each: 595 coins."). Items a player bought from the market in the last `round_trip_hours` (24) can't be
|
||||
sold back to it. (`max_trade_impact_percent` and `max_player_impact_percent` are no longer used: the curve and the
|
||||
minute's band do their work.) History: one point a minute for 24 hours and one an hour for 30 days (the mid price, the
|
||||
items traded and those sold), in `market_prices.json`, written by a thread every 5 minutes and when the world closes.
|
||||
At the first minute of each UTC day, the day's three biggest risers and fallers (at least 1%) and news from real
|
||||
activity ("Diamond supply up 40% today", sales against the day before's, at least `news_percent` and
|
||||
`news_min_volume`) go to everyone's chat and to `web/market.json` for Kira to post. `enabled: false` keeps the
|
||||
fixed prices of 0.23. For other mods: `Market::spot`, `volume(id, now, hours)`, `history(id, Span)`.
|
||||
|
||||
**`/market`.** A 6-row chest menu: the shop's categories and the day's movers; a category's items, each with its
|
||||
price, its change over 1 h and 24 h (green ▲, red ▼) and what was traded in 24 h; an item's page with its
|
||||
base price and what you may still sell today, buttons to buy or sell 1, 16 and 64 (what they come to
|
||||
along the curve), sell all of it you carry, and the price chart over 24 hours or 7 days, given as a filled map (128 × 128,
|
||||
drawn by the server: the curve green when it rose, red when it fell, the price, the change, the low and high). A
|
||||
chart map is drawn again each minute for whoever carries it, and once a minute the open menus follow the prices.
|
||||
`/market <item>` opens the item's page. `/worth` adds the item's moves and volume.
|
||||
|
||||
**The shop.** `/shop` opens a 6-row chest menu on the market's prices: the categories of `config.json`'s `shop` (an
|
||||
item in none goes under "Other"), each item named with its prices. A click buys one, a shift-click 64; a click on a
|
||||
stack in your own inventory, below the menu, sells it; "Sell all" sells everything the market buys. The bottom row
|
||||
shows your balance and today's selling limit. It goes through the market's own rules (survival or adventure only,
|
||||
items then money, logged, the daily limits); the items move by the console's `clear` and `give`, measured on the
|
||||
inventory before and after, so the money follows what really moved.
|
||||
|
||||
**Trades.** Once accepted, both players see a 6-row chest menu: their own offer on the left (16 stacks), the other's
|
||||
on the right, each side's money, their confirm and cancel buttons, and whether the other has confirmed. A click on a
|
||||
stack in your inventory, below the menu, adds it to your offer; a click on it in your offer takes it back. The menu
|
||||
@@ -172,129 +42,16 @@ the trade, and swaps everything in one step, or nothing (and both must confirm a
|
||||
adventure players only.
|
||||
|
||||
**Coinflips.** Off by default: the owner turns them on in `config.json` (`gambling`: `enabled`, `min_bet` 10,
|
||||
`max_bet` 1000, `cooldown_seconds` 30, `offer_seconds` 60). A stake is held from the offer, in
|
||||
`max_bet` 1000, `cooldown_seconds` 30, `offer_seconds` 60, `fee_percent` 0). A stake is held from the offer, in
|
||||
`economy.json` with the balances, until the coin falls; an offer cancelled, not taken in time, or whose player
|
||||
left gives it back, and so does the next start for one the server stopped with. The coin is a fresh random key from
|
||||
the system, never the world's random. Only the in-game currency is staked and won.
|
||||
|
||||
**The lottery.** Part of `gambling` (`ticket_price` 10, `max_tickets` 100 a player a draw, `lottery_seconds` 3600
|
||||
from a round's first ticket to its draw). Tickets are held like coinflip stakes; at the draw one ticket is picked at
|
||||
random among all sold (more tickets, more chances), its owner gets the whole pot, and everyone hears
|
||||
random among all sold (more tickets, more chances), its owner gets the pot (less `fee_percent`), and everyone hears
|
||||
it. A round with a single player, or one the server stopped with, gives every ticket back.
|
||||
|
||||
**The casino.** On with `gambling.enabled` (and `casino.enabled`, true by default). Every game is a chest menu any
|
||||
stock client can play, animated by changing its items at most 5 times a second for each open menu (and only while a
|
||||
round moves), with note-block sounds, titles and the action bar for results, fireworks and a line for everyone on a
|
||||
jackpot:
|
||||
|
||||
- European roulette: one zero, red/black, odd/even, 1-18/19-36 pay 1 to 1, dozens and columns 2 to 1, a number 35 to
|
||||
1; house edge 2.70% on every bet. The wheel turns and slows down on the drawn pocket.
|
||||
- Slots: 3 reels of 32 stops with item symbols, one payline, a published paytable (three Nether Stars 500x down to
|
||||
three Berries 6x, two Berries 2x); 94.2% paid back (house edge 5.8%), one pull in 4.5 pays.
|
||||
- Crash: one shared round; bet in the 10 s before take-off, then cash out (or set an automatic cash-out) before it
|
||||
crashes. P(crash at x or more) = 96% / x, capped at 100x: 96% paid back whatever you do. Each player in the round
|
||||
sees the multiplier in their own boss bar and the action bar.
|
||||
- Blackjack: 6 decks shuffled each hand, the dealer stands on all 17s and peeks, blackjack pays 3 to 2, double on the
|
||||
first two cards, no split; about 1% house edge with basic strategy.
|
||||
|
||||
Every draw is made by the server (ChaCha20 keyed from the system) before the animation starts. Bets go from `min_bet`
|
||||
10 to `max_bet` 1000; a player may lose at most `daily_loss_cap` (10,000) a day (UTC, all games together) and win at most
|
||||
`daily_win_cap` (10,000) net (once reached, no new bet until 00:00 UTC; the round that crosses it is paid in full), and
|
||||
`cooldown_ms` (2000) passes between the end of a round and their next bet. A bet is held like a coinflip stake;
|
||||
closing the menu or leaving never loses a round: a spin or a pull ends and is paid, a blackjack hand stands, a crash
|
||||
bet is cashed out when its player leaves in flight (or given back before take-off). Wins are paid from the casino's
|
||||
pot (`economy.json`'s pool `casino`): a win larger than the pot is paid up to it. A new casino's pot gets `float`
|
||||
(20,000) once, made for it (`casino_float`; an older pot only what it lacks of it), then keeps every lost bet: the
|
||||
house edge stays in the pot, out of the players' hands. A win of `jackpot_multiple` (50) times the stake, or of `announce_profit` (5000) coins, is
|
||||
told to everyone. Settings in `config.json`'s `casino`, also `crash_edge_percent` (4) and `crash_max` (100).
|
||||
|
||||
**Places.** A teleport waits `warmup_seconds` (3) in `config.json`'s `places`; a player who moves or is hurt meanwhile
|
||||
stays where they are, and `cooldown_seconds` (10) passes between two of one player's teleports. Teleports are free (an older config's
|
||||
`places.fees` is ignored). `/tpa` takes the
|
||||
asker to where the other player is when the warmup ends. Homes grow with the time played on the server since the mod
|
||||
was on (`homes`: `[hours, homes]`, by default 1 home, 2 from 5 hours, 3 from 20, 5 from 100). `rules` holds `/rules`'
|
||||
lines. `/spawn` lands on a random safe column within `spawn_radius` (250) blocks of the spawn point, like vanilla's `respawn_radius` for a first join or a respawn: after the `tp`, vanilla's `spreadplayers` moves the player off fluid, fire and magma onto solid ground (0: exactly the spawn point; if no column is found the player stays at the spawn point). Teleports are vanilla's `tp`, run as the server (`execute in <level> run tp`), so they cross levels and land
|
||||
as any teleport does.
|
||||
|
||||
**Claims.** In a claimed chunk, only its owner, the players they trust and operators of level 3 break blocks or right
|
||||
click blocks: doors, chests, levers, buttons, placing a block, a bucket or flint on a block. Anyone else's click does
|
||||
nothing, and the action bar says whose land it is. The chunks a player may hold grow with the time played here
|
||||
(`claims.chunks`: `[hours, chunks]`, by default 4, 16 from 5 hours, 36 from 20, 64 from 100); `claims.enabled`
|
||||
turns them off. `claims.free_radius` (0, none) keeps the land within that many blocks of 0 0, in every dimension, free
|
||||
for all: no one claims a chunk that touches it, and claims already there are dropped at start (each logged). The world stays out too: no water or lava flows, no fire spreads or burns, and no piston pushes into
|
||||
a claim from land that isn't its owner's (or a player's they trust), and explosions break no claimed block, whoever
|
||||
lit them. Buckets are guarded where they fill or empty, and hitting the claim's item frames, armour stands,
|
||||
paintings, boats, minecarts and animals does nothing for others (`claims.protected_entities`, entity ids; monsters
|
||||
and players aren't in it). Not guarded yet: right clicking an entity (rotating a frame's item, an armour stand's
|
||||
items, shearing, leads), which waits for Horizon's hook (#4648). The server's `spawn-protection` (vanilla's) guards
|
||||
the spawn.
|
||||
|
||||
**The scoreboard.** A sidebar on the right, titled `board.title` ("Horizon SMP"): your own block first (your name, or
|
||||
your nickname; your balance, `125.4k`, `3.2M`; your playtime, `2h 05m`; the players online), then the `board.top` (3)
|
||||
richest players with their balance, then `board.footer` (`play.playhorizon.dev`, empty for none). The ranking is
|
||||
built once for everyone, only when a balance changed (at most every `board.min_seconds`, 5) or every
|
||||
`board.refresh_seconds` (60); each player's own lines are looked at on the same `board.refresh_seconds`, and a
|
||||
sidebar is sent only to the players whose lines changed and to newcomers: nothing runs per tick per player. The Tab
|
||||
list shows `board.tab_header` and `board.tab_footer` (`{server}`, `{tps}`, `{players}` filled in, every
|
||||
`board.tab_refresh_seconds`, 5). `board.sidebar` and `board.tab` turn either off; `board.server_name` names the Tab
|
||||
list. A server that kept 0.13's defaults (`Richest players`, the top 10) gets these at its first start of 0.14. The
|
||||
sidebar uses one scoreboard objective of its own (`horizon:native_sidebar`) and leaves the world's scoreboard alone.
|
||||
|
||||
**Presence.** A player's first join is announced to everyone (`presence.first_join`, empty for none) and they read
|
||||
`presence.welcome` and the rules. Each player gets `presence.daily_reward` (50) once a day (UTC) after
|
||||
`presence.reward_after_minutes` (10) of play that day, logged as `daily_reward` (0 turns it off). Only seconds with a
|
||||
move, a turn or a command in the minute before count, so an alt that logs in and stands still gets nothing (on
|
||||
2026-11-01, 1,242 players got the reward; 323 of them had played 10 minutes in all). The count isn't kept over a
|
||||
restart. A player who hasn't moved, turned or run a command for `presence.afk_minutes` (5),
|
||||
or typed `/afk`, is AFK: they don't count for sleeping (vanilla's `players_sleeping_percentage`) until they move or
|
||||
get in a bed; `presence.afk_announce` tells everyone instead of only them. A player runs at most
|
||||
`presence.spam_commands` (8) of the SMP's commands in `presence.spam_seconds` (5); operators of level 3 aren't
|
||||
limited. All of it is looked at once a second.
|
||||
|
||||
**The auction house.** Players sell to players: a listing is a fixed price or a timed auction. The listed items
|
||||
leave the seller's inventory at once; what doesn't sell, what an auction's winner gets, and what didn't fit in a
|
||||
buyer's inventory wait in the player's mail (`/ah claim`, or the menu's mail page; as much as fits, the rest stays).
|
||||
A purchase takes the whole listing: the listing leaves first, the items move, then the money (the seller gets the
|
||||
whole price); of two players who buy at once (the game runs every click on one
|
||||
thread), the second finds it gone. Bids wait in the `auction` pool: a higher bid gives the last one back at once,
|
||||
raising one's own only holds the difference, and a bid in the last `snipe_seconds` (60) moves the end back to
|
||||
60 seconds away. When an auction ends, the seller is paid the winning bid and the items go to the winner's mail. Sellers
|
||||
and outbid players who are offline find a note when they come back. Everything (listings, bids, mail, notes) is
|
||||
written in `economy.json` with the balances, in one step: a crash can't keep the money and lose the items, or the
|
||||
reverse. A listing carries the whole stack (since 0.31): its enchantments, name, damage, lore, a shulker box's
|
||||
or a bundle's contents and every other component, written as the game writes it in player files, and given back
|
||||
exactly so (Horizon's `native_give_stack`) to the buyer, the winner, or the seller when it comes back. `/ah sell
|
||||
<price> <count>` lists part of the stack in hand; the rest stays in the hand, the same. The menu shows the stack
|
||||
itself (its tooltip), with the listing's price, seller and time under it. A stack is taken only if it would come
|
||||
back the same (its data written and read back equal); not market charts (free at `/market`), nor a stack holding
|
||||
more than 32 KiB of data (a box of books). Listings and mail from before 0.31 hold plain items and are given back as
|
||||
before. Survival and adventure players only. `config.json`'s `auction`:
|
||||
`enabled`, `max_listings` (8 a player), `listing_hours` (48), `auction_hours` (12),
|
||||
`auction_hours_max` (24), `bid_step_percent` (5: the smallest raise), `snipe_seconds` (60). Ended listings are
|
||||
looked at once a second (a pass over the open listings).
|
||||
|
||||
**Money in and out.** Money enters the game through what the market buys from players, the daily reward, the
|
||||
casino's float (once) and operators' `/eco give` (with a reason everyone reads, logged as `eco_give`). It leaves
|
||||
through what the market sells and operators' `/eco take`. There are no fees, taxes, bank, contracts or futures: no
|
||||
VAT, land or wealth tax, no tax on market trades, no teleport, auction or coinflip fee. A world from before 0.30 is
|
||||
cleaned up at its first start: bank savings and the margins of open futures positions go back to their owners
|
||||
(`bank_closed`, `futures_closed`), and the Treasury, its insurance fund, contracts and land tax owed are dropped.
|
||||
`config.json`'s old `taxes`, `bank`, `jobs` and `futures` sections and the `fee_percent` and `listing_fee_percent`
|
||||
keys are ignored.
|
||||
|
||||
**The report.** `/eco stats` (anyone) shows the money supply (wallets and money held, each pool, the casino's pot),
|
||||
what the server made today (market sales, the daily reward, `/eco give`) and destroyed (market purchases, operators'
|
||||
`/eco take`), and how evenly money is spread (Gini over players
|
||||
with money, the richest ten's share). At 00:00 UTC everyone reads the day before in one line (`report.daily_report`).
|
||||
A snapshot of each day is kept 60 days (`report.history_days`) in `economy.json` (`ext.report`). Once a minute
|
||||
`world/horizon-smp/web/economy.json` (`report.web_json`) is written off the tick thread for the site's /hub:
|
||||
`{"schema": 1, "generated": <ms>, "currency", "today", "pools", "minted_today", "burned_today", "days": [...],
|
||||
"daily_report": "<yesterday's line>"}`. The server's Discord relay posts only chat, joins, leaves and deaths: the
|
||||
daily line reaches Discord through whoever reads that file (Kira).
|
||||
|
||||
Other parts reach the pools through `Economy::to_pool`, `from_pool`, `pool_move` and `settle_pool` (a bet against a
|
||||
pool: the stake goes in, the payout comes out, never more than the pool holds), each one audit line.
|
||||
|
||||
The currency is earned in game only: it can't be bought with real money or cashed out (Mojang's usage guidelines).
|
||||
|
||||
## Data
|
||||
@@ -304,19 +61,9 @@ folder is untouched until the mod first runs on it; it changes no block and no p
|
||||
|
||||
| File | Holds |
|
||||
|---|---|
|
||||
| `config.json` | `currency` (default `coins`), `starting_balance` (default 0), `market`: `enabled`, `items` (each item's `buy`, what the market asks, and `sell`, what it pays, 0 closing that side), `daily_sell_coins` (2000) and `daily_sell_items` (640), 0 for no limit; `shop`: `enabled`, `title`, `categories` (`name`, `icon`, `items`); `web`: `url` (Kira's `/smp/ingest`) and `token` (empty: nothing is sent), where the pages of `web/` go; written with the defaults the first time, and again when a newer version adds keys (your values kept) |
|
||||
| `economy.json` | balances by player UUID, with the name last seen; `held`: coinflip stakes and lottery tickets being decided; `pools`: the casino's pot and the auction house's bids; `ext`: other parts' state written in the same step as the money (`auction`: the listings, bids, mail and notes) |
|
||||
| `places.json` | the spawn, the warps, each player's homes, and the seconds each player has played (written once a minute) |
|
||||
| `nicks.json` | each player's nickname and when they last changed it |
|
||||
| `staff.log` | one line per `/invsee` or `/endersee` menu in which something moved: who, whose, what was taken and put |
|
||||
| `market.json` | what each player sold today (coins and items), for the daily limits |
|
||||
| `market_prices.json` | each item's price factor and history (minutes for 24 h, hours for 30 days: `[time, mid, traded, sold]`), what each player bought in the last day (no selling it back), the day's summary |
|
||||
| `web/market.json` | for the website (`/hub/market`, through Kira), written by a thread each minute prices move: `schema` 1, `generated`, `currency`, `tax_percent` (always 0, for older readers), `daily_summary` (`day`, `lines`), `items` (`id`, `name`, `category`, `price` (the one price; `buy` and `sell` repeat it on the sides the market trades, for older readers), `mid`, `base`, `change_1h`, `change_24h`, `volume_24h`, `day`: 5-minute points, `month`: hours, each `{step, t, price, volume}`). When `web.token` is set, the same thread POSTs each page of `web/` that changed (gzipped, `Authorization: Bearer <token>`) to `<web.url>/<name>`: Kira keeps the last one and serves it to the site; the server needs no inbound access and Kira no key to it |
|
||||
| `presence.json` | the players who have joined (no welcome again), and the day each last got the daily reward |
|
||||
| `board.json` | the players who hid the sidebar (`/sidebar off`) |
|
||||
| `casino.json` | the day's ledger: each player's bets, wins and rounds today (the daily loss cap), the day's biggest wins, each game's totals, the pot's last sweep |
|
||||
| `claims.json` | each claimed chunk (`<dimension> <chunk x> <chunk z>`) with its owner, and whom each owner trusts |
|
||||
| `audit.log` | one JSON line per change, written before the change: `time` (ms), `kind` (`open`, `pay`, `grant`, `ah_listing_fee`...), `amount`, `from`/`to` with their balance before, `by` for an operator, `to_pool`/`from_pool` with `pool_before` and `reason` for a pool's movement; a trade's line (`trade`: both players, their items and money) comes before its swap, `trade_failed` after one that didn't go through |
|
||||
| `config.json` | `currency` (default `coins`), `starting_balance` (default 0), and `market`: `enabled` and `items`, each item's `buy` (what the market asks) and `sell` (what it pays), 0 closing that side; written with the defaults the first time, and again when a newer version adds keys (your values kept) |
|
||||
| `economy.json` | balances by player UUID, with the name last seen, and `held`: coinflip stakes and lottery tickets being decided |
|
||||
| `audit.log` | one JSON line per change, written before the change: `time` (ms), `kind` (`open`, `pay`, `eco_give`...), `amount`, `from`/`to` with their balance before, `by` for an operator; a trade's line (`trade`: both players, their items and money) comes before its swap, `trade_failed` after one that didn't go through |
|
||||
|
||||
`economy.json` is written whole to a temporary file, flushed and renamed over the old one, at most once a server tick
|
||||
and when the world closes: a crash leaves the old file or the new one. If it can't be read, the economy stays off (the
|
||||
@@ -325,23 +72,16 @@ commands say so) rather than start from nothing.
|
||||
## Made on the hook points
|
||||
|
||||
It hooks only Horizon's native hook points: `native_register_commands` and `native_perform_command` (API 8), the
|
||||
acting player's items (API 9), the server menus and `native_exchange_items` (API 10), the players' health and
|
||||
`native_run_command` (API 21), `native_destroy_block` (API 14), `native_right_click_block`, the acting player and the
|
||||
action bar (API 21), `native_block_spread`, `native_piston_move`, `native_explosion_detonate`, `native_fill_bucket` and
|
||||
`native_attack_entity` (API 22), `native_sidebar`, `native_tab_list` and `native_tick_stats` (API 49),
|
||||
`native_set_nickname` and `native_text_allowed` (API 62), the server tick and the world lifecycle.
|
||||
`compatibility.json` names `"hooks": 58`.
|
||||
acting player's items (API 9), the server menus and `native_exchange_items` (API 10), the server tick and the world
|
||||
lifecycle. `compatibility.json` names `"hooks": 10`.
|
||||
|
||||
| File | What it is |
|
||||
|---|---|
|
||||
| `mixins/smp/horizon-mixin.toml` | The bundle: twenty-seven modules and the HEAD hooks |
|
||||
| `mixins/smp/smp_store.rs`, `smp_economy.rs`, `smp_market.rs`, `smp_recipes.rs`, `smp_shop.rs`, `smp_nick.rs`, `smp_trade.rs`, `smp_games.rs`, `smp_lottery.rs`, `smp_places.rs`, `smp_claims.rs`, `smp_board.rs`, `smp_presence.rs`, `smp_auction.rs`, `smp_report.rs`, `smp_market_prices.rs`, `smp_market_menu.rs`, `smp_market_chart.rs`, `smp_invsee.rs` | The rules, no game types (a trade's stacks are a type parameter): added to the game as `game::smp_store`, `game::smp_economy`, `game::smp_market`, `game::smp_recipes`, `game::smp_shop`, `game::smp_nick`, `game::smp_trade`, `game::smp_games`, `game::smp_lottery`, `game::smp_places`, `game::smp_claims`, `game::smp_board`, `game::smp_presence`, `game::smp_auction`, `game::smp_report`, `game::smp_market_prices`, `game::smp_market_menu`, `game::smp_market_chart`, `game::smp_invsee`; also this crate's modules (`src/lib.rs`), for their tests |
|
||||
| `mixins/smp/horizon-mixin.toml` | The bundle: seven modules and the HEAD hooks |
|
||||
| `mixins/smp/smp_store.rs`, `smp_economy.rs`, `smp_market.rs`, `smp_trade.rs`, `smp_games.rs`, `smp_lottery.rs` | The rules, no game types (a trade's stacks are a type parameter): added to the game as `game::smp_store`, `game::smp_economy`, `game::smp_market`, `game::smp_trade`, `game::smp_games`, `game::smp_lottery`; also this crate's modules (`src/lib.rs`), for their tests |
|
||||
| `mixins/smp/glue.rs` | The state for the open world and the edges to the game's types (`game::smp_glue`) |
|
||||
| `mixins/smp/{register,command,tick,lifecycle,menu_clicked,menu_closed,destroy_block,right_click_block,block_spread,piston_move,explosion_detonate,fill_bucket,attack_entity}.rs` | One small helper per hook |
|
||||
| `mixins/smp/smp_casino.rs`, `smp_casino_roulette.rs`, `smp_casino_slots.rs`, `smp_casino_crash.rs`, `smp_casino_blackjack.rs` | The casino's rules, menus and effects (`game::smp_casino*`) |
|
||||
| `mixins/smp/casino_glue.rs` | The casino's effects for a stock client: menu items, sounds, titles, fireworks, boss bars (`game::smp_casino_glue`) |
|
||||
| `mixins/smp/{register,command,tick,lifecycle,menu_clicked,menu_closed}.rs` | One small helper per hook |
|
||||
| `proof.py` | A dedicated server built with the mod and two real clients, on fresh temporary data |
|
||||
| `proof_casino.py` | The casino's proof (`SMP_PROOF=casino`): both clients play every game through the menus |
|
||||
|
||||
## Build and prove
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"game": "26.3",
|
||||
"hooks": 62,
|
||||
"hooks": 10,
|
||||
"horizon_repository": "https://github.com/horizon-rust/horizon",
|
||||
"horizon_revision": "975c07d9151847e6af13afc4b5ab37b6bbe78ef5",
|
||||
"horizon_revision": "f533c3af7d41d7ecc3b015a9fbb0dbf5eb64ae26",
|
||||
"horizon_mixins_repository": "https://github.com/horizon-rust/horizon-mixins",
|
||||
"horizon_mixins_revision": "d9c83d7096b7ea5b83678da2efdfd6161f74997e"
|
||||
"horizon_mixins_revision": "0d6b103c70633d8fd9443d8d0acd3aadaacedb06"
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
// A player hits an entity: a claim's frames, armor stands and animals are
|
||||
// kept from players its owner doesn't trust.
|
||||
fn smp_attack_entity(
|
||||
game: &mut crate::game::Game<'_>,
|
||||
kind: &str,
|
||||
pos: [f64; 3],
|
||||
canceled: &mut bool,
|
||||
) {
|
||||
crate::game::smp_glue::attack(game, kind, pos, canceled);
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
// A fluid flows or fire spreads into a block: kept out of the land others
|
||||
// claimed.
|
||||
fn smp_block_spread(
|
||||
dimension: crate::game::LevelDimension,
|
||||
from: horizon_core::position::BlockPos,
|
||||
to: horizon_core::position::BlockPos,
|
||||
canceled: &mut bool,
|
||||
) {
|
||||
let dimension = crate::game::smp_glue::dimension_id(dimension);
|
||||
let (from, to) = ([from.x, from.y, from.z], [to.x, to.y, to.z]);
|
||||
if !crate::game::smp_glue::world_allows(dimension, from, &[to]) {
|
||||
*canceled = true;
|
||||
}
|
||||
}
|
||||
@@ -1,333 +0,0 @@
|
||||
// The casino in the server's game: its menus, and what its effects become
|
||||
// for a stock client (smp_casino's `Fx`): menu items, sounds and titles
|
||||
// through the console's `playsound` and `title`, the action bar, fireworks
|
||||
// and particles over a winner, a line for everyone. glue.rs calls it from the
|
||||
// command, menu and tick hooks with the SMP's state already locked; the
|
||||
// console commands it builds are run by glue.rs once that lock is let go.
|
||||
// Added to the game as `game::smp_casino_glue`.
|
||||
|
||||
use crate::game::{
|
||||
Game,
|
||||
native_server::NativeServerPlayer,
|
||||
smp_casino::{self, Casino, Color, Fx, Icon},
|
||||
smp_economy::{Economy, Out, Player},
|
||||
};
|
||||
use horizon_client::{
|
||||
items::ItemStack,
|
||||
lan::data::component_nbt,
|
||||
text::{self, Text},
|
||||
};
|
||||
|
||||
/// The crash's boss bars: one a player (a bar's players can't be a list of
|
||||
/// names, and tags don't reach a server's players), `smp:casino_crash_<i>`
|
||||
/// for the name in `bars[i]`, and the colour they all have.
|
||||
static BARS: std::sync::Mutex<(Vec<Option<String>>, &str)> =
|
||||
std::sync::Mutex::new((Vec::new(), "yellow"));
|
||||
/// The most bars at once; each taken off at the first hide of a run,
|
||||
/// whatever it held (a run before may have left one).
|
||||
const MAX_BARS: usize = 32;
|
||||
static CLEARED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||
|
||||
fn bar_id(i: usize) -> String {
|
||||
format!("smp:casino_crash_{i}")
|
||||
}
|
||||
|
||||
fn color(c: Color) -> u32 {
|
||||
match c {
|
||||
Color::White => text::WHITE,
|
||||
Color::Gray => text::GRAY,
|
||||
Color::DarkGray => text::DARK_GRAY,
|
||||
Color::Gold => text::GOLD,
|
||||
Color::Yellow => text::YELLOW,
|
||||
Color::Green => text::GREEN,
|
||||
Color::Red => text::RED,
|
||||
Color::Aqua => text::AQUA,
|
||||
}
|
||||
}
|
||||
|
||||
fn stack(icon: Icon) -> ItemStack {
|
||||
let mut stack = ItemStack {
|
||||
item: icon.item.into(),
|
||||
count: u32::from(icon.count.clamp(1, 99)),
|
||||
damage: 0,
|
||||
extra: None,
|
||||
};
|
||||
let title =
|
||||
serde_json::json!({ "text": icon.name, "italic": false, "color": icon.color.name() });
|
||||
stack.data_mut().custom_name = Some(component_nbt(&title));
|
||||
stack
|
||||
}
|
||||
|
||||
fn items(casino: &Casino, economy: &Economy, uuid: u128, now: i64) -> Vec<Option<ItemStack>> {
|
||||
casino
|
||||
.layout(economy, uuid, now)
|
||||
.into_iter()
|
||||
.map(|c| c.map(stack))
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Opens (again) the player's casino menu on its view: a new window, titled
|
||||
/// for the game. False when it couldn't open.
|
||||
fn open(game: &mut Game<'_>, casino: &mut Casino, economy: &Economy, uuid: u128, now: i64) -> bool {
|
||||
let Some(view) = casino.seats.get(&uuid).map(|s| s.view) else {
|
||||
return false;
|
||||
};
|
||||
let items = items(casino, economy, uuid, now);
|
||||
let title = Text::literal(view.title()).with_color(text::DARK_GRAY);
|
||||
match game.native_open_menu(uuid, smp_casino::ROWS, title, items) {
|
||||
Some(w) => {
|
||||
if let Some(s) = casino.seats.get_mut(&uuid) {
|
||||
s.window = Some(w);
|
||||
}
|
||||
true
|
||||
}
|
||||
None => {
|
||||
casino.seats.remove(&uuid);
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `/casino ...` (inside the player's command).
|
||||
pub(in crate::game) fn command(
|
||||
game: &mut Game<'_>,
|
||||
casino: &mut Casino,
|
||||
economy: &mut Economy,
|
||||
me: &Player,
|
||||
now: i64,
|
||||
line: &str,
|
||||
) -> Vec<Out> {
|
||||
let Some((mut out, view)) = casino.command(economy, me, now, line) else {
|
||||
return Vec::new();
|
||||
};
|
||||
if let Some(view) = view {
|
||||
casino.sit(me.uuid, &me.name, view);
|
||||
if !open(game, casino, economy, me.uuid, now) {
|
||||
out.push(Out::Error("The casino couldn't open.".into()));
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// A click in a player's casino menu: the console commands its effects need,
|
||||
/// for after the SMP's lock.
|
||||
pub(in crate::game) fn clicked(
|
||||
game: &mut Game<'_>,
|
||||
casino: &mut Casino,
|
||||
economy: &mut Economy,
|
||||
uuid: u128,
|
||||
slot: i32,
|
||||
shift: bool,
|
||||
) -> Vec<String> {
|
||||
let Ok(slot) = usize::try_from(slot) else {
|
||||
return Vec::new();
|
||||
};
|
||||
if slot >= smp_casino::SIZE {
|
||||
return Vec::new();
|
||||
}
|
||||
let now = chrono::Utc::now().timestamp_millis();
|
||||
economy.now = now;
|
||||
let fx = casino.click(economy, uuid, slot, shift, now);
|
||||
apply(game, casino, economy, fx, now)
|
||||
}
|
||||
|
||||
/// The casino's share of the server's tick: frames, rounds that end, the
|
||||
/// pot's float (once). The console commands, for after the lock.
|
||||
pub(in crate::game) fn tick(
|
||||
game: &mut Game<'_>,
|
||||
casino: &mut Casino,
|
||||
economy: &mut Economy,
|
||||
now: i64,
|
||||
online: Option<&[u128]>,
|
||||
) -> Vec<String> {
|
||||
let mut fx = casino.tick(economy, now);
|
||||
// Once a second: crash bets of players who left.
|
||||
if let Some(online) = online {
|
||||
fx.extend(casino.gone(economy, online, now));
|
||||
}
|
||||
if fx.is_empty() {
|
||||
return Vec::new();
|
||||
}
|
||||
apply(game, casino, economy, fx, now)
|
||||
}
|
||||
|
||||
/// Carries out `fx`: menus and lines now, console commands returned.
|
||||
fn apply(
|
||||
game: &mut Game<'_>,
|
||||
casino: &mut Casino,
|
||||
economy: &Economy,
|
||||
fx: Vec<Fx>,
|
||||
now: i64,
|
||||
) -> Vec<String> {
|
||||
let mut commands = Vec::new();
|
||||
let mut players: Option<Vec<NativeServerPlayer>> = None;
|
||||
let mut shown = Vec::new();
|
||||
for f in fx {
|
||||
// Where a player is, asked once for the whole batch.
|
||||
let mut find = |uuid: u128, game: &Game<'_>| -> Option<NativeServerPlayer> {
|
||||
players
|
||||
.get_or_insert_with(|| game.native_server_players())
|
||||
.iter()
|
||||
.find(|p| p.uuid == uuid)
|
||||
.cloned()
|
||||
};
|
||||
match f {
|
||||
Fx::Out(Out::Tell(uuid, s)) => {
|
||||
game.native_tell(uuid, Text::literal(s).with_color(text::GOLD));
|
||||
}
|
||||
Fx::Out(Out::All(s)) => game.native_broadcast(Text::literal(s).with_color(text::GOLD)),
|
||||
Fx::Out(Out::Reply(s) | Out::Error(s)) => log::info!("[smp] casino: {s}"),
|
||||
Fx::Sound {
|
||||
to,
|
||||
sound,
|
||||
volume,
|
||||
pitch,
|
||||
} => {
|
||||
if let Some(p) = find(to, game) {
|
||||
let [x, y, z] = p.position;
|
||||
commands.push(format!(
|
||||
"execute in {} run playsound {sound} master {} {x:.2} {y:.2} {z:.2} {volume} {pitch}",
|
||||
p.dimension, p.name
|
||||
));
|
||||
}
|
||||
}
|
||||
Fx::Title {
|
||||
to,
|
||||
title,
|
||||
subtitle,
|
||||
color: c,
|
||||
} => {
|
||||
if let Some(p) = find(to, game) {
|
||||
let line = |s: &str, bold: bool| {
|
||||
serde_json::json!({ "text": s, "color": c.name(), "bold": bold })
|
||||
.to_string()
|
||||
};
|
||||
commands.push(format!("title {} times 5 40 15", p.name));
|
||||
commands.push(format!(
|
||||
"title {} subtitle {}",
|
||||
p.name,
|
||||
line(&subtitle, false)
|
||||
));
|
||||
commands.push(format!("title {} title {}", p.name, line(&title, true)));
|
||||
}
|
||||
}
|
||||
Fx::Bar {
|
||||
to,
|
||||
text: s,
|
||||
color: c,
|
||||
} => {
|
||||
game.native_action_bar(to, Text::literal(s).with_color(color(c)));
|
||||
}
|
||||
Fx::Fireworks(to) => {
|
||||
if let Some(p) = find(to, game) {
|
||||
let [x, y, z] = p.position;
|
||||
// High enough over the player that their blast (5 blocks) never hurts.
|
||||
for (dx, dz, colours) in [
|
||||
(-3.0, 0.0, "16766720,16733525"),
|
||||
(3.0, 1.5, "5635925,16777045"),
|
||||
(0.0, -3.0, "5636095,16733695"),
|
||||
] {
|
||||
commands.push(format!(
|
||||
"execute in {} run summon minecraft:firework_rocket {:.2} {:.2} {:.2} {{LifeTime:18,FireworksItem:{{id:\"minecraft:firework_rocket\",count:1,components:{{\"minecraft:fireworks\":{{flight_duration:1b,explosions:[{{shape:\"large_ball\",colors:[I;{colours}],has_trail:true,has_twinkle:true}}]}}}}}}}}",
|
||||
p.dimension,
|
||||
x + dx,
|
||||
y + 9.0,
|
||||
z + dz
|
||||
));
|
||||
}
|
||||
commands.push(format!(
|
||||
"execute in {} run particle minecraft:totem_of_undying {x:.2} {:.2} {z:.2} 0.6 1 0.6 0.4 60 normal",
|
||||
p.dimension,
|
||||
y + 1.0
|
||||
));
|
||||
}
|
||||
}
|
||||
Fx::Announce(s) => {
|
||||
log::info!("[smp] casino: {s}");
|
||||
game.native_broadcast(
|
||||
Text::literal(format!("[Casino] {s}")).with_color(text::GOLD),
|
||||
);
|
||||
}
|
||||
Fx::Show(uuid) => {
|
||||
// One picture per menu per batch.
|
||||
if !shown.contains(&uuid)
|
||||
&& casino.seats.get(&uuid).is_some_and(|s| s.window.is_some())
|
||||
{
|
||||
shown.push(uuid);
|
||||
let items = items(casino, economy, uuid, now);
|
||||
game.native_set_menu_items(uuid, items);
|
||||
}
|
||||
}
|
||||
Fx::Open(uuid) => {
|
||||
shown.push(uuid);
|
||||
open(game, casino, economy, uuid, now);
|
||||
}
|
||||
Fx::Boss {
|
||||
text: line,
|
||||
color: c,
|
||||
value,
|
||||
} => {
|
||||
let mut bars = BARS.lock().unwrap_or_else(|e| e.into_inner());
|
||||
if let Some(c) = c {
|
||||
bars.1 = match c {
|
||||
Color::Green => "green",
|
||||
Color::Red => "red",
|
||||
_ => "yellow",
|
||||
};
|
||||
}
|
||||
let name = serde_json::json!({ "text": line, "color": "white" });
|
||||
for (i, _) in bars.0.iter().enumerate().filter(|(_, b)| b.is_some()) {
|
||||
let id = bar_id(i);
|
||||
commands.push(format!("bossbar set {id} name {name}"));
|
||||
commands.push(format!("bossbar set {id} value {value}"));
|
||||
if c.is_some() {
|
||||
commands.push(format!("bossbar set {id} color {}", bars.1));
|
||||
}
|
||||
}
|
||||
}
|
||||
Fx::BossPlayers(names) => {
|
||||
let mut bars = BARS.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let colour = bars.1;
|
||||
for (i, bar) in bars.0.iter_mut().enumerate() {
|
||||
if bar.as_ref().is_some_and(|n| !names.contains(n)) {
|
||||
*bar = None;
|
||||
commands.push(format!("bossbar remove {}", bar_id(i)));
|
||||
}
|
||||
}
|
||||
for name in names {
|
||||
if bars.0.iter().any(|b| b.as_ref() == Some(&name)) {
|
||||
continue;
|
||||
}
|
||||
let i = match bars.0.iter().position(Option::is_none) {
|
||||
Some(i) => i,
|
||||
None if bars.0.len() < MAX_BARS => {
|
||||
bars.0.push(None);
|
||||
bars.0.len() - 1
|
||||
}
|
||||
None => continue,
|
||||
};
|
||||
let id = bar_id(i);
|
||||
commands.push(format!("bossbar add {id} \"\""));
|
||||
commands.push(format!("bossbar set {id} max 100"));
|
||||
commands.push(format!("bossbar set {id} color {colour}"));
|
||||
commands.push(format!("bossbar set {id} players {name}"));
|
||||
bars.0[i] = Some(name);
|
||||
}
|
||||
}
|
||||
Fx::BossHide => {
|
||||
// Every bar taken off.
|
||||
let mut bars = BARS.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let all = !CLEARED.swap(true, std::sync::atomic::Ordering::Relaxed);
|
||||
let n = if all { MAX_BARS } else { bars.0.len() };
|
||||
for i in 0..n {
|
||||
if all || bars.0[i].is_some() {
|
||||
commands.push(format!("bossbar remove {}", bar_id(i)));
|
||||
}
|
||||
}
|
||||
bars.0.clear();
|
||||
bars.1 = "yellow";
|
||||
}
|
||||
}
|
||||
}
|
||||
commands
|
||||
}
|
||||
@@ -5,9 +5,6 @@ fn smp_perform_command(
|
||||
command: &str,
|
||||
ran: &mut bool,
|
||||
) {
|
||||
if !*ran {
|
||||
crate::game::smp_invsee_glue::perform(game, player, command, ran);
|
||||
}
|
||||
if !*ran {
|
||||
crate::game::smp_glue::perform(game, player, command, ran);
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
// A player breaks a block: kept out of the land others claimed.
|
||||
fn smp_destroy_block(game: &mut crate::game::Game<'_>, pos: [i32; 3], canceled: &mut bool) {
|
||||
crate::game::smp_glue::guard(game, pos, canceled);
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
// An explosion's blocks: claimed land is spared.
|
||||
fn smp_explosion_detonate(
|
||||
game: &crate::game::Game<'_>,
|
||||
dimension: &str,
|
||||
blocks: &mut Vec<[i32; 3]>,
|
||||
) {
|
||||
crate::game::smp_glue::explosion(game, dimension, blocks);
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
// A player fills or empties a bucket: kept out of the land others claimed.
|
||||
fn smp_fill_bucket(game: &mut crate::game::Game<'_>, pos: [i32; 3], canceled: &mut bool) {
|
||||
crate::game::smp_glue::guard(game, pos, canceled);
|
||||
}
|
||||
+24
-1891
File diff suppressed because it is too large.
Load diff
@@ -1,12 +1,12 @@
|
||||
[mod]
|
||||
id = "smp"
|
||||
version = "0.31.0"
|
||||
version = "0.5.0"
|
||||
priority = 100
|
||||
|
||||
# The commit of horizon it was tested on: it needs horizon#6106 (merged at 975c07d): native_inventory,
|
||||
# native_move_stack, native_send_map, lore on the wire.
|
||||
# The commit of horizon main it was tested on. It uses only the native hook points (hooks 10 in
|
||||
# compatibility.json): it builds on any Horizon that has them.
|
||||
[compatibility]
|
||||
horizon_revision = "975c07d9151847e6af13afc4b5ab37b6bbe78ef5"
|
||||
horizon_revision = "f533c3af7d41d7ecc3b015a9fbb0dbf5eb64ae26"
|
||||
|
||||
[[module]]
|
||||
id = "store"
|
||||
@@ -26,48 +26,6 @@ file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_market"
|
||||
source = "smp_market.rs"
|
||||
|
||||
[[module]]
|
||||
id = "market_prices"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_market_prices"
|
||||
source = "smp_market_prices.rs"
|
||||
|
||||
[[module]]
|
||||
id = "market_chart"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_market_chart"
|
||||
source = "smp_market_chart.rs"
|
||||
|
||||
[[module]]
|
||||
id = "market_menu"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_market_menu"
|
||||
source = "smp_market_menu.rs"
|
||||
|
||||
[[module]]
|
||||
id = "recipes"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_recipes"
|
||||
source = "smp_recipes.rs"
|
||||
|
||||
[[module]]
|
||||
id = "shop"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_shop"
|
||||
source = "smp_shop.rs"
|
||||
|
||||
[[module]]
|
||||
id = "report"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_report"
|
||||
source = "smp_report.rs"
|
||||
|
||||
[[module]]
|
||||
id = "auction"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_auction"
|
||||
source = "smp_auction.rs"
|
||||
|
||||
[[module]]
|
||||
id = "trade"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
@@ -86,84 +44,6 @@ file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_lottery"
|
||||
source = "smp_lottery.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino"
|
||||
source = "smp_casino.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino_roulette"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino_roulette"
|
||||
source = "smp_casino_roulette.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino_slots"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino_slots"
|
||||
source = "smp_casino_slots.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino_crash"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino_crash"
|
||||
source = "smp_casino_crash.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino_blackjack"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino_blackjack"
|
||||
source = "smp_casino_blackjack.rs"
|
||||
|
||||
[[module]]
|
||||
id = "casino_glue"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_casino_glue"
|
||||
source = "casino_glue.rs"
|
||||
|
||||
[[module]]
|
||||
id = "nick"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_nick"
|
||||
source = "smp_nick.rs"
|
||||
|
||||
[[module]]
|
||||
id = "places"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_places"
|
||||
source = "smp_places.rs"
|
||||
|
||||
[[module]]
|
||||
id = "board"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_board"
|
||||
source = "smp_board.rs"
|
||||
|
||||
[[module]]
|
||||
id = "presence"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_presence"
|
||||
source = "smp_presence.rs"
|
||||
|
||||
[[module]]
|
||||
id = "claims"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_claims"
|
||||
source = "smp_claims.rs"
|
||||
|
||||
[[module]]
|
||||
id = "invsee"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_invsee"
|
||||
source = "smp_invsee.rs"
|
||||
|
||||
[[module]]
|
||||
id = "invsee_glue"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
name = "smp_invsee_glue"
|
||||
source = "invsee_glue.rs"
|
||||
|
||||
[[module]]
|
||||
id = "glue"
|
||||
file = "crates/horizon-client/src/game.rs"
|
||||
@@ -233,85 +113,3 @@ bindings = [
|
||||
{ name = "uuid", ty = "u128", value = "uuid" },
|
||||
{ name = "window", ty = "i32", value = "window" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "destroy_block"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::Game<'_>::native_destroy_block"
|
||||
helper = "destroy_block.rs"
|
||||
bindings = [
|
||||
{ name = "game", ty = "&mut crate::game::Game<'_>", value = "&mut *self" },
|
||||
{ name = "pos", ty = "[i32; 3]", value = "pos" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "right_click_block"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::Game<'_>::native_right_click_block"
|
||||
helper = "right_click_block.rs"
|
||||
bindings = [
|
||||
{ name = "game", ty = "&mut crate::game::Game<'_>", value = "&mut *self" },
|
||||
{ name = "pos", ty = "[i32; 3]", value = "pos" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "block_spread"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::GameLevel<'_>::native_block_spread"
|
||||
helper = "block_spread.rs"
|
||||
bindings = [
|
||||
{ name = "dimension", ty = "crate::game::LevelDimension", value = "dimension" },
|
||||
{ name = "from", ty = "horizon_core::position::BlockPos", value = "from" },
|
||||
{ name = "to", ty = "horizon_core::position::BlockPos", value = "to" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "piston_move"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::GameLevel<'_>::native_piston_move"
|
||||
helper = "piston_move.rs"
|
||||
bindings = [
|
||||
{ name = "dimension", ty = "crate::game::LevelDimension", value = "dimension" },
|
||||
{ name = "piston", ty = "horizon_core::position::BlockPos", value = "piston" },
|
||||
{ name = "direction", ty = "[i32; 3]", value = "direction" },
|
||||
{ name = "push", ty = "&[horizon_core::position::BlockPos]", value = "push" },
|
||||
{ name = "destroy", ty = "&[horizon_core::position::BlockPos]", value = "destroy" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "explosion_detonate"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::Game<'_>::native_explosion_detonate"
|
||||
helper = "explosion_detonate.rs"
|
||||
bindings = [
|
||||
{ name = "game", ty = "&crate::game::Game<'_>", value = "&*self" },
|
||||
{ name = "dimension", ty = "&str", value = "dimension" },
|
||||
{ name = "blocks", ty = "&mut Vec<[i32; 3]>", value = "&mut *blocks" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "fill_bucket"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::Game<'_>::native_fill_bucket"
|
||||
helper = "fill_bucket.rs"
|
||||
bindings = [
|
||||
{ name = "game", ty = "&mut crate::game::Game<'_>", value = "&mut *self" },
|
||||
{ name = "pos", ty = "[i32; 3]", value = "pos" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
|
||||
[[injection]]
|
||||
id = "attack_entity"
|
||||
kind = "HEAD"
|
||||
target = "horizon_client::game::native_hooks::Game<'_>::native_attack_entity"
|
||||
helper = "attack_entity.rs"
|
||||
bindings = [
|
||||
{ name = "game", ty = "&mut crate::game::Game<'_>", value = "&mut *self" },
|
||||
{ name = "kind", ty = "&str", value = "kind" },
|
||||
{ name = "pos", ty = "[f64; 3]", value = "pos" },
|
||||
{ name = "canceled", ty = "&mut bool", value = "&mut *canceled" },
|
||||
]
|
||||
@@ -1,314 +0,0 @@
|
||||
// `/invsee` and `/endersee` in the server's game (smp_invsee's rules): the
|
||||
// menus open, their clicks and closings, the inventories through the native
|
||||
// helpers (`native_inventory`, `native_move_stack`), each move in the SMP's
|
||||
// audit log, the staff's summary in the server log, `staff.log` and the
|
||||
// chat of the other operators on. Its own state, apart from the SMP's: the
|
||||
// tick costs one atomic load while no menu is open. Added to the game as
|
||||
// `game::smp_invsee_glue`.
|
||||
|
||||
use crate::game::{
|
||||
Game,
|
||||
native_inventories::NativeInventoryKind,
|
||||
native_menus::native_menu_inventory_slot,
|
||||
native_server::{NativeCommand, NativeServerPlayer},
|
||||
smp_economy::{Out, Player},
|
||||
smp_glue,
|
||||
smp_invsee::{self, Cell, Invsee, Kind, Move},
|
||||
smp_store,
|
||||
};
|
||||
use horizon_client::{
|
||||
items::ItemStack,
|
||||
lan::data::component_nbt,
|
||||
text::{self, Text},
|
||||
};
|
||||
use std::sync::{
|
||||
Mutex,
|
||||
atomic::{AtomicBool, AtomicU64, Ordering::Relaxed},
|
||||
};
|
||||
|
||||
struct State {
|
||||
invsee: Invsee<ItemStack>,
|
||||
/// Asked in a command, opened at the next tick: (operator, target UUID,
|
||||
/// real name, which).
|
||||
pending: Vec<(u128, u128, String, Kind)>,
|
||||
}
|
||||
|
||||
static STATE: Mutex<Option<State>> = Mutex::new(None);
|
||||
/// A menu open or one to open: the tick has work.
|
||||
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
||||
static TICKS: AtomicU64 = AtomicU64::new(0);
|
||||
|
||||
fn state() -> std::sync::MutexGuard<'static, Option<State>> {
|
||||
let mut s = STATE.lock().unwrap_or_else(|e| e.into_inner());
|
||||
s.get_or_insert_with(|| State {
|
||||
invsee: Invsee::default(),
|
||||
pending: Vec::new(),
|
||||
});
|
||||
s
|
||||
}
|
||||
|
||||
impl smp_invsee::Stack for ItemStack {
|
||||
fn id(&self) -> String {
|
||||
self.item.to_string()
|
||||
}
|
||||
fn count(&self) -> u32 {
|
||||
self.count
|
||||
}
|
||||
}
|
||||
|
||||
fn native(kind: Kind) -> NativeInventoryKind {
|
||||
match kind {
|
||||
Kind::Player => NativeInventoryKind::Player,
|
||||
Kind::Ender => NativeInventoryKind::Ender,
|
||||
}
|
||||
}
|
||||
|
||||
/// The game's inventories, for the rules.
|
||||
struct GameWorld<'a, 'g>(&'a mut Game<'g>);
|
||||
|
||||
impl smp_invsee::World<ItemStack> for GameWorld<'_, '_> {
|
||||
fn read(&self, uuid: u128, kind: Kind) -> Result<(Vec<Option<ItemStack>>, bool), String> {
|
||||
self.0.native_inventory(uuid, native(kind)).map(|i| (i.slots, i.online))
|
||||
}
|
||||
fn move_stack(&mut self, from: (u128, Kind, usize), expected: &ItemStack, to: (u128, Kind)) -> Result<(), String> {
|
||||
self.0.native_move_stack((from.0, native(from.1), from.2), expected, (to.0, native(to.1)))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn commands(commands: &mut Vec<NativeCommand>) {
|
||||
for usage in ["invsee <player:word>", "endersee <player:word>"] {
|
||||
commands.push(NativeCommand::op(usage, smp_invsee::LEVEL));
|
||||
}
|
||||
}
|
||||
|
||||
/// `/invsee` and `/endersee`; anything else is left to the SMP.
|
||||
pub(in crate::game) fn perform(game: &mut Game<'_>, player: &NativeServerPlayer, line: &str, ran: &mut bool) {
|
||||
let word = line.split(' ').next().unwrap_or_default();
|
||||
if !smp_invsee::COMMANDS.contains(&word) || !game.native_on(smp_glue::ID) {
|
||||
return;
|
||||
}
|
||||
*ran = true;
|
||||
let me = Player {
|
||||
uuid: player.uuid,
|
||||
name: player.name.clone(),
|
||||
level: player.permission,
|
||||
};
|
||||
let find = |name: &str| smp_glue::find_player(game, name);
|
||||
let mut guard = state();
|
||||
let s = guard.as_mut().expect("made");
|
||||
let (out, open) = s.invsee.command(&me, &find, line).unwrap_or_default();
|
||||
if let Some((target, name, kind)) = open {
|
||||
s.pending.retain(|p| p.0 != me.uuid);
|
||||
s.pending.push((me.uuid, target, name, kind));
|
||||
ACTIVE.store(true, Relaxed);
|
||||
}
|
||||
drop(guard);
|
||||
for o in out {
|
||||
match o {
|
||||
Out::Error(e) => game.native_feedback(Text::literal(e).with_color(text::RED)),
|
||||
Out::Reply(r) => game.native_feedback(Text::literal(r)),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn named(item: &str, name: &str, color: &str) -> ItemStack {
|
||||
let mut stack = ItemStack {
|
||||
item: item.into(),
|
||||
count: 1,
|
||||
damage: 0,
|
||||
extra: None,
|
||||
};
|
||||
let title = serde_json::json!({ "text": name, "italic": false, "color": color });
|
||||
stack.data_mut().custom_name = Some(component_nbt(&title));
|
||||
stack
|
||||
}
|
||||
|
||||
fn items(invsee: &Invsee<ItemStack>, op: u128) -> Vec<Option<ItemStack>> {
|
||||
invsee
|
||||
.layout(op)
|
||||
.into_iter()
|
||||
.map(|c| match c {
|
||||
Cell::Empty => None,
|
||||
Cell::Stack(s) => Some(s),
|
||||
Cell::Filler => Some(named("minecraft:gray_stained_glass_pane", " ", "gray")),
|
||||
Cell::Label(l) => Some(named("minecraft:light_gray_stained_glass_pane", l, "gray")),
|
||||
Cell::Close => Some(named("minecraft:barrier", "Close", "red")),
|
||||
Cell::Info { name, online, busy } => {
|
||||
let line = match &busy {
|
||||
Some(b) => format!("{name}: {b} (nothing moves now)"),
|
||||
None if online => format!("{name} (online): click theirs to take, yours to give"),
|
||||
None => format!("{name} (offline, their saved file): click theirs to take, yours to give"),
|
||||
};
|
||||
Some(named("minecraft:player_head", &line, if busy.is_some() { "red" } else { "yellow" }))
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn title(name: &str, kind: Kind) -> Text {
|
||||
Text::literal(match kind {
|
||||
Kind::Player => format!("{name}'s inventory"),
|
||||
Kind::Ender => format!("{name}'s ender chest"),
|
||||
})
|
||||
}
|
||||
|
||||
/// The audit line of a move: written before it is made ("asked"), and
|
||||
/// again when the game refused it.
|
||||
fn audit(dir: &std::path::Path, m: &Move, outcome: &str) -> Result<(), String> {
|
||||
smp_glue::audit(
|
||||
dir,
|
||||
serde_json::json!({
|
||||
"kind": if m.take { "invsee_take" } else { "invsee_put" },
|
||||
"op": smp_store::uuid_string(m.op),
|
||||
"target": smp_store::uuid_string(m.target),
|
||||
"inventory": match m.kind { Kind::Player => "inventory", Kind::Ender => "ender_chest" },
|
||||
"item": m.item,
|
||||
"count": m.count,
|
||||
"outcome": outcome,
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
/// The staff's line: the server log, `staff.log`, the other operators on.
|
||||
fn staff(game: &mut Game<'_>, op: u128, line: &str) {
|
||||
log::warn!("[smp] staff: {line}");
|
||||
if let Some(dir) = game.native_world_dir() {
|
||||
use std::io::Write;
|
||||
let path = dir.join(smp_store::DIR).join("staff.log");
|
||||
let stamp = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ");
|
||||
if let Ok(mut f) = std::fs::OpenOptions::new().create(true).append(true).open(&path) {
|
||||
let _ = writeln!(f, "{stamp} {line}");
|
||||
}
|
||||
}
|
||||
for p in game.native_server_players() {
|
||||
if p.uuid != op && p.permission >= smp_invsee::LEVEL {
|
||||
game.native_tell(p.uuid, Text::literal(format!("[Staff] {line}")).with_color(text::GRAY));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Each tick: one load while nothing is open. Menus to open now; once a
|
||||
/// second, every open menu read again, and those of operators gone closed.
|
||||
pub(in crate::game) fn tick(game: &mut Game<'_>) {
|
||||
if !ACTIVE.load(Relaxed) {
|
||||
return;
|
||||
}
|
||||
let n = TICKS.fetch_add(1, Relaxed);
|
||||
let mut guard = state();
|
||||
let s = guard.as_mut().expect("made");
|
||||
let mut tell = Vec::new();
|
||||
for (op, target, name, kind) in std::mem::take(&mut s.pending) {
|
||||
let opened = s.invsee.open(op, target, &name, kind, &GameWorld(game));
|
||||
match opened {
|
||||
Ok(()) => {
|
||||
let window = game.native_open_menu(op, smp_invsee::ROWS, title(&name, kind), items(&s.invsee, op));
|
||||
match window {
|
||||
Some(w) => s.invsee.views.get_mut(&op).expect("opened").window = Some(w),
|
||||
None => {
|
||||
s.invsee.views.remove(&op);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => tell.push((op, format!("Can't open {name}'s inventory: {e}."))),
|
||||
}
|
||||
}
|
||||
let mut summaries = Vec::new();
|
||||
if n % 20 == 0 {
|
||||
let on: Vec<(u128, String)> = game.native_server_players().into_iter().map(|p| (p.uuid, p.name)).collect();
|
||||
let ops: Vec<u128> = s.invsee.views.keys().copied().collect();
|
||||
for op in ops {
|
||||
match on.iter().find(|p| p.0 == op) {
|
||||
None => summaries.extend(s.invsee.close(op, &smp_store::uuid_string(op)).map(|l| (op, l))),
|
||||
Some(_) => {
|
||||
if s.invsee.refresh(op, &GameWorld(game)) {
|
||||
game.native_set_menu_items(op, items(&s.invsee, op));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ACTIVE.store(!s.invsee.views.is_empty() || !s.pending.is_empty(), Relaxed);
|
||||
drop(guard);
|
||||
for (op, line) in tell {
|
||||
game.native_tell(op, Text::literal(line).with_color(text::RED));
|
||||
}
|
||||
for (op, line) in summaries {
|
||||
staff(game, op, &line);
|
||||
}
|
||||
}
|
||||
|
||||
/// A click in an `/invsee` menu: true when it was one.
|
||||
pub(in crate::game) fn menu_clicked(game: &mut Game<'_>, uuid: u128, window: i32, slot: i32, mode: i32) -> bool {
|
||||
let mut guard = state();
|
||||
let s = guard.as_mut().expect("made");
|
||||
if s.invsee.views.get(&uuid).is_none_or(|v| v.window != Some(window)) {
|
||||
return false;
|
||||
}
|
||||
let Some(dir) = game.native_world_dir() else {
|
||||
return true;
|
||||
};
|
||||
if !matches!(mode, 0 | 1) {
|
||||
return true;
|
||||
}
|
||||
let mut asked: Option<Move> = None;
|
||||
// Each move is in the audit log before it is made; one the log
|
||||
// refuses isn't made.
|
||||
let mut record = |m: &Move| {
|
||||
audit(&dir, m, "asked")?;
|
||||
asked = Some(m.clone());
|
||||
Ok(())
|
||||
};
|
||||
let own = native_menu_inventory_slot(smp_invsee::SIZE, slot);
|
||||
let mut world = GameWorld(game);
|
||||
let result = match own {
|
||||
Some(i) => match world.0.native_player_stacks(uuid).and_then(|st| st.get(i).cloned().flatten()) {
|
||||
Some(stack) => s.invsee.click_own(uuid, i, &stack, &mut world, &mut record).map(|_| false),
|
||||
None => Ok(false),
|
||||
},
|
||||
None => match usize::try_from(slot) {
|
||||
Ok(m) if m < smp_invsee::SIZE => s.invsee.click_menu(uuid, m, &mut world, &mut record).map(|c| c == Some(true)),
|
||||
_ => Ok(false),
|
||||
},
|
||||
};
|
||||
if let (Some(m), Err(e)) = (&asked, &result)
|
||||
&& let Err(err) = audit(&dir, m, &format!("refused: {e}"))
|
||||
{
|
||||
log::error!("[smp] invsee audit: {err}");
|
||||
}
|
||||
let name = game.native_server_players().into_iter().find(|p| p.uuid == uuid).map(|p| p.name);
|
||||
let close = matches!(result, Ok(true));
|
||||
let summary = if close { s.invsee.close(uuid, name.as_deref().unwrap_or("?")) } else { None };
|
||||
let refreshed = (!close).then(|| items(&s.invsee, uuid));
|
||||
ACTIVE.store(!s.invsee.views.is_empty() || !s.pending.is_empty(), Relaxed);
|
||||
drop(guard);
|
||||
if let Err(e) = &result {
|
||||
game.native_tell(uuid, Text::literal(format!("Nothing moved: {e}.")).with_color(text::RED));
|
||||
}
|
||||
if close {
|
||||
game.native_close_menu(uuid);
|
||||
} else if let Some(items) = refreshed {
|
||||
game.native_set_menu_items(uuid, items);
|
||||
}
|
||||
if let Some(line) = summary {
|
||||
staff(game, uuid, &line);
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
/// An `/invsee` menu closed: true when it was one.
|
||||
pub(in crate::game) fn menu_closed(game: &mut Game<'_>, uuid: u128, window: i32) -> bool {
|
||||
let mut guard = state();
|
||||
let s = guard.as_mut().expect("made");
|
||||
if s.invsee.views.get(&uuid).is_none_or(|v| v.window != Some(window)) {
|
||||
return false;
|
||||
}
|
||||
let name = game.native_server_players().into_iter().find(|p| p.uuid == uuid).map(|p| p.name);
|
||||
let summary = s.invsee.close(uuid, name.as_deref().unwrap_or("?"));
|
||||
ACTIVE.store(!s.invsee.views.is_empty() || !s.pending.is_empty(), Relaxed);
|
||||
drop(guard);
|
||||
if let Some(line) = summary {
|
||||
staff(game, uuid, &line);
|
||||
}
|
||||
true
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
// A click in a menu a native mod opened: the SMP's trade menu, when it is one.
|
||||
fn smp_menu_clicked(game: &mut crate::game::Game<'_>, uuid: u128, window: i32, slot: i32, mode: i32) {
|
||||
if !crate::game::smp_invsee_glue::menu_clicked(game, uuid, window, slot, mode) {
|
||||
crate::game::smp_glue::menu_clicked(game, uuid, window, slot, mode);
|
||||
}
|
||||
crate::game::smp_glue::menu_clicked(game, uuid, window, slot, mode);
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
// A menu a native mod opened closed: a trade's ends, nothing moved.
|
||||
fn smp_menu_closed(game: &mut crate::game::Game<'_>, uuid: u128, window: i32) {
|
||||
if !crate::game::smp_invsee_glue::menu_closed(game, uuid, window) {
|
||||
crate::game::smp_glue::menu_closed(game, uuid, window);
|
||||
}
|
||||
crate::game::smp_glue::menu_closed(game, uuid, window);
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
// A piston pushes, pulls or destroys blocks: kept out of the land others
|
||||
// claimed.
|
||||
fn smp_piston_move(
|
||||
dimension: crate::game::LevelDimension,
|
||||
piston: horizon_core::position::BlockPos,
|
||||
direction: [i32; 3],
|
||||
push: &[horizon_core::position::BlockPos],
|
||||
destroy: &[horizon_core::position::BlockPos],
|
||||
canceled: &mut bool,
|
||||
) {
|
||||
let dimension = crate::game::smp_glue::dimension_id(dimension);
|
||||
let step = |p: &horizon_core::position::BlockPos| {
|
||||
[p.x + direction[0], p.y + direction[1], p.z + direction[2]]
|
||||
};
|
||||
let touched: Vec<[i32; 3]> = push
|
||||
.iter()
|
||||
.flat_map(|p| [[p.x, p.y, p.z], step(p)])
|
||||
.chain(destroy.iter().map(|p| [p.x, p.y, p.z]))
|
||||
.collect();
|
||||
let piston = [piston.x, piston.y, piston.z];
|
||||
if !crate::game::smp_glue::world_allows(dimension, piston, &touched) {
|
||||
*canceled = true;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
// The SMP's commands in every player's command tree.
|
||||
fn smp_register_commands(commands: &mut Vec<crate::game::native_server::NativeCommand>) {
|
||||
crate::game::smp_glue::commands(commands);
|
||||
crate::game::smp_invsee_glue::commands(commands);
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
// A player right clicks a block: kept out of the land others claimed.
|
||||
fn smp_right_click_block(game: &mut crate::game::Game<'_>, pos: [i32; 3], canceled: &mut bool) {
|
||||
crate::game::smp_glue::guard(game, pos, canceled);
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,571 +0,0 @@
|
||||
// The SMP's screens: a scoreboard sidebar, the player's own block first (their
|
||||
// name or nickname, balance, playtime, the players on), then the three
|
||||
// richest and the server's address, which a player hides with `/sidebar off`
|
||||
// (kept in `board.json`); and the Tab list's header and footer (the server's
|
||||
// name, its TPS and the players on). Nothing happens per tick: the ranking is
|
||||
// built once for everyone when a balance changed (at most once each
|
||||
// `min_seconds`) or every `refresh_seconds`; the players' own lines are looked
|
||||
// at on the same `refresh_seconds`, and a sidebar is sent only to the players
|
||||
// whose lines changed and to newcomers. The Tab list goes out every
|
||||
// `tab_refresh_seconds`, and to a player who just joined. No game types. Added to the game as `game::smp_board`;
|
||||
// also a module of this crate, for its tests.
|
||||
|
||||
use super::smp_economy::{Out, Player};
|
||||
use super::smp_store;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{BTreeSet, HashMap, HashSet};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
/// The most of the richest a sidebar lists: vanilla's 15 lines, less the
|
||||
/// player's four, the two gaps, the heading and the address.
|
||||
const MAX_TOP: usize = 7;
|
||||
|
||||
/// `config.json`'s `board` section.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct Config {
|
||||
/// The sidebar (each player may hide it).
|
||||
pub sidebar: bool,
|
||||
pub title: String,
|
||||
/// How many of the richest players it lists (at most 7; 0: none).
|
||||
pub top: usize,
|
||||
/// Its last line, the server's address ("": none).
|
||||
pub footer: String,
|
||||
/// The ranking is built again, and the players' own lines looked at,
|
||||
/// at least this often.
|
||||
pub refresh_seconds: i64,
|
||||
/// After a balance changed, at most this often.
|
||||
pub min_seconds: i64,
|
||||
/// The Tab list's header and footer.
|
||||
pub tab: bool,
|
||||
/// `{server}`, `{tps}`, `{mspt}`, `{players}` are filled in.
|
||||
pub tab_header: String,
|
||||
pub tab_footer: String,
|
||||
pub server_name: String,
|
||||
pub tab_refresh_seconds: i64,
|
||||
}
|
||||
|
||||
impl Default for Config {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
sidebar: true,
|
||||
title: "Horizon SMP".into(),
|
||||
top: 3,
|
||||
footer: "play.playhorizon.dev".into(),
|
||||
refresh_seconds: 60,
|
||||
min_seconds: 5,
|
||||
tab: true,
|
||||
tab_header: "{server}".into(),
|
||||
tab_footer: "TPS {tps} · {players} online".into(),
|
||||
server_name: "Horizon SMP".into(),
|
||||
tab_refresh_seconds: 5,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// SMP 0.13's sidebar defaults (the richest ten), moved to 0.14's when a
|
||||
/// server never changed them. True when something changed.
|
||||
pub fn migrate(config: &mut Config) -> bool {
|
||||
let mut changed = false;
|
||||
if config.title == "Richest players" {
|
||||
config.title = Config::default().title;
|
||||
changed = true;
|
||||
}
|
||||
if config.top == 10 {
|
||||
config.top = Config::default().top;
|
||||
changed = true;
|
||||
}
|
||||
changed
|
||||
}
|
||||
|
||||
/// `board.json`.
|
||||
#[derive(Default, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
struct Data {
|
||||
/// The players who hid the sidebar, by UUID.
|
||||
hidden: BTreeSet<String>,
|
||||
}
|
||||
|
||||
/// A line of a player's sidebar.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub enum Line {
|
||||
/// The player's name, or their nickname.
|
||||
Name(String),
|
||||
/// A value of theirs or the server's: `Balance`, `Playtime`, `Online`.
|
||||
Stat { label: &'static str, value: String },
|
||||
/// An empty line.
|
||||
Gap,
|
||||
/// The heading over the richest.
|
||||
Heading,
|
||||
/// One of the richest: their rank, name and balance; `me` on the
|
||||
/// player's own line.
|
||||
Top {
|
||||
rank: usize,
|
||||
name: String,
|
||||
amount: String,
|
||||
me: bool,
|
||||
},
|
||||
/// The server's address.
|
||||
Footer(String),
|
||||
}
|
||||
|
||||
/// What a player's own lines show, from the other modules.
|
||||
pub struct Me {
|
||||
/// Their nickname, else their name.
|
||||
pub name: String,
|
||||
pub played_seconds: i64,
|
||||
}
|
||||
|
||||
/// `2h 05m`, `12m`: the sidebar's playtime.
|
||||
pub fn short_duration(seconds: i64) -> String {
|
||||
let (h, m) = (seconds / 3600, seconds % 3600 / 60);
|
||||
if h > 0 {
|
||||
format!("{h}h {m:02}m")
|
||||
} else {
|
||||
format!("{m}m")
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Board {
|
||||
pub config: Config,
|
||||
path: PathBuf,
|
||||
data: Data,
|
||||
changed: bool,
|
||||
/// Every account by balance, richest first: UUID, name, balance.
|
||||
ranked: Vec<(u128, String, i64)>,
|
||||
rank_of: HashMap<u128, usize>,
|
||||
/// When the ranking was built, and over which economy revision.
|
||||
built_at: Option<i64>,
|
||||
built_revision: u64,
|
||||
/// What each player on was last sent.
|
||||
sent: HashMap<u128, Vec<Line>>,
|
||||
/// Built since the last `updates`: every player's lines are looked at.
|
||||
stale: bool,
|
||||
/// When the players' own lines were last looked at.
|
||||
personal_at: Option<i64>,
|
||||
tab_at: Option<i64>,
|
||||
tab_sent: HashSet<u128>,
|
||||
}
|
||||
|
||||
/// `1,250`, `125.4k`, `3.2M`: short enough for the sidebar's right side.
|
||||
pub fn compact(n: i64) -> String {
|
||||
let a = n.unsigned_abs();
|
||||
let sign = if n < 0 { "-" } else { "" };
|
||||
if a < 100_000 {
|
||||
let digits = a.to_string();
|
||||
let mut out = String::new();
|
||||
for (i, c) in digits.chars().enumerate() {
|
||||
if i > 0 && (digits.len() - i).is_multiple_of(3) {
|
||||
out.push(',');
|
||||
}
|
||||
out.push(c);
|
||||
}
|
||||
return format!("{sign}{out}");
|
||||
}
|
||||
let (value, unit) = match a {
|
||||
100_000..1_000_000 => (a as f64 / 1e3, "k"),
|
||||
1_000_000..1_000_000_000 => (a as f64 / 1e6, "M"),
|
||||
_ => (a as f64 / 1e9, "B"),
|
||||
};
|
||||
format!("{sign}{value:.1}{unit}")
|
||||
}
|
||||
|
||||
impl Board {
|
||||
/// `board.json` in `dir`; an error when it exists but can't be read.
|
||||
pub fn open(dir: &Path, config: Config) -> Result<Self, String> {
|
||||
let path = dir.join("board.json");
|
||||
let data = smp_store::read_json(&path)?;
|
||||
Ok(Self {
|
||||
config,
|
||||
path,
|
||||
data,
|
||||
changed: false,
|
||||
ranked: Vec::new(),
|
||||
rank_of: HashMap::new(),
|
||||
built_at: None,
|
||||
built_revision: 0,
|
||||
sent: HashMap::new(),
|
||||
stale: false,
|
||||
personal_at: None,
|
||||
tab_at: None,
|
||||
tab_sent: HashSet::new(),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn save(&mut self) -> Result<(), String> {
|
||||
if self.changed {
|
||||
smp_store::write_json(&self.path, &self.data)?;
|
||||
self.changed = false;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn hidden(&self, uuid: u128) -> bool {
|
||||
self.data.hidden.contains(&smp_store::uuid_string(uuid))
|
||||
}
|
||||
|
||||
/// Whether the ranking should be built again: the economy changed
|
||||
/// (`revision`) and `min_seconds` passed, or `refresh_seconds` passed.
|
||||
pub fn due(&self, now: i64, revision: u64) -> bool {
|
||||
if !self.config.sidebar {
|
||||
return false;
|
||||
}
|
||||
let Some(at) = self.built_at else {
|
||||
return true;
|
||||
};
|
||||
let since = now - at;
|
||||
(revision != self.built_revision && since >= self.config.min_seconds * 1000)
|
||||
|| since >= self.config.refresh_seconds * 1000
|
||||
}
|
||||
|
||||
/// The ranking from the accounts (UUID, name, balance, any order).
|
||||
pub fn rebuild(&mut self, mut accounts: Vec<(u128, String, i64)>, now: i64, revision: u64) {
|
||||
accounts.sort_by(|a, b| b.2.cmp(&a.2).then_with(|| a.1.cmp(&b.1)));
|
||||
self.rank_of = accounts
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, a)| (a.0, i + 1))
|
||||
.collect();
|
||||
self.ranked = accounts;
|
||||
self.built_at = Some(now);
|
||||
self.built_revision = revision;
|
||||
self.stale = true;
|
||||
}
|
||||
|
||||
/// `uuid`'s sidebar: their own block, the richest from the ranking, the
|
||||
/// address.
|
||||
pub fn lines(&self, uuid: u128, me: &Me, online: usize) -> Vec<Line> {
|
||||
let balance = self
|
||||
.rank_of
|
||||
.get(&uuid)
|
||||
.map_or(0, |&rank| self.ranked[rank - 1].2);
|
||||
let mut lines = vec![
|
||||
Line::Name(me.name.clone()),
|
||||
Line::Stat {
|
||||
label: "Balance",
|
||||
value: compact(balance),
|
||||
},
|
||||
Line::Stat {
|
||||
label: "Playtime",
|
||||
value: short_duration(me.played_seconds),
|
||||
},
|
||||
Line::Stat {
|
||||
label: "Online",
|
||||
value: online.to_string(),
|
||||
},
|
||||
];
|
||||
let top = self.config.top.min(MAX_TOP);
|
||||
if top > 0 && !self.ranked.is_empty() {
|
||||
lines.push(Line::Gap);
|
||||
lines.push(Line::Heading);
|
||||
lines.extend(self.ranked.iter().take(top).enumerate().map(
|
||||
|(i, (u, name, balance))| Line::Top {
|
||||
rank: i + 1,
|
||||
name: name.clone(),
|
||||
amount: compact(*balance),
|
||||
me: *u == uuid,
|
||||
},
|
||||
));
|
||||
}
|
||||
if !self.config.footer.is_empty() {
|
||||
lines.push(Line::Gap);
|
||||
lines.push(Line::Footer(self.config.footer.clone()));
|
||||
}
|
||||
lines
|
||||
}
|
||||
|
||||
/// The sidebars to send now, to the players `on`: those who joined, and
|
||||
/// after a rebuild or each `refresh_seconds` those whose lines changed.
|
||||
/// `me` is asked only for the players looked at. Players who hid it get
|
||||
/// nothing; players gone are forgotten (they get it again on return).
|
||||
pub fn updates(
|
||||
&mut self,
|
||||
now: i64,
|
||||
on: &[u128],
|
||||
me: impl Fn(u128) -> Me,
|
||||
) -> Vec<(u128, Vec<Line>)> {
|
||||
self.sent.retain(|u, _| on.contains(u));
|
||||
self.tab_sent.retain(|u| on.contains(u));
|
||||
if !self.config.sidebar || self.built_at.is_none() {
|
||||
return Vec::new();
|
||||
}
|
||||
let personal = self
|
||||
.personal_at
|
||||
.is_none_or(|t| now - t >= self.config.refresh_seconds * 1000);
|
||||
if personal {
|
||||
self.personal_at = Some(now);
|
||||
}
|
||||
let all = std::mem::take(&mut self.stale) || personal;
|
||||
let mut out = Vec::new();
|
||||
for &uuid in on {
|
||||
if self.hidden(uuid) || (!all && self.sent.contains_key(&uuid)) {
|
||||
continue;
|
||||
}
|
||||
let lines = self.lines(uuid, &me(uuid), on.len());
|
||||
if self.sent.get(&uuid) != Some(&lines) {
|
||||
self.sent.insert(uuid, lines.clone());
|
||||
out.push((uuid, lines));
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// Whom the Tab list goes to now: everyone each `tab_refresh_seconds`,
|
||||
/// and players who just joined.
|
||||
pub fn tab_due(&mut self, now: i64, on: &[u128]) -> Vec<u128> {
|
||||
if !self.config.tab {
|
||||
return Vec::new();
|
||||
}
|
||||
let all = self
|
||||
.tab_at
|
||||
.is_none_or(|t| now - t >= self.config.tab_refresh_seconds * 1000);
|
||||
if all {
|
||||
self.tab_at = Some(now);
|
||||
}
|
||||
let to: Vec<u128> = on
|
||||
.iter()
|
||||
.copied()
|
||||
.filter(|u| all || !self.tab_sent.contains(u))
|
||||
.collect();
|
||||
self.tab_sent.extend(to.iter().copied());
|
||||
to
|
||||
}
|
||||
|
||||
/// The Tab list's header and footer.
|
||||
pub fn tab_lines(&self, tps: f64, mspt: f64, players: usize) -> (String, String) {
|
||||
let fill = |s: &str| {
|
||||
s.replace("{server}", &self.config.server_name)
|
||||
.replace("{tps}", &format!("{tps:.1}"))
|
||||
.replace("{mspt}", &format!("{mspt:.1}"))
|
||||
.replace("{players}", &players.to_string())
|
||||
};
|
||||
(fill(&self.config.tab_header), fill(&self.config.tab_footer))
|
||||
}
|
||||
|
||||
/// `/sidebar [on|off]`: the answer, and the sidebar to show (true) or
|
||||
/// take away (false). None for another command.
|
||||
pub fn command(&mut self, me: &Player, line: &str) -> Option<(Vec<Out>, Option<bool>)> {
|
||||
let words: Vec<&str> = line.split_whitespace().collect();
|
||||
if words.first() != Some(&"sidebar") {
|
||||
return None;
|
||||
}
|
||||
if !self.config.sidebar {
|
||||
return Some((
|
||||
vec![Out::Error("The sidebar is off on this server.".into())],
|
||||
None,
|
||||
));
|
||||
}
|
||||
let key = smp_store::uuid_string(me.uuid);
|
||||
let show = match words[1..] {
|
||||
[] => self.hidden(me.uuid),
|
||||
["on"] => true,
|
||||
["off"] => false,
|
||||
_ => {
|
||||
return Some((vec![Out::Error("Usage: /sidebar [on|off]".into())], None));
|
||||
}
|
||||
};
|
||||
if show {
|
||||
self.changed |= self.data.hidden.remove(&key);
|
||||
self.sent.remove(&me.uuid);
|
||||
} else {
|
||||
self.changed |= self.data.hidden.insert(key);
|
||||
}
|
||||
let reply = if show {
|
||||
"The sidebar is on. /sidebar off hides it."
|
||||
} else {
|
||||
"The sidebar is off. /sidebar on shows it again."
|
||||
};
|
||||
Some((vec![Out::Reply(reply.into())], Some(show)))
|
||||
}
|
||||
}
|
||||
|
||||
pub const COMMANDS: [&str; 1] = ["sidebar"];
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::sync::atomic::{AtomicU32, Ordering};
|
||||
|
||||
fn dir() -> PathBuf {
|
||||
static N: AtomicU32 = AtomicU32::new(0);
|
||||
let n = N.fetch_add(1, Ordering::Relaxed);
|
||||
std::env::temp_dir().join(format!("smp-board-{}-{n}", std::process::id()))
|
||||
}
|
||||
fn me(uuid: u128) -> Player {
|
||||
Player {
|
||||
uuid,
|
||||
name: format!("P{uuid}"),
|
||||
level: 0,
|
||||
}
|
||||
}
|
||||
fn accounts(n: u128) -> Vec<(u128, String, i64)> {
|
||||
(1..=n)
|
||||
.map(|u| (u, format!("P{u}"), u as i64 * 100))
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn amounts_are_short() {
|
||||
assert_eq!(compact(0), "0");
|
||||
assert_eq!(compact(1_250), "1,250");
|
||||
assert_eq!(compact(99_999), "99,999");
|
||||
assert_eq!(compact(125_400), "125.4k");
|
||||
assert_eq!(compact(3_210_000), "3.2M");
|
||||
assert_eq!(compact(7_000_000_000), "7.0B");
|
||||
}
|
||||
|
||||
fn me_of(uuid: u128) -> Me {
|
||||
Me {
|
||||
name: format!("P{uuid}"),
|
||||
played_seconds: 7_500,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn durations_are_short() {
|
||||
assert_eq!(short_duration(0), "0m");
|
||||
assert_eq!(short_duration(12 * 60 + 59), "12m");
|
||||
assert_eq!(short_duration(7_500), "2h 05m");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_sidebar_shows_the_player_then_the_three_richest_then_the_address() {
|
||||
let d = dir();
|
||||
let mut b = Board::open(&d, Config::default()).unwrap();
|
||||
assert!(b.due(0, 0));
|
||||
b.rebuild(accounts(12), 0, 1);
|
||||
let rocky = Me {
|
||||
name: "Rocky".into(),
|
||||
played_seconds: 7_500,
|
||||
};
|
||||
let stat = |label, value: &str| Line::Stat {
|
||||
label,
|
||||
value: value.into(),
|
||||
};
|
||||
let top = |rank, name: &str, amount: &str, me| Line::Top {
|
||||
rank,
|
||||
name: name.into(),
|
||||
amount: amount.into(),
|
||||
me,
|
||||
};
|
||||
assert_eq!(
|
||||
b.lines(11, &rocky, 42),
|
||||
vec![
|
||||
Line::Name("Rocky".into()),
|
||||
stat("Balance", "1,100"),
|
||||
stat("Playtime", "2h 05m"),
|
||||
stat("Online", "42"),
|
||||
Line::Gap,
|
||||
Line::Heading,
|
||||
top(1, "P12", "1,200", false),
|
||||
top(2, "P11", "1,100", true),
|
||||
top(3, "P10", "1,000", false),
|
||||
Line::Gap,
|
||||
Line::Footer("play.playhorizon.dev".into()),
|
||||
]
|
||||
);
|
||||
// A player with no account yet; a server with no address and no top.
|
||||
assert_eq!(b.lines(99, &rocky, 1)[1], stat("Balance", "0"));
|
||||
b.config.footer.clear();
|
||||
b.config.top = 0;
|
||||
assert_eq!(b.lines(99, &rocky, 1).len(), 4);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_old_defaults_move_to_the_new_ones_and_set_ones_stay() {
|
||||
let mut old = Config {
|
||||
title: "Richest players".into(),
|
||||
top: 10,
|
||||
..Config::default()
|
||||
};
|
||||
assert!(migrate(&mut old));
|
||||
assert_eq!(old, Config::default());
|
||||
assert!(!migrate(&mut old));
|
||||
let mut own = Config {
|
||||
title: "My server".into(),
|
||||
top: 5,
|
||||
..Config::default()
|
||||
};
|
||||
assert!(!migrate(&mut own));
|
||||
assert_eq!((own.title.as_str(), own.top), ("My server", 5));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sidebars_go_out_on_join_on_a_new_ranking_and_on_the_refresh() {
|
||||
let d = dir();
|
||||
let mut b = Board::open(&d, Config::default()).unwrap();
|
||||
b.rebuild(accounts(3), 0, 1);
|
||||
let asked = std::cell::Cell::new(0);
|
||||
let me = |u| {
|
||||
asked.set(asked.get() + 1);
|
||||
me_of(u)
|
||||
};
|
||||
assert_eq!(b.updates(0, &[1, 2], me).len(), 2);
|
||||
// Nothing new within the refresh: nobody is even looked at.
|
||||
asked.set(0);
|
||||
assert!(b.updates(1_000, &[1, 2], me).is_empty());
|
||||
assert_eq!(asked.get(), 0);
|
||||
assert!(!b.due(1_000, 1), "no change, not a minute yet");
|
||||
assert!(!b.due(1_000, 2), "changed, but within min_seconds");
|
||||
assert!(b.due(5_000, 2));
|
||||
b.rebuild(accounts(3), 5_000, 2);
|
||||
assert!(b.updates(5_000, &[1, 2], me).is_empty(), "same lines");
|
||||
// Player 1 gets richer: everyone's top changes.
|
||||
let mut a = accounts(3);
|
||||
a[0].2 = 1_000;
|
||||
b.rebuild(a, 10_000, 3);
|
||||
assert_eq!(b.updates(10_000, &[1, 2], me).len(), 2);
|
||||
// A newcomer gets theirs at once, and only they are looked at.
|
||||
asked.set(0);
|
||||
assert_eq!(b.updates(11_000, &[1, 2, 3], me).len(), 1);
|
||||
assert_eq!(asked.get(), 1);
|
||||
// One who left gets it on return.
|
||||
b.updates(12_000, &[2, 3], me);
|
||||
assert_eq!(b.updates(13_000, &[1, 2, 3], me).len(), 1);
|
||||
// Within the minute player 2 still shows 2 online; the minute's
|
||||
// refresh mends it, and sends nothing to the others.
|
||||
assert_eq!(b.updates(30_000, &[1, 2, 3], me).len(), 0);
|
||||
let sent = b.updates(60_000, &[1, 2, 3], me);
|
||||
assert_eq!(sent.iter().map(|s| s.0).collect::<Vec<_>>(), vec![2]);
|
||||
assert!(b.due(70_000, 3), "a minute passed");
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_hidden_sidebar_stays_hidden_after_a_restart() {
|
||||
let d = dir();
|
||||
let mut b = Board::open(&d, Config::default()).unwrap();
|
||||
b.rebuild(accounts(3), 0, 1);
|
||||
let (out, show) = b.command(&me(1), "sidebar off").unwrap();
|
||||
assert_eq!(show, Some(false));
|
||||
assert!(matches!(&out[0], Out::Reply(s) if s.contains("off")));
|
||||
assert_eq!(b.updates(0, &[1, 2], me_of).len(), 1, "only player 2");
|
||||
b.save().unwrap();
|
||||
let mut b = Board::open(&d, Config::default()).unwrap();
|
||||
assert!(b.hidden(1));
|
||||
b.rebuild(accounts(3), 0, 1);
|
||||
assert_eq!(b.updates(0, &[1], me_of).len(), 0);
|
||||
// `/sidebar` toggles it back on, and it is sent at the next update.
|
||||
let (_, show) = b.command(&me(1), "sidebar").unwrap();
|
||||
assert_eq!(show, Some(true));
|
||||
assert_eq!(b.updates(1_000, &[1], me_of).len(), 1);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_tab_list_fills_its_placeholders_and_goes_to_newcomers_at_once() {
|
||||
let d = dir();
|
||||
let mut b = Board::open(&d, Config::default()).unwrap();
|
||||
let (h, f) = b.tab_lines(19.96, 6.3, 42);
|
||||
assert_eq!(
|
||||
(h.as_str(), f.as_str()),
|
||||
("Horizon SMP", "TPS 20.0 · 42 online")
|
||||
);
|
||||
assert_eq!(b.tab_due(0, &[1, 2]), vec![1, 2]);
|
||||
assert!(b.tab_due(1_000, &[1, 2]).is_empty());
|
||||
assert_eq!(b.tab_due(2_000, &[1, 2, 3]), vec![3]);
|
||||
assert_eq!(b.tab_due(5_000, &[1, 2, 3]), vec![1, 2, 3]);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,657 +0,0 @@
|
||||
// The casino's blackjack: one player against the dealer, six decks shuffled
|
||||
// for every hand. The dealer stands on all 17s and checks for blackjack
|
||||
// first; a blackjack pays 3 to 2; the player may double on their first two
|
||||
// cards (one more card, the bet doubled); no split, insurance or surrender.
|
||||
// With basic strategy the house keeps about 1% (the test plays 400,000
|
||||
// hands). The dealer draws one card every 0.6 s in the menu. Closing the
|
||||
// menu or leaving stands on the hand, as does a minute without a move: it
|
||||
// is played out and paid all the same, once. Added to the game as
|
||||
// `game::smp_casino_blackjack`; also a module of this crate, for its tests.
|
||||
|
||||
use super::smp_casino::{Color, Icon, Rng, Seat, Stake, filler, icon};
|
||||
|
||||
pub const DECKS: usize = 6;
|
||||
/// Between two of the dealer's cards.
|
||||
pub const DEALER_MS: i64 = 600;
|
||||
/// A hand left this long without a move stands.
|
||||
pub const IDLE_MS: i64 = 60_000;
|
||||
|
||||
pub const HELP: [&str; 1] = [
|
||||
"Blackjack (6 decks, shuffled every hand): the dealer stands on all 17s; blackjack pays 3 to 2; double on your first two cards; no split or insurance. House edge about 1% with basic strategy.",
|
||||
];
|
||||
|
||||
/// A card: rank 1 (ace) to 13 (king), suit 0 to 3.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct Card {
|
||||
pub rank: u8,
|
||||
pub suit: u8,
|
||||
}
|
||||
|
||||
impl Card {
|
||||
pub fn value(self) -> u8 {
|
||||
self.rank.min(10)
|
||||
}
|
||||
pub fn name(self) -> String {
|
||||
let rank = match self.rank {
|
||||
1 => "A".to_owned(),
|
||||
11 => "J".to_owned(),
|
||||
12 => "Q".to_owned(),
|
||||
13 => "K".to_owned(),
|
||||
n => n.to_string(),
|
||||
};
|
||||
format!("{rank}{}", ["♠", "♥", "♦", "♣"][usize::from(self.suit % 4)])
|
||||
}
|
||||
fn red(self) -> bool {
|
||||
matches!(self.suit, 1 | 2)
|
||||
}
|
||||
}
|
||||
|
||||
/// A hand's best total, and whether an ace counts 11 in it (soft).
|
||||
pub fn total(cards: &[Card]) -> (u8, bool) {
|
||||
let hard: u8 = cards.iter().map(|c| c.value()).sum();
|
||||
if cards.iter().any(|c| c.rank == 1) && hard + 10 <= 21 {
|
||||
(hard + 10, true)
|
||||
} else {
|
||||
(hard, false)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn blackjack(cards: &[Card]) -> bool {
|
||||
cards.len() == 2 && total(cards).0 == 21
|
||||
}
|
||||
|
||||
/// Six decks, from which a hand draws without putting back.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Shoe(Vec<Card>);
|
||||
|
||||
impl Shoe {
|
||||
pub fn new() -> Self {
|
||||
let mut cards = Vec::with_capacity(52 * DECKS);
|
||||
for _ in 0..DECKS {
|
||||
for suit in 0..4 {
|
||||
for rank in 1..=13 {
|
||||
cards.push(Card { rank, suit });
|
||||
}
|
||||
}
|
||||
}
|
||||
Self(cards)
|
||||
}
|
||||
pub fn draw(&mut self, rng: &mut Rng) -> Card {
|
||||
let i = rng.below(self.0.len() as u64) as usize;
|
||||
self.0.swap_remove(i)
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Shoe {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum Phase {
|
||||
/// The player's move; since when.
|
||||
Player { since: i64 },
|
||||
/// The dealer draws; their next card at.
|
||||
Dealer { next: i64 },
|
||||
}
|
||||
|
||||
/// How a hand ended, for the line and the payout.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum End {
|
||||
Blackjack,
|
||||
Win,
|
||||
Push,
|
||||
Lose,
|
||||
Bust,
|
||||
DealerBlackjack,
|
||||
}
|
||||
|
||||
impl End {
|
||||
/// What the hand pays back on `stake` (the stake included).
|
||||
pub fn payout(self, stake: i64) -> i64 {
|
||||
match self {
|
||||
End::Blackjack => stake + stake * 3 / 2,
|
||||
End::Win => stake * 2,
|
||||
End::Push => stake,
|
||||
_ => 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Hand {
|
||||
pub stake: Stake,
|
||||
pub player: Vec<Card>,
|
||||
pub dealer: Vec<Card>,
|
||||
pub shoe: Shoe,
|
||||
pub doubled: bool,
|
||||
pub phase: Phase,
|
||||
}
|
||||
|
||||
impl Hand {
|
||||
/// How it ends, once the dealer is done (or at once for a blackjack or a
|
||||
/// bust).
|
||||
fn end(&self) -> Option<End> {
|
||||
let (p, _) = total(&self.player);
|
||||
let (d, _) = total(&self.dealer);
|
||||
if blackjack(&self.player) {
|
||||
return Some(if blackjack(&self.dealer) {
|
||||
End::Push
|
||||
} else {
|
||||
End::Blackjack
|
||||
});
|
||||
}
|
||||
if blackjack(&self.dealer) {
|
||||
return Some(End::DealerBlackjack);
|
||||
}
|
||||
if p > 21 {
|
||||
return Some(End::Bust);
|
||||
}
|
||||
if !matches!(self.phase, Phase::Dealer { .. }) || d < 17 {
|
||||
return None;
|
||||
}
|
||||
Some(if d > 21 || p > d {
|
||||
End::Win
|
||||
} else if p == d {
|
||||
End::Push
|
||||
} else {
|
||||
End::Lose
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// A hand played out, to be paid.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Done {
|
||||
pub hand: Hand,
|
||||
pub end: End,
|
||||
}
|
||||
|
||||
/// A player's table: the last hand, shown until the next.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct Table {
|
||||
pub last: Option<(Vec<Card>, Vec<Card>, End)>,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Blackjack {
|
||||
pub hands: Vec<Hand>,
|
||||
}
|
||||
|
||||
impl Blackjack {
|
||||
pub fn busy(&self) -> bool {
|
||||
!self.hands.is_empty()
|
||||
}
|
||||
pub fn playing(&self, uuid: u128) -> bool {
|
||||
self.hands.iter().any(|h| h.stake.uuid == uuid)
|
||||
}
|
||||
fn hand(&mut self, uuid: u128) -> Option<&mut Hand> {
|
||||
self.hands.iter_mut().find(|h| h.stake.uuid == uuid)
|
||||
}
|
||||
/// The bet is held: two cards each. A blackjack ends it at once.
|
||||
pub fn deal(&mut self, stake: Stake, now: i64, rng: &mut Rng) -> Option<Done> {
|
||||
let mut shoe = Shoe::new();
|
||||
let mut player = Vec::with_capacity(6);
|
||||
let mut dealer = Vec::with_capacity(6);
|
||||
for _ in 0..2 {
|
||||
player.push(shoe.draw(rng));
|
||||
dealer.push(shoe.draw(rng));
|
||||
}
|
||||
let hand = Hand {
|
||||
stake,
|
||||
player,
|
||||
dealer,
|
||||
shoe,
|
||||
doubled: false,
|
||||
phase: Phase::Player { since: now },
|
||||
};
|
||||
// The dealer checks for blackjack first.
|
||||
if let Some(end) = hand.end() {
|
||||
return Some(Done { hand, end });
|
||||
}
|
||||
self.hands.push(hand);
|
||||
None
|
||||
}
|
||||
fn finish(&mut self, uuid: u128) -> Option<Done> {
|
||||
let i = self.hands.iter().position(|h| h.stake.uuid == uuid)?;
|
||||
let end = self.hands[i].end()?;
|
||||
Some(Done {
|
||||
hand: self.hands.swap_remove(i),
|
||||
end,
|
||||
})
|
||||
}
|
||||
/// One more card; a bust ends the hand.
|
||||
pub fn hit(&mut self, uuid: u128, now: i64, rng: &mut Rng) -> Option<Done> {
|
||||
let h = self.hand(uuid)?;
|
||||
if !matches!(h.phase, Phase::Player { .. }) {
|
||||
return None;
|
||||
}
|
||||
let card = h.shoe.draw(rng);
|
||||
h.player.push(card);
|
||||
h.phase = Phase::Player { since: now };
|
||||
if total(&h.player).0 >= 21 {
|
||||
if total(&h.player).0 == 21 {
|
||||
h.phase = Phase::Dealer {
|
||||
next: now + DEALER_MS,
|
||||
};
|
||||
return None;
|
||||
}
|
||||
return self.finish(uuid);
|
||||
}
|
||||
None
|
||||
}
|
||||
/// The dealer plays.
|
||||
pub fn stand(&mut self, uuid: u128, now: i64) -> bool {
|
||||
match self.hand(uuid) {
|
||||
Some(h) if matches!(h.phase, Phase::Player { .. }) => {
|
||||
h.phase = Phase::Dealer {
|
||||
next: now + DEALER_MS,
|
||||
};
|
||||
true
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
/// Whether `uuid` may double now (first two cards); the caller holds the
|
||||
/// second bet first, then calls `doubled`.
|
||||
pub fn may_double(&self, uuid: u128) -> bool {
|
||||
self.hands.iter().any(|h| {
|
||||
h.stake.uuid == uuid && h.player.len() == 2 && matches!(h.phase, Phase::Player { .. })
|
||||
})
|
||||
}
|
||||
/// The bet doubled (held): one card, then the dealer plays.
|
||||
pub fn doubled(&mut self, uuid: u128, extra: i64, now: i64, rng: &mut Rng) -> Option<Done> {
|
||||
let h = self.hand(uuid)?;
|
||||
h.stake.amount += extra;
|
||||
h.doubled = true;
|
||||
let card = h.shoe.draw(rng);
|
||||
h.player.push(card);
|
||||
h.phase = Phase::Dealer {
|
||||
next: now + DEALER_MS,
|
||||
};
|
||||
if total(&h.player).0 > 21 {
|
||||
return self.finish(uuid);
|
||||
}
|
||||
None
|
||||
}
|
||||
/// The dealers' cards due by `now`; hands left idle stand. The hands
|
||||
/// played out, taken out to be paid once, and those that changed.
|
||||
pub fn step(&mut self, now: i64, rng: &mut Rng) -> (Vec<Done>, Vec<u128>) {
|
||||
let mut changed = Vec::new();
|
||||
for h in &mut self.hands {
|
||||
match h.phase {
|
||||
Phase::Player { since } if now - since >= IDLE_MS => {
|
||||
h.phase = Phase::Dealer {
|
||||
next: now + DEALER_MS,
|
||||
};
|
||||
changed.push(h.stake.uuid);
|
||||
}
|
||||
Phase::Dealer { next } if now >= next => {
|
||||
// The hidden card turns first (shown from this step), then one card a step.
|
||||
if total(&h.dealer).0 < 17 {
|
||||
let card = h.shoe.draw(rng);
|
||||
h.dealer.push(card);
|
||||
h.phase = Phase::Dealer {
|
||||
next: now + DEALER_MS,
|
||||
};
|
||||
} else {
|
||||
h.phase = Phase::Dealer { next: i64::MIN };
|
||||
}
|
||||
changed.push(h.stake.uuid);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
let mut done = Vec::new();
|
||||
let mut i = 0;
|
||||
while i < self.hands.len() {
|
||||
let h = &self.hands[i];
|
||||
let settled = matches!(h.phase, Phase::Dealer { next: i64::MIN });
|
||||
match h.end() {
|
||||
Some(end) if settled || matches!(end, End::Bust) => done.push(Done {
|
||||
hand: self.hands.swap_remove(i),
|
||||
end,
|
||||
}),
|
||||
_ => i += 1,
|
||||
}
|
||||
}
|
||||
(done, changed)
|
||||
}
|
||||
|
||||
/// The table's cells (all but the bottom row's shared cells).
|
||||
pub fn layout(&self, cells: &mut [Option<Icon>], uuid: u128, seat: &Seat) {
|
||||
for c in &mut cells[..45] {
|
||||
*c = filler("minecraft:green_stained_glass_pane");
|
||||
}
|
||||
let hand = self.hands.iter().find(|h| h.stake.uuid == uuid);
|
||||
let (player, dealer, hidden, message) = match (hand, &seat.blackjack.last) {
|
||||
(Some(h), _) => {
|
||||
let hidden = matches!(h.phase, Phase::Player { .. });
|
||||
let msg = if hidden {
|
||||
"Hit, stand or double".to_owned()
|
||||
} else {
|
||||
"The dealer plays...".to_owned()
|
||||
};
|
||||
(&h.player[..], &h.dealer[..], hidden, msg)
|
||||
}
|
||||
(None, Some((p, d, end))) => (&p[..], &d[..], false, end_line(*end)),
|
||||
(None, None) => (
|
||||
&[][..],
|
||||
&[][..],
|
||||
false,
|
||||
"Place your bet and deal".to_owned(),
|
||||
),
|
||||
};
|
||||
for (i, c) in dealer.iter().take(9).enumerate() {
|
||||
cells[9 + i] = if hidden && i == 1 {
|
||||
icon("minecraft:map", "Hidden card", Color::Gray)
|
||||
} else {
|
||||
card(*c)
|
||||
};
|
||||
}
|
||||
for (i, c) in player.iter().take(9).enumerate() {
|
||||
cells[27 + i] = card(*c);
|
||||
}
|
||||
if !dealer.is_empty() {
|
||||
let shown = if hidden {
|
||||
format!("Dealer shows {}", total(&dealer[..1]).0)
|
||||
} else {
|
||||
format!("Dealer: {}", show_total(dealer))
|
||||
};
|
||||
cells[4] = icon("minecraft:armor_stand", shown, Color::White);
|
||||
cells[36] = icon(
|
||||
"minecraft:name_tag",
|
||||
format!("You: {}", show_total(player)),
|
||||
Color::White,
|
||||
);
|
||||
}
|
||||
cells[22] = icon("minecraft:oak_sign", message, Color::Yellow);
|
||||
if hand.is_some_and(|h| matches!(h.phase, Phase::Player { .. })) {
|
||||
cells[38] = icon("minecraft:lime_wool", "HIT", Color::Green);
|
||||
cells[40] = icon("minecraft:red_wool", "STAND", Color::Red);
|
||||
if hand.is_some_and(|h| h.player.len() == 2) {
|
||||
cells[42] = icon(
|
||||
"minecraft:gold_block",
|
||||
"DOUBLE (one card, twice the bet)",
|
||||
Color::Gold,
|
||||
);
|
||||
}
|
||||
}
|
||||
cells[53] = if hand.is_some() {
|
||||
icon("minecraft:gray_concrete", "Hand in play", Color::Gray)
|
||||
} else {
|
||||
icon("minecraft:lime_concrete", "DEAL", Color::Green)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
fn show_total(cards: &[Card]) -> String {
|
||||
match total(cards) {
|
||||
(t, true) if t < 21 => format!("{t} (soft)"),
|
||||
(t, _) => t.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// How a hand ended, in a line.
|
||||
pub fn end_line(end: End) -> String {
|
||||
match end {
|
||||
End::Blackjack => "Blackjack! Paid 3 to 2".into(),
|
||||
End::Win => "You win".into(),
|
||||
End::Push => "Push: your bet back".into(),
|
||||
End::Lose => "The dealer wins".into(),
|
||||
End::Bust => "Bust".into(),
|
||||
End::DealerBlackjack => "The dealer has blackjack".into(),
|
||||
}
|
||||
}
|
||||
|
||||
/// A card as a cell: its blackjack value as the count.
|
||||
fn card(c: Card) -> Option<Icon> {
|
||||
let mut i = icon(
|
||||
"minecraft:paper",
|
||||
c.name(),
|
||||
if c.red() { Color::Red } else { Color::White },
|
||||
);
|
||||
if let Some(i) = i.as_mut() {
|
||||
i.count = c.value();
|
||||
}
|
||||
i
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::smp_casino::{Fx, Game, POT, View, tests::*};
|
||||
use super::*;
|
||||
|
||||
fn c(rank: u8) -> Card {
|
||||
Card { rank, suit: 0 }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn totals_soft_and_hard() {
|
||||
assert_eq!(total(&[c(1), c(6)]), (17, true));
|
||||
assert_eq!(total(&[c(1), c(6), c(10)]), (17, false));
|
||||
assert_eq!(total(&[c(1), c(1), c(9)]), (21, true));
|
||||
assert_eq!(total(&[c(13), c(12)]), (20, false));
|
||||
assert!(blackjack(&[c(1), c(11)]) && !blackjack(&[c(1), c(5), c(5)]));
|
||||
assert_eq!(End::Blackjack.payout(10), 25);
|
||||
assert_eq!(End::Blackjack.payout(15), 37, "3 to 2, rounded down");
|
||||
assert_eq!(
|
||||
(
|
||||
End::Win.payout(10),
|
||||
End::Push.payout(10),
|
||||
End::Lose.payout(10)
|
||||
),
|
||||
(20, 10, 0)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_dealer_stands_on_all_17s() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
for _ in 0..2000 {
|
||||
let mut b = Blackjack::default();
|
||||
let stake = Stake {
|
||||
uuid: A,
|
||||
name: "Alex".into(),
|
||||
game: Game::Blackjack,
|
||||
amount: 10,
|
||||
};
|
||||
if b.deal(stake, 0, &mut rng).is_some() {
|
||||
continue;
|
||||
}
|
||||
b.stand(A, 0);
|
||||
let mut now = 0;
|
||||
loop {
|
||||
now += DEALER_MS;
|
||||
let (done, _) = b.step(now, &mut rng);
|
||||
if let Some(d) = done.into_iter().next() {
|
||||
let (t, _) = total(&d.hand.dealer);
|
||||
assert!(t >= 17, "{:?}", d.hand.dealer);
|
||||
// It stopped at the first 17 or more.
|
||||
assert!(
|
||||
total(&d.hand.dealer[..d.hand.dealer.len() - 1]).0 < 17
|
||||
|| d.hand.dealer.len() == 2
|
||||
);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Basic strategy for 6 decks, dealer stands on 17, no split.
|
||||
fn strategy(player: &[Card], up: Card) -> char {
|
||||
let (t, soft) = total(player);
|
||||
let u = up.value();
|
||||
let u = if u == 1 { 11 } else { u };
|
||||
let two = player.len() == 2;
|
||||
let d = |yes: bool| {
|
||||
if yes && two {
|
||||
'D'
|
||||
} else if yes {
|
||||
'H'
|
||||
} else {
|
||||
'S'
|
||||
}
|
||||
};
|
||||
if soft {
|
||||
return match t {
|
||||
13 | 14 => {
|
||||
if (5..=6).contains(&u) && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
15 | 16 => {
|
||||
if (4..=6).contains(&u) && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
17 => {
|
||||
if (3..=6).contains(&u) && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
18 => {
|
||||
if (3..=6).contains(&u) {
|
||||
d(true)
|
||||
} else if u <= 8 {
|
||||
'S'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
_ => 'S',
|
||||
};
|
||||
}
|
||||
match t {
|
||||
0..=8 => 'H',
|
||||
9 => {
|
||||
if (3..=6).contains(&u) && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
10 => {
|
||||
if u <= 9 && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
11 => {
|
||||
if u <= 10 && two {
|
||||
'D'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
12 => {
|
||||
if (4..=6).contains(&u) {
|
||||
'S'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
13..=16 => {
|
||||
if u <= 6 {
|
||||
'S'
|
||||
} else {
|
||||
'H'
|
||||
}
|
||||
}
|
||||
_ => 'S',
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn basic_strategy_gets_back_about_99_percent() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
let (mut staked, mut back) = (0i64, 0i64);
|
||||
for _ in 0..400_000 {
|
||||
let mut b = Blackjack::default();
|
||||
let stake = Stake {
|
||||
uuid: A,
|
||||
name: "Alex".into(),
|
||||
game: Game::Blackjack,
|
||||
amount: 100,
|
||||
};
|
||||
let mut done = b.deal(stake, 0, &mut rng);
|
||||
while done.is_none() {
|
||||
let h = &b.hands[0];
|
||||
if !matches!(h.phase, Phase::Player { .. }) {
|
||||
break;
|
||||
}
|
||||
done = match strategy(&h.player, h.dealer[0]) {
|
||||
'H' => b.hit(A, 0, &mut rng),
|
||||
'D' => b.doubled(A, 100, 0, &mut rng),
|
||||
_ => {
|
||||
b.stand(A, 0);
|
||||
None
|
||||
}
|
||||
};
|
||||
}
|
||||
let mut now = 0;
|
||||
while done.is_none() {
|
||||
now += DEALER_MS;
|
||||
done = b.step(now, &mut rng).0.into_iter().next();
|
||||
}
|
||||
let d = done.unwrap();
|
||||
staked += d.hand.stake.amount;
|
||||
back += d.end.payout(d.hand.stake.amount);
|
||||
}
|
||||
let rtp = back as f64 / staked as f64;
|
||||
assert!((0.97..1.0).contains(&rtp), "{rtp}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_hand_through_the_casino_pays_once_and_closing_stands() {
|
||||
let (mut e, mut c, dir) = setup("blackjack", 100_000);
|
||||
let before = money(&e);
|
||||
let mut paid_hands = 0;
|
||||
let mut now = 0;
|
||||
c.sit(A, "Alex", View::Blackjack);
|
||||
for round in 0..40 {
|
||||
c.seats.get_mut(&A).unwrap().window = Some(round);
|
||||
c.click(&mut e, A, 53, false, now);
|
||||
c.click(&mut e, A, 53, false, now + 10);
|
||||
assert!(e.held(A) <= 10, "one deal per click");
|
||||
if c.blackjack.playing(A) {
|
||||
if round % 3 == 0 {
|
||||
// Double, with the second bet held.
|
||||
c.click(&mut e, A, 42, false, now + 20);
|
||||
c.click(&mut e, A, 42, false, now + 30);
|
||||
assert!(e.held(A) <= 20);
|
||||
} else if round % 3 == 1 {
|
||||
// The menu closes: the hand stands.
|
||||
assert!(c.closed(A, round, 0));
|
||||
c.sit(A, "Alex", View::Blackjack);
|
||||
} else {
|
||||
// Stand by hand; a second click does nothing more.
|
||||
c.click(&mut e, A, 40, false, now + 20);
|
||||
c.click(&mut e, A, 40, false, now + 30);
|
||||
}
|
||||
}
|
||||
for _ in 0..20 {
|
||||
now += 300;
|
||||
c.tick(&mut e, now);
|
||||
}
|
||||
if !c.blackjack.playing(A) {
|
||||
paid_hands += 1;
|
||||
}
|
||||
assert_eq!(money(&e), before);
|
||||
now += 5000;
|
||||
}
|
||||
assert_eq!(paid_hands, 40);
|
||||
assert_eq!(e.held(A), 0);
|
||||
assert_eq!(c.ledger.totals["blackjack"].rounds, 40);
|
||||
let _ = (e.pool(POT), Fx::BossHide);
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
}
|
||||
@@ -1,543 +0,0 @@
|
||||
// The casino's crash: one round for everyone. The first bet opens a 10 s
|
||||
// betting window. Then the multiplier climbs from 1.00x (2x at 8 s, 10x at
|
||||
// 27 s) until it crashes; whoever cashes out first gets their bet times the
|
||||
// multiplier at that moment, and the others lose it. The crash point is
|
||||
// drawn when the flight starts, P(crash >= x) = (100% - edge) / x, so with
|
||||
// the 4% edge any way of playing gets back 96% on average. A crash at
|
||||
// 1.00x happens about 5% of the time, and the flight never goes past the cap
|
||||
// (100x). A player may set an automatic cash-out before the flight. Leaving
|
||||
// the server mid-flight cashes out at that moment, and closing the menu
|
||||
// doesn't (/casino crash opens it again). Every menu, the boss bar and the
|
||||
// action bar show the climb, 5 pictures a second. Added to the game as
|
||||
// `game::smp_casino_crash`; also a module of this crate, for its tests.
|
||||
|
||||
use super::smp_casino::{Color, FRAME_MS, Icon, Rng, Seat, Stake, filler, icon};
|
||||
use std::collections::VecDeque;
|
||||
|
||||
pub const BETTING_MS: i64 = 10_000;
|
||||
/// How long the crash stays shown before the next round may open.
|
||||
pub const SHOWN_MS: i64 = 3000;
|
||||
/// The multiplier doubles every 8 s.
|
||||
const DOUBLING_MS: f64 = 8000.0;
|
||||
/// The automatic cash-outs a player can pick, in hundredths (0: none).
|
||||
pub const AUTOS: [u32; 7] = [0, 150, 200, 300, 500, 1000, 2500];
|
||||
|
||||
pub const HELP: [&str; 1] = [
|
||||
"Crash: bet before the flight, then cash out before it crashes; you get your bet times the multiplier. P(crash at x or more) = 96% / x, capped at 100x: whatever you do, 96% is paid back on average (house edge 4%).",
|
||||
];
|
||||
|
||||
/// The multiplier, in hundredths, `ms` into a flight.
|
||||
pub fn multiple_at(ms: i64) -> u32 {
|
||||
let m = 100.0 * (ms.max(0) as f64 * std::f64::consts::LN_2 / DOUBLING_MS).exp();
|
||||
m.floor().min(f64::from(u32::MAX)) as u32
|
||||
}
|
||||
|
||||
/// The first millisecond the multiplier reaches `h` hundredths.
|
||||
pub fn time_to(h: u32) -> i64 {
|
||||
let mut t =
|
||||
((f64::from(h.max(100)) / 100.0).ln() / std::f64::consts::LN_2 * DOUBLING_MS).ceil() as i64;
|
||||
while t > 0 && multiple_at(t - 1) >= h {
|
||||
t -= 1;
|
||||
}
|
||||
while multiple_at(t) < h {
|
||||
t += 1;
|
||||
}
|
||||
t
|
||||
}
|
||||
|
||||
/// A crash point, in hundredths: P(>= x) = (1 - edge) / x, at least 1.00x,
|
||||
/// at most `max` (in whole times the bet).
|
||||
pub fn draw(rng: &mut Rng, edge_percent: i64, max: i64) -> u32 {
|
||||
let u = (rng.next_u64() >> 11) as f64 / (1u64 << 53) as f64;
|
||||
let keep = 1.0 - edge_percent.clamp(0, 99) as f64 / 100.0;
|
||||
let x = (100.0 * keep / (1.0 - u)).floor();
|
||||
x.clamp(100.0, (max.max(1) * 100) as f64) as u32
|
||||
}
|
||||
|
||||
/// "2.31x".
|
||||
pub fn times(h: u32) -> String {
|
||||
format!("{}.{:02}x", h / 100, h % 100)
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum Phase {
|
||||
Idle,
|
||||
Betting {
|
||||
ends: i64,
|
||||
},
|
||||
Flying {
|
||||
started: i64,
|
||||
crash: u32,
|
||||
crash_at: i64,
|
||||
},
|
||||
Crashed {
|
||||
at: i64,
|
||||
crash: u32,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Bet {
|
||||
pub stake: Stake,
|
||||
/// Cash out by itself at this multiplier (hundredths); 0: by hand.
|
||||
pub auto: u32,
|
||||
}
|
||||
|
||||
/// What moved in a step of the round.
|
||||
#[derive(Default, Debug)]
|
||||
pub struct Step {
|
||||
pub took_off: bool,
|
||||
/// Bets cashed out by their automatic cash-out: paid at that multiplier.
|
||||
pub cashed: Vec<(Bet, u32)>,
|
||||
/// The crash, and the bets still in: lost.
|
||||
pub crashed: Option<(u32, Vec<Bet>)>,
|
||||
}
|
||||
|
||||
pub struct Crash {
|
||||
pub phase: Phase,
|
||||
pub bets: Vec<Bet>,
|
||||
/// The last rounds' crash points, newest first.
|
||||
pub history: VecDeque<u32>,
|
||||
}
|
||||
|
||||
impl Default for Crash {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
phase: Phase::Idle,
|
||||
bets: Vec::new(),
|
||||
history: VecDeque::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Crash {
|
||||
pub fn busy(&self) -> bool {
|
||||
self.phase != Phase::Idle
|
||||
}
|
||||
pub fn playing(&self, uuid: u128) -> bool {
|
||||
self.bets.iter().any(|b| b.stake.uuid == uuid)
|
||||
}
|
||||
/// Whether a bet may be placed now (before a flight).
|
||||
pub fn open(&self) -> bool {
|
||||
matches!(self.phase, Phase::Idle | Phase::Betting { .. })
|
||||
}
|
||||
/// A held bet joins the next flight (`open` was checked).
|
||||
pub fn join(&mut self, stake: Stake, auto: u32, now: i64) {
|
||||
if self.phase == Phase::Idle {
|
||||
self.phase = Phase::Betting {
|
||||
ends: now + BETTING_MS,
|
||||
};
|
||||
}
|
||||
self.bets.push(Bet { stake, auto });
|
||||
}
|
||||
/// `uuid` cashes out: their bet and the multiplier, when the flight is
|
||||
/// still climbing. Once only: the bet leaves the round.
|
||||
pub fn cash_out(&mut self, uuid: u128, now: i64) -> Option<(Bet, u32)> {
|
||||
let Phase::Flying {
|
||||
started, crash_at, ..
|
||||
} = self.phase
|
||||
else {
|
||||
return None;
|
||||
};
|
||||
if now >= crash_at {
|
||||
return None;
|
||||
}
|
||||
let i = self.bets.iter().position(|b| b.stake.uuid == uuid)?;
|
||||
Some((self.bets.swap_remove(i), multiple_at(now - started)))
|
||||
}
|
||||
/// A bet taken back before the flight (its player left): None once flying.
|
||||
pub fn withdraw(&mut self, uuid: u128) -> Option<Bet> {
|
||||
if !matches!(self.phase, Phase::Betting { .. }) {
|
||||
return None;
|
||||
}
|
||||
let i = self.bets.iter().position(|b| b.stake.uuid == uuid)?;
|
||||
let bet = self.bets.swap_remove(i);
|
||||
if self.bets.is_empty() {
|
||||
self.phase = Phase::Idle;
|
||||
}
|
||||
Some(bet)
|
||||
}
|
||||
/// The round moves on to `now`.
|
||||
pub fn step(&mut self, now: i64, rng: &mut Rng, edge_percent: i64, max: i64) -> Step {
|
||||
let mut step = Step::default();
|
||||
if let Phase::Betting { ends } = self.phase
|
||||
&& now >= ends
|
||||
{
|
||||
let crash = draw(rng, edge_percent, max);
|
||||
self.phase = Phase::Flying {
|
||||
started: ends,
|
||||
crash,
|
||||
crash_at: ends + time_to(crash),
|
||||
};
|
||||
step.took_off = true;
|
||||
}
|
||||
if let Phase::Flying {
|
||||
started,
|
||||
crash,
|
||||
crash_at,
|
||||
} = self.phase
|
||||
{
|
||||
// Automatic cash-outs below the crash, reached by now.
|
||||
let mut i = 0;
|
||||
while i < self.bets.len() {
|
||||
let b = &self.bets[i];
|
||||
if b.auto > 0 && b.auto < crash && now >= started + time_to(b.auto) {
|
||||
let bet = self.bets.swap_remove(i);
|
||||
let at = bet.auto;
|
||||
step.cashed.push((bet, at));
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
if now >= crash_at {
|
||||
step.crashed = Some((crash, std::mem::take(&mut self.bets)));
|
||||
self.phase = Phase::Crashed {
|
||||
at: crash_at,
|
||||
crash,
|
||||
};
|
||||
self.history.push_front(crash);
|
||||
self.history.truncate(8);
|
||||
}
|
||||
}
|
||||
if let Phase::Crashed { at, .. } = self.phase
|
||||
&& now >= at + SHOWN_MS
|
||||
{
|
||||
self.phase = Phase::Idle;
|
||||
}
|
||||
step
|
||||
}
|
||||
/// The picture the round is at: it changes 5 times a second in flight,
|
||||
/// once a second before.
|
||||
pub fn frame(&self, now: i64) -> i64 {
|
||||
match self.phase {
|
||||
Phase::Idle => 0,
|
||||
Phase::Betting { ends } => 1_000_000 + (ends - now).max(0) / 1000,
|
||||
Phase::Flying { started, .. } => 2_000_000 + (now - started).max(0) / FRAME_MS,
|
||||
Phase::Crashed { .. } => 3_000_000,
|
||||
}
|
||||
}
|
||||
/// The multiplier now, in flight.
|
||||
pub fn now_multiple(&self, now: i64) -> Option<u32> {
|
||||
match self.phase {
|
||||
Phase::Flying { started, crash, .. } => Some(multiple_at(now - started).min(crash)),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The boss bar's line, colour and fill (0 to 100).
|
||||
pub fn boss(&self, now: i64, max: i64) -> Option<(String, Color, u32)> {
|
||||
let fill = |h: u32| {
|
||||
let f = (f64::from(h) / 100.0).ln() / (max.max(2) as f64).ln();
|
||||
(f * 100.0).clamp(0.0, 100.0) as u32
|
||||
};
|
||||
Some(match self.phase {
|
||||
Phase::Idle => return None,
|
||||
Phase::Betting { ends } => (
|
||||
format!(
|
||||
"Crash: takes off in {} s · {} bet(s) · /casino crash",
|
||||
((ends - now).max(0) + 999) / 1000,
|
||||
self.bets.len()
|
||||
),
|
||||
Color::Yellow,
|
||||
0,
|
||||
),
|
||||
Phase::Flying { .. } => {
|
||||
let h = self.now_multiple(now).unwrap_or(100);
|
||||
(format!("Crash: {}", times(h)), Color::Green, fill(h))
|
||||
}
|
||||
Phase::Crashed { crash, .. } => (
|
||||
format!("Crash: crashed at {}", times(crash)),
|
||||
Color::Red,
|
||||
fill(crash),
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
/// The crash menu's cells (all but the bottom row's shared cells).
|
||||
pub fn layout(&self, cells: &mut [Option<Icon>], uuid: u128, seat: &Seat, now: i64, max: i64) {
|
||||
// The chart: 9 columns of time, 4 rows of (log) multiplier.
|
||||
let (elapsed, top, crashed) = match self.phase {
|
||||
Phase::Flying { started, crash, .. } => {
|
||||
(now - started, multiple_at(now - started).min(crash), false)
|
||||
}
|
||||
Phase::Crashed { crash, .. } => (time_to(crash), crash, true),
|
||||
_ => (0, 100, false),
|
||||
};
|
||||
let level = |h: u32| {
|
||||
let f = (f64::from(h) / 100.0).ln() / (max.max(2) as f64).ln().min(5f64.ln() * 2.0);
|
||||
(f * 4.0).clamp(0.0, 4.0)
|
||||
};
|
||||
let fill = if crashed {
|
||||
"minecraft:red_stained_glass_pane"
|
||||
} else {
|
||||
"minecraft:lime_stained_glass_pane"
|
||||
};
|
||||
for col in 0..9usize {
|
||||
let h = multiple_at(elapsed * (col as i64 + 1) / 9);
|
||||
let l = level(h);
|
||||
for row in 0..4usize {
|
||||
let from_bottom = 3 - row;
|
||||
cells[row * 9 + col] = if elapsed > 0 && l > from_bottom as f64 {
|
||||
filler(fill)
|
||||
} else {
|
||||
filler("minecraft:black_stained_glass_pane")
|
||||
};
|
||||
}
|
||||
}
|
||||
if elapsed > 0 {
|
||||
let row = 3 - (level(top).ceil() as usize).clamp(1, 4).saturating_sub(1);
|
||||
let (item, color) = if crashed {
|
||||
("minecraft:tnt", Color::Red)
|
||||
} else {
|
||||
("minecraft:firework_rocket", Color::Green)
|
||||
};
|
||||
let name = if crashed {
|
||||
format!("Crashed at {}", times(top))
|
||||
} else {
|
||||
times(top)
|
||||
};
|
||||
cells[row * 9 + 8] = icon(item, name, color);
|
||||
}
|
||||
for c in &mut cells[36..45] {
|
||||
*c = filler("minecraft:gray_stained_glass_pane");
|
||||
}
|
||||
let status = match self.phase {
|
||||
Phase::Idle => "No round: the first bet opens one (10 s to join)".to_owned(),
|
||||
Phase::Betting { ends } => {
|
||||
format!("Takes off in {} s", ((ends - now).max(0) + 999) / 1000)
|
||||
}
|
||||
Phase::Flying { .. } => format!("Flying: {}", times(top)),
|
||||
Phase::Crashed { crash, .. } => format!("Crashed at {}", times(crash)),
|
||||
};
|
||||
cells[38] = icon("minecraft:clock", status, Color::Yellow);
|
||||
cells[39] = icon(
|
||||
"minecraft:paper",
|
||||
format!("{} bet(s) in this round", self.bets.len()),
|
||||
Color::White,
|
||||
);
|
||||
let past: Vec<String> = self.history.iter().take(6).map(|h| times(*h)).collect();
|
||||
cells[40] = icon(
|
||||
"minecraft:map",
|
||||
if past.is_empty() {
|
||||
"Last crashes: none yet".to_owned()
|
||||
} else {
|
||||
format!("Last crashes: {}", past.join(", "))
|
||||
},
|
||||
Color::Gray,
|
||||
);
|
||||
cells[42] = icon(
|
||||
"minecraft:repeater",
|
||||
match seat.crash_auto {
|
||||
0 => "Auto cash-out: off (click to set)".to_owned(),
|
||||
a => format!("Auto cash-out at {} (click to change)", times(a)),
|
||||
},
|
||||
Color::Aqua,
|
||||
);
|
||||
let mine = self.bets.iter().find(|b| b.stake.uuid == uuid);
|
||||
cells[53] = match (self.phase, mine) {
|
||||
(Phase::Flying { .. }, Some(b)) => icon(
|
||||
"minecraft:gold_block",
|
||||
format!(
|
||||
"CASH OUT at {}: {}",
|
||||
times(top),
|
||||
b.stake.amount * i64::from(top) / 100
|
||||
),
|
||||
Color::Gold,
|
||||
),
|
||||
(Phase::Idle | Phase::Betting { .. }, Some(b)) => icon(
|
||||
"minecraft:lime_stained_glass",
|
||||
format!("Your bet is in: {}", b.stake.amount),
|
||||
Color::Green,
|
||||
),
|
||||
(Phase::Idle | Phase::Betting { .. }, None) => {
|
||||
icon("minecraft:lime_concrete", "BET", Color::Green)
|
||||
}
|
||||
_ => icon(
|
||||
"minecraft:gray_concrete",
|
||||
"Wait for the next round",
|
||||
Color::Gray,
|
||||
),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::smp_casino::{Fx, Game, POT, View, tests::*};
|
||||
use super::*;
|
||||
|
||||
fn stake(uuid: u128, amount: i64) -> Stake {
|
||||
Stake {
|
||||
uuid,
|
||||
name: "x".into(),
|
||||
game: Game::Crash,
|
||||
amount,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_curve_and_its_inverse() {
|
||||
assert_eq!(multiple_at(0), 100);
|
||||
assert_eq!(multiple_at(8000), 200);
|
||||
assert_eq!(multiple_at(16_000), 400);
|
||||
for h in [100, 101, 150, 199, 200, 231, 1000, 10_000] {
|
||||
let t = time_to(h);
|
||||
assert!(
|
||||
multiple_at(t) >= h && (t == 0 || multiple_at(t - 1) < h),
|
||||
"{h}"
|
||||
);
|
||||
}
|
||||
assert_eq!(times(231), "2.31x");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn crash_points_follow_96_over_x() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
let n = 200_000;
|
||||
let points: Vec<u32> = (0..n).map(|_| draw(&mut rng, 4, 100)).collect();
|
||||
let share = |x: u32| points.iter().filter(|p| **p >= x).count() as f64 / n as f64;
|
||||
for x in [100, 150, 200, 500, 1000] {
|
||||
let expected = if x == 100 {
|
||||
1.0
|
||||
} else {
|
||||
0.96 * 100.0 / f64::from(x)
|
||||
};
|
||||
assert!(
|
||||
(share(x) - expected).abs() < 0.01,
|
||||
"{x}: {} vs {expected}",
|
||||
share(x)
|
||||
);
|
||||
}
|
||||
let instant = points.iter().filter(|p| **p == 100).count() as f64 / n as f64;
|
||||
// Below 1.01x, shown as 1.00x: 1 - 96/101.
|
||||
assert!((instant - 0.0495).abs() < 0.005, "{instant}");
|
||||
assert!(points.iter().all(|p| (100..=10_000).contains(p)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_round_cashes_out_by_hand_and_by_itself_then_crashes() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
let mut c = Crash::default();
|
||||
c.join(stake(A, 100), 0, 0);
|
||||
c.join(stake(B, 100), 150, 1000);
|
||||
assert_eq!(c.phase, Phase::Betting { ends: BETTING_MS });
|
||||
assert!(c.cash_out(A, 5000).is_none(), "not before the flight");
|
||||
// A crash at 3.00x.
|
||||
|
||||
c.phase = Phase::Flying {
|
||||
started: BETTING_MS,
|
||||
crash: 300,
|
||||
crash_at: BETTING_MS + time_to(300),
|
||||
};
|
||||
let s = c.step(BETTING_MS + time_to(150), &mut rng, 4, 100);
|
||||
assert_eq!(s.cashed.len(), 1);
|
||||
assert_eq!((s.cashed[0].0.stake.uuid, s.cashed[0].1), (B, 150));
|
||||
let (bet, m) = c.cash_out(A, BETTING_MS + 8000).unwrap();
|
||||
assert_eq!((bet.stake.uuid, m), (A, 200));
|
||||
assert!(c.cash_out(A, BETTING_MS + 8100).is_none(), "once");
|
||||
c.join(stake(B, 50), 0, 0);
|
||||
let s = c.step(BETTING_MS + time_to(300), &mut rng, 4, 100);
|
||||
let (crash, lost) = s.crashed.unwrap();
|
||||
assert_eq!((crash, lost.len()), (300, 1));
|
||||
assert!(
|
||||
c.cash_out(B, BETTING_MS + time_to(300)).is_none(),
|
||||
"too late"
|
||||
);
|
||||
c.step(BETTING_MS + time_to(300) + SHOWN_MS, &mut rng, 4, 100);
|
||||
assert_eq!(c.phase, Phase::Idle);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn through_the_casino_every_bet_is_paid_once_and_leaving_cashes_out() {
|
||||
let (mut e, mut c, dir) = setup("crash", 100_000);
|
||||
let before = money(&e);
|
||||
for (u, n) in [(A, "Alex"), (B, "Steve")] {
|
||||
c.sit(u, n, View::Crash);
|
||||
c.seats.get_mut(&u).unwrap().window = Some(7);
|
||||
c.click(&mut e, u, 53, false, 0);
|
||||
c.click(&mut e, u, 53, false, 20);
|
||||
}
|
||||
assert_eq!((e.held(A), e.held(B)), (10, 10), "double clicks bet once");
|
||||
c.tick(&mut e, BETTING_MS);
|
||||
let Phase::Flying {
|
||||
crash, crash_at, ..
|
||||
} = c.crash.phase
|
||||
else {
|
||||
panic!("{:?}", c.crash.phase)
|
||||
};
|
||||
// Steve leaves the server right away; Alex keeps flying.
|
||||
c.gone(&mut e, &[A], BETTING_MS);
|
||||
assert_eq!(e.held(B), 0);
|
||||
assert_eq!(
|
||||
e.balance(B),
|
||||
10_000 - 10 + 10 * 100 / 100,
|
||||
"cashed out at 1.00x"
|
||||
);
|
||||
// Closing the menu doesn't cash out.
|
||||
assert!(c.closed(A, 7, 0));
|
||||
let mut t = BETTING_MS;
|
||||
while t <= crash_at + SHOWN_MS {
|
||||
c.tick(&mut e, t);
|
||||
t += 50;
|
||||
}
|
||||
c.tick(&mut e, crash_at + SHOWN_MS);
|
||||
assert_eq!(e.held(A), 0);
|
||||
assert_eq!(
|
||||
e.balance(A),
|
||||
9990,
|
||||
"lost: no cash-out before {}",
|
||||
times(crash)
|
||||
);
|
||||
assert_eq!(money(&e), before);
|
||||
assert!(!c.animating());
|
||||
let _ = e.pool(POT);
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_flight_is_drawn_at_take_off_and_shown_5_times_a_second() {
|
||||
let (mut e, mut c, dir) = setup("crash-frames", 100_000);
|
||||
c.sit(A, "Alex", View::Crash);
|
||||
c.seats.get_mut(&A).unwrap().window = Some(7);
|
||||
c.seats.get_mut(&A).unwrap().crash_auto = 0;
|
||||
c.click(&mut e, A, 53, false, 0);
|
||||
c.tick(&mut e, BETTING_MS);
|
||||
c.crash.phase = Phase::Flying {
|
||||
started: BETTING_MS,
|
||||
crash: 10_000,
|
||||
crash_at: BETTING_MS + time_to(10_000),
|
||||
};
|
||||
let mut shows = 0;
|
||||
for t in (BETTING_MS + 1..BETTING_MS + 2002).step_by(50) {
|
||||
shows += c
|
||||
.tick(&mut e, t)
|
||||
.iter()
|
||||
.filter(|f| matches!(f, Fx::Show(A)))
|
||||
.count();
|
||||
}
|
||||
assert_eq!(shows, 10, "2 s of flight, 10 pictures");
|
||||
// A cash-out click at 1.00x + 2 s.
|
||||
let t = BETTING_MS + 2000;
|
||||
c.click(&mut e, A, 53, false, t);
|
||||
let m = i64::from(multiple_at(2000));
|
||||
assert_eq!(e.balance(A), 10_000 - 10 + 10 * m / 100);
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn playing_any_way_pays_back_about_96_percent() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
let n = 100_000;
|
||||
for target in [110u32, 200, 500, 2000] {
|
||||
let mut back = 0i64;
|
||||
for _ in 0..n {
|
||||
let crash = draw(&mut rng, 4, 100);
|
||||
if target < crash {
|
||||
back += i64::from(target);
|
||||
}
|
||||
}
|
||||
let rtp = back as f64 / (n as f64 * 100.0);
|
||||
assert!((0.90..1.02).contains(&rtp), "{target}: {rtp}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,527 +0,0 @@
|
||||
// The casino's roulette: European, one zero, 37 pockets in the wheel's real
|
||||
// order. One bet a spin (a number, red or black, odd or even, 1-18 or 19-36,
|
||||
// a dozen, a column), paid at the true odds, so the house's edge is the zero:
|
||||
// 1/37 = 2.70% on every bet. The pocket is drawn the moment the player
|
||||
// spins; the menu's top rows then show the wheel turning under a pointer,
|
||||
// fast first and slowing down to land on it (20 pictures over 4 s). Closing
|
||||
// the menu or leaving doesn't stop it: the round ends and is paid all the
|
||||
// same. Added to the game as `game::smp_casino_roulette`; also a module of
|
||||
// this crate, for its tests.
|
||||
|
||||
use super::smp_casino::{Color, FRAME_MS, Icon, Rng, Seat, Stake, View, filler, icon};
|
||||
|
||||
/// The pockets in the order they sit on the wheel.
|
||||
pub const WHEEL: [u8; 37] = [
|
||||
0, 32, 15, 19, 4, 21, 2, 25, 17, 34, 6, 27, 13, 36, 11, 30, 8, 23, 10, 5, 24, 16, 33, 1, 20,
|
||||
14, 31, 9, 22, 18, 29, 7, 28, 12, 35, 3, 26,
|
||||
];
|
||||
const RED: [u8; 18] = [
|
||||
1, 3, 5, 7, 9, 12, 14, 16, 18, 19, 21, 23, 25, 27, 30, 32, 34, 36,
|
||||
];
|
||||
/// Pictures of a spin, `FRAME_MS` apart.
|
||||
pub const FRAMES: i64 = 20;
|
||||
|
||||
pub const HELP: [&str; 2] = [
|
||||
"Roulette (European, one zero, 37 pockets): a number pays 35 to 1; a dozen or a column 2 to 1; red, black, odd, even, 1-18, 19-36 1 to 1.",
|
||||
"Zero loses every bet but a bet on 0. House edge 2.70% on every bet (97.3% paid back on average).",
|
||||
];
|
||||
|
||||
pub fn is_red(n: u8) -> bool {
|
||||
RED.contains(&n)
|
||||
}
|
||||
|
||||
/// "17 Black".
|
||||
pub fn pocket_name(n: u8) -> String {
|
||||
let colour = match n {
|
||||
0 => "Green",
|
||||
n if is_red(n) => "Red",
|
||||
_ => "Black",
|
||||
};
|
||||
format!("{n} {colour}")
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum Bet {
|
||||
Number(u8),
|
||||
Red,
|
||||
Black,
|
||||
Odd,
|
||||
Even,
|
||||
Low,
|
||||
High,
|
||||
/// 1: 1-12, 2: 13-24, 3: 25-36.
|
||||
Dozen(u8),
|
||||
/// 1: 1, 4, 7... 34; 2: 2, 5... 35; 3: 3, 6... 36.
|
||||
Column(u8),
|
||||
}
|
||||
|
||||
impl Bet {
|
||||
pub fn wins(self, n: u8) -> bool {
|
||||
if n == 0 {
|
||||
return self == Bet::Number(0);
|
||||
}
|
||||
match self {
|
||||
Bet::Number(k) => k == n,
|
||||
Bet::Red => is_red(n),
|
||||
Bet::Black => !is_red(n),
|
||||
Bet::Odd => !n.is_multiple_of(2),
|
||||
Bet::Even => n.is_multiple_of(2),
|
||||
Bet::Low => n <= 18,
|
||||
Bet::High => n >= 19,
|
||||
Bet::Dozen(d) => (n - 1) / 12 + 1 == d,
|
||||
Bet::Column(c) => (n - 1) % 3 + 1 == c,
|
||||
}
|
||||
}
|
||||
/// What a winning bet pays back for each coin staked, the stake included.
|
||||
pub fn multiple(self) -> i64 {
|
||||
match self {
|
||||
Bet::Number(_) => 36,
|
||||
Bet::Dozen(_) | Bet::Column(_) => 3,
|
||||
_ => 2,
|
||||
}
|
||||
}
|
||||
/// What the bet pays back on pocket `n`: 0 when it loses.
|
||||
pub fn payout(self, n: u8, stake: i64) -> i64 {
|
||||
if self.wins(n) {
|
||||
stake * self.multiple()
|
||||
} else {
|
||||
0
|
||||
}
|
||||
}
|
||||
pub fn label(self) -> String {
|
||||
match self {
|
||||
Bet::Number(n) => format!("{n}"),
|
||||
Bet::Red => "Red".into(),
|
||||
Bet::Black => "Black".into(),
|
||||
Bet::Odd => "Odd".into(),
|
||||
Bet::Even => "Even".into(),
|
||||
Bet::Low => "1 to 18".into(),
|
||||
Bet::High => "19 to 36".into(),
|
||||
Bet::Dozen(d) => format!(
|
||||
"{} 12",
|
||||
["1st", "2nd", "3rd"][usize::from(d.clamp(1, 3) - 1)]
|
||||
),
|
||||
Bet::Column(c) => format!("Column {c}"),
|
||||
}
|
||||
}
|
||||
fn odds(self) -> &'static str {
|
||||
match self.multiple() {
|
||||
36 => "35 to 1",
|
||||
3 => "2 to 1",
|
||||
_ => "1 to 1",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A player's table: the bet chosen, where the wheel stopped, the last
|
||||
/// pocket and whether it won.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct Table {
|
||||
pub bet: Option<Bet>,
|
||||
/// The wheel's index under the pointer.
|
||||
pub at: usize,
|
||||
pub last: Option<(u8, bool)>,
|
||||
}
|
||||
|
||||
/// A spin: drawn when it starts, paid when its last picture is shown.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Spin {
|
||||
pub stake: Stake,
|
||||
pub bet: Bet,
|
||||
/// The wheel's index under the pointer at the start, and where it stops.
|
||||
pub from: usize,
|
||||
pub stop: usize,
|
||||
/// Pockets the wheel passes: two turns and the way to `stop`.
|
||||
pub total: i64,
|
||||
pub started: i64,
|
||||
}
|
||||
|
||||
impl Spin {
|
||||
/// The wheel's index under the pointer at frame `f` (0..=FRAMES): an
|
||||
/// ease-out, fast first, the last pockets one by one.
|
||||
pub fn position(&self, f: i64) -> usize {
|
||||
let f = f.clamp(0, FRAMES);
|
||||
let done = self.total * (FRAMES * FRAMES - (FRAMES - f) * (FRAMES - f)) / (FRAMES * FRAMES);
|
||||
(self.from + done as usize) % 37
|
||||
}
|
||||
fn frame(&self, now: i64) -> i64 {
|
||||
((now - self.started) / FRAME_MS).clamp(0, FRAMES)
|
||||
}
|
||||
#[cfg(test)]
|
||||
pub fn test(stake: Stake) -> Self {
|
||||
Self {
|
||||
stake,
|
||||
bet: Bet::Red,
|
||||
from: 0,
|
||||
stop: 0,
|
||||
total: 74,
|
||||
started: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The spins under way.
|
||||
#[derive(Default)]
|
||||
pub struct Roulette {
|
||||
pub rounds: Vec<Spin>,
|
||||
}
|
||||
|
||||
impl Roulette {
|
||||
pub fn busy(&self) -> bool {
|
||||
!self.rounds.is_empty()
|
||||
}
|
||||
pub fn playing(&self, uuid: u128) -> bool {
|
||||
self.rounds.iter().any(|s| s.stake.uuid == uuid)
|
||||
}
|
||||
/// The bet is held: the pocket is drawn now, the wheel starts at `from`.
|
||||
pub fn spin(&mut self, stake: Stake, bet: Bet, from: usize, now: i64, rng: &mut Rng) {
|
||||
let stop = rng.below(37) as usize;
|
||||
let from = from % 37;
|
||||
self.rounds.push(Spin {
|
||||
stake,
|
||||
bet,
|
||||
from,
|
||||
stop,
|
||||
total: 74 + ((stop + 37 - from) % 37) as i64,
|
||||
started: now,
|
||||
});
|
||||
}
|
||||
/// The picture `uuid`'s spin is at.
|
||||
pub fn frame(&self, uuid: u128, now: i64) -> Option<i64> {
|
||||
self.rounds
|
||||
.iter()
|
||||
.find(|s| s.stake.uuid == uuid)
|
||||
.map(|s| s.frame(now))
|
||||
}
|
||||
/// The spins whose wheel has stopped, each with its pocket: taken out,
|
||||
/// to be paid once.
|
||||
pub fn ended(&mut self, now: i64) -> Vec<(Spin, u8)> {
|
||||
let mut out = Vec::new();
|
||||
let mut i = 0;
|
||||
while i < self.rounds.len() {
|
||||
if now - self.rounds[i].started >= FRAMES * FRAME_MS {
|
||||
let s = self.rounds.swap_remove(i);
|
||||
let n = WHEEL[s.stop];
|
||||
out.push((s, n));
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// The table's cells (all but the bottom row).
|
||||
pub fn layout(&self, cells: &mut [Option<Icon>], uuid: u128, seat: &Seat, now: i64) {
|
||||
let t = &seat.roulette;
|
||||
if seat.view == View::RouletteNumbers {
|
||||
for n in 1..=36u8 {
|
||||
cells[usize::from(n) - 1] = pocket(n, Some(Bet::Number(n)) == t.bet);
|
||||
}
|
||||
for c in &mut cells[36..45] {
|
||||
*c = filler("minecraft:gray_stained_glass_pane");
|
||||
}
|
||||
cells[36] = icon("minecraft:arrow", "Back to the table", Color::White);
|
||||
cells[40] = pocket(0, t.bet == Some(Bet::Number(0)));
|
||||
return;
|
||||
}
|
||||
let spin = self.rounds.iter().find(|s| s.stake.uuid == uuid);
|
||||
let at = spin.map_or(t.at, |s| s.position(s.frame(now)));
|
||||
for c in &mut cells[..9] {
|
||||
*c = filler("minecraft:black_stained_glass_pane");
|
||||
}
|
||||
let pointer = match (spin, t.last) {
|
||||
(Some(_), _) => "The wheel turns...".to_owned(),
|
||||
(None, Some((n, true))) => format!("{}: you won!", pocket_name(n)),
|
||||
(None, Some((n, false))) => format!("{}: no luck", pocket_name(n)),
|
||||
(None, None) => "The ball lands under this arrow".to_owned(),
|
||||
};
|
||||
cells[4] = icon("minecraft:hopper", pointer, Color::Yellow);
|
||||
for k in 0..9 {
|
||||
let n = WHEEL[(at + 37 + k - 4) % 37];
|
||||
cells[9 + k] = pocket(n, false);
|
||||
}
|
||||
let bets: [(usize, Bet, &'static str); 15] = [
|
||||
(18, Bet::Red, "minecraft:red_wool"),
|
||||
(19, Bet::Black, "minecraft:black_wool"),
|
||||
(20, Bet::Odd, "minecraft:white_wool"),
|
||||
(21, Bet::Even, "minecraft:gray_wool"),
|
||||
(22, Bet::Low, "minecraft:cyan_terracotta"),
|
||||
(23, Bet::High, "minecraft:purple_terracotta"),
|
||||
(24, Bet::Dozen(1), "minecraft:light_blue_concrete"),
|
||||
(25, Bet::Dozen(2), "minecraft:light_blue_concrete"),
|
||||
(26, Bet::Dozen(3), "minecraft:light_blue_concrete"),
|
||||
(27, Bet::Column(1), "minecraft:yellow_concrete"),
|
||||
(28, Bet::Column(2), "minecraft:yellow_concrete"),
|
||||
(29, Bet::Column(3), "minecraft:yellow_concrete"),
|
||||
(33, Bet::Number(0), "minecraft:lime_concrete"),
|
||||
(30, Bet::Low, ""),
|
||||
(31, Bet::Low, ""),
|
||||
];
|
||||
for (slot, bet, item) in bets {
|
||||
if item.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let chosen = t.bet == Some(bet);
|
||||
let name = format!(
|
||||
"{}{} (pays {})",
|
||||
if chosen { "» " } else { "" },
|
||||
bet.label(),
|
||||
bet.odds()
|
||||
);
|
||||
let mut i = icon(
|
||||
item,
|
||||
name,
|
||||
if chosen { Color::Yellow } else { Color::White },
|
||||
);
|
||||
if let (Some(i), Bet::Dozen(k) | Bet::Column(k)) = (i.as_mut(), bet) {
|
||||
i.count = k;
|
||||
}
|
||||
cells[slot] = i;
|
||||
}
|
||||
for slot in [30, 32, 34, 35] {
|
||||
cells[slot] = filler("minecraft:gray_stained_glass_pane");
|
||||
}
|
||||
let number = match t.bet {
|
||||
Some(Bet::Number(n)) if n > 0 => format!("» Number {n} (pays 35 to 1): pick another"),
|
||||
_ => "A single number (pays 35 to 1)...".into(),
|
||||
};
|
||||
cells[31] = icon("minecraft:target", number, Color::White);
|
||||
let shade = match (spin.is_some(), t.last) {
|
||||
(false, Some((_, true))) => "minecraft:lime_stained_glass_pane",
|
||||
(false, Some((_, false))) => "minecraft:red_stained_glass_pane",
|
||||
_ => "minecraft:gray_stained_glass_pane",
|
||||
};
|
||||
for c in &mut cells[36..45] {
|
||||
*c = filler(shade);
|
||||
}
|
||||
cells[40] = icon(
|
||||
"minecraft:paper",
|
||||
match t.bet {
|
||||
Some(b) => format!("Your bet: {} (pays {})", b.label(), b.odds()),
|
||||
None => "Pick a bet above, then spin".into(),
|
||||
},
|
||||
Color::White,
|
||||
);
|
||||
cells[53] = if spin.is_some() {
|
||||
icon("minecraft:gray_concrete", "The wheel turns...", Color::Gray)
|
||||
} else {
|
||||
icon("minecraft:lime_concrete", "SPIN", Color::Green)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// A pocket as a cell: its colour, its number as the count.
|
||||
fn pocket(n: u8, chosen: bool) -> Option<Icon> {
|
||||
let item = match n {
|
||||
0 => "minecraft:lime_concrete",
|
||||
n if is_red(n) => "minecraft:red_concrete",
|
||||
_ => "minecraft:black_concrete",
|
||||
};
|
||||
let name = format!("{}{}", if chosen { "» " } else { "" }, pocket_name(n));
|
||||
let mut i = icon(
|
||||
item,
|
||||
name,
|
||||
if chosen { Color::Yellow } else { Color::White },
|
||||
);
|
||||
if let Some(i) = i.as_mut() {
|
||||
i.count = n.max(1);
|
||||
}
|
||||
i
|
||||
}
|
||||
|
||||
/// What a click on the table does.
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum Click {
|
||||
Nothing,
|
||||
Show,
|
||||
Spin,
|
||||
}
|
||||
|
||||
/// A click on the table (not its bottom row).
|
||||
pub fn click(seat: &mut Seat, slot: usize) -> Click {
|
||||
let t = &mut seat.roulette;
|
||||
if seat.view == View::RouletteNumbers {
|
||||
let bet = match slot {
|
||||
0..36 => Bet::Number(slot as u8 + 1),
|
||||
40 => Bet::Number(0),
|
||||
36 => {
|
||||
seat.view = View::Roulette;
|
||||
return Click::Show;
|
||||
}
|
||||
_ => return Click::Nothing,
|
||||
};
|
||||
t.bet = Some(bet);
|
||||
seat.view = View::Roulette;
|
||||
return Click::Show;
|
||||
}
|
||||
let bet = match slot {
|
||||
18 => Bet::Red,
|
||||
19 => Bet::Black,
|
||||
20 => Bet::Odd,
|
||||
21 => Bet::Even,
|
||||
22 => Bet::Low,
|
||||
23 => Bet::High,
|
||||
24..=26 => Bet::Dozen(slot as u8 - 23),
|
||||
27..=29 => Bet::Column(slot as u8 - 26),
|
||||
33 => Bet::Number(0),
|
||||
31 => {
|
||||
seat.view = View::RouletteNumbers;
|
||||
return Click::Show;
|
||||
}
|
||||
53 => return Click::Spin,
|
||||
_ => return Click::Nothing,
|
||||
};
|
||||
t.bet = Some(bet);
|
||||
Click::Show
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::smp_casino::{Fx, Game, POT, tests::*};
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn the_wheel_holds_each_number_once_and_the_colours_alternate() {
|
||||
let mut seen = WHEEL.to_vec();
|
||||
seen.sort_unstable();
|
||||
assert_eq!(seen, (0..=36).collect::<Vec<u8>>());
|
||||
for pair in WHEEL[1..].windows(2) {
|
||||
assert_ne!(is_red(pair[0]), is_red(pair[1]), "{pair:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_bet_pays_its_true_odds_and_the_edge_is_one_in_37() {
|
||||
let mut bets = vec![
|
||||
Bet::Red,
|
||||
Bet::Black,
|
||||
Bet::Odd,
|
||||
Bet::Even,
|
||||
Bet::Low,
|
||||
Bet::High,
|
||||
];
|
||||
bets.extend((1..=3).flat_map(|k| [Bet::Dozen(k), Bet::Column(k)]));
|
||||
bets.extend((0..=36).map(Bet::Number));
|
||||
for bet in bets {
|
||||
let winners = (0..=36u8).filter(|n| bet.wins(*n)).count() as i64;
|
||||
assert_eq!(
|
||||
winners * bet.multiple(),
|
||||
36,
|
||||
"{bet:?}: 36 of 37 coins paid back"
|
||||
);
|
||||
// Over the 37 pockets, a stake of 37 x 100 gets back 36 x 100.
|
||||
let back: i64 = (0..=36).map(|n| bet.payout(n, 100)).sum();
|
||||
assert_eq!(back, 3600, "{bet:?}");
|
||||
}
|
||||
assert!(!Bet::Red.wins(0) && !Bet::Even.wins(0) && !Bet::Low.wins(0));
|
||||
assert!(Bet::Column(1).wins(34) && Bet::Column(3).wins(36) && Bet::Dozen(3).wins(25));
|
||||
assert_eq!(Bet::Number(17).payout(17, 10), 360);
|
||||
assert_eq!(Bet::Dozen(2).payout(13, 10), 30);
|
||||
assert_eq!(Bet::Black.payout(17, 10), 20);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_wheel_slows_down_and_lands_on_the_drawn_pocket() {
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
for from in [0, 5, 36] {
|
||||
for _ in 0..50 {
|
||||
let mut r = Roulette::default();
|
||||
let stake = Stake {
|
||||
uuid: A,
|
||||
name: "Alex".into(),
|
||||
game: Game::Roulette,
|
||||
amount: 10,
|
||||
};
|
||||
r.spin(stake, Bet::Red, from, 0, &mut rng);
|
||||
let s = &r.rounds[0];
|
||||
assert_eq!(s.position(0), from);
|
||||
assert_eq!(s.position(FRAMES), s.stop);
|
||||
let steps: Vec<i64> = (1..=FRAMES)
|
||||
.map(|f| {
|
||||
let done = |f: i64| {
|
||||
s.total * (FRAMES * FRAMES - (FRAMES - f).pow(2)) / (FRAMES * FRAMES)
|
||||
};
|
||||
done(f) - done(f - 1)
|
||||
})
|
||||
.collect();
|
||||
assert!(
|
||||
steps.windows(2).all(|w| w[0] >= w[1] - 1),
|
||||
"slows down: {steps:?}"
|
||||
);
|
||||
assert!(steps[0] >= 7 && *steps.last().unwrap() <= 1, "{steps:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_spin_through_the_menu_pays_once_even_when_the_menu_closes() {
|
||||
let (mut e, mut c, dir) = setup("roulette", 50_000);
|
||||
let before = money(&e);
|
||||
c.sit(A, "Alex", View::Roulette);
|
||||
c.seats.get_mut(&A).unwrap().window = Some(3);
|
||||
assert!(
|
||||
c.click(&mut e, A, 53, false, 0)
|
||||
.iter()
|
||||
.any(|f| matches!(f, Fx::Bar { .. })),
|
||||
"no bet yet"
|
||||
);
|
||||
c.click(&mut e, A, 49, false, 0);
|
||||
assert_eq!(c.seats[&A].stake, 25);
|
||||
c.click(&mut e, A, 18, false, 0);
|
||||
assert_eq!(c.seats[&A].roulette.bet, Some(Bet::Red));
|
||||
c.click(&mut e, A, 53, false, 0);
|
||||
// A double click: the second spin is refused, nothing more held.
|
||||
c.click(&mut e, A, 53, false, 50);
|
||||
assert_eq!(e.held(A), 25);
|
||||
// Frames: one picture per 200 ms, not per tick.
|
||||
let shows = |fx: &[Fx]| fx.iter().filter(|f| matches!(f, Fx::Show(A))).count();
|
||||
assert_eq!(
|
||||
shows(&c.tick(&mut e, 10)),
|
||||
0,
|
||||
"the spin's click showed frame 0"
|
||||
);
|
||||
assert_eq!(shows(&c.tick(&mut e, 210)), 1);
|
||||
assert_eq!(shows(&c.tick(&mut e, 260)), 0);
|
||||
assert_eq!(shows(&c.tick(&mut e, 400)), 1);
|
||||
// The menu closes mid-spin: the round still ends and is paid, once.
|
||||
assert!(c.closed(A, 3, 0));
|
||||
let n = WHEEL[c.roulette.rounds[0].stop];
|
||||
c.tick(&mut e, 3999);
|
||||
assert_eq!(e.held(A), 25, "not before the wheel stops");
|
||||
c.tick(&mut e, 4000);
|
||||
c.tick(&mut e, 4200);
|
||||
assert_eq!(e.held(A), 0);
|
||||
let expected = 10_000 - 25 + Bet::Red.payout(n, 25);
|
||||
assert_eq!(e.balance(A), expected);
|
||||
assert_eq!(money(&e), before);
|
||||
assert_eq!(c.ledger.totals["roulette"].rounds, 1);
|
||||
assert!(!c.animating());
|
||||
let _ = e.pool(POT);
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn many_spins_keep_about_the_house_edge() {
|
||||
let (mut e, mut c, dir) = setup("edge", 1_000_000_000);
|
||||
c.config.daily_loss_cap = i64::MAX / 4;
|
||||
c.config.daily_win_cap = i64::MAX / 4;
|
||||
c.config.cooldown_ms = 0;
|
||||
let mut rng = Rng::from_seed([3; 32]);
|
||||
let mut now = 0;
|
||||
for i in 0..20_000 {
|
||||
if e.balance(A) < 100 {
|
||||
e.adjust("eco_give", A, 1_000_000, "test").unwrap();
|
||||
}
|
||||
let stake = c.bet(&mut e, A, "Alex", Game::Roulette, 10, now).unwrap();
|
||||
// Even-money bets: little spread, so 20,000 spins show the edge.
|
||||
let bet = if i % 2 == 0 { Bet::Red } else { Bet::Odd };
|
||||
c.roulette.spin(stake, bet, 0, now, &mut rng);
|
||||
now += FRAMES * FRAME_MS;
|
||||
c.tick(&mut e, now);
|
||||
}
|
||||
let t = &c.ledger.totals["roulette"];
|
||||
let rtp = t.paid as f64 / t.wagered as f64;
|
||||
assert!((0.94..1.0).contains(&rtp), "{rtp}");
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
}
|
||||
@@ -1,298 +0,0 @@
|
||||
// The casino's slot machine: three reels of 32 stops with item symbols, one
|
||||
// payline (the middle row). Each reel's stop is drawn when the player pulls
|
||||
// the lever; the reels then scroll in the menu and stop one after another
|
||||
// (at 1.6, 2.4 and 3.2 s), and the line is paid from the published paytable:
|
||||
// three of a kind, or two berries anywhere on it. The reels hold each symbol
|
||||
// a fixed number of times, so the odds are exact: 94.2% of what is staked is
|
||||
// paid back on average (the test enumerates all 32,768 lines), and one pull
|
||||
// in 4.5 pays. Closing the menu or leaving doesn't stop a pull: it ends and
|
||||
// is paid all the same. Added to the game as `game::smp_casino_slots`; also
|
||||
// a module of this crate, for its tests.
|
||||
|
||||
use super::smp_casino::{Color, FRAME_MS, Icon, Rng, Seat, Stake, filler, icon};
|
||||
|
||||
/// The symbols: item, name, stops on each reel, what three on the line pay
|
||||
/// for each coin staked (the stake included).
|
||||
pub const SYMBOLS: [(&str, &str, usize, i64); 6] = [
|
||||
("minecraft:sweet_berries", "Berries", 9, 6),
|
||||
("minecraft:melon_slice", "Melon", 8, 10),
|
||||
("minecraft:golden_apple", "Golden Apple", 7, 15),
|
||||
("minecraft:emerald", "Emerald", 5, 30),
|
||||
("minecraft:diamond", "Diamond", 2, 100),
|
||||
("minecraft:nether_star", "Nether Star", 1, 500),
|
||||
];
|
||||
/// Two berries on the line (not three) pay this for each coin staked.
|
||||
pub const TWO_BERRIES: i64 = 2;
|
||||
const BERRIES: u8 = 0;
|
||||
pub const STOPS: usize = 32;
|
||||
|
||||
/// The reels, by stop: indices into `SYMBOLS`, no symbol twice in a row.
|
||||
pub const REELS: [[u8; STOPS]; 3] = [
|
||||
[
|
||||
1, 0, 2, 3, 1, 4, 0, 1, 3, 1, 0, 5, 1, 2, 0, 1, 0, 2, 0, 2, 3, 2, 3, 2, 0, 1, 2, 1, 0, 4,
|
||||
3, 0,
|
||||
],
|
||||
[
|
||||
1, 5, 0, 1, 0, 1, 2, 3, 1, 0, 2, 3, 0, 3, 2, 4, 2, 1, 0, 1, 2, 0, 3, 2, 4, 1, 0, 2, 3, 0,
|
||||
1, 0,
|
||||
],
|
||||
[
|
||||
0, 1, 4, 3, 1, 0, 2, 0, 2, 3, 2, 0, 3, 0, 2, 1, 0, 4, 1, 2, 1, 2, 1, 3, 0, 1, 0, 2, 3, 0,
|
||||
1, 5,
|
||||
],
|
||||
];
|
||||
/// The frame each reel stops at; the pull is paid at the last.
|
||||
pub const STOP_AT: [i64; 3] = [8, 12, 16];
|
||||
pub const FRAMES: i64 = 16;
|
||||
|
||||
pub const HELP: [&str; 2] = [
|
||||
"Slots (3 reels of 32 stops, one line): three Nether Stars pay 500x, Diamonds 100x, Emeralds 30x, Golden Apples 15x, Melons 10x, Berries 6x; two Berries 2x (the stake included).",
|
||||
"Each reel holds 9 Berries, 8 Melons, 7 Golden Apples, 5 Emeralds, 2 Diamonds, 1 Nether Star: 94.2% paid back on average (house edge 5.8%), one pull in 4.5 pays.",
|
||||
];
|
||||
|
||||
/// What a line pays for each coin staked: 0 when it loses.
|
||||
pub fn multiple(line: [u8; 3]) -> i64 {
|
||||
if line[0] == line[1] && line[1] == line[2] {
|
||||
return SYMBOLS[usize::from(line[0])].3;
|
||||
}
|
||||
if line.iter().filter(|s| **s == BERRIES).count() == 2 {
|
||||
return TWO_BERRIES;
|
||||
}
|
||||
0
|
||||
}
|
||||
|
||||
pub fn line(stops: [usize; 3]) -> [u8; 3] {
|
||||
[0, 1, 2].map(|r| REELS[r][stops[r] % STOPS])
|
||||
}
|
||||
|
||||
/// "Diamond · Diamond · Melon".
|
||||
pub fn line_name(stops: [usize; 3]) -> String {
|
||||
line(stops).map(|s| SYMBOLS[usize::from(s)].1).join(" · ")
|
||||
}
|
||||
|
||||
/// A player's machine: where its reels stand and whether the last pull won.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct Machine {
|
||||
pub stops: [usize; 3],
|
||||
pub last: Option<bool>,
|
||||
}
|
||||
|
||||
/// A pull: drawn when it starts, paid when the last reel stops.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Pull {
|
||||
pub stake: Stake,
|
||||
pub stops: [usize; 3],
|
||||
pub started: i64,
|
||||
}
|
||||
|
||||
impl Pull {
|
||||
fn frame(&self, now: i64) -> i64 {
|
||||
((now - self.started) / FRAME_MS).clamp(0, FRAMES)
|
||||
}
|
||||
/// Reel `r`'s stop at frame `f`: scrolling, slower as it nears its stop.
|
||||
pub fn position(&self, r: usize, f: i64) -> usize {
|
||||
let left = (STOP_AT[r] - f).max(0);
|
||||
let behind = (left * (left + 1) / 2) as usize;
|
||||
(self.stops[r] + STOPS * 8 - behind % STOPS) % STOPS
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Slots {
|
||||
pub rounds: Vec<Pull>,
|
||||
}
|
||||
|
||||
impl Slots {
|
||||
pub fn busy(&self) -> bool {
|
||||
!self.rounds.is_empty()
|
||||
}
|
||||
pub fn playing(&self, uuid: u128) -> bool {
|
||||
self.rounds.iter().any(|p| p.stake.uuid == uuid)
|
||||
}
|
||||
pub fn pull(&mut self, stake: Stake, now: i64, rng: &mut Rng) {
|
||||
let stops = [0; 3].map(|_| rng.below(STOPS as u64) as usize);
|
||||
self.rounds.push(Pull {
|
||||
stake,
|
||||
stops,
|
||||
started: now,
|
||||
});
|
||||
}
|
||||
/// The picture `uuid`'s pull is at, and whether a reel stops on it.
|
||||
pub fn frame(&self, uuid: u128, now: i64) -> Option<(i64, bool)> {
|
||||
let p = self.rounds.iter().find(|p| p.stake.uuid == uuid)?;
|
||||
let f = p.frame(now);
|
||||
Some((f, STOP_AT.contains(&f)))
|
||||
}
|
||||
/// The pulls whose last reel stopped: taken out, to be paid once.
|
||||
pub fn ended(&mut self, now: i64) -> Vec<Pull> {
|
||||
let mut out = Vec::new();
|
||||
let mut i = 0;
|
||||
while i < self.rounds.len() {
|
||||
if now - self.rounds[i].started >= FRAMES * FRAME_MS {
|
||||
out.push(self.rounds.swap_remove(i));
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// The machine's cells (all but the bottom row).
|
||||
pub fn layout(&self, cells: &mut [Option<Icon>], uuid: u128, seat: &Seat, now: i64) {
|
||||
let m = &seat.slots;
|
||||
let pull = self.rounds.iter().find(|p| p.stake.uuid == uuid);
|
||||
for c in &mut cells[..45] {
|
||||
*c = filler("minecraft:black_stained_glass_pane");
|
||||
}
|
||||
for c in &mut cells[..9] {
|
||||
*c = filler("minecraft:yellow_stained_glass_pane");
|
||||
}
|
||||
let top = match (pull, m.last) {
|
||||
(Some(_), _) => "The reels turn...".to_owned(),
|
||||
(None, Some(true)) => format!("{}: you won!", line_name(m.stops)),
|
||||
(None, Some(false)) => format!("{}: no luck", line_name(m.stops)),
|
||||
(None, None) => "Three of a kind on the middle row wins".to_owned(),
|
||||
};
|
||||
cells[4] = icon("minecraft:bell", top, Color::Yellow);
|
||||
let won = pull.is_none() && m.last == Some(true);
|
||||
let marker = if won {
|
||||
"minecraft:gold_block"
|
||||
} else {
|
||||
"minecraft:lime_stained_glass_pane"
|
||||
};
|
||||
cells[18] = icon(marker, "Payline →", Color::Green);
|
||||
cells[26] = icon(marker, "← Payline", Color::Green);
|
||||
for (r, col) in [2usize, 4, 6].into_iter().enumerate() {
|
||||
let at = match pull {
|
||||
Some(p) => p.position(r, p.frame(now)),
|
||||
None => m.stops[r],
|
||||
};
|
||||
for (row, d) in [(1usize, STOPS - 1), (2, 0), (3, 1)] {
|
||||
let s = SYMBOLS[usize::from(REELS[r][(at + d) % STOPS])];
|
||||
let name = if row == 2 {
|
||||
s.1.to_owned()
|
||||
} else {
|
||||
" ".to_owned()
|
||||
};
|
||||
cells[row * 9 + col] = icon(
|
||||
s.0,
|
||||
name,
|
||||
if row == 2 {
|
||||
Color::White
|
||||
} else {
|
||||
Color::DarkGray
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
// The paytable, on the fifth row.
|
||||
for (i, (item, name, _, pays)) in SYMBOLS.iter().enumerate().rev() {
|
||||
cells[36 + (5 - i)] = icon(item, format!("3 {name}: {pays}x"), Color::Gold);
|
||||
}
|
||||
cells[42] = icon(
|
||||
"minecraft:sweet_berries",
|
||||
format!("2 Berries: {TWO_BERRIES}x"),
|
||||
Color::Gold,
|
||||
);
|
||||
cells[43] = icon("minecraft:book", "94.2% paid back on average", Color::Aqua);
|
||||
cells[53] = if pull.is_some() {
|
||||
icon("minecraft:gray_concrete", "The reels turn...", Color::Gray)
|
||||
} else {
|
||||
icon("minecraft:lever", "PULL", Color::Green)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::smp_casino::{Fx, Game, View, tests::*};
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn each_reel_holds_the_published_stops() {
|
||||
for reel in REELS {
|
||||
for (i, s) in SYMBOLS.iter().enumerate() {
|
||||
assert_eq!(
|
||||
reel.iter().filter(|x| usize::from(**x) == i).count(),
|
||||
s.2,
|
||||
"{}",
|
||||
s.1
|
||||
);
|
||||
}
|
||||
for k in 0..STOPS {
|
||||
assert_ne!(reel[k], reel[(k + 1) % STOPS], "no symbol twice in a row");
|
||||
}
|
||||
}
|
||||
assert_eq!(SYMBOLS.iter().map(|s| s.2).sum::<usize>(), STOPS);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_paytable_pays_back_94_2_percent() {
|
||||
let (mut back, mut hits) = (0i64, 0);
|
||||
for a in 0..STOPS {
|
||||
for b in 0..STOPS {
|
||||
for c in 0..STOPS {
|
||||
let m = multiple(line([a, b, c]));
|
||||
back += m;
|
||||
hits += i64::from(m > 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
let lines = (STOPS * STOPS * STOPS) as f64;
|
||||
let rtp = back as f64 / lines;
|
||||
assert!((0.92..=0.95).contains(&rtp), "{rtp}");
|
||||
assert_eq!(format!("{:.1}", rtp * 100.0), "94.2");
|
||||
assert_eq!(format!("{:.1}", lines / hits as f64), "4.5");
|
||||
assert_eq!(multiple([5, 5, 5]), 500);
|
||||
assert_eq!(multiple([0, 3, 0]), 2);
|
||||
assert_eq!(multiple([0, 0, 0]), 6);
|
||||
assert_eq!(multiple([0, 3, 4]), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_reels_scroll_and_stop_one_after_another_on_the_draw() {
|
||||
let p = Pull {
|
||||
stake: Stake {
|
||||
uuid: A,
|
||||
name: "Alex".into(),
|
||||
game: Game::Slots,
|
||||
amount: 10,
|
||||
},
|
||||
stops: [3, 17, 31],
|
||||
started: 0,
|
||||
};
|
||||
for (r, stop) in STOP_AT.into_iter().enumerate() {
|
||||
assert_ne!(p.position(r, stop - 1), p.stops[r], "still turning");
|
||||
for f in stop..=FRAMES {
|
||||
assert_eq!(p.position(r, f), p.stops[r]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_pull_is_paid_once_and_frames_stay_at_5_a_second() {
|
||||
let (mut e, mut c, dir) = setup("slots", 100_000);
|
||||
let before = money(&e);
|
||||
c.sit(A, "Alex", View::Slots);
|
||||
c.seats.get_mut(&A).unwrap().window = Some(5);
|
||||
c.click(&mut e, A, 53, false, 0);
|
||||
c.click(&mut e, A, 53, false, 30);
|
||||
assert_eq!(e.held(A), 10, "the double click pulled once");
|
||||
let mut shows = 0;
|
||||
for t in (0..FRAMES * FRAME_MS).step_by(50) {
|
||||
shows += c
|
||||
.tick(&mut e, t)
|
||||
.iter()
|
||||
.filter(|f| matches!(f, Fx::Show(A)))
|
||||
.count();
|
||||
}
|
||||
assert_eq!(shows as i64, FRAMES - 1, "one picture per frame");
|
||||
let stops = c.slots.rounds[0].stops;
|
||||
c.tick(&mut e, FRAMES * FRAME_MS);
|
||||
assert_eq!(e.held(A), 0);
|
||||
assert_eq!(e.balance(A), 10_000 - 10 + 10 * multiple(line(stops)));
|
||||
assert_eq!(money(&e), before);
|
||||
assert!(!c.animating());
|
||||
std::fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
}
|
||||
@@ -1,781 +0,0 @@
|
||||
// Land claims: a player claims the chunk they stand in (`/claim`), all its
|
||||
// height, and only they and the players they trust (`/trust`) break blocks
|
||||
// or right click blocks there (doors, chests, levers, placing, buckets on a
|
||||
// block), or hit its frames, armor stands and animals. Nothing flows, burns
|
||||
// or is pushed into it from land of someone else, and explosions spare it.
|
||||
// The chunks a player may hold grow with the time they played here.
|
||||
// Operators of level 3 pass everywhere and may `/unclaim` any chunk. Kept in
|
||||
// `claims.json`, written atomically. No game types. Added to the game as
|
||||
// `game::smp_claims`; also a module of this crate, for its tests.
|
||||
|
||||
use super::smp_economy::{Out, Player};
|
||||
use super::smp_places::Place;
|
||||
use super::smp_store;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{BTreeMap, BTreeSet, HashMap};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
/// `config.json`'s `claims` section.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct Config {
|
||||
pub enabled: bool,
|
||||
/// Chunks a player may claim, by hours played here: `[hours, chunks]`,
|
||||
/// the last line reached counts.
|
||||
pub chunks: Vec<[i64; 2]>,
|
||||
/// The entities only the owner and trusted players may hit in a claim.
|
||||
pub protected_entities: Vec<String>,
|
||||
/// Blocks around 0 0, in every dimension, where no one may claim (free
|
||||
/// for all); 0 for none. Claims already there are dropped at start.
|
||||
pub free_radius: i64,
|
||||
}
|
||||
|
||||
impl Default for Config {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
enabled: true,
|
||||
chunks: vec![[0, 4], [5, 16], [20, 36], [100, 64]],
|
||||
protected_entities: PROTECTED
|
||||
.iter()
|
||||
.map(|&e| format!("minecraft:{e}"))
|
||||
.collect(),
|
||||
free_radius: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Frames, stands, vehicles and the animals a player keeps: not monsters.
|
||||
/// Points along a chunk's four edges, every `step` blocks, at height `y`:
|
||||
/// where `/claim show` draws its border.
|
||||
pub fn border(cx: i32, cz: i32, y: f64, step: usize) -> Vec<[f64; 3]> {
|
||||
let (x0, z0) = (f64::from(cx * 16), f64::from(cz * 16));
|
||||
let mut points = Vec::new();
|
||||
for i in (0..=16).step_by(step.max(1)) {
|
||||
let t = f64::from(i);
|
||||
points.push([x0 + t, y, z0]);
|
||||
points.push([x0 + t, y, z0 + 16.0]);
|
||||
if i != 0 && i != 16 {
|
||||
points.push([x0, y, z0 + t]);
|
||||
points.push([x0 + 16.0, y, z0 + t]);
|
||||
}
|
||||
}
|
||||
points
|
||||
}
|
||||
|
||||
const PROTECTED: &[&str] = &[
|
||||
"item_frame",
|
||||
"glow_item_frame",
|
||||
"armor_stand",
|
||||
"painting",
|
||||
"leash_knot",
|
||||
"minecart",
|
||||
"chest_minecart",
|
||||
"furnace_minecart",
|
||||
"hopper_minecart",
|
||||
"tnt_minecart",
|
||||
"oak_boat",
|
||||
"spruce_boat",
|
||||
"birch_boat",
|
||||
"jungle_boat",
|
||||
"acacia_boat",
|
||||
"dark_oak_boat",
|
||||
"mangrove_boat",
|
||||
"cherry_boat",
|
||||
"pale_oak_boat",
|
||||
"bamboo_raft",
|
||||
"oak_chest_boat",
|
||||
"spruce_chest_boat",
|
||||
"birch_chest_boat",
|
||||
"jungle_chest_boat",
|
||||
"acacia_chest_boat",
|
||||
"dark_oak_chest_boat",
|
||||
"mangrove_chest_boat",
|
||||
"cherry_chest_boat",
|
||||
"pale_oak_chest_boat",
|
||||
"bamboo_chest_raft",
|
||||
"allay",
|
||||
"armadillo",
|
||||
"axolotl",
|
||||
"bee",
|
||||
"camel",
|
||||
"cat",
|
||||
"chicken",
|
||||
"cow",
|
||||
"donkey",
|
||||
"fox",
|
||||
"frog",
|
||||
"goat",
|
||||
"happy_ghast",
|
||||
"horse",
|
||||
"llama",
|
||||
"mooshroom",
|
||||
"mule",
|
||||
"ocelot",
|
||||
"panda",
|
||||
"parrot",
|
||||
"pig",
|
||||
"rabbit",
|
||||
"sheep",
|
||||
"sniffer",
|
||||
"snow_golem",
|
||||
"iron_golem",
|
||||
"copper_golem",
|
||||
"strider",
|
||||
"turtle",
|
||||
"villager",
|
||||
"wolf",
|
||||
"trader_llama",
|
||||
"wandering_trader",
|
||||
];
|
||||
|
||||
/// `claims.json`.
|
||||
#[derive(Default, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
struct Data {
|
||||
/// Claimed chunks, `<dimension> <chunk x> <chunk z>`, to their owner's UUID.
|
||||
chunks: BTreeMap<String, String>,
|
||||
/// The players each owner trusts, by UUID.
|
||||
trust: BTreeMap<String, BTreeSet<String>>,
|
||||
}
|
||||
|
||||
pub struct Claims {
|
||||
pub config: Config,
|
||||
path: PathBuf,
|
||||
data: Data,
|
||||
changed: bool,
|
||||
/// `data.chunks` by dimension, then (chunk x, chunk z): asked on every
|
||||
/// fluid flow, so a lookup allocates nothing.
|
||||
owners: HashMap<String, HashMap<(i32, i32), u128>>,
|
||||
/// When each player was last told a chunk isn't theirs.
|
||||
told: HashMap<u128, i64>,
|
||||
}
|
||||
|
||||
fn key(dimension: &str, cx: i32, cz: i32) -> String {
|
||||
format!("{dimension} {cx} {cz}")
|
||||
}
|
||||
|
||||
fn chunk_of(at: &Place) -> (i32, i32) {
|
||||
((at.x.floor() as i32) >> 4, (at.z.floor() as i32) >> 4)
|
||||
}
|
||||
|
||||
impl Claims {
|
||||
/// `claims.json` in `dir`; an error when it exists but can't be read
|
||||
/// (never replaced by an empty one).
|
||||
pub fn open(dir: &Path, config: Config) -> Result<Self, String> {
|
||||
let path = dir.join("claims.json");
|
||||
let data: Data = smp_store::read_json(&path)?;
|
||||
let mut owners: HashMap<String, HashMap<(i32, i32), u128>> = HashMap::new();
|
||||
for (k, owner) in &data.chunks {
|
||||
let mut w = k.split(' ');
|
||||
let (Some(d), Some(x), Some(z), Some(u)) = (
|
||||
w.next(),
|
||||
w.next().and_then(|x| x.parse().ok()),
|
||||
w.next().and_then(|z| z.parse().ok()),
|
||||
smp_store::parse_uuid(owner),
|
||||
) else {
|
||||
return Err(format!("{}: a bad claim `{k}`", path.display()));
|
||||
};
|
||||
owners.entry(d.to_owned()).or_default().insert((x, z), u);
|
||||
}
|
||||
Ok(Self {
|
||||
config,
|
||||
path,
|
||||
data,
|
||||
changed: false,
|
||||
owners,
|
||||
told: HashMap::new(),
|
||||
})
|
||||
}
|
||||
|
||||
/// Whether a chunk touches the free zone around 0 0 (any dimension).
|
||||
fn in_free_zone(&self, cx: i32, cz: i32) -> bool {
|
||||
let r = self.config.free_radius;
|
||||
let near = |c: i32| i64::from(c) * 16 <= r && i64::from(c) * 16 + 15 >= -r;
|
||||
r > 0 && near(cx) && near(cz)
|
||||
}
|
||||
|
||||
/// Drops the claims inside the free zone (a radius set after they were
|
||||
/// made): one line each, for the log.
|
||||
pub fn clear_free_zone(&mut self) -> Vec<String> {
|
||||
let inside: Vec<(String, i32, i32, u128)> = self
|
||||
.owners
|
||||
.iter()
|
||||
.flat_map(|(d, c)| {
|
||||
c.iter()
|
||||
.filter(|((x, z), _)| self.in_free_zone(*x, *z))
|
||||
.map(|((x, z), u)| (d.clone(), *x, *z, *u))
|
||||
})
|
||||
.collect();
|
||||
let mut lines = Vec::new();
|
||||
for (dimension, cx, cz, owner) in inside {
|
||||
if let Some(c) = self.owners.get_mut(&dimension) {
|
||||
c.remove(&(cx, cz));
|
||||
}
|
||||
self.data.chunks.remove(&key(&dimension, cx, cz));
|
||||
self.changed = true;
|
||||
lines.push(format!(
|
||||
"chunk {cx} {cz} (x {}, z {}) in {dimension} of {} is in the free zone: unclaimed",
|
||||
cx * 16,
|
||||
cz * 16,
|
||||
smp_store::uuid_string(owner)
|
||||
));
|
||||
}
|
||||
lines.sort();
|
||||
lines
|
||||
}
|
||||
|
||||
pub fn save(&mut self) -> Result<(), String> {
|
||||
if self.changed {
|
||||
smp_store::write_json(&self.path, &self.data)?;
|
||||
self.changed = false;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Who holds the chunk of this block, if anyone.
|
||||
pub fn owner(&self, dimension: &str, x: i32, z: i32) -> Option<u128> {
|
||||
self.chunk_owner(dimension, x >> 4, z >> 4)
|
||||
}
|
||||
|
||||
fn chunk_owner(&self, dimension: &str, cx: i32, cz: i32) -> Option<u128> {
|
||||
self.owners.get(dimension)?.get(&(cx, cz)).copied()
|
||||
}
|
||||
|
||||
/// Whether the world may change the block at `to` from `from` (a fluid,
|
||||
/// fire, a piston): yes, unless `to` is claimed by someone other than
|
||||
/// `from`'s owner or a player they trust.
|
||||
pub fn spread_allowed(&self, dimension: &str, from: [i32; 3], to: [i32; 3]) -> bool {
|
||||
if !self.config.enabled {
|
||||
return true;
|
||||
}
|
||||
let Some(owner) = self.owner(dimension, to[0], to[2]) else {
|
||||
return true;
|
||||
};
|
||||
match self.owner(dimension, from[0], from[2]) {
|
||||
Some(source) => source == owner || self.trusts(owner, source),
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Takes out of an explosion's blocks those in a claim: explosions
|
||||
/// spare claimed land, whoever lit them.
|
||||
pub fn spare(&self, dimension: &str, blocks: &mut Vec<[i32; 3]>) {
|
||||
if self.config.enabled && self.owners.get(dimension).is_some_and(|c| !c.is_empty()) {
|
||||
blocks.retain(|b| self.owner(dimension, b[0], b[2]).is_none());
|
||||
}
|
||||
}
|
||||
|
||||
/// Whose land a block is to `who`: None when free, true when theirs or
|
||||
/// trusted to them, false when someone else's.
|
||||
pub fn relation(&self, dimension: &str, x: i32, z: i32, who: u128) -> Option<bool> {
|
||||
let owner = self.owner(dimension, x, z)?;
|
||||
Some(owner == who || self.trusts(owner, who))
|
||||
}
|
||||
|
||||
/// Whether entities of type `kind` (`minecraft:cow`) are kept from
|
||||
/// players a claim's owner doesn't trust.
|
||||
pub fn protects(&self, kind: &str) -> bool {
|
||||
self.config.protected_entities.iter().any(|e| e == kind)
|
||||
}
|
||||
|
||||
fn trusts(&self, owner: u128, who: u128) -> bool {
|
||||
self.data
|
||||
.trust
|
||||
.get(&smp_store::uuid_string(owner))
|
||||
.is_some_and(|t| t.contains(&smp_store::uuid_string(who)))
|
||||
}
|
||||
|
||||
/// Whether `who` may break or use the block at `pos`. When not, the line
|
||||
/// to tell them: at most one each 2 s, so holding a click doesn't flood
|
||||
/// their chat.
|
||||
pub fn check(
|
||||
&mut self,
|
||||
who: &Player,
|
||||
dimension: &str,
|
||||
pos: [i32; 3],
|
||||
name_of: &dyn Fn(u128) -> String,
|
||||
now: i64,
|
||||
) -> Result<(), Option<String>> {
|
||||
if !self.config.enabled || who.level >= 3 {
|
||||
return Ok(());
|
||||
}
|
||||
let Some(owner) = self.owner(dimension, pos[0], pos[2]) else {
|
||||
return Ok(());
|
||||
};
|
||||
if owner == who.uuid || self.trusts(owner, who.uuid) {
|
||||
return Ok(());
|
||||
}
|
||||
let last = self.told.insert(who.uuid, now);
|
||||
if last.is_some_and(|t| now - t < 2_000) {
|
||||
return Err(None);
|
||||
}
|
||||
Err(Some(format!("This land is claimed by {}.", name_of(owner))))
|
||||
}
|
||||
|
||||
/// How many chunks `uuid` holds.
|
||||
pub fn held(&self, uuid: u128) -> usize {
|
||||
self.owners
|
||||
.values()
|
||||
.flat_map(|c| c.values())
|
||||
.filter(|&&u| u == uuid)
|
||||
.count()
|
||||
}
|
||||
|
||||
/// How many chunks a player may hold after `played` seconds here.
|
||||
pub fn limit(&self, played: i64) -> usize {
|
||||
self.config
|
||||
.chunks
|
||||
.iter()
|
||||
.filter(|[h, _]| played / 3600 >= *h)
|
||||
.map(|[_, n]| (*n).max(0) as usize)
|
||||
.next_back()
|
||||
.unwrap_or(0)
|
||||
}
|
||||
|
||||
/// The claims' commands; None for another command. `at` is where the
|
||||
/// player stands; `find` a player's UUID and name from a name (on or
|
||||
/// known); `name_of` a name from a UUID.
|
||||
pub fn command(
|
||||
&mut self,
|
||||
me: &Player,
|
||||
at: &Place,
|
||||
played: i64,
|
||||
find: &dyn Fn(&str) -> Option<(u128, String)>,
|
||||
name_of: &dyn Fn(u128) -> String,
|
||||
line: &str,
|
||||
) -> Option<Vec<Out>> {
|
||||
let words: Vec<&str> = line.split_whitespace().collect();
|
||||
let command = *words.first()?;
|
||||
if !COMMANDS.contains(&command) {
|
||||
return None;
|
||||
}
|
||||
if !self.config.enabled {
|
||||
return Some(vec![Out::Error("Claims are off on this server.".into())]);
|
||||
}
|
||||
let (cx, cz) = chunk_of(at);
|
||||
let here = at.dimension.as_str();
|
||||
let blocks = format!(
|
||||
"x {} to {}, z {} to {}",
|
||||
cx * 16,
|
||||
cx * 16 + 15,
|
||||
cz * 16,
|
||||
cz * 16 + 15
|
||||
);
|
||||
let me_key = smp_store::uuid_string(me.uuid);
|
||||
Some(match (command, &words[1..]) {
|
||||
("claim", []) => match self.chunk_owner(here, cx, cz) {
|
||||
Some(u) if u == me.uuid => vec![Out::Error("This chunk is already yours.".into())],
|
||||
Some(u) => vec![Out::Error(format!("This chunk is {}'s.", name_of(u)))],
|
||||
None if self.in_free_zone(cx, cz) => vec![Out::Error(format!(
|
||||
"No claims within {} blocks of 0 0: that land is free for all.",
|
||||
self.config.free_radius
|
||||
))],
|
||||
None => {
|
||||
let (held, limit) = (self.held(me.uuid), self.limit(played));
|
||||
if held >= limit {
|
||||
vec![Out::Error(format!(
|
||||
"You hold {held} of {limit} chunks: play longer for more, or /unclaim one."
|
||||
))]
|
||||
} else {
|
||||
self.data.chunks.insert(key(here, cx, cz), me_key);
|
||||
let chunks = self.owners.entry(here.to_owned()).or_default();
|
||||
chunks.insert((cx, cz), me.uuid);
|
||||
self.changed = true;
|
||||
vec![Out::Reply(format!(
|
||||
"Claimed this chunk ({blocks}), {} of {limit}. /trust <player> lets a friend build.",
|
||||
held + 1
|
||||
))]
|
||||
}
|
||||
}
|
||||
},
|
||||
("claim", ["info"]) => vec![Out::Reply(match self.chunk_owner(here, cx, cz) {
|
||||
Some(u) => format!("This chunk ({blocks}) is {}'s.", name_of(u)),
|
||||
None => format!("This chunk ({blocks}) is free: /claim it."),
|
||||
})],
|
||||
("unclaim", []) => match self.chunk_owner(here, cx, cz) {
|
||||
Some(u) if u == me.uuid || me.level >= 3 => {
|
||||
if let Some(chunks) = self.owners.get_mut(here) {
|
||||
chunks.remove(&(cx, cz));
|
||||
}
|
||||
self.data.chunks.remove(&key(here, cx, cz));
|
||||
self.changed = true;
|
||||
vec![Out::Reply(format!("Unclaimed this chunk ({blocks})."))]
|
||||
}
|
||||
Some(u) => vec![Out::Error(format!("This chunk is {}'s.", name_of(u)))],
|
||||
None => vec![Out::Error("This chunk isn't claimed.".into())],
|
||||
},
|
||||
("claims", []) => {
|
||||
let mine: Vec<String> = self
|
||||
.data
|
||||
.chunks
|
||||
.iter()
|
||||
.filter(|(_, o)| **o == me_key)
|
||||
.map(|(k, _)| {
|
||||
let w: Vec<&str> = k.split(' ').collect();
|
||||
let n = |s: &str| s.parse::<i32>().unwrap_or(0) * 16;
|
||||
format!(
|
||||
"{} at x {} z {}",
|
||||
w[0].trim_start_matches("minecraft:"),
|
||||
n(w[1]),
|
||||
n(w[2])
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
let trusted: Vec<String> = self
|
||||
.data
|
||||
.trust
|
||||
.get(&me_key)
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter_map(|u| smp_store::parse_uuid(u))
|
||||
.map(name_of)
|
||||
.collect();
|
||||
vec![
|
||||
Out::Reply(format!(
|
||||
"Your chunks ({} of {}): {}",
|
||||
mine.len(),
|
||||
self.limit(played),
|
||||
if mine.is_empty() {
|
||||
"none, /claim where you stand".into()
|
||||
} else {
|
||||
mine.join("; ")
|
||||
}
|
||||
)),
|
||||
Out::Reply(format!(
|
||||
"Trusted: {}",
|
||||
if trusted.is_empty() {
|
||||
"nobody".into()
|
||||
} else {
|
||||
trusted.join(", ")
|
||||
}
|
||||
)),
|
||||
]
|
||||
}
|
||||
("trust", [name]) | ("untrust", [name]) => match find(name) {
|
||||
None => vec![Out::Error(format!(
|
||||
"No player named {name} has played here."
|
||||
))],
|
||||
Some((u, _)) if u == me.uuid => vec![Out::Error("That's you.".into())],
|
||||
Some((u, name)) => {
|
||||
let set = self.data.trust.entry(me_key.clone()).or_default();
|
||||
let changed = if command == "trust" {
|
||||
set.insert(smp_store::uuid_string(u))
|
||||
} else {
|
||||
set.remove(&smp_store::uuid_string(u))
|
||||
};
|
||||
if set.is_empty() {
|
||||
self.data.trust.remove(&me_key);
|
||||
}
|
||||
self.changed |= changed;
|
||||
vec![Out::Reply(match (command, changed) {
|
||||
("trust", true) => {
|
||||
format!("{name} may now build and open things on your land.")
|
||||
}
|
||||
("trust", false) => format!("You already trust {name}."),
|
||||
(_, true) => format!("{name} no longer may build on your land."),
|
||||
_ => format!("You didn't trust {name}."),
|
||||
})]
|
||||
}
|
||||
},
|
||||
_ => vec![Out::Error(
|
||||
"Usage: /claim, /claim info, /claim show, /unclaim, /claims, /trust <player>, /untrust <player>"
|
||||
.into(),
|
||||
)],
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// The claims' commands.
|
||||
pub const COMMANDS: [&str; 5] = ["claim", "unclaim", "claims", "trust", "untrust"];
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::sync::atomic::{AtomicU32, Ordering};
|
||||
|
||||
const A: u128 = 1;
|
||||
const B: u128 = 2;
|
||||
|
||||
fn dir() -> PathBuf {
|
||||
static N: AtomicU32 = AtomicU32::new(0);
|
||||
let n = N.fetch_add(1, Ordering::Relaxed);
|
||||
std::env::temp_dir().join(format!("smp-claims-{}-{n}", std::process::id()))
|
||||
}
|
||||
fn at(x: f64, z: f64) -> Place {
|
||||
Place {
|
||||
dimension: "minecraft:overworld".into(),
|
||||
x,
|
||||
y: 64.0,
|
||||
z,
|
||||
}
|
||||
}
|
||||
fn player(uuid: u128, level: u8) -> Player {
|
||||
Player {
|
||||
uuid,
|
||||
name: if uuid == A { "Alex" } else { "Steve" }.into(),
|
||||
level,
|
||||
}
|
||||
}
|
||||
fn find(n: &str) -> Option<(u128, String)> {
|
||||
match n.to_ascii_lowercase().as_str() {
|
||||
"alex" => Some((A, "Alex".into())),
|
||||
"steve" => Some((B, "Steve".into())),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
fn name_of(u: u128) -> String {
|
||||
if u == A { "Alex" } else { "Steve" }.into()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_border_runs_along_the_chunks_edges() {
|
||||
let points = border(1, -1, 70.0, 2);
|
||||
// 9 points on each edge, the corners once.
|
||||
assert_eq!(points.len(), 32);
|
||||
assert!(points.contains(&[16.0, 70.0, -16.0]) && points.contains(&[32.0, 70.0, 0.0]));
|
||||
assert!(
|
||||
points
|
||||
.iter()
|
||||
.all(|p| p[0] == 16.0 || p[0] == 32.0 || p[2] == -16.0 || p[2] == 0.0)
|
||||
);
|
||||
let d = dir();
|
||||
let mut c = Claims::open(&d, Config::default()).unwrap();
|
||||
c.command(&player(A, 0), &at(8.0, 8.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
let ow = "minecraft:overworld";
|
||||
assert_eq!(c.relation(ow, 3, 3, A), Some(true));
|
||||
assert_eq!(c.relation(ow, 3, 3, B), Some(false));
|
||||
assert_eq!(c.relation(ow, 20, 3, B), None);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_claims_in_the_free_zone_and_old_ones_are_dropped() {
|
||||
let d = dir();
|
||||
let mut c = Claims::open(&d, Config::default()).unwrap();
|
||||
let alex = player(A, 0);
|
||||
for (x, z) in [(8.0, 8.0), (-520.0, 8.0), (600.0, 600.0)] {
|
||||
c.command(&alex, &at(x, z), 1_000_000, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
}
|
||||
c.save().unwrap();
|
||||
let config = Config {
|
||||
free_radius: 500,
|
||||
..Config::default()
|
||||
};
|
||||
let mut c = Claims::open(&d, config).unwrap();
|
||||
// Chunk 0 0 and chunk -33 0 (x -528 to -513: outside 500) stay apart.
|
||||
assert_eq!(c.clear_free_zone().len(), 1);
|
||||
let ow = "minecraft:overworld";
|
||||
assert_eq!(c.owner(ow, 8, 8), None);
|
||||
assert_eq!(c.owner(ow, -520, 8), Some(A));
|
||||
assert_eq!(c.owner(ow, 600, 600), Some(A));
|
||||
let out = c
|
||||
.command(
|
||||
&alex,
|
||||
&at(490.0, -490.0),
|
||||
1_000_000,
|
||||
&find,
|
||||
&name_of,
|
||||
"claim",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(matches!(&out[0], Out::Error(e) if e.contains("free for all")));
|
||||
// The zone is the same in every dimension.
|
||||
let nether = Place {
|
||||
dimension: "minecraft:the_nether".into(),
|
||||
..at(8.0, 8.0)
|
||||
};
|
||||
let out = c
|
||||
.command(&alex, &nether, 1_000_000, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
assert!(matches!(&out[0], Out::Error(e) if e.contains("free for all")));
|
||||
// Saved without them.
|
||||
c.save().unwrap();
|
||||
let again = Claims::open(&d, Config::default()).unwrap();
|
||||
assert_eq!(again.owner(ow, 8, 8), None);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_world_stays_out_of_a_claim() {
|
||||
let d = dir();
|
||||
let mut c = Claims::open(&d, Config::default()).unwrap();
|
||||
c.command(&player(A, 0), &at(8.0, 8.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
let ow = "minecraft:overworld";
|
||||
// Into Alex's chunk from outside: refused; inside it and out of it: allowed.
|
||||
assert!(!c.spread_allowed(ow, [16, 64, 8], [15, 64, 8]));
|
||||
assert!(c.spread_allowed(ow, [14, 64, 8], [15, 64, 8]));
|
||||
assert!(c.spread_allowed(ow, [15, 64, 8], [16, 64, 8]));
|
||||
assert!(c.spread_allowed("minecraft:the_nether", [16, 64, 8], [15, 64, 8]));
|
||||
// From Steve's chunk next door: allowed once Alex trusts Steve.
|
||||
c.command(&player(B, 0), &at(24.0, 8.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
assert!(!c.spread_allowed(ow, [16, 64, 8], [15, 64, 8]));
|
||||
c.command(
|
||||
&player(A, 0),
|
||||
&at(8.0, 8.0),
|
||||
0,
|
||||
&find,
|
||||
&name_of,
|
||||
"trust steve",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(c.spread_allowed(ow, [16, 64, 8], [15, 64, 8]));
|
||||
assert!(!c.spread_allowed(ow, [15, 64, 8], [16, 64, 8]));
|
||||
// Explosions spare both claims, not the land around them.
|
||||
let mut blocks = vec![[0, 64, 0], [20, 64, 0], [40, 64, 0], [-1, 64, 0]];
|
||||
c.spare(ow, &mut blocks);
|
||||
assert_eq!(blocks, vec![[40, 64, 0], [-1, 64, 0]]);
|
||||
assert!(c.protects("minecraft:item_frame") && c.protects("minecraft:cow"));
|
||||
assert!(!c.protects("minecraft:zombie") && !c.protects("minecraft:player"));
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_claim_keeps_others_out_until_trusted() {
|
||||
let d = dir();
|
||||
let mut c = Claims::open(&d, Config::default()).unwrap();
|
||||
let out = c
|
||||
.command(&player(A, 0), &at(-3.5, 20.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
assert!(
|
||||
matches!(&out[0], Out::Reply(s) if s.contains("x -16 to -1, z 16 to 31")),
|
||||
"{out:?}"
|
||||
);
|
||||
let ow = "minecraft:overworld";
|
||||
assert_eq!(
|
||||
c.check(&player(A, 0), ow, [-16, 0, 31], &name_of, 0),
|
||||
Ok(())
|
||||
);
|
||||
assert_eq!(
|
||||
c.check(&player(B, 0), ow, [-1, 100, 16], &name_of, 0),
|
||||
Err(Some("This land is claimed by Alex.".into()))
|
||||
);
|
||||
// Told once each 2 s; the next chunk and the Nether are free.
|
||||
assert_eq!(
|
||||
c.check(&player(B, 0), ow, [-1, 100, 16], &name_of, 1_000),
|
||||
Err(None)
|
||||
);
|
||||
assert_eq!(c.check(&player(B, 0), ow, [0, 64, 16], &name_of, 0), Ok(()));
|
||||
assert_eq!(
|
||||
c.check(
|
||||
&player(B, 0),
|
||||
"minecraft:the_nether",
|
||||
[-1, 64, 16],
|
||||
&name_of,
|
||||
0
|
||||
),
|
||||
Ok(())
|
||||
);
|
||||
// Operators pass.
|
||||
assert_eq!(
|
||||
c.check(&player(B, 3), ow, [-1, 64, 16], &name_of, 0),
|
||||
Ok(())
|
||||
);
|
||||
c.command(
|
||||
&player(A, 0),
|
||||
&at(0.0, 0.0),
|
||||
0,
|
||||
&find,
|
||||
&name_of,
|
||||
"trust steve",
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
c.check(&player(B, 0), ow, [-1, 64, 16], &name_of, 9_000),
|
||||
Ok(())
|
||||
);
|
||||
let out = c
|
||||
.command(
|
||||
&player(B, 0),
|
||||
&at(-3.5, 20.0),
|
||||
0,
|
||||
&find,
|
||||
&name_of,
|
||||
"unclaim",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(
|
||||
matches!(&out[0], Out::Error(s) if s.contains("Alex's")),
|
||||
"trust isn't ownership"
|
||||
);
|
||||
c.save().unwrap();
|
||||
let mut again = Claims::open(&d, Config::default()).unwrap();
|
||||
assert_eq!(again.owner(ow, -1, 16), Some(A));
|
||||
again
|
||||
.command(
|
||||
&player(A, 0),
|
||||
&at(0.0, 0.0),
|
||||
0,
|
||||
&find,
|
||||
&name_of,
|
||||
"untrust Steve",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(
|
||||
again
|
||||
.check(&player(B, 0), ow, [-1, 64, 16], &name_of, 20_000)
|
||||
.is_err()
|
||||
);
|
||||
std::fs::remove_dir_all(d).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn chunks_grow_with_time_played() {
|
||||
let d = dir();
|
||||
let mut c = Claims::open(&d, Config::default()).unwrap();
|
||||
for x in 0..4 {
|
||||
let out = c
|
||||
.command(
|
||||
&player(A, 0),
|
||||
&at(x as f64 * 16.0, 0.0),
|
||||
0,
|
||||
&find,
|
||||
&name_of,
|
||||
"claim",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(matches!(&out[0], Out::Reply(_)), "{out:?}");
|
||||
}
|
||||
let out = c
|
||||
.command(&player(A, 0), &at(64.0, 0.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
assert!(
|
||||
matches!(&out[0], Out::Error(s) if s.contains("4 of 4")),
|
||||
"{out:?}"
|
||||
);
|
||||
let out = c
|
||||
.command(
|
||||
&player(A, 0),
|
||||
&at(64.0, 0.0),
|
||||
5 * 3600,
|
||||
&find,
|
||||
&name_of,
|
||||
"claim",
|
||||
)
|
||||
.unwrap();
|
||||
assert!(
|
||||
matches!(&out[0], Out::Reply(s) if s.contains("5 of 16")),
|
||||
"{out:?}"
|
||||
);
|
||||
let out = c
|
||||
.command(&player(B, 0), &at(0.0, 0.0), 0, &find, &name_of, "claim")
|
||||
.unwrap();
|
||||
assert_eq!(out, vec![Out::Error("This chunk is Alex's.".into())]);
|
||||
// An operator may free any chunk.
|
||||
let out = c
|
||||
.command(&player(B, 3), &at(0.0, 0.0), 0, &find, &name_of, "unclaim")
|
||||
.unwrap();
|
||||
assert!(matches!(&out[0], Out::Reply(_)));
|
||||
let out = c
|
||||
.command(&player(A, 0), &at(0.0, 0.0), 0, &find, &name_of, "claims")
|
||||
.unwrap();
|
||||
assert!(
|
||||
matches!(&out[0], Out::Reply(s) if s.starts_with("Your chunks (4 of 4)")),
|
||||
"{out:?}"
|
||||
);
|
||||
let _ = std::fs::remove_dir_all(d);
|
||||
}
|
||||
}
|
||||
@@ -42,9 +42,6 @@ pub struct Account {
|
||||
pub balance: i64,
|
||||
}
|
||||
|
||||
/// Milliseconds in a day.
|
||||
pub const DAY_MS: i64 = 86_400_000;
|
||||
|
||||
/// `economy.json`.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct Accounts {
|
||||
@@ -55,58 +52,8 @@ pub struct Accounts {
|
||||
/// it twice. Given back when the economy opens (a restart voids games).
|
||||
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
|
||||
pub held: BTreeMap<String, i64>,
|
||||
/// Other parts' state that holds money or items (the auction house's
|
||||
/// listings, bids and mail), by part: written in the same file as the
|
||||
/// balances, so one write moves both and a crash can't split them.
|
||||
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
|
||||
pub ext: BTreeMap<String, serde_json::Value>,
|
||||
/// System pools, by name: the casino's pot, the auction house's bids.
|
||||
/// Money in a pool belongs to no player: never in `accounts()`,
|
||||
/// `/baltop` or the sidebar.
|
||||
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
|
||||
pub pools: BTreeMap<String, i64>,
|
||||
/// Money made and destroyed by the server (`adjust`: market sales and
|
||||
/// purchases, the daily reward, operators' `/eco give` and `/eco take`),
|
||||
/// by kind, for `/eco stats`.
|
||||
#[serde(default)]
|
||||
pub flows: Flows,
|
||||
}
|
||||
|
||||
/// Money the server made (`minted`) or took out of the game (`burned`),
|
||||
/// today and the day before, by kind (the audit kind's first word).
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct Flows {
|
||||
pub day: i64,
|
||||
pub minted: BTreeMap<String, i64>,
|
||||
pub burned: BTreeMap<String, i64>,
|
||||
pub minted_yesterday: BTreeMap<String, i64>,
|
||||
pub burned_yesterday: BTreeMap<String, i64>,
|
||||
}
|
||||
|
||||
impl Flows {
|
||||
/// Starts `day` (moving the last one to yesterday's when it was the day
|
||||
/// before).
|
||||
pub fn roll(&mut self, day: i64) {
|
||||
if self.day == day {
|
||||
return;
|
||||
}
|
||||
let next = self.day + 1 == day;
|
||||
self.minted_yesterday = std::mem::take(&mut self.minted);
|
||||
self.burned_yesterday = std::mem::take(&mut self.burned);
|
||||
if !next {
|
||||
self.minted_yesterday.clear();
|
||||
self.burned_yesterday.clear();
|
||||
}
|
||||
self.day = day;
|
||||
}
|
||||
}
|
||||
|
||||
/// What 0.30 took out (the Treasury, its insurance fund, the bank, the
|
||||
/// futures, the jobs, the taxes): their pools and their state in `ext`.
|
||||
const RETIRED_POOLS: [&str; 4] = ["treasury", "insurance", "bank", "futures"];
|
||||
const RETIRED_PARTS: [&str; 4] = ["bank", "futures", "jobs", "tax"];
|
||||
|
||||
/// A player as a command sees them.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct Player {
|
||||
@@ -133,9 +80,6 @@ pub struct Economy {
|
||||
path: PathBuf,
|
||||
audit: Audit,
|
||||
dirty: bool,
|
||||
/// Counts the changes to the accounts, so the sidebar knows when to
|
||||
/// look again.
|
||||
revision: u64,
|
||||
/// Milliseconds since 1970, for the log (the glue sets it each call).
|
||||
pub now: i64,
|
||||
}
|
||||
@@ -153,10 +97,8 @@ impl Economy {
|
||||
path,
|
||||
audit: Audit::new(dir.join("audit.log")),
|
||||
dirty: false,
|
||||
revision: 0,
|
||||
now: 0,
|
||||
};
|
||||
economy.retire()?;
|
||||
// Games the last run left undecided: their stakes go back.
|
||||
let held: Vec<(String, i64)> = economy.accounts.held.clone().into_iter().collect();
|
||||
for (key, amount) in held {
|
||||
@@ -167,97 +109,6 @@ impl Economy {
|
||||
Ok(economy)
|
||||
}
|
||||
|
||||
/// Once, on a world from before 0.30: bank savings and open futures
|
||||
/// positions' margins go back to their owners (logged `bank_closed`,
|
||||
/// `futures_closed`), and the retired parts' pools and state are dropped.
|
||||
fn retire(&mut self) -> Result<(), String> {
|
||||
let mut back: Vec<(&str, u128, i64)> = Vec::new();
|
||||
let ext = &self.accounts.ext;
|
||||
if let Some(accounts) = ext
|
||||
.get("bank")
|
||||
.and_then(|b| b.get("accounts"))
|
||||
.and_then(|a| a.as_object())
|
||||
{
|
||||
for (key, saving) in accounts {
|
||||
let amount = saving.get("amount").and_then(|a| a.as_i64()).unwrap_or(0);
|
||||
if let Some(u) = super::smp_store::parse_uuid(key) {
|
||||
back.push(("bank_closed", u, amount));
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Some(positions) = ext
|
||||
.get("futures")
|
||||
.and_then(|f| f.get("positions"))
|
||||
.and_then(|p| p.as_array())
|
||||
{
|
||||
for p in positions {
|
||||
let owner = p
|
||||
.get("owner")
|
||||
.and_then(|o| o.as_str())
|
||||
.and_then(super::smp_store::parse_uuid);
|
||||
let margin = p.get("margin").and_then(|m| m.as_i64()).unwrap_or(0);
|
||||
if let Some(u) = owner {
|
||||
back.push(("futures_closed", u, margin));
|
||||
}
|
||||
}
|
||||
}
|
||||
for (kind, uuid, amount) in back.into_iter().filter(|b| b.2 > 0) {
|
||||
let entry = self.entry(kind, None, Some(uuid), amount, "");
|
||||
self.audit.append(&entry)?;
|
||||
let account = self.accounts.accounts.entry(uuid_string(uuid)).or_default();
|
||||
account.balance = account.balance.saturating_add(amount);
|
||||
self.touch();
|
||||
}
|
||||
for part in RETIRED_PARTS {
|
||||
if self.accounts.ext.remove(part).is_some() {
|
||||
self.touch();
|
||||
}
|
||||
}
|
||||
for pool in RETIRED_POOLS {
|
||||
if self.accounts.pools.remove(pool).is_some() {
|
||||
self.touch();
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn touch(&mut self) {
|
||||
self.dirty = true;
|
||||
self.revision += 1;
|
||||
}
|
||||
|
||||
/// Changes to the accounts so far (in this run).
|
||||
pub fn revision(&self) -> u64 {
|
||||
self.revision
|
||||
}
|
||||
|
||||
/// Every account: UUID, name, balance.
|
||||
pub fn accounts(&self) -> Vec<(u128, String, i64)> {
|
||||
self.accounts
|
||||
.accounts
|
||||
.iter()
|
||||
.filter_map(|(k, a)| {
|
||||
Some((super::smp_store::parse_uuid(k)?, a.name.clone(), a.balance))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Money the server made and destroyed, by kind (rolled to `now`'s day).
|
||||
pub fn flows(&mut self) -> &Flows {
|
||||
self.accounts.flows.roll(self.now.div_euclid(DAY_MS));
|
||||
&self.accounts.flows
|
||||
}
|
||||
|
||||
/// All the money held for games.
|
||||
pub fn held_total(&self) -> i64 {
|
||||
self.accounts.held.values().sum()
|
||||
}
|
||||
|
||||
/// Every pool, by name.
|
||||
pub fn pools(&self) -> &BTreeMap<String, i64> {
|
||||
&self.accounts.pools
|
||||
}
|
||||
|
||||
/// Money `uuid` has held for a game.
|
||||
pub fn held(&self, uuid: u128) -> i64 {
|
||||
self.accounts
|
||||
@@ -288,7 +139,7 @@ impl Economy {
|
||||
.expect("checked")
|
||||
.balance -= amount;
|
||||
*self.accounts.held.entry(key).or_default() += amount;
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -304,22 +155,23 @@ impl Economy {
|
||||
self.take_held(&key, amount);
|
||||
let account = self.accounts.accounts.entry(key).or_default();
|
||||
account.balance = account.balance.saturating_add(amount);
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// A game decided: each stake leaves held, and `winner` gets them all,
|
||||
/// logged as `kind`.
|
||||
/// A game decided: each stake leaves held, and `winner` gets `prize`
|
||||
/// (at most the stakes together), logged as `kind`.
|
||||
pub fn award(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
stakes: &[(u128, i64)],
|
||||
winner: u128,
|
||||
prize: i64,
|
||||
) -> Result<(), String> {
|
||||
if stakes.iter().any(|(u, a)| self.held(*u) < *a) {
|
||||
let total: i64 = stakes.iter().map(|(_, a)| *a).sum();
|
||||
if stakes.iter().any(|(u, a)| self.held(*u) < *a) || !(0..=total).contains(&prize) {
|
||||
return Err("The stakes are not held.".into());
|
||||
}
|
||||
let prize: i64 = stakes.iter().map(|(_, a)| *a).sum();
|
||||
let mut entry = self.entry(kind, None, Some(winner), prize, "");
|
||||
entry["stakes"] = stakes
|
||||
.iter()
|
||||
@@ -335,7 +187,7 @@ impl Economy {
|
||||
.entry(uuid_string(winner))
|
||||
.or_default();
|
||||
account.balance = account.balance.saturating_add(prize);
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -348,223 +200,6 @@ impl Economy {
|
||||
}
|
||||
}
|
||||
|
||||
/// Money in the pool `name` (0 for one never used).
|
||||
pub fn pool(&self, name: &str) -> i64 {
|
||||
self.accounts.pools.get(name).copied().unwrap_or(0)
|
||||
}
|
||||
|
||||
fn pool_add(&mut self, name: &str, delta: i64) {
|
||||
let p = self.accounts.pools.entry(name.to_owned()).or_default();
|
||||
*p = p.saturating_add(delta);
|
||||
if *p == 0 {
|
||||
self.accounts.pools.remove(name);
|
||||
}
|
||||
}
|
||||
|
||||
/// A bid, a bet: `amount` of `uuid`'s balance goes into `pool`, logged
|
||||
/// as `kind`. An Err when they hold less.
|
||||
pub fn to_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
uuid: u128,
|
||||
pool: &str,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
) -> Result<(), String> {
|
||||
self.into_pool(kind, uuid, pool, amount, reason, "")
|
||||
}
|
||||
|
||||
/// [`Self::to_pool`] by an operator (`by`: their UUID), logged so.
|
||||
pub fn into_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
uuid: u128,
|
||||
pool: &str,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
by: &str,
|
||||
) -> Result<(), String> {
|
||||
if amount <= 0 || amount > MAX_AMOUNT {
|
||||
return Err("The amount must be a positive whole number.".into());
|
||||
}
|
||||
let key = uuid_string(uuid);
|
||||
let Some(a) = self.accounts.accounts.get(&key) else {
|
||||
return Err("No such account.".into());
|
||||
};
|
||||
if a.balance < amount {
|
||||
return Err(format!("Only {} there.", self.money(a.balance)));
|
||||
}
|
||||
let mut entry = self.entry(kind, Some(uuid), None, amount, by);
|
||||
entry["to_pool"] = pool.into();
|
||||
entry["pool_before"] = self.pool(pool).into();
|
||||
if !reason.is_empty() {
|
||||
entry["reason"] = reason.into();
|
||||
}
|
||||
self.audit.append(&entry)?;
|
||||
self.accounts
|
||||
.accounts
|
||||
.get_mut(&key)
|
||||
.expect("checked")
|
||||
.balance -= amount;
|
||||
self.pool_add(pool, amount);
|
||||
self.touch();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// A payment from `pool` to `uuid` (a refund, a payout),
|
||||
/// logged as `kind`: never more than the pool holds.
|
||||
#[allow(dead_code)] // the casino and the auction house
|
||||
pub fn from_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
pool: &str,
|
||||
uuid: u128,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
) -> Result<(), String> {
|
||||
self.out_of_pool(kind, pool, uuid, amount, reason, "")
|
||||
}
|
||||
|
||||
/// [`Self::from_pool`] by an operator (`by`: their UUID), logged so.
|
||||
pub fn out_of_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
pool: &str,
|
||||
uuid: u128,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
by: &str,
|
||||
) -> Result<(), String> {
|
||||
if amount <= 0 || amount > MAX_AMOUNT {
|
||||
return Err("The amount must be a positive whole number.".into());
|
||||
}
|
||||
let key = uuid_string(uuid);
|
||||
let Some(a) = self.accounts.accounts.get(&key) else {
|
||||
return Err("No such account.".into());
|
||||
};
|
||||
if a.balance.saturating_add(amount) > MAX_AMOUNT * 1000 {
|
||||
return Err("That account can't hold more.".into());
|
||||
}
|
||||
let held = self.pool(pool);
|
||||
if held < amount {
|
||||
return Err(format!("The {pool} only holds {}.", self.money(held)));
|
||||
}
|
||||
let mut entry = self.entry(kind, None, Some(uuid), amount, by);
|
||||
entry["from_pool"] = pool.into();
|
||||
entry["pool_before"] = held.into();
|
||||
if !reason.is_empty() {
|
||||
entry["reason"] = reason.into();
|
||||
}
|
||||
self.audit.append(&entry)?;
|
||||
self.accounts
|
||||
.accounts
|
||||
.get_mut(&key)
|
||||
.expect("checked")
|
||||
.balance += amount;
|
||||
self.pool_add(pool, -amount);
|
||||
self.touch();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Moves `amount` from one pool to another, logged as `kind`; an Err
|
||||
/// when `from` holds less.
|
||||
#[allow(dead_code)] // the casino and the auction house
|
||||
pub fn pool_move(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
from: &str,
|
||||
to: &str,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
) -> Result<(), String> {
|
||||
if amount <= 0 || amount > MAX_AMOUNT * 1000 || from == to {
|
||||
return Err("The amount must be a positive whole number.".into());
|
||||
}
|
||||
let held = self.pool(from);
|
||||
if held < amount {
|
||||
return Err(format!("The {from} only holds {}.", self.money(held)));
|
||||
}
|
||||
let mut entry = serde_json::json!({
|
||||
"time": self.now, "kind": kind, "amount": amount,
|
||||
"from_pool": from, "from_pool_before": held,
|
||||
"to_pool": to, "to_pool_before": self.pool(to),
|
||||
});
|
||||
if !reason.is_empty() {
|
||||
entry["reason"] = reason.into();
|
||||
}
|
||||
self.audit.append(&entry)?;
|
||||
self.pool_add(from, -amount);
|
||||
self.pool_add(to, amount);
|
||||
self.touch();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Money made for a pool (the casino's float, once), logged as `kind`
|
||||
/// and counted as made.
|
||||
pub fn mint_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
pool: &str,
|
||||
amount: i64,
|
||||
reason: &str,
|
||||
) -> Result<(), String> {
|
||||
if amount <= 0 || amount > MAX_AMOUNT {
|
||||
return Err("The amount must be a positive whole number.".into());
|
||||
}
|
||||
let entry = serde_json::json!({
|
||||
"time": self.now, "kind": kind, "amount": amount,
|
||||
"to_pool": pool, "pool_before": self.pool(pool), "reason": reason,
|
||||
});
|
||||
self.audit.append(&entry)?;
|
||||
self.pool_add(pool, amount);
|
||||
self.count_flow(kind, amount);
|
||||
self.touch();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// A bet against a pool decided: `uuid`'s held `stake` goes into
|
||||
/// `pool`, then `payout` (at most what the pool then holds) comes out
|
||||
/// to them; one log line. What was paid. Never makes money.
|
||||
#[allow(dead_code)] // the casino and the auction house
|
||||
pub fn settle_pool(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
uuid: u128,
|
||||
stake: i64,
|
||||
payout: i64,
|
||||
pool: &str,
|
||||
) -> Result<i64, String> {
|
||||
if stake < 0 || payout < 0 || self.held(uuid) < stake {
|
||||
return Err("The stake is not held.".into());
|
||||
}
|
||||
let before = self.pool(pool);
|
||||
let paid = payout.min(before.saturating_add(stake));
|
||||
let mut entry = self.entry(kind, None, Some(uuid), paid, "");
|
||||
entry["stake"] = stake.into();
|
||||
entry["pool"] = pool.into();
|
||||
entry["pool_before"] = before.into();
|
||||
entry["asked"] = payout.into();
|
||||
self.audit.append(&entry)?;
|
||||
let key = uuid_string(uuid);
|
||||
self.take_held(&key, stake);
|
||||
self.pool_add(pool, stake - paid);
|
||||
let account = self.accounts.accounts.entry(key).or_default();
|
||||
account.balance = account.balance.saturating_add(paid);
|
||||
self.touch();
|
||||
Ok(paid)
|
||||
}
|
||||
|
||||
/// A part's state kept with the balances (`Accounts::ext`).
|
||||
pub fn ext(&self, part: &str) -> Option<&serde_json::Value> {
|
||||
self.accounts.ext.get(part)
|
||||
}
|
||||
|
||||
/// Replaces a part's state, written with the balances at the next save.
|
||||
pub fn set_ext(&mut self, part: &str, value: serde_json::Value) {
|
||||
self.accounts.ext.insert(part.to_owned(), value);
|
||||
self.dirty = true;
|
||||
}
|
||||
|
||||
/// Writes `economy.json` when it changed (end of a tick, world closing).
|
||||
pub fn save(&mut self) -> Result<(), String> {
|
||||
self.audit.sync();
|
||||
@@ -591,7 +226,7 @@ impl Economy {
|
||||
Some(a) if a.name == name => {}
|
||||
Some(a) => {
|
||||
a.name = name.to_owned();
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
}
|
||||
None => {
|
||||
let start = self.config.starting_balance.clamp(0, MAX_AMOUNT);
|
||||
@@ -604,7 +239,7 @@ impl Economy {
|
||||
balance: start,
|
||||
},
|
||||
);
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -619,15 +254,6 @@ impl Economy {
|
||||
.and_then(|(k, a)| Some((super::smp_store::parse_uuid(k)?, a)))
|
||||
}
|
||||
|
||||
/// The name last seen of a player who has an account.
|
||||
pub fn name_of(&self, uuid: u128) -> Option<&str> {
|
||||
let a = self
|
||||
.accounts
|
||||
.accounts
|
||||
.get(&super::smp_store::uuid_string(uuid))?;
|
||||
Some(&a.name)
|
||||
}
|
||||
|
||||
/// `1,250 coins`.
|
||||
pub fn money(&self, amount: i64) -> String {
|
||||
let digits = amount.unsigned_abs().to_string();
|
||||
@@ -713,25 +339,13 @@ impl Economy {
|
||||
.get_mut(&uuid_string(to))
|
||||
.expect("checked")
|
||||
.balance = to_after;
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Adds (or with a negative `delta`, takes) money from the server: the
|
||||
/// market, games, operators. The balance never goes below zero.
|
||||
pub fn adjust(&mut self, kind: &str, uuid: u128, delta: i64, by: &str) -> Result<i64, String> {
|
||||
self.adjust_why(kind, uuid, delta, by, "")
|
||||
}
|
||||
|
||||
/// [`Self::adjust`] with the operator's reason in the log.
|
||||
pub fn adjust_why(
|
||||
&mut self,
|
||||
kind: &str,
|
||||
uuid: u128,
|
||||
delta: i64,
|
||||
by: &str,
|
||||
reason: &str,
|
||||
) -> Result<i64, String> {
|
||||
let key = uuid_string(uuid);
|
||||
let Some(a) = self.accounts.accounts.get(&key) else {
|
||||
return Err("No such account.".into());
|
||||
@@ -748,34 +362,17 @@ impl Economy {
|
||||
} else {
|
||||
(None, Some(uuid))
|
||||
};
|
||||
let mut entry = self.entry(kind, from, to, delta.abs(), by);
|
||||
if !reason.is_empty() {
|
||||
entry["reason"] = reason.into();
|
||||
}
|
||||
let entry = self.entry(kind, from, to, delta.abs(), by);
|
||||
self.audit.append(&entry)?;
|
||||
self.accounts
|
||||
.accounts
|
||||
.get_mut(&key)
|
||||
.expect("checked")
|
||||
.balance = after;
|
||||
self.count_flow(kind, delta);
|
||||
self.touch();
|
||||
self.dirty = true;
|
||||
Ok(after)
|
||||
}
|
||||
|
||||
/// Counts money made (`delta` > 0) or destroyed, by the kind's first word.
|
||||
fn count_flow(&mut self, kind: &str, delta: i64) {
|
||||
let flows = &mut self.accounts.flows;
|
||||
flows.roll(self.now.div_euclid(DAY_MS));
|
||||
let family = kind.split(' ').next().unwrap_or(kind).to_owned();
|
||||
let map = if delta >= 0 {
|
||||
&mut flows.minted
|
||||
} else {
|
||||
&mut flows.burned
|
||||
};
|
||||
*map.entry(family).or_default() += delta.abs();
|
||||
}
|
||||
|
||||
/// Appends a line of another kind to the audit log (a trade's items),
|
||||
/// with the time; the change it records waits for it.
|
||||
pub fn record(&mut self, mut entry: serde_json::Value) -> Result<(), String> {
|
||||
@@ -795,22 +392,16 @@ impl Economy {
|
||||
all
|
||||
}
|
||||
|
||||
/// Runs `/balance`, `/bal`, `/pay`, `/baltop` or the operators' `/eco`
|
||||
/// (and its other name `/money`); None for another command. `_online`:
|
||||
/// the players on (no command uses it now that `/eco give *` is gone).
|
||||
pub fn command(
|
||||
&mut self,
|
||||
me: &Player,
|
||||
_online: &[(u128, String)],
|
||||
line: &str,
|
||||
) -> Option<Vec<Out>> {
|
||||
/// Runs `/balance`, `/bal`, `/pay`, `/baltop` or `/eco`; None for another
|
||||
/// command.
|
||||
pub fn command(&mut self, me: &Player, line: &str) -> Option<Vec<Out>> {
|
||||
let words: Vec<&str> = line.split_whitespace().collect();
|
||||
let (&name, args) = words.split_first()?;
|
||||
Some(match name {
|
||||
"balance" | "bal" => self.balance_command(me, args),
|
||||
"pay" => self.pay(me, args),
|
||||
"baltop" => self.baltop(args),
|
||||
"eco" | "money" => self.eco(me, args),
|
||||
"eco" => self.eco(me, args),
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -877,55 +468,40 @@ impl Economy {
|
||||
out
|
||||
}
|
||||
|
||||
/// `/eco give <player> <amount> <reason>` (made for them: an event
|
||||
/// prize, a bug refund) and `/eco take <player> <amount> [reason]` (a
|
||||
/// cheat's gains, destroyed): operators of level 3. A gift is told to
|
||||
/// everyone, with its reason.
|
||||
fn eco(&mut self, me: &Player, args: &[&str]) -> Vec<Out> {
|
||||
if me.level < 3 {
|
||||
return vec![Out::Error("Only operators of level 3 may use /eco.".into())];
|
||||
}
|
||||
const USAGE: &str =
|
||||
"Usage: /eco give <player> <amount> <reason>, /eco take <player> <amount> [reason]";
|
||||
let (give, who, amount, reason) = match args {
|
||||
[verb @ ("give" | "take"), who, amount, reason @ ..] => {
|
||||
(*verb == "give", *who, *amount, reason.join(" "))
|
||||
let [verb, who, amount] = args else {
|
||||
return vec![Out::Error(
|
||||
"Usage: /eco give|take|set <player> <amount>".into(),
|
||||
)];
|
||||
};
|
||||
let amount = match amount.parse::<i64>() {
|
||||
Ok(a) if (0..=MAX_AMOUNT).contains(&a) => a,
|
||||
_ => {
|
||||
return vec![Out::Error(
|
||||
"The amount must be a whole number from 0.".into(),
|
||||
)];
|
||||
}
|
||||
_ => return vec![Out::Error(USAGE.into())],
|
||||
};
|
||||
let Some(amount) = parse_amount(amount) else {
|
||||
return vec![Out::Error(
|
||||
"The amount must be a positive whole number.".into(),
|
||||
)];
|
||||
};
|
||||
let reason = reason.trim().to_owned();
|
||||
if give && reason.chars().count() < 3 {
|
||||
return vec![Out::Error(
|
||||
"Say why: /eco give <player> <amount> <reason> (an event prize, a bug refund...)"
|
||||
.into(),
|
||||
)];
|
||||
}
|
||||
let Some((uuid, account)) = self.find(who) else {
|
||||
return vec![Out::Error(format!("No player named {who} has an account."))];
|
||||
};
|
||||
let name = account.name.clone();
|
||||
let by = uuid_string(me.uuid);
|
||||
let (kind, delta) = if give {
|
||||
("eco_give", amount)
|
||||
} else {
|
||||
("eco_take", -amount)
|
||||
let delta = match *verb {
|
||||
"give" => amount,
|
||||
"take" => -amount,
|
||||
"set" => amount - account.balance,
|
||||
_ => {
|
||||
return vec![Out::Error(
|
||||
"Usage: /eco give|take|set <player> <amount>".into(),
|
||||
)];
|
||||
}
|
||||
};
|
||||
match self.adjust_why(kind, uuid, delta, &by, &reason) {
|
||||
Ok(_) if give => vec![Out::All(format!(
|
||||
"{} gave {} to {name}: {reason}.",
|
||||
me.name,
|
||||
self.money(amount)
|
||||
))],
|
||||
Ok(after) => vec![Out::Reply(format!(
|
||||
"Took {} from {name}. They have {}.",
|
||||
self.money(amount),
|
||||
self.money(after)
|
||||
))],
|
||||
let by = uuid_string(me.uuid);
|
||||
match self.adjust(&format!("eco_{verb}"), uuid, delta, &by) {
|
||||
Ok(after) => vec![Out::Reply(format!("{name} now has {}.", self.money(after)))],
|
||||
Err(e) => vec![Out::Error(e)],
|
||||
}
|
||||
}
|
||||
@@ -983,9 +559,7 @@ mod tests {
|
||||
#[test]
|
||||
fn pay_moves_money_and_tells_both() {
|
||||
let (mut e, dir) = economy("pay");
|
||||
let out = e
|
||||
.command(&player(ALEX, "Alex", 0), &[], "pay steve 30")
|
||||
.unwrap();
|
||||
let out = e.command(&player(ALEX, "Alex", 0), "pay steve 30").unwrap();
|
||||
assert_eq!(
|
||||
out,
|
||||
[
|
||||
@@ -1024,7 +598,7 @@ mod tests {
|
||||
("pay Steve", "Usage: /pay <player> <amount>"),
|
||||
] {
|
||||
assert_eq!(
|
||||
e.command(&alex, &[], line).unwrap(),
|
||||
e.command(&alex, line).unwrap(),
|
||||
[Out::Error(error.into())],
|
||||
"{line}"
|
||||
);
|
||||
@@ -1041,10 +615,9 @@ mod tests {
|
||||
#[test]
|
||||
fn balances_survive_a_restart_and_a_damaged_file_stops_the_economy() {
|
||||
let (mut e, dir) = economy("restart");
|
||||
e.command(&player(ALEX, "Alex", 0), &[], "pay Steve 1,000")
|
||||
.unwrap();
|
||||
e.command(&player(ALEX, "Alex", 0), &[], "pay Steve 25")
|
||||
e.command(&player(ALEX, "Alex", 0), "pay Steve 1,000")
|
||||
.unwrap();
|
||||
e.command(&player(ALEX, "Alex", 0), "pay Steve 25").unwrap();
|
||||
e.save().unwrap();
|
||||
let again = Economy::open(&dir, Config::default()).unwrap();
|
||||
assert_eq!((again.balance(ALEX), again.balance(STEVE)), (75, 125));
|
||||
@@ -1054,174 +627,29 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn operators_give_with_a_reason_and_take_and_both_are_logged() {
|
||||
fn eco_is_for_level_3_and_never_goes_below_zero() {
|
||||
let (mut e, dir) = economy("eco");
|
||||
let op = player(ALEX, "Alex", 4);
|
||||
let alex = player(ALEX, "Alex", 2);
|
||||
assert_eq!(
|
||||
e.command(&player(ALEX, "Alex", 2), &[], "eco give Steve 5 a prize")
|
||||
.unwrap(),
|
||||
e.command(&alex, "eco give Steve 5").unwrap(),
|
||||
[Out::Error("Only operators of level 3 may use /eco.".into())]
|
||||
);
|
||||
assert!(
|
||||
matches!(&e.command(&op, &[], "eco give Steve 5").unwrap()[0], Out::Error(s) if s.starts_with("Say why")),
|
||||
"a gift needs its reason"
|
||||
);
|
||||
assert!(
|
||||
matches!(&e.command(&op, &[], "eco set Steve 5").unwrap()[0], Out::Error(s) if s.starts_with("Usage"))
|
||||
let op = player(ALEX, "Alex", 3);
|
||||
assert_eq!(
|
||||
e.command(&op, "eco give Steve 5").unwrap(),
|
||||
[Out::Reply("Steve now has 105 coins.".into())]
|
||||
);
|
||||
assert_eq!(
|
||||
e.command(&op, &[], "money give Steve 50 build contest")
|
||||
.unwrap(),
|
||||
[Out::All(
|
||||
"Alex gave 50 coins to Steve: build contest.".into()
|
||||
)]
|
||||
e.command(&op, "eco take Steve 200").unwrap(),
|
||||
[Out::Error("Only 105 coins there.".into())]
|
||||
);
|
||||
assert_eq!(
|
||||
e.command(&op, &[], "eco take Steve 200").unwrap(),
|
||||
[Out::Error("Only 150 coins there.".into())]
|
||||
);
|
||||
assert_eq!(
|
||||
e.command(&op, &[], "eco take Steve 40 duped diamonds")
|
||||
.unwrap(),
|
||||
[Out::Reply(
|
||||
"Took 40 coins from Steve. They have 110 coins.".into()
|
||||
)]
|
||||
);
|
||||
assert_eq!(e.balance(STEVE), 110);
|
||||
let flows = e.flows();
|
||||
assert_eq!(
|
||||
(flows.minted["eco_give"], flows.burned["eco_take"]),
|
||||
(50, 40)
|
||||
e.command(&op, "eco set Steve 1234567").unwrap(),
|
||||
[Out::Reply("Steve now has 1,234,567 coins.".into())]
|
||||
);
|
||||
let log = log_lines(&dir);
|
||||
let [.., give, take] = &log[..] else {
|
||||
panic!("{log:?}")
|
||||
};
|
||||
assert_eq!(
|
||||
(
|
||||
give["kind"].as_str(),
|
||||
give["reason"].as_str(),
|
||||
give["amount"].as_i64()
|
||||
),
|
||||
(Some("eco_give"), Some("build contest"), Some(50))
|
||||
);
|
||||
assert_eq!(
|
||||
(
|
||||
take["kind"].as_str(),
|
||||
take["reason"].as_str(),
|
||||
take["from"].as_str()
|
||||
),
|
||||
(
|
||||
Some("eco_take"),
|
||||
Some("duped diamonds"),
|
||||
Some(uuid_string(STEVE).as_str())
|
||||
)
|
||||
);
|
||||
assert_eq!(take["by"], uuid_string(ALEX));
|
||||
fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pools_pay_only_what_they_hold_and_survive_a_restart() {
|
||||
let (mut e, dir) = economy("pools");
|
||||
e.to_pool("ah_bid", ALEX, "ah", 30, "").unwrap();
|
||||
assert!(
|
||||
e.to_pool("ah_bid", ALEX, "ah", 71, "").is_err(),
|
||||
"more than Alex has"
|
||||
);
|
||||
assert!(
|
||||
e.from_pool("ah_sale", "ah", STEVE, 31, "").is_err(),
|
||||
"more than the pool holds"
|
||||
);
|
||||
e.from_pool("ah_sale", "ah", STEVE, 10, "").unwrap();
|
||||
e.pool_move("test", "ah", "casino", 5, "").unwrap();
|
||||
e.mint_pool("casino_float", "casino", 100, "the casino's float")
|
||||
.unwrap();
|
||||
assert_eq!((e.pool("ah"), e.pool("casino")), (15, 105));
|
||||
assert_eq!((e.balance(ALEX), e.balance(STEVE)), (70, 110));
|
||||
assert_eq!(e.flows().minted["casino_float"], 100);
|
||||
// Pools are nobody's: not in the ranking.
|
||||
assert_eq!(e.accounts().len(), 2);
|
||||
e.save().unwrap();
|
||||
let again = Economy::open(&dir, Config::default()).unwrap();
|
||||
assert_eq!((again.pool("ah"), again.pool("casino")), (15, 105));
|
||||
fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_world_from_before_0_30_gets_its_savings_and_margins_back() {
|
||||
let dir = std::env::temp_dir().join(format!("smp-eco-retire-{}", std::process::id()));
|
||||
let _ = fs::remove_dir_all(&dir);
|
||||
fs::create_dir_all(&dir).unwrap();
|
||||
let (a, s) = (uuid_string(ALEX), uuid_string(STEVE));
|
||||
let old = serde_json::json!({
|
||||
"accounts": {a.clone(): {"name": "Alex", "balance": 10}, s.clone(): {"name": "Steve", "balance": 20}},
|
||||
"pools": {"treasury": 5000, "insurance": 300, "bank": 700, "futures": 90, "casino": 40},
|
||||
"treasury": {"income": {"vat": 12}, "log": []},
|
||||
"ext": {
|
||||
"bank": {"accounts": {a.clone(): {"amount": 500, "low": 500, "earned": 3}, s.clone(): {"amount": 200}}},
|
||||
"futures": {"positions": [{"id": 1, "owner": s.clone(), "name": "Steve", "item": "minecraft:diamond",
|
||||
"long": true, "size": 1.0, "entry": 200.0, "margin": 90, "leverage": 2, "opened": 0}]},
|
||||
"jobs": {"day": 3},
|
||||
"tax": {"week": 2},
|
||||
"auction": {"listings": []}
|
||||
}
|
||||
});
|
||||
fs::write(dir.join("economy.json"), old.to_string()).unwrap();
|
||||
let mut e = Economy::open(&dir, Config::default()).unwrap();
|
||||
assert_eq!((e.balance(ALEX), e.balance(STEVE)), (510, 310));
|
||||
assert_eq!(
|
||||
e.pools().keys().collect::<Vec<_>>(),
|
||||
["casino"],
|
||||
"the retired pools are gone"
|
||||
);
|
||||
assert!(
|
||||
e.ext("bank").is_none()
|
||||
&& e.ext("futures").is_none()
|
||||
&& e.ext("jobs").is_none()
|
||||
&& e.ext("tax").is_none()
|
||||
);
|
||||
assert!(e.ext("auction").is_some(), "the auction house stays");
|
||||
let kinds: Vec<_> = log_lines(&dir)
|
||||
.iter()
|
||||
.map(|l| l["kind"].as_str().unwrap().to_owned())
|
||||
.collect();
|
||||
assert_eq!(kinds, ["bank_closed", "bank_closed", "futures_closed"]);
|
||||
e.save().unwrap();
|
||||
let saved = fs::read_to_string(dir.join("economy.json")).unwrap();
|
||||
assert!(!saved.contains("treasury"), "{saved}");
|
||||
// Only once.
|
||||
let again = Economy::open(&dir, Config::default()).unwrap();
|
||||
assert_eq!((again.balance(ALEX), again.balance(STEVE)), (510, 310));
|
||||
assert_eq!(log_lines(&dir).len(), 3);
|
||||
fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn settle_pool_never_pays_more_than_the_pool_and_award_pays_the_stakes() {
|
||||
let (mut e, dir) = economy("settle");
|
||||
e.hold("bet", ALEX, 50).unwrap();
|
||||
// The pool held nothing: a 1,000 payout is capped at the stake.
|
||||
assert_eq!(
|
||||
e.settle_pool("roulette", ALEX, 50, 1000, "casino").unwrap(),
|
||||
50
|
||||
);
|
||||
assert_eq!((e.balance(ALEX), e.pool("casino")), (100, 0));
|
||||
e.hold("bet", ALEX, 40).unwrap();
|
||||
assert_eq!(e.settle_pool("roulette", ALEX, 40, 0, "casino").unwrap(), 0);
|
||||
assert_eq!((e.balance(ALEX), e.pool("casino")), (60, 40));
|
||||
assert!(
|
||||
e.settle_pool("roulette", ALEX, 10, 0, "casino").is_err(),
|
||||
"nothing held"
|
||||
);
|
||||
// A coinflip: the winner gets both stakes, no fee.
|
||||
e.hold("coinflip_stake", ALEX, 50).unwrap();
|
||||
e.hold("coinflip_stake", STEVE, 50).unwrap();
|
||||
e.award("coinflip_win", &[(ALEX, 50), (STEVE, 50)], STEVE)
|
||||
.unwrap();
|
||||
assert_eq!((e.balance(ALEX), e.balance(STEVE)), (10, 150));
|
||||
// Nothing made: 200 at the start.
|
||||
assert_eq!(e.balance(ALEX) + e.balance(STEVE) + e.pool("casino"), 200);
|
||||
assert_eq!(log.last().unwrap()["kind"], "eco_set");
|
||||
assert_eq!(log.last().unwrap()["by"], uuid_string(ALEX));
|
||||
fs::remove_dir_all(dir).unwrap();
|
||||
}
|
||||
|
||||
@@ -1231,15 +659,12 @@ mod tests {
|
||||
for i in 0..12u128 {
|
||||
e.seen(100 + i, &format!("P{i:02}"));
|
||||
}
|
||||
e.command(&player(ALEX, "Alex", 0), &[], "pay Steve 50")
|
||||
.unwrap();
|
||||
let first = e.command(&player(ALEX, "Alex", 0), &[], "baltop").unwrap();
|
||||
e.command(&player(ALEX, "Alex", 0), "pay Steve 50").unwrap();
|
||||
let first = e.command(&player(ALEX, "Alex", 0), "baltop").unwrap();
|
||||
assert_eq!(first[0], Out::Reply("Richest players (1/2):".into()));
|
||||
assert_eq!(first[1], Out::Reply("1. Steve: 150 coins".into()));
|
||||
assert_eq!(first.len(), 11);
|
||||
let last = e
|
||||
.command(&player(ALEX, "Alex", 0), &[], "baltop 2")
|
||||
.unwrap();
|
||||
let last = e.command(&player(ALEX, "Alex", 0), "baltop 2").unwrap();
|
||||
assert_eq!(
|
||||
last.last().unwrap(),
|
||||
&Out::Reply("14. Alex: 50 coins".into())
|
||||
|
||||
@@ -25,6 +25,8 @@ pub struct Config {
|
||||
pub cooldown_seconds: i64,
|
||||
/// How long an offer waits before its stake goes back.
|
||||
pub offer_seconds: i64,
|
||||
/// What the server keeps of the pot, in percent (0: the winner takes all).
|
||||
pub fee_percent: i64,
|
||||
/// The lottery: a ticket's price, the tickets one player may hold in a
|
||||
/// draw, and the time from a round's first ticket to its draw.
|
||||
pub ticket_price: i64,
|
||||
@@ -40,6 +42,7 @@ impl Default for Config {
|
||||
max_bet: 1000,
|
||||
cooldown_seconds: 30,
|
||||
offer_seconds: 60,
|
||||
fee_percent: 0,
|
||||
ticket_price: 10,
|
||||
max_tickets: 100,
|
||||
lottery_seconds: 3600,
|
||||
@@ -281,14 +284,15 @@ impl Games {
|
||||
return vec![Out::Error(e)];
|
||||
}
|
||||
let o = self.offers.remove(i);
|
||||
let prize = amount * 2;
|
||||
let pot = amount * 2;
|
||||
let prize = pot - pot * self.config.fee_percent.clamp(0, 100) / 100;
|
||||
let (winner, loser, winner_name, loser_name) = if heads() {
|
||||
(o.from, me.uuid, o.from_name.as_str(), me.name.as_str())
|
||||
} else {
|
||||
(me.uuid, o.from, me.name.as_str(), o.from_name.as_str())
|
||||
};
|
||||
let stakes = [(o.from, amount), (me.uuid, amount)];
|
||||
if let Err(e) = economy.award("coinflip_win", &stakes, winner) {
|
||||
if let Err(e) = economy.award("coinflip_win", &stakes, winner, prize) {
|
||||
// Not decided: both stakes go back (or, failing that, at the next start).
|
||||
for (u, a) in stakes {
|
||||
let _ = economy.release("coinflip_cancel", u, a);
|
||||
|
||||
Loaded 100 of 138 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user