Skip to content

Add brush_maps - #13

Merged
tomaszbk merged 5 commits into
mirai-engine:mainfrom
5hif7y:add-brush_maps
Nov 8, 2026
Merged

tomaszbk merged 5 commits into
mirai-engine:mainfrom
5hif7y:add-brush_maps

Conversation

@5hif7y

@5hif7y 5hif7y commented Nov 7, 2026 •

Copy link
Copy Markdown
Member

The map plugins in one catalog entry. brush_maps holds valve220, map_convert, map_agent and bsp_decompile as its companions in plugins/<name>/, each a git subtree of its own repository: the files are in brush_maps, so the engine installs it as it is, and each plugin keeps its own repository, tests and history, so it can be audited and debugged on its own. The catalog lists only brush_maps; #7, #8, #9 and #10 are closed.

  • The packages of the four import each other by relative path, so the same files build installed alone and as companions.
  • The methods keep the names of their plugins: map_convert.to_valve220, map_convert.unpack_wad, map_agent.layout, map_agent.check, bsp_decompile.to_valve220.
  • All of it is MIT or Apache-2.0. The decompilation method of bsp_decompile is the one of ericw-tools, credited in its README.

It no longer depends on other changes. Submodules would need mirai-engine/mirai#2 and #14, which stay open on their own as support for plugins that do hold submodules.

Checked against main of the engine:

  • uv run scripts/validate.py lists brush_maps, bsp_decompile, map_agent, map_convert, valve220.
  • mirai plugin add <this url> --ref <this commit> in an empty project brings the four companions with their files, and build editor builds them.
  • Their 26 tests pass, run from plugins/brush_maps/plugins/<name>, and so do the same four built alone.
  • In a project that has valve220 installed alone, plugin add brush_maps is refused: "two folders provide the plugin 'valve220'", and the project is left as it was.

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 7, 2026
5hif7y and others added 2 commits November 7, 2026 18:23
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@5hif7y
5hif7y marked this pull request as draft November 7, 2026 21:24
@5hif7y

5hif7y commented Nov 7, 2026

Copy link
Copy Markdown
Member Author

Thanks for the review. I took it a bit differently:

  • brush_maps is now the only catalog entry for maps, and Add valve220 #7, Add map_convert #8, Add bsp_decompile #9 and Add map_agent #10 are closed. bsp_decompile is inside too, now under MIT or Apache-2.0, crediting ericw-tools for the method.
  • Instead of moving the code into one flat plugin, the four stay as their own repositories, held here as companion submodules in plugins/<name>/. Each one can be reviewed, tested and debugged on its own, and the catalog still sees one plugin. assemble.py and SOURCES.json are gone.
  • Submodules need the engine to clone them, so this stays a draft until that and a validator change that sees submodule companions are in. I'll link both PRs here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@5hif7y

5hif7y commented Nov 7, 2026

Copy link
Copy Markdown
Member Author

The two changes this depends on are open: mirai-engine/mirai#2 (install, update and sync check out the submodules of a plugin; closes mirai-engine/mirai#1) and #14 (the validator sees companions held as submodules). The entry now points to 778a02f, which only fixes two READMEs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@5hif7y

5hif7y commented Nov 7, 2026

Copy link
Copy Markdown
Member Author

Changed course: the four companions are now git subtrees instead of submodules, so their files are in this repository and brush_maps installs with the engine as it is, at eb54ebd. Each plugin still has its own repository and history; git subtree pull brings a fix from it. mirai-engine/mirai#2 and #14 stay open as support for plugins that hold submodules, but this entry no longer waits for them.

@5hif7y
5hif7y marked this pull request as ready for review November 7, 2026 22:08
@tomaszbk
tomaszbk merged commit cfe0915 into mirai-engine:main Nov 8, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants