Initial Commit

ObservatoryFramework/Files/Journal/Other/AfmuRepairs.cs

@@ -1,10 +1,9 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class AfmuRepairs : JournalBase
 {
-    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; }
-    }
-}
+    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

@@ -1,27 +1,26 @@
-using Observatory.Framework.Files.Converters;
-using Observatory.Framework.Files.ParameterTypes;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Text.Json.Serialization;
+using Observatory.Framework.Files.Converters;
+using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class ApproachSettlement : JournalBase
 {
-    public class ApproachSettlement : JournalBase
-    {
-        public ulong SystemAddress { get; init; }
-        public string Name { get; init; }
-        public string Name_Localised { get; init; }
-        public ulong MarketID { get; init; }
-        public float Latitude { get; init; }
-        public float Longitude { get; init; }
-        public int BodyID { get; init; }
-        public string BodyName { get; init; }
-        public ImmutableList<StationEconomy> StationEconomies { get; init; }
-        public string StationEconomy { get; init; }
-        public string StationEconomy_Localised { 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 ulong SystemAddress { get; init; }
+    public string Name { get; init; }
+    public string Name_Localised { get; init; }
+    public ulong MarketID { get; init; }
+    public float Latitude { get; init; }
+    public float Longitude { get; init; }
+    public int BodyID { get; init; }
+    public string BodyName { get; init; }
+    public ImmutableList<StationEconomy> StationEconomies { get; init; }
+    public string StationEconomy { get; init; }
+    public string StationEconomy_Localised { 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; }
+}

ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs

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

ObservatoryFramework/Files/Journal/Other/ChangeCrewRole.cs

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

ObservatoryFramework/Files/Journal/Other/CockpitBreached.cs

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

ObservatoryFramework/Files/Journal/Other/CommitCrime.cs

@@ -1,16 +1,15 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class CommitCrime : JournalBase
 {
-    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; }
-    }
-}
+    [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

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

ObservatoryFramework/Files/Journal/Other/CrewLaunchFighter.cs

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

ObservatoryFramework/Files/Journal/Other/CrewMemberJoins.cs

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

ObservatoryFramework/Files/Journal/Other/CrewMemberQuits.cs

@@ -1,5 +1,4 @@
-namespace Observatory.Framework.Files.Journal
-{
-    public class CrewMemberQuits : CrewMemberJoins
-    { }
-}
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class CrewMemberQuits : CrewMemberJoins
+{ }

ObservatoryFramework/Files/Journal/Other/CrewMemberRoleChange.cs

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

ObservatoryFramework/Files/Journal/Other/CrimeVictim.cs

@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class CrimeVictim : JournalBase
 {
-    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; }
-    }
-}
+    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

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

ObservatoryFramework/Files/Journal/Other/DatalinkScan.cs

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

ObservatoryFramework/Files/Journal/Other/DatalinkVoucher.cs

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

