CS2GSI.sln.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String></wpf:ResourceDictionary>

CS2GSI/CS2GSI.cs

@@ -38,12 +38,12 @@ public class CS2GSI
 
         if (_lastLocalGameState is not null && _allGameStates.Count > 0)
         {
-            List<ValueTuple<CS2Event, CS2EventArgs>> generatedEvents = CS2EventGenerator.GenerateEvents(_lastLocalGameState, newState, _allGameStates.Last());
+            List<ValueTuple<CS2Event, CS2EventArgs>> generatedEvents = CS2EventGenerator.GenerateEvents(_lastLocalGameState.Value, newState, _allGameStates.Last());
-            this._logger?.Log(LogLevel.Information, $"Generated {generatedEvents.Count} event{(generatedEvents.Count > 1 ? 's' : null)}:\n- {string.Join("\n- ", generatedEvents)}");
+            this._logger?.Log(LogLevel.Information, $"Generated {generatedEvents.Count} events:\n\t{string.Join("\n\t", generatedEvents)}");
             InvokeEvents(generatedEvents);
         }
         this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
-        this._logger?.Log(LogLevel.Debug, $"\nUpdated Local State:\n{_lastLocalGameState}");
+        this._logger?.Log(LogLevel.Debug, $"Updated Local State:\n{_lastLocalGameState.ToString()}");
         _allGameStates.Add(newState);
     }
 

CS2GSI/GSIServer.cs

@@ -44,7 +44,7 @@ internal class GSIServer
 
             StreamReader reader = new (request.InputStream, request.ContentEncoding);
             string content = await reader.ReadToEndAsync();
-            this.logger?.Log(LogLevel.Debug, $"Message Content:\n{content}");
+            this.logger?.Log(LogLevel.Debug, content);
             OnMessage?.Invoke(content);
         }
         HttpListener.Close();

CS2GSI/GameState/CS2GameState.cs

@@ -2,7 +2,7 @@
 
 namespace CS2GSI.GameState;
 
-public record CS2GameState : GameState
+public struct CS2GameState
 {
     public string ProviderSteamId;
     public int Timestamp;
@@ -12,7 +12,11 @@ public record CS2GameState : GameState
 
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Time: {Timestamp}\tProviderSteamId: {ProviderSteamId}\n" +
+               $"..{Map.ToString()?.Replace("\n", "\n...")}\n" +
+               $"..{Round.ToString()?.Replace("\n", "\n...")}\n" +
+               $"..{Player.ToString()?.Replace("\n", "\n...")}\n";
     }
     
     internal static CS2GameState ParseFromJObject(JObject jsonObject)
@@ -21,9 +25,9 @@ public record CS2GameState : GameState
         {
             ProviderSteamId = jsonObject.SelectToken("provider.steamid")!.Value<string>()!,
             Timestamp = jsonObject.SelectToken("provider.timestamp")!.Value<int>(),
-            Map = Map.ParseFromJObject(jsonObject),
+            Map = GameState.Map.ParseFromJObject(jsonObject),
-            Player = Player.ParseFromJObject(jsonObject),
+            Player = GameState.Player.ParseFromJObject(jsonObject),
-            Round = Round.ParseFromJObject(jsonObject)
+            Round = GameState.Round.ParseFromJObject(jsonObject)
         };
     }
 
@@ -32,7 +36,7 @@ public record CS2GameState : GameState
         if (previousLocalState is null)
             return this.Player?.SteamId == ProviderSteamId ? this : null;
         if (this.Player?.SteamId != ProviderSteamId)
-            return this.WithPlayer(previousLocalState.Player);
+            return this.WithPlayer(previousLocalState.Value.Player);
         return this;
     }
 

CS2GSI/GameState/GameState.cs

@@ -1,21 +0,0 @@
-using System.Reflection;
-
-namespace CS2GSI.GameState;
-
-public abstract record GameState
-{
-    public override string ToString()
-    {
-        string ret = "";
-        foreach (FieldInfo field in GetType().GetFields())
-        {
-            string filler = GetType().GetFields().Last() != field ? "\u251c\u2500" : "\u2514\u2500";
-            string filler2 = GetType().GetFields().Last() != field ? "\u2502" : " ";
-            if (field.FieldType.BaseType == typeof(GameState))
-                ret += $"\b{filler}\u2510 {field.Name}\n{field.GetValue(this)?.ToString()?.Replace("\b", $"\b{filler2} ")}";
-            else
-                ret += $"\b{filler} {field.Name}{new string('.', field.Name.Length > 25 ? 0 : 25-field.Name.Length)}{field.GetValue(this)}\n";
-        }
-        return ret;
-    }
-}

CS2GSI/GameState/GameStateTeam.cs

