From b368f674f529de62cb27cc0de9c60e44ee915e06 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 13 Jun 2026 19:30:18 +0100 Subject: [PATCH] Delete dead legacy catalog roots --- .voidbot/state/aetheria.cc | Bin 46595 -> 47288 bytes Aetheria.State/README.md | 4 + Assets/Scripts/ServerShared/Corporations.cs | 2 +- Assets/Scripts/ServerShared/GlobalData.cs | 123 ------------------ .../Scripts/ServerShared/GlobalData.cs.meta | 11 -- Assets/Scripts/ServerShared/ItemData.cs | 22 ++-- Assets/Scripts/ServerShared/ItemManager.cs | 1 - Assets/Scripts/ServerShared/PlayerData.cs | 23 ---- .../Scripts/ServerShared/PlayerData.cs.meta | 3 - .../RuntimeProjection/Attributes.cs | 13 +- docs/aetheria-perfect-machine-map.md | 6 +- 11 files changed, 20 insertions(+), 188 deletions(-) delete mode 100644 Assets/Scripts/ServerShared/GlobalData.cs delete mode 100644 Assets/Scripts/ServerShared/GlobalData.cs.meta delete mode 100644 Assets/Scripts/ServerShared/PlayerData.cs delete mode 100644 Assets/Scripts/ServerShared/PlayerData.cs.meta diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 731974ad0f7eb0207755264b95c386f5b6a8d8d0..53b83a91460b33be49843bdfc23a9f07cfed9f52 100644 GIT binary patch delta 1447 zcmaJ>OKTKC5N0=`CW3|#2}%yFh%b^^AFFOOqQRgD5k=HP5TtjeGTS=Sy>|C(96=Wq ze?V*mA1DEzXngKP1P`9Qn1hG>2QN7Ydb4^SiyHOVHB(jJ_f>s$?Q8MfeDU?;V&}G@ z-P?CKm0cCn{jA@7DqdfjMJi^^OrH@Q7xTc7neQkUpI&NhShUeJ!r3%>hOMD>!U)c{BcntGT=YP12Q3c!hkP&6=WLW+xh?)|ZV#!Zl;Hre(%L<4#uK0@nbG|s}4AR)&f0$x&#HXX>le*N(m{_5H77o0hMtIU)O-x&X!`8 zD X2%IMxxMG6OwZ?!p825>1bzCUmA0jcHqDiG7=Ny2#B7Zh1xzxqJG}1L8t#S>f zA{qp-d2ws4S+TdPDJD4ynJ=kE{CQWU@#(ywu0~{s!+OB*iv>A*Kyb}?1Vq&&1rVCRkG{Jzz`NVb=rdV&zCSSfa#X4WS)s z>0pZFm-31v+E3a<9oG?i4k3|MAr($6w*(!WkC?=Nd>Yy&F=4zxC8Jy~SI#raT~y~d zOsLyt%5+POrIoe|2Ab5$sSBhRJnMl6yw5U zfl!)LHm)fUh`|UVluf#RYCe`Y4XzGQsH-f{%tMk0)C^|?t2Q+-m0RMOh@oU&B6&5W z1KxnaT0mbs(LPGDZ>?((igY_mU7a-0<<%tQvdOr_gbcNNt2$u&1L}t+ zYEA6Nn=uW}LpOM4QK>jMk*`+D!u;kXrXY^j9LBW$?}>0 zYz}!M8u|Xtr7xB%1v9r&IgzijU7q};`ILHZey=R2&sLB1_8y#=h0W8gmA9>7n^u0n s{Mp!Uy$aiMhRgY@IBd2zF_$?bE!p_iLR&U^DU+rDwtn=sL(b^r9&0E^LjV8( diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index 0822f3104..c80297163 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -56,6 +56,10 @@ edits are runtime-only until Verse owns a typed layout/settings document. The old IMGUI CultCache database editor has been deleted, and `NameTools` no longer exports `NameFile/*.msgpack`. `AetherDB.msgpack` and existing name files remain legacy catalog inputs only; typed catalog records are the durable owner. +Dead legacy catalog roots for user records and galaxy map-layer resources have +been deleted from live Unity source. Surviving runtime DTOs no longer carry +legacy catalog group/table annotations; their remaining metadata is projection +and inspection metadata for the typed runtime bridge. `Aetheria.State.Import` captures the legacy catalog files into typed quarantine state: path, size, and SHA-256 fingerprint for `AetherDB.msgpack` plus diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index 5098379f7..36a4c6c3a 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -7,7 +7,7 @@ using System.Collections; using System.Collections.Generic; using Unity.Mathematics; -[LegacyCatalogGroup("Galaxy"), Inspectable] +[Inspectable] public class Faction : RuntimeCatalogEntry, INamedEntry { [Inspectable] diff --git a/Assets/Scripts/ServerShared/GlobalData.cs b/Assets/Scripts/ServerShared/GlobalData.cs deleted file mode 100644 index e2bf5a3aa..000000000 --- a/Assets/Scripts/ServerShared/GlobalData.cs +++ /dev/null @@ -1,123 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System; -using System.Collections; -using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; -using static NoiseFbm; - -[Inspectable, Serializable, LegacyCatalogGroup("Galaxy")] -public class GalaxyMapLayerData : RuntimeCatalogEntry, INamedEntry -{ - [Inspectable] - public float CoreBoost = 1.05f; - - [Inspectable] - public float CoreBoostOffset = .1f; - - [Inspectable] - public float CoreBoostPower = 2.25f; - - [Inspectable] - public float SpokeScale = 1; - - [Inspectable] - public float SpokeOffset = 0; - - [Inspectable] - public float EdgeReduction = 3; - - [Inspectable] - public float NoiseOffset = 0; - - [Inspectable] - public float NoiseAmplitude = 1.5f; - - [Inspectable] - public float NoiseGain = .7f; - - [Inspectable] - public float NoiseLacunarity = 2; - - [Inspectable] - public int NoiseOctaves = 7; - - [Inspectable] - public float NoiseFrequency = 1; - - [Inspectable] - public float NoisePosition = 1337; - - [Inspectable] - public string Name; - - public float Evaluate(float2 uv, GalaxyShapeSettings settings) - { - float2 offset = -float2(.5f, .5f)+uv; - float circle = (.5f-length(offset))*2; - float angle = pow(length(offset)*2,settings.TwistExponent) * settings.Twist; - float2 t = float2(offset.x*cos(angle) - offset.y*sin(angle), offset.x*sin(angle) + offset.y*cos(angle)); - float atan = atan2(t.y,t.x); - float spokes = (sin(atan*settings.Arms) + SpokeOffset) * SpokeScale; - float noise = fBm(uv + float2(NoisePosition), NoiseOctaves, NoiseFrequency, NoiseOffset, NoiseAmplitude, NoiseLacunarity, NoiseGain); - float shape = lerp(spokes - EdgeReduction * length(offset), 1, pow(circle, CoreBoostPower) * CoreBoost) + CoreBoostOffset; - float gal = max(shape - noise * saturate(circle), 0); - - return gal; - } - - public string EntryName - { - get => Name; - set => Name = value; - } -} - -public static class NoiseFbm -{ - public static float3 fBm3(float2 p, int octaves, float frequency, float offset, float amplitude, float lacunarity, float gain) - { - return float3( - fBm(p, octaves, frequency, offset, amplitude, lacunarity, gain), - fBm(p+10, octaves, frequency, offset, amplitude, lacunarity, gain), - fBm(p+20, octaves, frequency, offset, amplitude, lacunarity, gain)); - } - - public static float fBm(float2 p, int octaves, float frequency, float offset, float amplitude, float lacunarity, float gain) - { - float freq = frequency, amp = .5f; - float sum = 0; - for(int i = 0; i < octaves; i++) - { - sum += snoise(p * freq) * amp; - freq *= lacunarity; - amp *= gain; - } - return (sum + offset)*amplitude; - } - - public static float3 fBm3(float p, int octaves, float frequency, float offset, float amplitude, float lacunarity, float gain) - { - return float3( - fBm(p, octaves, frequency, offset, amplitude, lacunarity, gain), - fBm(p+10, octaves, frequency, offset, amplitude, lacunarity, gain), - fBm(p+20, octaves, frequency, offset, amplitude, lacunarity, gain)); - } - - public static float fBm(float p, int octaves, float frequency, float offset, float amplitude, float lacunarity, float gain) - { - float freq = frequency, amp = .5f; - float sum = 0; - for(int i = 0; i < octaves; i++) - { - sum += Noise1D.noise(p * freq) * amp; - freq *= lacunarity; - amp *= gain; - } - return (sum + offset)*amplitude; - } -} diff --git a/Assets/Scripts/ServerShared/GlobalData.cs.meta b/Assets/Scripts/ServerShared/GlobalData.cs.meta deleted file mode 100644 index 353f44e6a..000000000 --- a/Assets/Scripts/ServerShared/GlobalData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b7bd4d9c038c3c24b86780de3f29f10e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index c9824659b..98aadff20 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -295,17 +295,13 @@ public abstract class ItemData : RuntimeCatalogEntry, INamedEntry } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class SimpleCommodityData : ItemData { // // Types of body where this resource can be found // [InspectableField, RuntimeCatalogKey(6)] // public BodyType ResourceBodyType; // - // // Link to map(s) controlling density of resource, multiplied together when more than one - // [InspectableRuntimeCatalogLink(typeof(GalaxyMapLayerData)), RuntimeCatalogKey(7)] - // public List ResourceDensity = new List(); - // // // Controls the lowest value in the resource distribution curve // [InspectableField, RuntimeCatalogKey(8)] // public ExponentialLerp Distribution; @@ -327,7 +323,7 @@ public abstract class CraftedItemData : ItemData // public float IngredientQualityWeight = .5f; } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class CompoundCommodityData : CraftedItemData { [InspectableRuntimeCatalogLink(typeof(PersonalityAttribute)), RuntimeCatalogKey(10)] @@ -337,7 +333,7 @@ public class CompoundCommodityData : CraftedItemData public CompoundCommodityCategory Category; } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class ConsumableItemData : CraftedItemData { [Inspectable, RuntimeCatalogKey(10)] @@ -443,7 +439,7 @@ public class AudioStat public PerformanceStat Stat = new PerformanceStat(); } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class GearData : EquippableItemData { [Inspectable, RuntimeCatalogKey(23)] @@ -452,7 +448,7 @@ public class GearData : EquippableItemData public override HardpointType HardpointType => Hardpoint; } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class CargoBayData : EquippableItemData { [Inspectable, RuntimeCatalogKey(24)] @@ -461,14 +457,14 @@ public class CargoBayData : EquippableItemData public override HardpointType HardpointType => HardpointType.Tool; } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class DockingBayData : CargoBayData { [Inspectable, RuntimeCatalogKey(25)] public int2 MaxSize; } -[LegacyCatalogGroup("Items")] + public class WeaponItemData : GearData { [Inspectable, RuntimeCatalogKey(24)] @@ -487,7 +483,7 @@ public class WeaponItemData : GearData public WeaponModifiers WeaponModifiers; } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class HullData : EquippableItemData { [Inspectable, RuntimeCatalogKey(23)] @@ -612,7 +608,7 @@ public class PerformanceStat } } -[LegacyCatalogGroup("Items"), Inspectable] +[Inspectable] public class PersonalityAttribute : RuntimeCatalogEntry, INamedEntry { [Inspectable, RuntimeCatalogKey(1)] diff --git a/Assets/Scripts/ServerShared/ItemManager.cs b/Assets/Scripts/ServerShared/ItemManager.cs index 5121425b9..bef248f21 100644 --- a/Assets/Scripts/ServerShared/ItemManager.cs +++ b/Assets/Scripts/ServerShared/ItemManager.cs @@ -17,7 +17,6 @@ using float4 = Unity.Mathematics.float4; public class ItemManager { public Random Random = new Random((uint) (DateTime.Now.Ticks%uint.MaxValue)); - // public Dictionary MapLayers = new Dictionary(); // public SimpleCommodityData[] Resources; // public Dictionary> CorporationControllers = new Dictionary>(); // public Dictionary GalaxyZones; diff --git a/Assets/Scripts/ServerShared/PlayerData.cs b/Assets/Scripts/ServerShared/PlayerData.cs deleted file mode 100644 index 10c15d32b..000000000 --- a/Assets/Scripts/ServerShared/PlayerData.cs +++ /dev/null @@ -1,23 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System; - -[LegacyCatalogGroup("Users")] -public class PlayerData : RuntimeCatalogEntry, INamedEntry -{ - public string Email; - - public string Password; - - public string Username; - - public Guid Corporation; - - public string EntryName - { - get => Username; - set => Username = value; - } -} diff --git a/Assets/Scripts/ServerShared/PlayerData.cs.meta b/Assets/Scripts/ServerShared/PlayerData.cs.meta deleted file mode 100644 index c4469f21b..000000000 --- a/Assets/Scripts/ServerShared/PlayerData.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 6daac48880264dcc91c928f0dd9c2abb -timeCreated: 1591829144 \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/RuntimeProjection/Attributes.cs b/Assets/Scripts/ServerShared/RuntimeProjection/Attributes.cs index 6b1babb10..43ccf930e 100644 --- a/Assets/Scripts/ServerShared/RuntimeProjection/Attributes.cs +++ b/Assets/Scripts/ServerShared/RuntimeProjection/Attributes.cs @@ -106,17 +106,6 @@ public class TooltipAttribute : Attribute public TooltipAttribute(string tooltip) => this.tooltip = tooltip; } -[AttributeUsage(AttributeTargets.Class)] -public class LegacyCatalogGroupAttribute : Attribute -{ - public string TableName; - - public LegacyCatalogGroupAttribute(string tableName) - { - TableName = tableName; - } -} - public class NameAttribute : Attribute { public string Name; @@ -143,4 +132,4 @@ public class InspectorHeaderAttribute : Attribute public readonly string header; public InspectorHeaderAttribute(string header) => this.header = header; -} \ No newline at end of file +} diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 2700eee42..19fb3bdd1 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -47,7 +47,9 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. while hosting the CultMesh state node. `Aetheria.State.ApplyPending` remains a bounded local operator applicator for both pending lanes. - Shared domain state is still partly built around `RuntimeCatalogEntry`, GUID - identity, runtime catalog metadata, and static projection references. Newtonsoft, + identity, runtime catalog metadata, and static projection references. Dead + user-record and galaxy-map-layer catalog roots have been deleted, and + surviving runtime DTOs no longer carry legacy catalog group/table annotations. Newtonsoft, JsonKnownTypes, RethinkDB, LiteNetLib client transport, and the broken `Economy.Shared` wrapper have been removed from live source. The stale `StrategyGameManager.csbak` backup file and unused Unity asset MessagePack @@ -547,6 +549,8 @@ First Aetheria surfaces to publish: - Done: replace remaining item/behavior DTO MessagePack field metadata with `RuntimeCatalogKeyAttribute`; no live `Assets/Scripts` source depends on MessagePack, Newtonsoft, RethinkDB, or bespoke save-file serializer symbols. + - Done: delete dead `PlayerData` and `GalaxyMapLayerData` catalog roots, and + remove legacy catalog group/table annotations from surviving runtime DTOs. - Done: remove the stale `MessagePack` assembly reference from `Aetheria.Shared.Unity`; the remaining MessagePack reference is contained in the typed state package's `.cc` reader.