2026-09-26 18:30:02 +02:00
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.IO;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
using GameCult.Caching;
|
|
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
|
|
using System.Text;
|
|
|
|
|
|
|
|
|
|
// Builds the one catalog snapshot CultCache needs. Sources remain the shipped catalog and each
|
|
|
|
|
// mod-owned ship.cc; this output is disposable and never becomes an authoring surface.
|
|
|
|
|
public static class ShipModCatalog
|
|
|
|
|
{
|
2026-09-26 19:10:44 +02:00
|
|
|
public sealed class Package
|
|
|
|
|
{
|
2026-09-30 03:06:43 +02:00
|
|
|
public HullData Hull;
|
|
|
|
|
public ShipAuthoring Visual;
|
2026-09-26 19:10:44 +02:00
|
|
|
public string ModelPath;
|
|
|
|
|
public Dictionary<string, uint> NodeIndices;
|
|
|
|
|
}
|
|
|
|
|
|
2026-09-26 18:30:02 +02:00
|
|
|
public static CultRecordKey HullKey(string id) => new CultRecordKey("mod-hull:" + id);
|
|
|
|
|
public static CultRecordKey AuthoringKey(string id) => new CultRecordKey("mod-ship:" + id);
|
|
|
|
|
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
// A key the mods own. The shipped catalog and its authored records never reference one: a mod may be uninstalled.
|
|
|
|
|
public static bool IsModKey(CultRecordKey key) =>
|
|
|
|
|
key.IsSet() && (key.Value.StartsWith("mod-hull:", StringComparison.Ordinal) || key.Value.StartsWith("mod-ship:", StringComparison.Ordinal));
|
|
|
|
|
|
|
|
|
|
// A package left out of the composition, named by its directory, with every reason it was left out.
|
|
|
|
|
public sealed class Exclusion
|
|
|
|
|
{
|
|
|
|
|
public string Package;
|
|
|
|
|
public string Reason;
|
|
|
|
|
public override string ToString() => $"{Package}: {Reason}";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public sealed class Composition
|
|
|
|
|
{
|
|
|
|
|
// Ship IDs of the packages composed into the derived catalog, in directory order.
|
|
|
|
|
public string[] Included;
|
|
|
|
|
// Packages that failed on their own or collided with the catalog or with each other, in directory order.
|
|
|
|
|
public Exclusion[] Excluded;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// One bad package never stops the rest. Each package is read and validated on its own; one that fails is excluded and
|
|
|
|
|
// named. A collision (with the shipped catalog, or with another package's hull name) excludes every package involved,
|
|
|
|
|
// since neither has a claim to the name. The derived catalog holds the shipped catalog plus the included packages.
|
|
|
|
|
// Unsafe inputs and outputs (a missing catalog, a derived file that would replace a source) still throw: nothing is composed.
|
|
|
|
|
public static Composition Compose(string shippedCatalog, string outputCatalog, string modsRoot)
|
2026-09-26 18:30:02 +02:00
|
|
|
{
|
|
|
|
|
var source = Path.GetFullPath(shippedCatalog);
|
|
|
|
|
var output = Path.GetFullPath(outputCatalog);
|
|
|
|
|
var root = Path.GetFullPath(modsRoot);
|
|
|
|
|
if (!File.Exists(source)) throw new FileNotFoundException("Shipped catalog is missing", source);
|
|
|
|
|
if (!Directory.Exists(root)) throw new DirectoryNotFoundException($"Mod root is missing: {root}");
|
|
|
|
|
if (string.Equals(source, output, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
throw new InvalidOperationException("The derived catalog cannot replace the shipped catalog.");
|
|
|
|
|
if (output.StartsWith(root + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
throw new InvalidOperationException("The derived catalog cannot replace a mod source or asset.");
|
|
|
|
|
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
var reasons = new SortedDictionary<string, List<string>>(StringComparer.Ordinal);
|
|
|
|
|
void Exclude(string package, string reason)
|
|
|
|
|
{
|
|
|
|
|
if (!reasons.TryGetValue(package, out var list)) reasons[package] = list = new List<string>();
|
|
|
|
|
list.Add(reason);
|
|
|
|
|
}
|
|
|
|
|
var packages = new List<(string Directory, Package Package)>();
|
2026-09-26 18:30:02 +02:00
|
|
|
foreach (var directory in Directory.GetDirectories(root).OrderBy(path => path, StringComparer.Ordinal))
|
|
|
|
|
{
|
|
|
|
|
var path = Path.Combine(directory, "ship.cc");
|
|
|
|
|
if (!File.Exists(path)) continue;
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
var name = Path.GetFileName(directory);
|
|
|
|
|
// A package can fail in any way a hostile or broken file can, so its failure is quarantined whatever it is.
|
|
|
|
|
try { packages.Add((name, ReadPackage(path))); }
|
|
|
|
|
catch (Exception error) { Exclude(name, error.Message); }
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Directory.CreateDirectory(Path.GetDirectoryName(output));
|
Pin Compose, ReadPackage and ReadNodeIds; refuse name collisions (S-Soul F2, F6)
Compose, ReadPackage and ReadNodeIds had no test. ShipModCatalogTests now
covers the derived catalog, the atomic replace of an existing one, every
failure path leaving the previous derived file byte-identical, the unsafe
source/output refusals, package binding (directory name, GLB existence and
extension, anchor node presence), and the GLB reader (each header guard, the
JSON chunk boundary, node index accounting, duplicate ids).
Writing them exposed three defects in Compose, fixed here:
- F6: AetheriaStores.CatalogTypes routes ShipAuthoring to the shipped
catalog, and CultCache indexes names per concrete type with last writer
winning while GetByName over a base type throws on a cross-subtype match.
Compose checked keys only, so a mod hull named like a shipped item, or like
another mod's hull, silently shadowed it or broke lookups. It now refuses
a hull name matching any catalog ItemData and a ship ID matching an
existing ShipAuthoring, naming the ship.
- The backing store writes a .lock file beside every file it opens, so each
Compose left <output>.<guid>.tmp.lock behind, success or failure, once per
boot. The working copy now lives in its own directory that is deleted whole.
- Deleted: the duplicate-ID check (ReadPackage already pins ID to directory
name, so it could not fire) and ReadPackage's containment StartsWith
(Validate already refuses rooted and `..` model paths on the same Read).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-09-29 23:47:13 +02:00
|
|
|
// The store keeps a lock file beside every file it opens, so the working copy gets its own directory and the
|
|
|
|
|
// whole directory goes away, whatever the store left in it.
|
|
|
|
|
var workspace = output + "." + Guid.NewGuid().ToString("N") + ".tmp";
|
|
|
|
|
var temporary = Path.Combine(workspace, "catalog.cc");
|
2026-09-26 18:30:02 +02:00
|
|
|
try
|
|
|
|
|
{
|
Pin Compose, ReadPackage and ReadNodeIds; refuse name collisions (S-Soul F2, F6)
Compose, ReadPackage and ReadNodeIds had no test. ShipModCatalogTests now
covers the derived catalog, the atomic replace of an existing one, every
failure path leaving the previous derived file byte-identical, the unsafe
source/output refusals, package binding (directory name, GLB existence and
extension, anchor node presence), and the GLB reader (each header guard, the
JSON chunk boundary, node index accounting, duplicate ids).
Writing them exposed three defects in Compose, fixed here:
- F6: AetheriaStores.CatalogTypes routes ShipAuthoring to the shipped
catalog, and CultCache indexes names per concrete type with last writer
winning while GetByName over a base type throws on a cross-subtype match.
Compose checked keys only, so a mod hull named like a shipped item, or like
another mod's hull, silently shadowed it or broke lookups. It now refuses
a hull name matching any catalog ItemData and a ship ID matching an
existing ShipAuthoring, naming the ship.
- The backing store writes a .lock file beside every file it opens, so each
Compose left <output>.<guid>.tmp.lock behind, success or failure, once per
boot. The working copy now lives in its own directory that is deleted whole.
- Deleted: the duplicate-ID check (ReadPackage already pins ID to directory
name, so it could not fire) and ReadPackage's containment StartsWith
(Validate already refuses rooted and `..` model paths on the same Read).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-09-29 23:47:13 +02:00
|
|
|
Directory.CreateDirectory(workspace);
|
2026-09-26 18:30:02 +02:00
|
|
|
File.Copy(source, temporary);
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
Composition composition;
|
2026-09-26 18:30:02 +02:00
|
|
|
using (var cache = AetheriaStores.Open(temporary, catalogWritable: true))
|
|
|
|
|
{
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
// Collisions are judged against the shipped records alone, before any package is written, so the
|
|
|
|
|
// verdict does not depend on directory order. CultCache indexes names per concrete type and lets the
|
|
|
|
|
// last writer win, and GetByName over a base type throws on a match across subtypes: a mod hull named
|
|
|
|
|
// like any shipped item, or like another mod's hull, would make name lookups wrong or throw.
|
|
|
|
|
var keys = new HashSet<CultRecordKey>(cache.AllStoredDocuments.Select(record => record.Key));
|
|
|
|
|
var itemNames = new HashSet<string>(cache.GetAll<ItemData>().Select(item => item.Name), StringComparer.Ordinal);
|
|
|
|
|
var shipIds = new HashSet<string>(cache.GetAll<ShipAuthoring>().Select(existing => existing.Id), StringComparer.Ordinal);
|
|
|
|
|
foreach (var (directory, package) in packages)
|
2026-09-26 18:30:02 +02:00
|
|
|
{
|
2026-09-30 03:06:43 +02:00
|
|
|
var (hull, ship) = (package.Hull, package.Visual);
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
if (keys.Contains(HullKey(ship.Id)) || keys.Contains(AuthoringKey(ship.Id)))
|
|
|
|
|
Exclude(directory, $"a mod key collides with an existing catalog record.");
|
|
|
|
|
if (itemNames.Contains(hull.Name))
|
|
|
|
|
Exclude(directory, $"hull name '{hull.Name}' collides with an existing catalog item.");
|
|
|
|
|
if (shipIds.Contains(ship.Id))
|
|
|
|
|
Exclude(directory, $"ship ID collides with an existing catalog ship authoring record.");
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
foreach (var claim in packages.GroupBy(package => package.Package.Hull.Name, StringComparer.Ordinal).Where(group => group.Count() > 1))
|
|
|
|
|
foreach (var (directory, package) in claim)
|
|
|
|
|
Exclude(directory, $"hull name '{claim.Key}' is also claimed by " +
|
|
|
|
|
string.Join(", ", claim.Where(other => other.Directory != directory).Select(other => other.Directory)) + ".");
|
|
|
|
|
|
|
|
|
|
var included = packages.Where(package => !reasons.ContainsKey(package.Directory)).Select(package => package.Package).ToArray();
|
|
|
|
|
foreach (var package in included)
|
|
|
|
|
// Verbatim: the mod store's own two records, under the keys it already holds them at.
|
|
|
|
|
ShipAuthoringStore.Write(cache, package.Hull, package.Visual);
|
Ship S1 fixes: refuse the retired embedded hull, one body per hull, closed validator gaps
Load reads the raw ship authoring payload and refuses a non-nil retired key 1 (the
pre-S1 embedded hull) naming the old shape, so a stale hull is no longer silently
ignored; ship_cc.py refuses the same file on read and therefore on every save.
A hull naming both a Unity prefab and a visual is refused by one predicate
(ShipAuthoringStore.RequireOneBody), called by Validate and by Compose over every hull
in the derived catalog, shipped ones included; a whitespace-only Prefab is unset. This
replaces the mod-ship-only "cannot name a Unity prefab" check.
The validator also refuses non-finite or negative hardpoint Armor and FiringArc, an
undefined HardpointType or ItemRotation, and an anchor Role outside the eight the
schema documents.
Load wraps MessagePack decode failures with the file path. Python replace_layout
refuses non-boolean layout and hardpoint-footprint cells.
Tests: exact Visual key comparison, HullData.Visual at key 32, a save refreshing
stored_at, plus one case per new refusal. HullData.Visual is now [Inspectable] like
Prefab (Unity editor only; not compiled here).
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 06:18:20 +02:00
|
|
|
// Shipped hulls too: the derived catalog must not hold a hull that names two bodies.
|
|
|
|
|
foreach (var hull in cache.GetAll<HullData>())
|
|
|
|
|
ShipAuthoringStore.RequireOneBody(hull, hull.Name);
|
2026-09-26 18:30:02 +02:00
|
|
|
cache.FlushAsync().GetAwaiter().GetResult();
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
composition = new Composition
|
|
|
|
|
{
|
|
|
|
|
Included = included.Select(package => package.Visual.Id).ToArray(),
|
|
|
|
|
Excluded = reasons.Select(entry => new Exclusion { Package = entry.Key, Reason = string.Join("; ", entry.Value) }).ToArray()
|
|
|
|
|
};
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
|
|
|
|
if (File.Exists(output)) File.Replace(temporary, output, null);
|
|
|
|
|
else File.Move(temporary, output);
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
return composition;
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
|
|
|
|
finally
|
|
|
|
|
{
|
Pin Compose, ReadPackage and ReadNodeIds; refuse name collisions (S-Soul F2, F6)
Compose, ReadPackage and ReadNodeIds had no test. ShipModCatalogTests now
covers the derived catalog, the atomic replace of an existing one, every
failure path leaving the previous derived file byte-identical, the unsafe
source/output refusals, package binding (directory name, GLB existence and
extension, anchor node presence), and the GLB reader (each header guard, the
JSON chunk boundary, node index accounting, duplicate ids).
Writing them exposed three defects in Compose, fixed here:
- F6: AetheriaStores.CatalogTypes routes ShipAuthoring to the shipped
catalog, and CultCache indexes names per concrete type with last writer
winning while GetByName over a base type throws on a cross-subtype match.
Compose checked keys only, so a mod hull named like a shipped item, or like
another mod's hull, silently shadowed it or broke lookups. It now refuses
a hull name matching any catalog ItemData and a ship ID matching an
existing ShipAuthoring, naming the ship.
- The backing store writes a .lock file beside every file it opens, so each
Compose left <output>.<guid>.tmp.lock behind, success or failure, once per
boot. The working copy now lives in its own directory that is deleted whole.
- Deleted: the duplicate-ID check (ReadPackage already pins ID to directory
name, so it could not fire) and ReadPackage's containment StartsWith
(Validate already refuses rooted and `..` model paths on the same Read).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-09-29 23:47:13 +02:00
|
|
|
if (Directory.Exists(workspace)) Directory.Delete(workspace, true);
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-09-26 19:10:44 +02:00
|
|
|
public static Package ReadPackage(string shipPath)
|
|
|
|
|
{
|
|
|
|
|
var path = Path.GetFullPath(shipPath);
|
2026-09-30 03:06:43 +02:00
|
|
|
var (hull, ship) = ShipAuthoringStore.Read(path);
|
2026-09-30 06:43:52 +02:00
|
|
|
return Bind(hull, ship, Path.GetDirectoryName(path), path);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// The package a catalog hull names: its two records come from the catalog, and only the GLB comes from the mod
|
|
|
|
|
// directory (<modsRoot>/<id>/<ModelAsset>). Gameplay reads a mod ship through this, never through its ship.cc.
|
|
|
|
|
public static Package PackageOf(CultCache catalog, HullData hull, string modsRoot)
|
|
|
|
|
{
|
|
|
|
|
var ship = catalog.Get(hull.Visual) ??
|
|
|
|
|
throw new InvalidOperationException($"{hull.Name}: the catalog holds no visual record {hull.Visual.Key.Value}.");
|
|
|
|
|
ShipAuthoringStore.Validate(hull, ship);
|
|
|
|
|
var directory = Path.Combine(Path.GetFullPath(modsRoot), ship.Id);
|
|
|
|
|
return Bind(hull, ship, directory, Path.Combine(directory, "ship.cc"));
|
|
|
|
|
}
|
|
|
|
|
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
// The one game-side choice of catalog: the shipped file when no package is installed or none survives composition,
|
|
|
|
|
// otherwise the derived file, composed afresh from the shipped one and the surviving packages. Recomposed every
|
|
|
|
|
// call, so the derived file is never stale and never an authority. Excluded packages come back named, for the menu.
|
|
|
|
|
public static (string Catalog, Exclusion[] Excluded) ResolveCatalog(string shippedCatalog, string derivedCatalog, string modsRoot)
|
2026-09-30 06:43:52 +02:00
|
|
|
{
|
|
|
|
|
if (!Directory.Exists(modsRoot) ||
|
|
|
|
|
!Directory.GetDirectories(modsRoot).Any(directory => File.Exists(Path.Combine(directory, "ship.cc"))))
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
return (shippedCatalog, Array.Empty<Exclusion>());
|
2026-09-30 10:06:16 +02:00
|
|
|
Composition composition;
|
|
|
|
|
// A failure of the composition itself (an unwritable derived path, say) is still a mod problem, never a reason not to boot.
|
|
|
|
|
try { composition = Compose(shippedCatalog, derivedCatalog, modsRoot); }
|
|
|
|
|
catch (Exception error) { return (shippedCatalog, new[] { new Exclusion { Package = "(all mods)", Reason = error.Message } }); }
|
Ship S2 fixes: structural anchors are not mounts, mod presets refused, one bad mod never bricks the boot
- Validate: a hardpoint's anchor role is fixed by its type (thruster-emitter, radiator-mesh, else articulation); ShipModPlan's
duplicate role check is deleted.
- Loadouts.Commit refuses a preset naming a mod design (mod-hull:/mod-ship:), so the shipped catalog never references a mod.
- Compose quarantines each package: a bad package is excluded and named, a collision excludes every package involved; the
game boots on the rest (or the shipped catalog) and the main menu lists the exclusions.
- RequireDesigns refuses a save with a null item or lot instead of throwing NullReferenceException.
- Tests: per structural role, muzzle id ties, every slot/zone/lot in RequireDesigns, listing order, exclusion cases.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-09-30 08:30:52 +02:00
|
|
|
return (composition.Included.Length == 0 ? shippedCatalog : derivedCatalog, composition.Excluded);
|
2026-09-30 06:43:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static Package Bind(HullData hull, ShipAuthoring ship, string directory, string path)
|
|
|
|
|
{
|
2026-09-26 19:10:44 +02:00
|
|
|
if (!string.Equals(Path.GetFileName(directory), ship.Id, StringComparison.Ordinal))
|
|
|
|
|
throw new InvalidOperationException($"{path}: ship ID must match its package directory name.");
|
|
|
|
|
var modelPath = Path.GetFullPath(Path.Combine(directory, ship.ModelAsset));
|
Pin Compose, ReadPackage and ReadNodeIds; refuse name collisions (S-Soul F2, F6)
Compose, ReadPackage and ReadNodeIds had no test. ShipModCatalogTests now
covers the derived catalog, the atomic replace of an existing one, every
failure path leaving the previous derived file byte-identical, the unsafe
source/output refusals, package binding (directory name, GLB existence and
extension, anchor node presence), and the GLB reader (each header guard, the
JSON chunk boundary, node index accounting, duplicate ids).
Writing them exposed three defects in Compose, fixed here:
- F6: AetheriaStores.CatalogTypes routes ShipAuthoring to the shipped
catalog, and CultCache indexes names per concrete type with last writer
winning while GetByName over a base type throws on a cross-subtype match.
Compose checked keys only, so a mod hull named like a shipped item, or like
another mod's hull, silently shadowed it or broke lookups. It now refuses
a hull name matching any catalog ItemData and a ship ID matching an
existing ShipAuthoring, naming the ship.
- The backing store writes a .lock file beside every file it opens, so each
Compose left <output>.<guid>.tmp.lock behind, success or failure, once per
boot. The working copy now lives in its own directory that is deleted whole.
- Deleted: the duplicate-ID check (ReadPackage already pins ID to directory
name, so it could not fire) and ReadPackage's containment StartsWith
(Validate already refuses rooted and `..` model paths on the same Read).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-09-29 23:47:13 +02:00
|
|
|
// Containment is ShipAuthoringStore.Validate's job: it refuses rooted and `..` model paths before this line.
|
|
|
|
|
if (!File.Exists(modelPath) || !string.Equals(Path.GetExtension(modelPath), ".glb", StringComparison.OrdinalIgnoreCase))
|
2026-09-26 19:10:44 +02:00
|
|
|
throw new InvalidOperationException($"{ship.Id}: model asset must name an existing GLB inside its package.");
|
|
|
|
|
var modelNodes = ReadNodeIds(modelPath);
|
|
|
|
|
foreach (var anchor in ship.Anchors)
|
|
|
|
|
if (!modelNodes.ContainsKey(anchor.ModelNodeId))
|
|
|
|
|
throw new InvalidOperationException($"{ship.Id}: model has no node with aetheria.id={anchor.ModelNodeId} for anchor {anchor.Id}.");
|
2026-10-03 17:07:08 +02:00
|
|
|
// A thruster's mesh is its exhaust emission surface and a radiator's mesh is what glows (ruling
|
|
|
|
|
// thrusters-radiators-are-meshes), so either on an empty node is refused here, before any catalog sees the ship.
|
|
|
|
|
foreach (var anchor in ship.Anchors)
|
|
|
|
|
if ((anchor.Role == "thruster-emitter" || anchor.Role == "radiator-mesh") && !modelNodes[anchor.ModelNodeId].HasMesh)
|
|
|
|
|
throw new InvalidOperationException($"{ship.Id}: {anchor.Role} anchor {anchor.Id} needs a mesh, but model node {anchor.ModelNodeId} has none.");
|
2026-10-10 05:23:02 +02:00
|
|
|
BindRig(ship, modelNodes);
|
2026-09-30 03:06:43 +02:00
|
|
|
CultRecordRefs.Validate(hull);
|
2026-10-03 17:07:08 +02:00
|
|
|
return new Package
|
|
|
|
|
{
|
|
|
|
|
Hull = hull, Visual = ship, ModelPath = modelPath,
|
|
|
|
|
NodeIndices = modelNodes.ToDictionary(node => node.Key, node => node.Value.Index, StringComparer.Ordinal)
|
|
|
|
|
};
|
2026-09-26 19:10:44 +02:00
|
|
|
}
|
|
|
|
|
|
2026-10-10 05:23:02 +02:00
|
|
|
// The rig the record states must be the rig the model has: every joint is a node, each joint's Parent and each mount's
|
|
|
|
|
// Joint is the nearest joint above its node, ancestors without an id being walked through by ReadNodeIds, and a thruster or radiator
|
|
|
|
|
// mesh sits under no joint (follow-up gimballed-thrusters).
|
|
|
|
|
private static void BindRig(ShipAuthoring ship, Dictionary<string, (uint Index, bool HasMesh, int Parent)> nodes)
|
|
|
|
|
{
|
|
|
|
|
var joints = new HashSet<string>((ship.Joints ?? new List<ShipJoint>()).Select(joint => joint.Id), StringComparer.Ordinal);
|
|
|
|
|
var idAt = nodes.ToDictionary(node => (int)node.Value.Index, node => node.Key);
|
|
|
|
|
// Parent is already the nearest ancestor that carries an id, so the walk up is the chain of those.
|
|
|
|
|
string JointAbove(string nodeId)
|
|
|
|
|
{
|
|
|
|
|
// glTF forbids cycles; the bound keeps a malformed model from hanging the binder.
|
|
|
|
|
var parent = nodes[nodeId].Parent;
|
|
|
|
|
for (var steps = 0; parent >= 0 && steps <= nodes.Count; steps++, parent = nodes[idAt[parent]].Parent)
|
|
|
|
|
if (joints.Contains(idAt[parent])) return idAt[parent];
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
foreach (var joint in ship.Joints ?? new List<ShipJoint>())
|
|
|
|
|
{
|
|
|
|
|
if (!nodes.ContainsKey(joint.Id))
|
|
|
|
|
throw new InvalidOperationException($"{ship.Id}: model has no node with aetheria.id={joint.Id} for a joint.");
|
|
|
|
|
if (!string.Equals(JointAbove(joint.Id) ?? "", joint.Parent ?? "", StringComparison.Ordinal))
|
|
|
|
|
throw new InvalidOperationException($"{ship.Id}: joint {joint.Id} must name the nearest joint above its model node as its Parent.");
|
|
|
|
|
}
|
|
|
|
|
foreach (var anchor in ship.Anchors.Where(anchor => anchor.Role == "weapon-mount" || anchor.Role == "thruster-emitter" || anchor.Role == "radiator-mesh"))
|
|
|
|
|
{
|
|
|
|
|
var above = JointAbove(anchor.ModelNodeId);
|
|
|
|
|
if (string.Equals(above ?? "", anchor.Joint ?? "", StringComparison.Ordinal)) continue;
|
|
|
|
|
throw new InvalidOperationException(anchor.Role == "weapon-mount"
|
|
|
|
|
? $"{ship.Id}: weapon mount {anchor.Id} must name the nearest joint above its model node as its Joint."
|
|
|
|
|
: $"{ship.Id}: {anchor.Role} anchor {anchor.Id} sits under a joint in the model (follow-up gimballed-thrusters).");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// GLB is the xenos asset boundary. Only its node extras, whether each node names a mesh, and its nearest identified ancestor's node index
|
|
|
|
|
// (-1 for none) are read here; geometry belongs to the runtime importer.
|
|
|
|
|
public static Dictionary<string, (uint Index, bool HasMesh, int Parent)> ReadNodeIds(string path)
|
2026-09-26 18:30:02 +02:00
|
|
|
{
|
|
|
|
|
using var stream = File.OpenRead(path);
|
|
|
|
|
using var reader = new BinaryReader(stream);
|
|
|
|
|
if (stream.Length < 20 || reader.ReadUInt32() != 0x46546C67 || reader.ReadUInt32() != 2 ||
|
|
|
|
|
reader.ReadUInt32() != stream.Length)
|
|
|
|
|
throw new InvalidOperationException($"{path}: invalid GLB 2 header.");
|
|
|
|
|
var chunkLength = reader.ReadUInt32();
|
|
|
|
|
if (reader.ReadUInt32() != 0x4E4F534A || chunkLength > stream.Length - stream.Position)
|
|
|
|
|
throw new InvalidOperationException($"{path}: missing GLB JSON chunk.");
|
|
|
|
|
var json = JObject.Parse(Encoding.UTF8.GetString(reader.ReadBytes((int)chunkLength)));
|
2026-10-10 05:23:02 +02:00
|
|
|
var ids = new Dictionary<string, (uint Index, bool HasMesh, int Parent)>(StringComparer.Ordinal);
|
|
|
|
|
var nodes = (json["nodes"]?.OfType<JObject>() ?? Enumerable.Empty<JObject>()).ToArray();
|
|
|
|
|
var parents = Enumerable.Repeat(-1, nodes.Length).ToArray();
|
|
|
|
|
for (var parent = 0; parent < nodes.Length; parent++)
|
|
|
|
|
foreach (var child in nodes[parent]["children"]?.Select(token => (int)token) ?? Enumerable.Empty<int>())
|
|
|
|
|
if (child >= 0 && child < nodes.Length) parents[child] = parent;
|
2026-09-26 19:10:44 +02:00
|
|
|
uint index = 0;
|
|
|
|
|
foreach (var node in nodes)
|
2026-09-26 18:30:02 +02:00
|
|
|
{
|
|
|
|
|
var id = (string)node["extras"]?["aetheria.id"];
|
2026-09-26 19:10:44 +02:00
|
|
|
if (string.IsNullOrEmpty(id)) { index++; continue; }
|
2026-10-10 05:23:02 +02:00
|
|
|
if (!ids.TryAdd(id, (index, node["mesh"] != null && node["mesh"].Type != JTokenType.Null, IdentifiedAncestor(parents, nodes, (int)index))))
|
2026-09-26 18:30:02 +02:00
|
|
|
throw new InvalidOperationException($"{path}: duplicate GLB node aetheria.id={id}.");
|
2026-09-26 19:10:44 +02:00
|
|
|
index++;
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|
|
|
|
|
return ids;
|
|
|
|
|
}
|
2026-10-10 05:23:02 +02:00
|
|
|
|
|
|
|
|
private static int IdentifiedAncestor(int[] parents, JObject[] nodes, int index)
|
|
|
|
|
{
|
|
|
|
|
var parent = parents[index];
|
|
|
|
|
for (var steps = 0; parent >= 0 && steps <= nodes.Length; steps++, parent = parents[parent])
|
|
|
|
|
if (!string.IsNullOrEmpty((string)nodes[parent]["extras"]?["aetheria.id"])) return parent;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2026-09-26 18:30:02 +02:00
|
|
|
}
|