@@ -2,14 +2,18 @@
 
 namespace CS2GSI.GameState;
 
-public record GameStateTeam : GameState
+public struct GameStateTeam
 {
     public CS2Team Team;
     public int Score, ConsecutiveRoundLosses, TimeoutsRemaining, MatchesWonThisSeries;
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Team {Team}\tScore: {Score}\n" +
+               $"..ConsecutiveRoundLosses: {ConsecutiveRoundLosses}\n" +
+               $"..TimeoutsRemaining: {TimeoutsRemaining}\n" +
+               $"..MatchesWonThisSeries: {MatchesWonThisSeries}\n";
     }
     
     internal static GameStateTeam ParseFromJObject(JObject jsonObject, CS2Team team)

CS2GSI/GameState/Map.cs

@@ -2,7 +2,7 @@
 
 namespace CS2GSI.GameState;
 
-public record Map : GameState
+public struct Map
 {
     public string Mode, MapName;
     public MapPhase Phase;
@@ -11,7 +11,13 @@ public record Map : GameState
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Mode: {Mode} Map: {MapName}\n" +
+               $"..Round: {Round}\n" +
+               $"..Matches to Win Series: {NumMatchesToWinSeries}\n" +
+               $"..Phase: {Phase}\n" +
+               $"..{GameStateTeamCT.ToString().Replace("\n", "\n...")}\n" +
+               $"..{GameStateTeamT.ToString().Replace("\n", "\n...")}\n";
     }
 
     internal static Map? ParseFromJObject(JObject jsonObject)

CS2GSI/GameState/Player.cs

@@ -2,7 +2,7 @@
 
 namespace CS2GSI.GameState;
 
-public record Player : GameState
+public struct Player
 {
     public string SteamId, Name;
     public PlayerActivity Activity;
@@ -13,7 +13,12 @@ public record Player : GameState
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Name: {Name} SteamId: {SteamId}\n" +
+               $"..Activity: {Activity}\n" +
+               $"..Team: {Team}\n" +
+               $"..{State.ToString()?.Replace("\n", "\n...")}\n" +
+               $"..{MatchStats.ToString()?.Replace("\n", "\n...")}\n";
     }
     
     internal static Player? ParseFromJObject(JObject jsonObject)

CS2GSI/GameState/PlayerMatchStats.cs

@@ -2,13 +2,16 @@
 
 namespace CS2GSI.GameState;
 
-public record PlayerMatchStats : GameState
+public struct PlayerMatchStats
 {
     public int Kills, Assists, Deaths, MVPs, Score;
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..KAD: {Kills} {Assists} {Deaths}\n" +
+               $"..MVPs: {MVPs}\n" +
+               $"..Score: {Score}\n";
     }
     
     internal static PlayerMatchStats? ParseFromJObject(JObject jsonObject)

CS2GSI/GameState/PlayerState.cs

@@ -2,14 +2,23 @@
 
 namespace CS2GSI.GameState;
 
-public record PlayerState : GameState
+public struct PlayerState
 {
     public int Health, Armor, Flashed, Smoked, Burning, Money, RoundKills, RoundHs, EquipmentValue;
     public bool Helmet;
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Health: {Health}\n" +
+               $"..Armor: {Armor}\n" +
+               $"..Flashed: {Flashed}\n" +
+               $"..Smoked: {Smoked}\n" +
+               $"..Burning: {Burning}\n" +
+               $"..Money: {Money}\n" +
+               $"..RoundKills: {RoundKills}\n" +
+               $"..RoundHs: {RoundHs}\n" +
+               $"..EquipmentValue: {EquipmentValue}\n";
     }
     
     internal static PlayerState? ParseFromJObject(JObject jsonObject)

CS2GSI/GameState/Round.cs

@@ -2,7 +2,7 @@
 
 namespace CS2GSI.GameState;
 
-public record Round : GameState
+public struct Round
 {
     public RoundPhase Phase;
     public BombStatus? Bomb;
@@ -10,7 +10,10 @@ public record Round : GameState
     
     public override string ToString()
     {
-        return base.ToString();
+        return $"{GetType().Name}\n" +
+               $"..Phase: {Phase}\n" +
+               $"..Winner: {WinnerTeam}\n" +
+               $"..Bomb: {Bomb}\n";
     }
     
     internal static Round? ParseFromJObject(JObject jsonObject)

TestApp/Program.cs

@@ -7,8 +7,6 @@ public class TestApp
 {
     public static void Main(string[] args)
     {
-        CS2GSI.CS2GSI gsi = new (new Logger(LogLevel.Debug));
+        new CS2GSI.CS2GSI(new Logger(LogLevel.Information));
-        while(gsi.IsRunning)
-            Thread.Sleep(10);
     }
 }