diff --git a/Cargo.lock b/Cargo.lock index df07f8a..c62fcb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -548,7 +548,7 @@ dependencies = [ [[package]] name = "canvas-pilot" -version = "0.9.41" +version = "0.9.42" dependencies = [ "base64", "craft-dwg", diff --git a/Cargo.toml b/Cargo.toml index 0b32726..f659fa8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"] resolver = "3" [workspace.package] -version = "0.9.41" +version = "0.9.42" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot" diff --git a/crates/canvas-pilot/src/theme_packs.rs b/crates/canvas-pilot/src/theme_packs.rs index 8ab2102..e7d1c30 100644 --- a/crates/canvas-pilot/src/theme_packs.rs +++ b/crates/canvas-pilot/src/theme_packs.rs @@ -374,9 +374,9 @@ mod tests { include_str!("../../../docs/theme-packs/detroit-become-human/manifest.json"), ), ( - "minecraft", - include_bytes!("../../../docs/theme-packs/minecraft.zip"), - include_str!("../../../docs/theme-packs/minecraft/manifest.json"), + "vivid-world", + include_bytes!("../../../docs/theme-packs/vivid-world.zip"), + include_str!("../../../docs/theme-packs/vivid-world/manifest.json"), ), ]; fn zip(files: &[(&str, &[u8])]) -> Vec { @@ -452,7 +452,7 @@ mod tests { assert_eq!(choices(&restarted), choices(&ctx)); let isolated = egui::Context::default(); assert!(choices(&isolated).is_empty()); - let missing = Theme::Pack("minecraft/overworld".into()); + let missing = Theme::Pack("vivid-world/default".into()); missing.apply(&isolated); assert_eq!(Theme::current(&isolated), missing); assert_eq!( diff --git a/docs/canvas-pilot/changelog.md b/docs/canvas-pilot/changelog.md index 127521f..50a0d87 100644 --- a/docs/canvas-pilot/changelog.md +++ b/docs/canvas-pilot/changelog.md @@ -4,6 +4,14 @@ ## Unreleased +### v0.9.42 + +- Replaced the distributed Minecraft palette with Vivid World: midnight navy, + violet, pink and cyan crystal accents inspired by the supplied reference. + Added its standalone pack and updated extra-themes to revision 4. Existing + standalone Minecraft installs remain user-managed; an active removed collection + theme falls back to Midra Dark. Updated downloads, docs and contrast coverage. + ### v0.9.41 - Retuned Deep Rock Galactic to gold and molten-orange accents on dark rock/brown diff --git a/docs/canvas-pilot/guide/preferences.md b/docs/canvas-pilot/guide/preferences.md index f8a01ba..5d80124 100644 --- a/docs/canvas-pilot/guide/preferences.md +++ b/docs/canvas-pilot/guide/preferences.md @@ -115,10 +115,10 @@ close it with its window close button when finished. Reusing a theme moves it to the top without duplicates. Closing the picker without choosing leaves the theme and history unchanged. Use **Theme packs** to install additional palettes; see [Add a theme pack](theme-packs.md) -for Tokyo Night, Catppuccin, Detroit: Become Human and Minecraft examples. +for Tokyo Night, Catppuccin, Detroit: Become Human and Vivid World examples. The viewport, grid, layer boxes and source test patterns use the selected palette; -selected layers remain gold (darker gold for contrast in light themes). Imported +selected layers use the palette’s selection accent. Imported reference images retain their colors. Theme and history survive opening projects and are not included in project JSON or geometry exports. diff --git a/docs/canvas-pilot/guide/theme-packs.md b/docs/canvas-pilot/guide/theme-packs.md index 3585863..2307c53 100644 --- a/docs/canvas-pilot/guide/theme-packs.md +++ b/docs/canvas-pilot/guide/theme-packs.md @@ -23,7 +23,7 @@ keeps separate copies, so you only need one option. | [Tokyo Night](../../theme-packs/tokyo-night.zip) | Dark blue with cool cyan accents | [manifest.json](../../theme-packs/tokyo-night/manifest.json) | | [Catppuccin Mocha](../../theme-packs/catppuccin.zip) | Soft charcoal and pastel accents | [manifest.json](../../theme-packs/catppuccin/manifest.json) | | [Detroit: Become Human](../../theme-packs/detroit-become-human.zip) | Deep blue, pale text and cyan android-inspired accents | [manifest.json](../../theme-packs/detroit-become-human/manifest.json) | -| [Minecraft Overworld](../../theme-packs/minecraft.zip) | Earth and stone surfaces with grass-green accents | [manifest.json](../../theme-packs/minecraft/manifest.json) | +| [Vivid World](../../theme-packs/vivid-world.zip) | Midnight navy, violet, pink and cyan crystal accents | [manifest.json](../../theme-packs/vivid-world/manifest.json) | | [Deep Rock Galactic](../../theme-packs/deep-rock-galactic.zip) | Dark, gold/molten-orange accents | [manifest.json](../../theme-packs/deep-rock-galactic/manifest.json) | | [Dispatch](../../theme-packs/dispatch.zip) | Dark, yellow/cyan accents | [manifest.json](../../theme-packs/dispatch/manifest.json) | | [Dracula](../../theme-packs/dracula.zip) | Dark | [manifest.json](../../theme-packs/dracula/manifest.json) | @@ -40,10 +40,14 @@ keeps separate copies, so you only need one option. Tokyo Night adapts the [upstream palette](https://github.com/folke/tokyonight.nvim), and Catppuccin uses [Mocha colors](https://catppuccin.com/palette/). Their license notices travel inside the ZIP and can be viewed under **Attribution and licenses**. -The Detroit, Minecraft, Dispatch, Helldivers and Deep Rock Galactic themes are +The Detroit, Vivid World, Dispatch, Helldivers and Deep Rock Galactic themes are original, unofficial color interpretations; they include no game artwork, fonts or code and are not endorsed by the games' owners. +The current collection replaces Minecraft with Vivid World. Reimport the collection +to update; if Minecraft was selected, choose Vivid World after the update returns +to Midra Dark. A separately installed Minecraft pack remains until you remove it. + ## Manage packs The manager uses a compact, searchable pack list and shows the contents of only @@ -51,7 +55,7 @@ one selected pack. Search by pack ID or theme name; **Clear** restores the full list. Rows show the theme count and revision, with a dot marking packs currently in use. Large collections scroll within the list instead of stretching Settings. -Select a pack to see its theme swatches, light/dark labels, attribution and +Select a pack to see its theme names, swatches, attribution and **Remove pack…** action. The contents and license text scroll independently; removal stays above them. On narrower windows, details appear below the list. Newly installed or updated packs are selected automatically. diff --git a/docs/interfaces/theme-packs.md b/docs/interfaces/theme-packs.md index 4de5a67..229c046 100644 --- a/docs/interfaces/theme-packs.md +++ b/docs/interfaces/theme-packs.md @@ -104,8 +104,13 @@ the importer continues to accept both stored and DEFLATE-compressed packs. ## Bundled collection `docs/theme-packs/extra-themes.zip` is a normal version-1 pack (`extra-themes`, -revision 3), containing all 16 distributed themes. One import validates and installs +revision 4), containing all 16 distributed themes. One import validates and installs all entries atomically; it does not unpack nested ZIPs. The build script combines individual manifests in sorted path order, prefixes theme IDs with their source pack ID and preserves all notices. Individual packs and the collection have distinct saved choices and can coexist. Updates and removal operate on the whole collection. + +Collection revision 4 replaces `minecraft-overworld` with `vivid-world-default`. +Updating while Minecraft is active uses the existing removed-theme fallback to +Midra Dark; Vivid World can then be selected explicitly. Older standalone Minecraft +installations are not deleted or remapped by this collection update. diff --git a/docs/theme-packs/extra-themes.zip b/docs/theme-packs/extra-themes.zip index 1605201..bed72a5 100644 Binary files a/docs/theme-packs/extra-themes.zip and b/docs/theme-packs/extra-themes.zip differ diff --git a/docs/theme-packs/minecraft.zip b/docs/theme-packs/minecraft.zip deleted file mode 100644 index f8b74bb..0000000 Binary files a/docs/theme-packs/minecraft.zip and /dev/null differ diff --git a/docs/theme-packs/minecraft/manifest.json b/docs/theme-packs/minecraft/manifest.json deleted file mode 100644 index efec793..0000000 --- a/docs/theme-packs/minecraft/manifest.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 1, - "id": "minecraft", - "revision": 1, - "themes": [ - { - "id": "overworld", - "name": "Minecraft Overworld", - "light": false, - "colors": { - "canvas": "#182018", - "banner": "#283024", - "grid": "#65704b", - "layer": "#363d28", - "pattern": [ - "#363d28", - "#1e241b" - ], - "bg": "#182018", - "panel": "#283024", - "field": "#1e241b", - "line": "#65704b", - "text": "#f1eddb", - "muted": "#c5cbb2", - "cyan": "#a8dc70", - "amber": "#f2ce76", - "purple": "#3e5830" - } - } - ], - "notices": "Original Canvas Pilot palette inspired by Minecraft grass, stone and earth colors. Unofficial; no game artwork, fonts or code included. Not affiliated with Mojang or Microsoft. Palette provided under the Canvas Pilot MIT license." -} diff --git a/docs/theme-packs/vivid-world.zip b/docs/theme-packs/vivid-world.zip new file mode 100644 index 0000000..03545ff Binary files /dev/null and b/docs/theme-packs/vivid-world.zip differ diff --git a/docs/theme-packs/vivid-world/manifest.json b/docs/theme-packs/vivid-world/manifest.json new file mode 100644 index 0000000..cc315bd --- /dev/null +++ b/docs/theme-packs/vivid-world/manifest.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "id": "vivid-world", + "revision": 1, + "themes": [ + { + "id": "default", + "name": "Vivid World", + "light": false, + "colors": { + "canvas": "#14162e", + "banner": "#2a2545", + "grid": "#68618c", + "layer": "#323154", + "pattern": [ + "#41304f", + "#234252" + ], + "bg": "#101023", + "panel": "#19172f", + "field": "#24233f", + "line": "#68618c", + "text": "#fff1dc", + "muted": "#c4bddc", + "cyan": "#77e4f2", + "amber": "#ff9dcc", + "purple": "#633e77" + } + } + ], + "notices": "Original Canvas Pilot palette inspired by the supplied Vivid World title-art reference: midnight navy, violet, pink and luminous crystal accents. Unofficial; no game artwork, fonts, logos or code included. Not affiliated with or endorsed by the game owners. Palette provided under the Canvas Pilot MIT license." +} diff --git a/scripts/build-theme-packs.py b/scripts/build-theme-packs.py index 59b16cd..4ddd2ec 100644 --- a/scripts/build-theme-packs.py +++ b/scripts/build-theme-packs.py @@ -32,7 +32,7 @@ def collection(sources): notices.append(manifest['id'] + '\n' + manifest.get('notices', '')) if not 1 <= len(themes) <= 16: raise ValueError('The collection must respect the v1 limit of 16 themes') - manifest = dict(version=1, id='extra-themes', revision=3, + manifest = dict(version=1, id='extra-themes', revision=4, themes=themes, notices='\n\n'.join(notices)) return (json.dumps(manifest, indent=2) + '\n').encode()