ObservatoryFramework/Files/Journal/Other/DockFighter.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class DockFighter : JournalBase
 {
-    public class DockFighter : JournalBase
-    {
-        public ulong ID { get; init; }
-    }
-}
+    public ulong ID { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/DockSRV.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class DockSRV : DockFighter
 {
-    public class DockSRV : DockFighter
-    {
-        public string SRVType { get; init; }
-        public string SRVType_Localised { get; init; }
-    }
-}
+    public string SRVType { get; init; }
+    public string SRVType_Localised { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/EndCrewSession.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class EndCrewSession : JournalBase
 {
-    public class EndCrewSession : JournalBase
-    {
-        public bool OnCrime { get; init; }
-        public bool Telepresence { get; init; }
-    }
-}
+    public bool OnCrime { get; init; }
+    public bool Telepresence { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/FighterRebuilt.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class FighterRebuilt : JournalBase
 {
-    public class FighterRebuilt : JournalBase
-    {
-        public string Loadout { get; init; }
-        public ulong ID { get; init; }
-    }
-}
+    public string Loadout { get; init; }
+    public ulong ID { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/Friends.cs

@@ -1,12 +1,11 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Friends : JournalBase
 {
-    public class Friends : JournalBase
-    {
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public FriendStatus Status { get; init; }
-        public string Name { get; init; }
-    }
-}
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public FriendStatus Status { get; init; }
+    public string Name { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/FuelScoop.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class FuelScoop : JournalBase
 {
-    public class FuelScoop : JournalBase
-    {
-        public float Scooped { get; init; }
-        public float Total { get; init; }
-    }
-}
+    public float Scooped { get; init; }
+    public float Total { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/JetConeBoost.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class JetConeBoost : JournalBase
 {
-    public class JetConeBoost : JournalBase
-    {
-        public float BoostValue { get; init; }
-    }
-}
+    public float BoostValue { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/JetConeDamage.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class JetConeDamage : JournalBase
 {
-    public class JetConeDamage : JournalBase
-    {
-        public string Module { get; init; }
-    }
-}
+    public string Module { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/JoinACrew.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class JoinACrew : JournalBase
 {
-    public class JoinACrew : JournalBase
-    {
-        public string Captain { get; init; }
-        public bool Telepresence { get; init; }
-    }
-}
+    public string Captain { get; init; }
+    public bool Telepresence { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/KickCrewMember.cs

@@ -1,9 +1,8 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class KickCrewMember : JournalBase
 {
-    public class KickCrewMember : JournalBase
-    {
-        public string Crew { get; init; }
-        public bool OnCrime { get; init; }
-        public bool Telepresence { get; init; }
-    }
-}
+    public string Crew { get; init; }
+    public bool OnCrime { get; init; }
+    public bool Telepresence { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/LaunchDrone.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class LaunchDrone : JournalBase
 {
-    public class LaunchDrone : JournalBase
-    {
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public LimpetDrone Type { get; init; }
-    }
-}
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public LimpetDrone Type { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/LaunchFighter.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class LaunchFighter : LaunchSRV
 {
-    public class LaunchFighter : LaunchSRV
-    {
-    }
-}
+}

ObservatoryFramework/Files/Journal/Other/LaunchSRV.cs

@@ -1,11 +1,10 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class LaunchSRV : JournalBase
 {
-    public class LaunchSRV : JournalBase
-    {
-        public string Loadout { get; init; }
-        public ulong ID { get; init; }
-        public bool PlayerControlled { get; init; }
-        public string SRVType { get; init; }
-        public string SRVType_Localised { get; init; }
-    }
-}
+    public string Loadout { get; init; }
+    public ulong ID { get; init; }
+    public bool PlayerControlled { get; init; }
+    public string SRVType { get; init; }
+    public string SRVType_Localised { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/ModuleInfo.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
-{
-    public class ModuleInfo : JournalBase
-    {
+namespace Observatory.Framework.Files.Journal.Other;
 
-    }
-}
+public class ModuleInfo : JournalBase
+{
+
+}

ObservatoryFramework/Files/Journal/Other/Music.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Music : JournalBase
 {
-    public class Music : JournalBase
-    {
-        public string MusicTrack { get; init; }
-    }
-}
+    public string MusicTrack { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/NpcCrewPaidWage.cs

@@ -1,9 +1,8 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class NpcCrewPaidWage : JournalBase
 {
-    public class NpcCrewPaidWage : JournalBase
-    {
-        public ulong NpcCrewId { get; init; }
-        public string NpcCrewName { get; init; }
-        public int Amount { get; init; }
-    }
-}
+    public ulong NpcCrewId { get; init; }
+    public string NpcCrewName { get; init; }
+    public int Amount { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/NpcCrewRank.cs

@@ -1,11 +1,10 @@
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class NpcCrewRank : JournalBase
 {
-    public class NpcCrewRank : JournalBase
-    {
-        public ulong NpcCrewId { get; init; }
-        public string NpcCrewName { get; init; }
-        public RankCombat RankCombat { get; init; }
-    }
-}
+    public ulong NpcCrewId { get; init; }
+    public string NpcCrewName { get; init; }
+    public RankCombat RankCombat { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/Promotion.cs

@@ -1,5 +1,6 @@
-namespace Observatory.Framework.Files.Journal
-{
-    public class Promotion : Rank
-    { }
-}
+using Observatory.Framework.Files.Journal.Startup;
+
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Promotion : Rank
+{ }

ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs

@@ -1,15 +1,14 @@
-using Observatory.Framework.Files.ParameterTypes;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
+using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class ProspectedAsteroid : JournalBase
 {
-    public class ProspectedAsteroid : JournalBase
-    {
-        public ImmutableList<ProspectMaterial> Materials { get; init; }
-        public string Content { get; init; }
-        public string Content_Localised { get; init; }
-        public string MotherlodeMaterial { get; init; }
-        public string MotherlodeMaterial_Localised { get; init; }
-        public float Remaining { get; init; }
-    }
-}
+    public ImmutableList<ProspectMaterial> Materials { get; init; }
+    public string Content { get; init; }
+    public string Content_Localised { get; init; }
+    public string MotherlodeMaterial { get; init; }
+    public string MotherlodeMaterial_Localised { get; init; }
+    public float Remaining { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/QuitACrew.cs

@@ -1,5 +1,4 @@
-namespace Observatory.Framework.Files.Journal
-{
-    public class QuitACrew : JoinACrew
-    { }
-}
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class QuitACrew : JoinACrew
+{ }

ObservatoryFramework/Files/Journal/Other/RebootRepair.cs

@@ -1,9 +1,8 @@
 using System.Collections.Immutable;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class RebootRepair : JournalBase
 {
-    public class RebootRepair : JournalBase
-    {
-        public ImmutableList<string> Modules { get; init; }
-    }
-}
+    public ImmutableList<string> Modules { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/ReceiveText.cs

@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class ReceiveText : JournalBase
 {
-    public class ReceiveText : JournalBase
-    {
-        public string From { get; init; }
-        public string From_Localised { get; init; }
-        public string Message { get; init; }
-        public string Message_Localised { get; init; }
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public TextChannel Channel { get; init; }
-    }
-}
+    public string From { get; init; }
+    public string From_Localised { get; init; }
+    public string Message { get; init; }
+    public string Message_Localised { get; init; }
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public TextChannel Channel { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/RepairDrone.cs

@@ -1,9 +1,8 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class RepairDrone : JournalBase
 {
-    public class RepairDrone : JournalBase
-    {
-        public float HullRepaired { get; init; }
-        public float CockpitRepaired { get; init; }
-        public float CorrosionRepaired { get; init; }
-    }
-}
+    public float HullRepaired { get; init; }
+    public float CockpitRepaired { get; init; }
+    public float CorrosionRepaired { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/ReservoirReplenished.cs

@@ -1,8 +1,7 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class ReservoirReplenished : JournalBase
 {
-    public class ReservoirReplenished : JournalBase
-    {
-        public float FuelMain { get; init; }
-        public float FuelReservoir { get; init; }
-    }
-}
+    public float FuelMain { get; init; }
+    public float FuelReservoir { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/Resurrect.cs

@@ -1,9 +1,8 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Resurrect : JournalBase
 {
-    public class Resurrect : JournalBase
-    {
-        public string Option { get; init; }
-        public int Cost { get; init; }
-        public bool Bankrupt { get; init; }
-    }
-}
+    public string Option { get; init; }
+    public int Cost { get; init; }
+    public bool Bankrupt { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/Scanned.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Scanned : JournalBase
 {
-    public class Scanned : JournalBase
-    {
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public ScanType ScanType { get; init; }
-    }
-}
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public ScanType ScanType { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/SelfDestruct.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class SelfDestruct : JournalBase
 {
-    public class SelfDestruct : JournalBase
-    {
-    }
-}
+}

ObservatoryFramework/Files/Journal/Other/SendText.cs

@@ -1,10 +1,9 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class SendText : JournalBase
 {
-    public class SendText : JournalBase
-    {
-        public string To { get; init; }
-        public string To_Localised { get; init; }
-        public string Message { get; init; }
-        public bool Sent { get; init; }
-    }
-}
+    public string To { get; init; }
+    public string To_Localised { get; init; }
+    public string Message { get; init; }
+    public bool Sent { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/Shutdown.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Shutdown : JournalBase
 {
-    public class Shutdown : JournalBase
-    {
-    }
-}
+}

ObservatoryFramework/Files/Journal/Other/Synthesis.cs

@@ -1,15 +1,14 @@
-using System.Text.Json.Serialization;
+using System.Collections.Immutable;
+using System.Text.Json.Serialization;
 using Observatory.Framework.Files.Converters;
 using Observatory.Framework.Files.ParameterTypes;
-using System.Collections.Immutable;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class Synthesis : JournalBase
 {
-    public class Synthesis : JournalBase
-    {
-        public string Name { get; init; }
+    public string Name { get; init; }
 
-        [JsonConverter(typeof(MaterialConverter))]
-        public ImmutableList<Material> Materials { get; init; }
-    }
-}
+    [JsonConverter(typeof(MaterialConverter))]
+    public ImmutableList<Material> Materials { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/SystemsShutdown.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class SystemsShutdown : JournalBase
 {
-    public class SystemsShutdown : JournalBase
-    {
-    }
-}
+}

ObservatoryFramework/Files/Journal/Other/USSDrop.cs

@@ -1,9 +1,8 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class USSDrop : JournalBase
 {
-    public class USSDrop : JournalBase
-    {
-        public string USSType { get; init; }
-        public string USSType_Localised { get; init; }
-        public int USSThreat { get; init; }
-    }
-}
+    public string USSType { get; init; }
+    public string USSType_Localised { get; init; }
+    public int USSThreat { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/VehicleSwitch.cs

@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
 using Observatory.Framework.Files.ParameterTypes;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class VehicleSwitch : JournalBase
 {
-    public class VehicleSwitch : JournalBase
-    {
-        [JsonConverter(typeof(JsonStringEnumConverter))]
-        public VehicleSwitchTo To { get; init; }
-    }
-}
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public VehicleSwitchTo To { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/WingAdd.cs

@@ -1,7 +1,6 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class WingAdd : JournalBase
 {
-    public class WingAdd : JournalBase
-    {
-        public string Name { get; init; }
-    }
-}
+    public string Name { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/WingInvite.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class WingInvite : WingAdd
 {
-    public class WingInvite : WingAdd
-    {
-    }
-}
+}

ObservatoryFramework/Files/Journal/Other/WingJoin.cs

@@ -1,9 +1,8 @@
 using System.Collections.Immutable;
 
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class WingJoin : JournalBase
 {
-    public class WingJoin : JournalBase
-    {
-        public ImmutableList<string> Others { get; init; }
-    }
-}
+    public ImmutableList<string> Others { get; init; }
+}

ObservatoryFramework/Files/Journal/Other/WingLeave.cs

@@ -1,6 +1,5 @@
-namespace Observatory.Framework.Files.Journal
+namespace Observatory.Framework.Files.Journal.Other;
+
+public class WingLeave : JournalBase
 {
-    public class WingLeave : JournalBase
-    {
-    }
-}
+}