Reorganize all observatory core projects into monorepo (#25)

* chore: move all observatory repos to core

* only save journal folder on change, don't constantly re-check during monitoring

* chore: monorepo project changes

* chore: monorepo migration

ObservatoryFramework/Files/Journal/Combat/Bounty.cs

@@ -0,0 +1,19 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class Bounty : JournalBase
+    {
+        public ImmutableList<Rewards> Rewards { get; init; }
+        public string Target { get; init; }
+        public string Target_Localised { get; init; }
+        public string Faction { get; init; }
+        public string Faction_Localised { get; init; }
+        public long Reward { get; init; }
+        public long TotalReward { get; init; }
+        public string VictimFaction { get; init; }
+        public string VictimFaction_Localised { get; init; }
+        public int SharedWithOthers { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/CapShipBound.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CapShipBound : JournalBase
+    {
+        public long Reward { get; init; }
+        public string AwardingFaction { get; init; }
+        public string VictimFaction { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/Died.cs

@@ -0,0 +1,14 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class Died : JournalBase
+    {
+        public string KillerName { get; init; }
+        public string KillerName_Localised { get; init; }
+        public string KillerShip { get; init; }
+        public string KillerRank { get; init; }
+        public ImmutableList<Killer> Killers { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class EscapeInterdiction : JournalBase
+    {
+        public string Interdictor { get; init; }
+        public bool IsPlayer { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/FactionKillBond.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FactionKillBond : JournalBase
+    {
+        public long Reward { get; init; }
+        public string AwardingFaction { get; init; }
+        public string AwardingFaction_Localised { get; init; }
+        public string VictimFaction { get; init; }
+        public string VictimFaction_Localised { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/FighterDestroyed.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FighterDestroyed : JournalBase
+    {
+        public int ID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/HeatDamage.cs

@@ -0,0 +1,5 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class HeatDamage : JournalBase
+    { }
+}

ObservatoryFramework/Files/Journal/Combat/HeatWarning.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class HeatWarning : JournalBase
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Combat/HullDamage.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class HullDamage : JournalBase
+    {
+        public float Health { get; init; }
+        public bool PlayerPilot { get; init; }
+        public bool Fighter { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/Interdicted.cs

@@ -0,0 +1,13 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class Interdicted : JournalBase
+    {
+        public bool Submitted { get; init; }
+        public string Interdictor { get; init; }
+        public string Interdictor_Localised { get; init; }
+        public bool IsPlayer { get; init; }
+        public int CombatRank { get; init; }
+        public string Faction { get; init; }
+        public string Power { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/Interdiction.cs

@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class Interdiction : JournalBase
+    {
+        public bool Success { get; init; }
+        public string Interdictor { get; init; }
+        public bool IsPlayer { get; init; }
+        public int CombatRank { get; init; }
+        public string Faction { get; init; }
+        public string Power { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/PVPKill.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class PVPKill : JournalBase
+    {
+        public string Victim { get; init; }
+        public int CombatRank { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/SRVDestroyed.cs

@@ -0,0 +1,5 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class SRVDestroyed : JournalBase
+    { }
+}

ObservatoryFramework/Files/Journal/Combat/ShieldState.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class ShieldState : JournalBase
+    {
+        public bool ShieldsUp { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/ShipTargeted.cs

@@ -0,0 +1,23 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class ShipTargeted : JournalBase
+    {
+        public bool TargetLocked { get; init; }
+        public string Ship { get; init; }
+        public string Ship_Localised { get; init; }
+        public int ScanStage { get; init; }
+        public string PilotName { get; init; }
+        public string PilotName_Localised { get; init; }
+        public string PilotRank { get; init; }
+        public float ShieldHealth { get; init; }
+        public float HullHealth { get; init; }
+        public string Faction { get; init; }
+        public string LegalStatus { get; init; }
+        public long Bounty { get; init; }
+        public string Subsystem { get; init; }
+        public string Subsystem_Localised { get; init; }
+        public float SubsystemHealth { get; init; }
+        public string Power { get; init; }
+        public string SquadronID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Combat/UnderAttack.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class UnderAttack : JournalBase
+    {
+        public string Target { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/BuyExplorationData.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class BuyExplorationData : JournalBase
+    {
+        public string System { get; init; }
+        public int Cost { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs

@@ -0,0 +1,27 @@
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CodexEntry : JournalBase
+    {
+        public long EntryID { get; init; }
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public string SubCategory { get; init; }
+        public string SubCategory_Localised { get; init; }
+        public string Category { get; init; }
+        public string Category_Localised { get; init; }
+        public string Region { get; init; }
+        public string Region_Localised { get; init; }
+        public string System { get; init; }
+        public ulong SystemAddress { get; init; }
+        public string NearestDestination { get; init; }
+        public string NearestDestination_Localised { get; init; }
+        public bool IsNewEntry { get; init; }
+        public bool NewTraitsDiscovered { get; init; }
+        public ImmutableList<string> Traits { get; init; }
+        public int VoucherAmount { get; init; }
+        public float Latitude { get; init; }
+        public float Longitude { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/DiscoveryScan.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DiscoveryScan : JournalBase
+    {
+        public ulong SystemAddress { get; init; }
+        public int Bodies { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/FSSAllBodiesFound.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FSSAllBodiesFound : JournalBase
+    {
+        public string SystemName { get; init; }
+        public ulong SystemAddress { get; init; }
+        public int Count { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/FSSBodySignals.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FSSBodySignals : SAASignalsFound
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/FSSDiscoveryScan.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FSSDiscoveryScan : JournalBase
+    {
+        public string SystemName { get; init; }
+        public ulong SystemAddress { get; init; }
+        public float Progress { get; init; }
+        public int BodyCount { get; init; }
+        public int NonBodyCount { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs

@@ -0,0 +1,18 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class FSSSignalDiscovered : JournalBase
+    {
+        public string SignalName { get; init; }
+        public string SignalName_Localised { get; init; }
+        public string SpawningState { get; init; }
+        public string SpawningState_Localised { get; init; }
+        public string SpawningFaction { get; init; }
+        public string SpawningFaction_Localised { get; init; }
+        public float TimeRemaining { get; init; }
+        public ulong SystemAddress { get; init; }
+        public int ThreatLevel { get; init; }
+        public string USSType { get; init; }
+        public string USSType_Localised { get; init; }
+        public bool IsStation { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/MaterialCollected.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class MaterialCollected : JournalBase
+    {
+        public string Category { get; init; }
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public int Count { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/MaterialDiscarded.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class MaterialDiscarded : MaterialCollected
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/MaterialDiscovered.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class MaterialDiscovered : JournalBase
+    {
+        public string Category { get; init; }
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public int DiscoveryNumber { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs

@@ -0,0 +1,14 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class MultiSellExplorationData : JournalBase
+    {
+        public ImmutableList<Discovered> Discovered { get; init; }
+        public long BaseValue { get; init; }
+        public long Bonus { get; init; }
+        public long TotalEarnings { get; init; }
+
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/NavBeaconScan.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class NavBeaconScan : JournalBase
+    {
+        public int NumBodies { get; init; }
+        public ulong SystemAddress { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs

@@ -0,0 +1,21 @@
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class SAAScanComplete : JournalBase
+    {
+        public ulong SystemAddress { get; init; }
+        public string BodyName { get; init; }
+        public int BodyID { get; init; }
+        /// <summary>
+        /// This property is indicated with strikethrough in Frontier's documentation and may be deprecated.
+        /// </summary>
+        public ImmutableList<string> Discoverers { get; init; }
+        /// <summary>
+        /// This property is indicated with strikethrough in Frontier's documentation and may be deprecated.
+        /// </summary>
+        public ImmutableList<string> Mappers { get; init; }
+        public int ProbesUsed { get; init; }
+        public int EfficiencyTarget { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs

@@ -0,0 +1,13 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class SAASignalsFound : JournalBase
+    {
+        public ulong SystemAddress { get; init; }
+        public string BodyName { get; init; }
+        public int BodyID { get; init; }
+        public ImmutableList<Signal> Signals { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/Scan.cs

@@ -0,0 +1,168 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+using Observatory.Framework.Files.Converters;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    /// <summary>
+    /// Journal "Scan" event generated when directly FSS scanning, from automatic proximity scans, or nav beacon data.
+    /// </summary>
+    public class Scan : ScanBaryCentre
+    {
+        /// <summary>
+        /// Type of scan which generated the event. Possible options include "Detailed", "AutoScan", and "NavBeaconDetail" (non-exhaustive).
+        /// </summary>
+        public string ScanType { get; init; }
+        /// <summary>
+        /// Name of scanned body.
+        /// </summary>
+        public string BodyName { get; init; }
+        /// <summary>
+        /// List which reflects Frontier's JSON structure for the "Parents" object. Use of Parent property is recommended instead.
+        /// </summary>
+        public ImmutableList<Parent> Parents { 
+            get => _Parents; 
+            init
+            {
+                _Parents = value;
+                var ParentList = new System.Collections.Generic.List<(ParentType ParentType, int Body)>();
+                foreach (var parent in value)
+                {
+                    if (parent.Null != null)
+                    {
+                        ParentList.Add((ParentType.Null, parent.Null.GetValueOrDefault(0)));
+                    }
+                    else if (parent.Planet != null)
+                    {
+                        ParentList.Add((ParentType.Planet, parent.Planet.GetValueOrDefault(0)));
+                    }
+                    else if (parent.Star != null)
+                    {
+                        ParentList.Add((ParentType.Star, parent.Star.GetValueOrDefault(0)));
+                    }
+                }
+                Parent = ParentList.ToImmutableList();
+            }
+        }
+        /// <summary>
+        /// "Parents" object rearranged into more intuitive structure for ease of use.
+        /// </summary>
+        [JsonIgnore]
+        public ImmutableList<(ParentType ParentType, int Body)> Parent { get; init; }
+        private ImmutableList<Parent> _Parents;
+        /// <summary>
+        /// Body distance from system arrival point in light-seconds.
+        /// </summary>
+        public double DistanceFromArrivalLS { get; init; }
+        /// <summary>
+        /// Indicates if body is tidally locked to another body (parent, child, or binary partner).
+        /// </summary>
+        public bool TidalLock { get; init; }
+        /// <summary>
+        /// Whether the planet can be or has been terraformed. Options include "Terraformable", "Terraformed", or "" (non-terraformable or naturally earth-like).
+        /// </summary>
+        public string TerraformState { get; init; }
+        /// <summary>
+        /// Class of planet. Consult your preferred source of journal documentation for all possible values.
+        /// </summary>
+        public string PlanetClass { get; init; }
+        /// <summary>
+        /// Descriptive string for body atmosphere, e.g. "hot thick sulfur dioxide atmosphere".
+        /// </summary>
+        public string Atmosphere { get; init; }
+        /// <summary>
+        /// Simple string indicating dominant atmosphere type, e.g. "SulfurDioxide".
+        /// </summary>
+        public string AtmosphereType { get; init; }
+        /// <summary>
+        /// List containing full breakdown of atmospheric components and their relative percentages.
+        /// </summary>
+        public ImmutableList<MaterialComposition> AtmosphereComposition { get; init; }
+        /// <summary>
+        /// Descriptive string for type of volcanism present, or an empty string for none, e.g. "major silicate vapour geysers volcanism".
+        /// </summary>
+        public string Volcanism { get; init; }
+        /// <summary>
+        /// Mass of body in multiples of Earth's mass (5.972e24 kg).
+        /// </summary>
+        public float MassEM { get; init; }
+        /// <summary>
+        /// Radius of body in metres.
+        /// </summary>
+        public float Radius { get; init; }
+        /// <summary>
+        /// Surface gravity in m/s².
+        /// </summary>
+        public float SurfaceGravity { get; init; }
+        /// <summary>
+        /// Average surface temperature in Kelvin.
+        /// </summary>
+        public float SurfaceTemperature { get; init; }
+        /// <summary>
+        /// Average surface pressure in Pascals.
+        /// </summary>
+        public float SurfacePressure { get; init; }
+        /// <summary>
+        /// Whether the body in landable in the player's current version of Elite Dangerous.
+        /// </summary>
+        public bool Landable { get; init; }
+        /// <summary>
+        /// List containing full breakdown of prospectable surface materials and their relative percentages.
+        /// </summary>
+        [JsonConverter(typeof(MaterialCompositionConverter))]
+        public ImmutableList<MaterialComposition> Materials { get; init; }
+        /// <summary>
+        /// Overall composition of body, expressed as percentages of ice, rock, and metal.
+        /// </summary>
+        public Composition Composition { get; init; }
+        /// <summary>
+        /// Rotation period of body in seconds.
+        /// </summary>
+        public float RotationPeriod { get; init; }
+        /// <summary>
+        /// Axial tilt of body in radians.
+        /// </summary>
+        public float AxialTilt { get; init; }
+        /// <summary>
+        /// List of all planetary or stellar ring systems around the body.
+        /// </summary>
+        public ImmutableList<Ring> Rings { get; init; }
+        /// <summary>
+        /// Description of the minable material abundance.<br/>Possible values inclue "PristineResources", "MajorResources", "CommonResources", "LowResources", and "DepletedResources". 
+        /// </summary>
+        public string ReserveLevel { get; init; }
+        /// <summary>
+        /// Type of star. Consult your preferred source of journal documentation for all possible values.
+        /// </summary>
+        public string StarType { get; init; }
+        /// <summary>
+        /// Subclass of star. Consult your preferred source of journal documentation for all possible values.
+        /// </summary>
+        public int Subclass { get; init; }
+        /// <summary>
+        /// Mass of star in multiples of The Sun's mass (1.989e30 kg).
+        /// </summary>
+        public float StellarMass { get; init; }
+        /// <summary>
+        /// Absolute magnitude of star.
+        /// </summary>
+        public float AbsoluteMagnitude { get; init; }
+        /// <summary>
+        /// Age of body in millions of years.
+        /// </summary>
+        public int Age_MY { get; init; }
+        /// <summary>
+        /// Yerkes luminosity class of star.
+        /// </summary>
+        public string Luminosity { get; init; }
+        /// <summary>
+        /// Whether the body has been previously discovered by a player.
+        /// </summary>
+        public bool WasDiscovered { get; init; }
+        /// <summary>
+        /// Whether the body has been previously mapped by a player.
+        /// </summary>
+        public bool WasMapped { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/ScanBaryCentre.cs

@@ -0,0 +1,50 @@
+namespace Observatory.Framework.Files.Journal
+{
+    /// <summary>
+    /// Barycentre orbital properties, automatically recorded when any member of a multiple-body orbital arrangement is first scanned.
+    /// </summary>
+    public class ScanBaryCentre : JournalBase
+    {
+        /// <summary>
+        /// Name of star system containing scanned body.
+        /// </summary>
+        public string StarSystem { get; init; }
+        /// <summary>
+        /// 64-bit unique identifier for the current star system. Also known as the system's "ID64".
+        /// </summary>
+        public ulong SystemAddress { get; init; }
+        /// <summary>
+        /// Id number of body within a system.
+        /// </summary>
+        public int BodyID { get; init; }
+        /// <summary>
+        /// Orbital semi-major axis in metres.<br/>Distance from the body's centre of gravity to the parent's centre of gravity at the most distant point in the orbit.
+        /// </summary>
+        public float SemiMajorAxis { get; init; }
+        /// <summary>
+        /// Orbital eccentricity.<br/>0: perfectly circular, 0 &gt; x &gt; 1: eccentric, 1: parabolic (escape) trajectory.<br/>(You should not ever see 1 or 0.)
+        /// </summary>
+        public float Eccentricity { get; init; }
+        /// <summary>
+        /// Orbital inclination in degrees.
+        /// </summary>
+        public float OrbitalInclination { get; init; }
+        /// <summary>
+        /// Argument of periapsis in degrees.
+        /// </summary>
+        public float Periapsis { get; init; }
+        /// <summary>
+        /// Orbital period in seconds.
+        /// </summary>
+        public float OrbitalPeriod { get; init; }
+        /// <summary>
+        /// Longitude of the ascending node in degrees.
+        /// </summary>
+        public float AscendingNode { get; init; }
+        /// <summary>
+        /// Mean anomaly in degrees.
+        /// </summary>
+        public float MeanAnomaly { get; init; }
+
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/Screenshot.cs

@@ -0,0 +1,15 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class Screenshot : JournalBase
+    {
+        public string Filename { get; init; }
+        public int Width { get; init; }
+        public int Height { get; init; }
+        public string System { get; init; }
+        public string Body { get; init; }
+        public float Latitude { get; init; }
+        public float Longitude { get; init; }
+        public float Altitude { get; init; }
+        public int Heading { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs

@@ -0,0 +1,13 @@
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class SellExplorationData : JournalBase
+    {
+        public ImmutableList<string> Systems { get; init; }
+        public ImmutableList<string> Discovered { get; init; }
+        public long BaseValue { get; init; }
+        public long Bonus { get; init; }
+        public long TotalEarnings { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBankTransfer.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierBankTransfer : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public long Deposit { get; init; }
+        public long Withdraw { get; init; }
+        public long PlayerBalance { get; init; }
+        public long CarrierBalance { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierBuy.cs

@@ -0,0 +1,13 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierBuy : JournalBase
+    {
+        public long BoughtAtMarket { get; init; }
+        public ulong SystemAddress { get; init; }
+        public long CarrierID { get; init; }
+        public string Location { get; init; }
+        public long Price { get; init; }
+        public string Variant { get; init; }
+        public string Callsign { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCancelDecommission.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierCancelDecommission : JournalBase
+    {
+        public long CarrierID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierCrewServices.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.Converters;
+using Observatory.Framework.Files.ParameterTypes;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierCrewServices : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public string CrewRole { get; init; }
+        public string CrewName { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CarrierCrewOperation Operation { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDecommission.cs

@@ -0,0 +1,16 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierDecommission : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public long ScrapRefund { get; init; }
+        public long ScrapTime { get; init; }
+        public System.DateTime ScrapTimeUTC
+        {
+            get 
+            {
+                return System.DateTimeOffset.FromUnixTimeSeconds(ScrapTime).UtcDateTime; 
+            }
+        }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDepositFuel.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierDepositFuel : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public int Amount { get; init; }
+        public int Total { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierDockingPermission.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierDockingPermission : JournalBase
+    {
+        public long CarrierID { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CarrierDockingAccess DockingAccess { get; init; }
+        public bool AllowNotorious { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierFinance.cs

@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierFinance : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public int TaxRate { get; init; }
+        public long CarrierBalance { get; init; }
+        public long ReserveBalance { get; init; }
+        public long AvailableBalance { get; init; }
+        public int ReservePercent { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.Converters;
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierJump : FSDJump
+    {
+        public bool Docked { get; init; }
+        public string StationName { get; init; }
+        public string StationType { get; init; }
+        public long MarketID { get; init; }
+        public Faction StationFaction { get; init; }
+        public string StationGovernment { get; init; }
+        public string StationGovernment_Localised { get; init; }
+        [JsonConverter(typeof(StationServiceConverter))]
+        public StationService StationServices { get; init; }
+        public string StationEconomy { get; init; }
+        public string StationEconomy_Localised { get; init; }
+        public ImmutableList<StationEconomy> StationEconomies { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpCancelled.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierJumpCancelled : JournalBase
+    {
+        public long CarrierID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJumpRequest.cs

@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierJumpRequest : JournalBase
+    {
+        public string Body { get; init; }
+        public int BodyID { get; init; }
+        public ulong SystemAddress { get; init; }
+        public long CarrierID { get; init; }
+        public string SystemName { get; init; }
+        public ulong SystemID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierModulePack.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierModulePack : CarrierShipPack
+    {
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierShipPack.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierShipPack : JournalBase
+    {
+        public long CarrierID { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CarrierOperation Operation { get; init; }
+        public string PackTheme { get; init; }
+        public int PackTier { get; init; }
+        public int Cost { get; init; }
+        public int Refund { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs

@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierStats : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public string Callsign { get; init; }
+        public string Name { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CarrierDockingAccess DockingAccess { get; init; }
+        public bool AllowNotorious { get; init; }
+        public int FuelLevel { get; init; }
+        public float JumpRangeCurr { get; init; }
+        public float JumpRangeMax { get; init; }
+        public bool PendingDecommission { get; init; }
+        public CarrierSpaceUsage SpaceUsage { get; init; }
+        public ParameterTypes.CarrierFinance Finance { get; init; }
+        public ImmutableList<CarrierCrew> Crew { get; init; }
+        public ImmutableList<CarrierPack> ShipPacks { get; init; }
+        public ImmutableList<CarrierPack> ModulePacks { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/FleetCarrier/CarrierTradeOrder.cs

@@ -0,0 +1,14 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CarrierTradeOrder : JournalBase
+    {
+        public long CarrierID { get; init; }
+        public bool BlackMarket { get; init; }
+        public string Commodity { get; init; }
+        public string Commodity_Localised { get; init; }
+        public int PurchaseOrder { get; init; }
+        public int SaleOrder { get; init; }
+        public bool CancelTrade { get; init; }
+        public int Price { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/InvalidJson.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Immutable;
+using System.Text;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class InvalidJson : JournalBase
+    {
+        public string OriginalEvent { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/JournalBase.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class JournalBase
+    {
+        [JsonPropertyName("timestamp")]
+        public string Timestamp { get; init; }
+
+        [JsonIgnore]
+        public DateTime TimestampDateTime
+        {
+            get
+            {
+                return DateTime.ParseExact(Timestamp, "yyyy-MM-ddTHH:mm:ssZ", null, System.Globalization.DateTimeStyles.AssumeUniversal);
+            }
+        }
+
+        [JsonPropertyName("event")]
+        public string Event { get;  init; }
+
+        [JsonExtensionData]
+        public Dictionary<string, object> AdditionalProperties { get; init; }
+
+        [JsonIgnore]
+        public string Json 
+        {
+            get => json; 
+            set
+            {
+                if (json == null || string.IsNullOrWhiteSpace(json))
+                {
+                    json = value;
+                }
+                else
+                {
+                    throw new Exception("Journal property \"Json\" can only be set while empty.");
+                }
+            }
+        }
+
+        private string json;
+
+    }
+}

ObservatoryFramework/Files/Journal/JournalUtilities.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Immutable;
+using System.Text;
+using System.Text.Json;
+
+namespace Observatory.Framework.Files
+{
+    public static class JournalUtilities
+    {
+        public static string GetEventType(string line)
+        {
+            var reader = new Utf8JsonReader(Encoding.UTF8.GetBytes(line));
+            string result = string.Empty;
+
+            try
+            {
+                while (reader.Read())
+                {
+                    if (reader.TokenType == JsonTokenType.PropertyName && reader.GetString() == "event")
+                    {
+                        reader.Read();
+                        result = reader.GetString();
+                    }
+                }
+            }
+            catch
+            {
+                
+                result = "InvalidJson";
+            }
+
+
+            return result;
+        }
+
+        public static string CleanScanEvent(string line)
+        {
+            return line.Replace("\"RotationPeriod\":inf,", "");
+        }
+
+        public const string ObsoleteMessage = "Unused in Elite Dangerous 3.7+, may appear in legacy journal data.";
+
+        public const string UnusedMessage = "Documented by Frontier, but no occurances of this value ever found in real journal data.";
+     
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BackPack.cs

@@ -0,0 +1,10 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class BackPack : JournalBase
+    {
+       
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs

@@ -0,0 +1,11 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class BackpackChange : JournalBase
+    {
+        public ImmutableList<BackpackItemChange> Added { get; init; }
+        public ImmutableList<BackpackItemChange> Removed { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs

@@ -0,0 +1,13 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class BackpackMaterials : JournalBase
+    {
+        public ImmutableList<BackpackItem> Items { get; init; }
+        public ImmutableList<BackpackItem> Components { get; init; }
+        public ImmutableList<BackpackItem> Consumables { get; init; }
+        public ImmutableList<BackpackItem> Data { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BookDropship.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class BookDropship : BookTaxi
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BookTaxi.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class BookTaxi : JournalBase
+    {
+        public int Cost { get; init; }
+        public string DestinationSystem { get; init; }
+        public string DestinationLocation { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs

@@ -0,0 +1,16 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Text.Json.Serialization;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class BuyMicroResources : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public MicroCategory Category { get; init; }
+        public int Count { get; init; }
+        public int Price { get; init; }
+        public ulong MarketID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BuySuit.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class BuySuit : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public int Price { get; init; }
+        public ulong SuitID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/BuyWeapon.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class BuyWeapon : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public int Price { get; init; }
+        public ulong SuitModuleID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/CancelDropship.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CancelDropship : CancelTaxi
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/CancelTaxi.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CancelTaxi : JournalBase
+    {
+        public int Refund { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/CollectItems.cs

@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CollectItems : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public string Type { get; init; }
+        public ulong OwnerID { get; init; }
+        public int Count { get; init; }
+        public bool Stolen { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs

@@ -0,0 +1,11 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CreateSuitLoadout : DeleteSuitLoadout
+    {
+        public ImmutableList<SuitModule> Modules { get; init; }
+        public ImmutableList<string> SuitMods { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/DeleteSuitLoadout.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DeleteSuitLoadout : JournalBase
+    {
+        public ulong SuitID { get; init; }
+        public string SuitName { get; init; }
+        public string SuitName_Localised { get; init; }
+        public ulong LoadoutID { get; init; }
+        public string LoadoutName { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class Disembark : JournalBase
+    {
+        public bool SRV { get; init; }
+        public bool Taxi { get; init; }
+        public bool Multicrew { get; init; }
+        public ulong ID { get; init; }
+        public string StarSystem { get; init; }
+        public ulong SystemAddress { get; init; }
+        public string Body { get; init; }
+        public int BodyID { get; init; }
+        public bool OnStation { get; init; }
+        public bool OnPlanet { get; init; }
+        public string StationName { get; init; }
+        public string StationType { get; init; }
+        public ulong MarketID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/DropItems.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DropItems : CollectItems
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/DropShipDeploy.cs

@@ -0,0 +1,12 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DropShipDeploy : JournalBase
+    {
+        public string StarSystem { get; init; }
+        public ulong SystemAddress { get; init; }
+        public string Body { get; init; }
+        public int BodyID { get; init; }
+        public bool OnStation { get; init; }
+        public bool OnPlanet { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/Embark.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class Embark : Disembark
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/LoadoutEquipModule.cs

@@ -0,0 +1,15 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class LoadoutEquipModule : JournalBase
+    {
+        public ulong SuitID { get; init; }
+        public string SuitName { get; init; }
+        public string SuitName_Localised { get; init; }
+        public string SlotName { get; init; }
+        public ulong LoadoutID { get; init; }
+        public string LoadoutName { get; init; }
+        public string ModuleName { get; init; }
+        public string ModuleName_Localised { get; init; }
+        public ulong SuitModuleID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/LoadoutRemoveModule.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class LoadoutRemoveModule : LoadoutEquipModule
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/RenameSuitLoadout.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class RenameSuitLoadout : JournalBase
+    {
+        public ulong SuitID { get; init; }
+        public string SuitName { get; init; }
+        public ulong LoadoutID { get; init; }
+        public string LoadoutName { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs

@@ -0,0 +1,17 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Text.Json.Serialization;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class ScanOrganic : JournalBase
+    {
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public ScanOrganicType ScanType { get; init; }
+        public string Genus { get; init; }
+        public string Genus_Localised { get; init; }
+        public string Species { get; init; }
+        public string Species_Localised { get; init; }
+        public ulong SystemAddress { get; init; }
+        public int Body { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs

@@ -0,0 +1,12 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class SellMicroResources : JournalBase
+    {
+        public ImmutableList<MicroResource> MicroResources { get; init; }
+        public int Price { get; init; }
+        public ulong MarketID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs

@@ -0,0 +1,11 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class SellOrganicData : JournalBase
+    {
+        public ulong MarketID { get; init; }
+        public ImmutableList<BioData> BioData { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/SellSuit.cs

@@ -0,0 +1,5 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class SellSuit : BuySuit
+    { }
+}

ObservatoryFramework/Files/Journal/Odyssey/SellWeapon.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class SellWeapon : BuyWeapon
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs

@@ -0,0 +1,13 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class ShipLockerMaterials : JournalBase
+    {
+        public ImmutableList<BackpackItem> Items { get; init; }
+        public ImmutableList<BackpackItem> Components { get; init; }
+        public ImmutableList<BackpackItem> Consumables { get; init; }
+        public ImmutableList<BackpackItem> Data { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/SuitLoadout.cs

@@ -0,0 +1,5 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class SuitLoadout : CreateSuitLoadout
+    { }
+}

ObservatoryFramework/Files/Journal/Odyssey/SwitchSuitLoadout.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class SwitchSuitLoadout : CreateSuitLoadout
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs

@@ -0,0 +1,14 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class TradeMicroResources : JournalBase
+    {
+        public ImmutableList<MicroResource> Offered { get; init; }
+        public string Received { get; init; }
+        public MicroCategory Category { get; init; }
+        public int Count { get; init; }
+        public ulong MarketID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs

@@ -0,0 +1,10 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class TransferMicroResources : JournalBase
+    {
+        public ImmutableList<MicroTransfer> Transfers { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/UpgradeSuit.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class UpgradeSuit : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public ulong SuitID { get; init; }
+        public int Class { get; init; }
+        public int Cost { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/UpgradeWeapon.cs

@@ -0,0 +1,11 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class UpgradeWeapon : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public ulong SuitModuleID { get; init; }
+        public int Class { get; init; }
+        public int Cost { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Odyssey/UseConsumable.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class UseConsumable : JournalBase
+    {
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public string Type { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs

@@ -0,0 +1,10 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class AfmuRepairs : JournalBase
+    {
+        public string Module { get; init; }
+        public string Module_Localised { get; init; }
+        public bool FullyRepaired { get; init; }
+        public float Health { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs

@@ -0,0 +1,14 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class ApproachSettlement : JournalBase
+    {
+        public ulong SystemAddress { get; init; }
+        public string Name { get; init; }
+        public string Name_Localised { get; init; }
+        public long MarketID { get; init; }
+        public float Latitude { get; init; }
+        public float Longitude { get; init; }
+        public int BodyID { get; init; }
+        public string BodyName { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs

@@ -0,0 +1,10 @@
+using Observatory.Framework.Files.ParameterTypes;
+using System.Collections.Immutable;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CargoTransfer : JournalBase
+    {
+        public ImmutableList<CargoTransferDetail> Transfers { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class ChangeCrewRole : JournalBase
+    {
+        public string Role { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CockpitBreached : JournalBase
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Other/CommitCrime.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CommitCrime : JournalBase
+    {
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CrimeType CrimeType { get; init; }
+        public string Faction { get; init; }
+        public string Victim { get; init; }
+        public string Victim_Localised { get; init; }
+        public int Fine { get; init; }
+        public int Bounty { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/Continued.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class Continued : JournalBase
+    {
+        public int Part { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CrewLaunchFighter : CrewMemberJoins
+    {
+        public int ID { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CrewMemberJoins : JournalBase
+    {
+        public string Crew { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs

@@ -0,0 +1,6 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CrewMemberQuits : CrewMemberJoins
+    {
+    }
+}

ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs

@@ -0,0 +1,7 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class CrewMemberRoleChange : CrewMemberJoins
+    {
+        public string Role { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/CrimeVictim.cs

@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+using Observatory.Framework.Files.ParameterTypes;
+
+namespace Observatory.Framework.Files.Journal
+{
+    public class CrimeVictim : JournalBase
+    {
+        public string Offender { get; init; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public CrimeType CrimeType { get; init; }
+        public int Fine { get; init; }
+        public int Bounty { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/DataScanned.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DataScanned : JournalBase
+    {
+        public string Type { get; init; }
+        public string Type_Localised { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/DatalinkScan.cs

@@ -0,0 +1,8 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DatalinkScan : JournalBase
+    {
+        public string Message { get; init; }
+        public string Message_Localised { get; init; }
+    }
+}

ObservatoryFramework/Files/Journal/Other/DatalinkVoucher.cs

@@ -0,0 +1,9 @@
+namespace Observatory.Framework.Files.Journal
+{
+    public class DatalinkVoucher : JournalBase
+    {
+        public int Reward { get; init; }
+        public string VictimFaction { get; init; }
+        public string PayeeFaction { get; init; }
+    }
+}