Compare commits
11 Commits
996255b490
...
master
Author | SHA1 | Date | |
---|---|---|---|
4ca3a8b464 | |||
11c8a4f38f | |||
a11f50b6d8 | |||
8371f119d5 | |||
386c211de5 | |||
eda66a2334 | |||
04be9d6fab | |||
f18e6744f4 | |||
fba5d42db3 | |||
ea6099a7d2 | |||
316cc815b5 |
@ -1,2 +1,3 @@
|
|||||||
<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">
|
<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>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
|
||||||
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=steamid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
4
CS2GSI.sln.DotSettings.user
Normal file
4
CS2GSI.sln.DotSettings.user
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<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:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CS2GSI_002FResources/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
|
||||||
|
<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
|
32
CS2GSI/CS2Event.cs
Normal file
32
CS2GSI/CS2Event.cs
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
namespace CS2GSI;
|
||||||
|
|
||||||
|
public enum CS2Event : byte {
|
||||||
|
OnKill = 0,
|
||||||
|
OnHeadshot = 1,
|
||||||
|
OnDeath = 2,
|
||||||
|
OnFlashed = 3,
|
||||||
|
OnBurning = 4,
|
||||||
|
OnSmoked = 5,
|
||||||
|
OnRoundStart = 6,
|
||||||
|
OnRoundOver = 7,
|
||||||
|
OnRoundWin = 8,
|
||||||
|
OnRoundLoss = 9,
|
||||||
|
OnDamageTaken = 10,
|
||||||
|
OnMatchStart = 11,
|
||||||
|
OnMatchOver = 12,
|
||||||
|
OnMoneyChange = 13,
|
||||||
|
OnHealthChange = 14,
|
||||||
|
OnArmorChange = 15,
|
||||||
|
OnHelmetChange = 16,
|
||||||
|
OnEquipmentValueChange = 17,
|
||||||
|
OnTeamChange = 18,
|
||||||
|
OnPlayerChange = 19,
|
||||||
|
OnHalfTime = 20,
|
||||||
|
OnFreezeTime = 21,
|
||||||
|
OnBombPlanted = 22,
|
||||||
|
OnBombDefused = 23,
|
||||||
|
OnBombExploded = 24,
|
||||||
|
AnyEvent = 25,
|
||||||
|
AnyMessage = 26,
|
||||||
|
OnActivityChange = 27
|
||||||
|
}
|
@ -1,5 +1,4 @@
|
|||||||
using CS2GSI.GameState;
|
using CS2GSI.GameState;
|
||||||
using CS2Event = CS2GSI.CS2GSI.CS2Event;
|
|
||||||
|
|
||||||
namespace CS2GSI;
|
namespace CS2GSI;
|
||||||
|
|
||||||
@ -16,6 +15,9 @@ internal static class CS2EventGenerator
|
|||||||
|
|
||||||
if(events.Count > 0)
|
if(events.Count > 0)
|
||||||
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyEvent, new CS2EventArgs(events.Count)));
|
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyEvent, new CS2EventArgs(events.Count)));
|
||||||
|
|
||||||
|
if (lastGameState.Player?.Activity != newGameState.Player?.Activity)
|
||||||
|
events.Add(new(CS2Event.OnActivityChange, new CS2EventArgs(newGameState.Player?.Activity)));
|
||||||
|
|
||||||
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyMessage, new CS2EventArgs()));
|
events.Add(new ValueTuple<CS2Event, CS2EventArgs>(CS2Event.AnyMessage, new CS2EventArgs()));
|
||||||
return events;
|
return events;
|
||||||
|
201
CS2GSI/CS2GSI.cs
201
CS2GSI/CS2GSI.cs
@ -1,21 +1,29 @@
|
|||||||
using CS2GSI.GameState;
|
using CS2GSI.GameState;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
namespace CS2GSI;
|
namespace CS2GSI;
|
||||||
|
|
||||||
public class CS2GSI
|
public class CS2GSI
|
||||||
{
|
{
|
||||||
private readonly GSIServer _gsiServer;
|
private readonly GSIServer _gsiServer = null!;
|
||||||
private readonly List<CS2GameState> _allGameStates = new();
|
private readonly List<CS2GameState> _allGameStates = new();
|
||||||
private CS2GameState? _lastLocalGameState = null;
|
private CS2GameState? _lastLocalGameState = null;
|
||||||
private readonly ILogger? _logger;
|
private readonly ILogger? _logger;
|
||||||
public bool IsRunning => this._gsiServer.IsRunning;
|
public bool IsRunning => this._gsiServer.IsRunning;
|
||||||
|
public CS2GameState? CurrentGameState => _lastLocalGameState;
|
||||||
|
|
||||||
|
private const string DebugDirectory = "Debug";
|
||||||
|
public static string StatesDirectory => Path.Join(DebugDirectory, "States");
|
||||||
|
public static string MessagesDirectory => Path.Join(DebugDirectory, "Messages");
|
||||||
|
public static string EventsDirectory => Path.Join(DebugDirectory, "Messages");
|
||||||
|
public static bool DebugEnabled = false;
|
||||||
|
|
||||||
public CS2GSI(ILogger? logger = null)
|
public CS2GSI(ILogger? logger = null, bool debugEnabled = false)
|
||||||
{
|
{
|
||||||
this._logger = logger;
|
this._logger = logger;
|
||||||
this._logger?.Log(LogLevel.Information, "Installing GSI-Configfile...");
|
this._logger?.Log(LogLevel.Information, Resources.Installing_GSI_File);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GsiConfigInstaller.InstallGsi();
|
GsiConfigInstaller.InstallGsi();
|
||||||
@ -23,10 +31,12 @@ public class CS2GSI
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
this._logger?.Log(LogLevel.Error, e.StackTrace);
|
this._logger?.Log(LogLevel.Error, e.StackTrace);
|
||||||
this._logger?.Log(LogLevel.Critical, "Could not install GSI-Configfile. Exiting.");
|
this._logger?.Log(LogLevel.Critical, Resources.Installing_GSI_File_Failed);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this._gsiServer = new GSIServer(3000, logger);
|
|
||||||
|
DebugEnabled = debugEnabled;
|
||||||
|
this._gsiServer = GSIServer.Create(3000, logger);
|
||||||
this._gsiServer.OnMessage += GsiServerOnOnMessage;
|
this._gsiServer.OnMessage += GsiServerOnOnMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,16 +44,37 @@ public class CS2GSI
|
|||||||
{
|
{
|
||||||
JObject jsonObject = JObject.Parse(messageJson);
|
JObject jsonObject = JObject.Parse(messageJson);
|
||||||
CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
|
CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
|
||||||
this._logger?.Log(LogLevel.Debug, $"Received State:\n{newState.ToString()}");
|
this._logger?.Log(LogLevel.Debug, $"{Resources.Received_State}:\n{newState.ToString()}");
|
||||||
|
|
||||||
|
double time = DateTime.UtcNow.Subtract(
|
||||||
|
new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)
|
||||||
|
).TotalMilliseconds;
|
||||||
|
string timeString = $"{time:N0}.json";
|
||||||
|
|
||||||
|
if (DebugEnabled)
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(StatesDirectory);
|
||||||
|
Directory.CreateDirectory(MessagesDirectory);
|
||||||
|
File.WriteAllText(Path.Join(StatesDirectory, timeString),
|
||||||
|
JsonConvert.SerializeObject(newState, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
|
||||||
|
File.WriteAllText(Path.Join(MessagesDirectory, timeString), messageJson);
|
||||||
|
}
|
||||||
|
|
||||||
if (_lastLocalGameState is not null && _allGameStates.Count > 0)
|
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, 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} event{(generatedEvents.Count > 1 ? 's' : null)}:\n- {string.Join("\n- ", generatedEvents)}");
|
||||||
|
if (DebugEnabled)
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(EventsDirectory);
|
||||||
|
File.WriteAllText(Path.Join(StatesDirectory, EventsDirectory),
|
||||||
|
JsonConvert.SerializeObject(generatedEvents, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
|
||||||
|
}
|
||||||
|
|
||||||
InvokeEvents(generatedEvents);
|
InvokeEvents(generatedEvents);
|
||||||
}
|
}
|
||||||
this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
|
this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
|
||||||
this._logger?.Log(LogLevel.Debug, $"\nUpdated Local State:\n{_lastLocalGameState}");
|
this._logger?.Log(LogLevel.Debug, $"\n{Resources.Updated_Local_State}:\n{_lastLocalGameState}");
|
||||||
_allGameStates.Add(newState);
|
_allGameStates.Add(newState);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,123 +87,43 @@ public class CS2GSI
|
|||||||
|
|
||||||
private void InvokeEvent(ValueTuple<CS2Event, CS2EventArgs> cs2Event)
|
private void InvokeEvent(ValueTuple<CS2Event, CS2EventArgs> cs2Event)
|
||||||
{
|
{
|
||||||
switch (cs2Event.Item1)
|
GetEventHandlerForEvent(cs2Event.Item1)?.Invoke(cs2Event.Item2);
|
||||||
{
|
|
||||||
case CS2Event.OnKill:
|
|
||||||
OnKill?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnHeadshot:
|
|
||||||
OnHeadshot?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnDeath:
|
|
||||||
OnDeath?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnFlashed:
|
|
||||||
OnFlashed?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnBurning:
|
|
||||||
OnBurning?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnSmoked:
|
|
||||||
OnSmoked?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnRoundStart:
|
|
||||||
OnRoundStart?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnRoundOver:
|
|
||||||
OnRoundOver?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnRoundWin:
|
|
||||||
OnRoundWin?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnRoundLoss:
|
|
||||||
OnRoundLoss?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnDamageTaken:
|
|
||||||
OnDamageTaken?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnMatchStart:
|
|
||||||
OnMatchStart?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnMatchOver:
|
|
||||||
OnMatchOver?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnMoneyChange:
|
|
||||||
OnMoneyChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnHealthChange:
|
|
||||||
OnHealthChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnArmorChange:
|
|
||||||
OnArmorChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnHelmetChange:
|
|
||||||
OnHelmetChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnEquipmentValueChange:
|
|
||||||
OnEquipmentValueChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnTeamChange:
|
|
||||||
OnTeamChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnPlayerChange:
|
|
||||||
OnPlayerChange?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnFreezeTime:
|
|
||||||
OnFreezeTime?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnHalfTime:
|
|
||||||
OnHalfTime?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnBombDefused:
|
|
||||||
OnBombDefused?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnBombExploded:
|
|
||||||
OnBombExploded?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.OnBombPlanted:
|
|
||||||
OnBombPlanted?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.AnyEvent:
|
|
||||||
AnyEvent?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
case CS2Event.AnyMessage:
|
|
||||||
AnyMessage?.Invoke(cs2Event.Item2);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
this._logger?.Log(LogLevel.Error, $"Unknown Event {cs2Event}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum CS2Event {
|
private CS2EventHandler? GetEventHandlerForEvent(CS2Event cs2Event)
|
||||||
OnKill,
|
{
|
||||||
OnHeadshot,
|
return cs2Event switch
|
||||||
OnDeath,
|
{
|
||||||
OnFlashed,
|
CS2Event.OnKill => this.OnKill,
|
||||||
OnBurning,
|
CS2Event.OnHeadshot => this.OnHeadshot,
|
||||||
OnSmoked,
|
CS2Event.OnDeath => this.OnDeath,
|
||||||
OnRoundStart,
|
CS2Event.OnFlashed => this.OnFlashed,
|
||||||
OnRoundOver,
|
CS2Event.OnBurning => this.OnBurning,
|
||||||
OnRoundWin,
|
CS2Event.OnSmoked => this.OnSmoked,
|
||||||
OnRoundLoss,
|
CS2Event.OnRoundStart => this.OnRoundStart,
|
||||||
OnDamageTaken,
|
CS2Event.OnRoundOver => this.OnRoundOver,
|
||||||
OnMatchStart,
|
CS2Event.OnRoundWin => this.OnRoundWin,
|
||||||
OnMatchOver,
|
CS2Event.OnRoundLoss => this.OnRoundLoss,
|
||||||
OnMoneyChange,
|
CS2Event.OnDamageTaken => this.OnDamageTaken,
|
||||||
OnHealthChange,
|
CS2Event.OnMatchStart => this.OnMatchStart,
|
||||||
OnArmorChange,
|
CS2Event.OnMatchOver => this.OnMatchOver,
|
||||||
OnHelmetChange,
|
CS2Event.OnMoneyChange => this.OnMoneyChange,
|
||||||
OnEquipmentValueChange,
|
CS2Event.OnHealthChange => this.OnHealthChange,
|
||||||
OnTeamChange,
|
CS2Event.OnArmorChange => this.OnArmorChange,
|
||||||
OnPlayerChange,
|
CS2Event.OnHelmetChange => this.OnHelmetChange,
|
||||||
OnHalfTime,
|
CS2Event.OnEquipmentValueChange => this.OnEquipmentValueChange,
|
||||||
OnFreezeTime,
|
CS2Event.OnTeamChange => this.OnTeamChange,
|
||||||
OnBombPlanted,
|
CS2Event.OnPlayerChange => this.OnPlayerChange,
|
||||||
OnBombDefused,
|
CS2Event.OnHalfTime => this.OnHalfTime,
|
||||||
OnBombExploded,
|
CS2Event.OnFreezeTime => this.OnFreezeTime,
|
||||||
AnyEvent,
|
CS2Event.OnBombPlanted => this.OnBombPlanted,
|
||||||
AnyMessage
|
CS2Event.OnBombDefused => this.OnBombDefused,
|
||||||
|
CS2Event.OnBombExploded => this.OnBombExploded,
|
||||||
|
CS2Event.AnyEvent => this.OnAnyEvent,
|
||||||
|
CS2Event.AnyMessage => this.OnAnyMessage,
|
||||||
|
CS2Event.OnActivityChange => this.OnActivityChange,
|
||||||
|
_ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event))
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public delegate void CS2EventHandler(CS2EventArgs eventArgs);
|
public delegate void CS2EventHandler(CS2EventArgs eventArgs);
|
||||||
@ -202,7 +153,7 @@ public class CS2GSI
|
|||||||
OnBombPlanted,
|
OnBombPlanted,
|
||||||
OnBombDefused,
|
OnBombDefused,
|
||||||
OnBombExploded,
|
OnBombExploded,
|
||||||
AnyEvent,
|
OnAnyEvent,
|
||||||
AnyMessage;
|
OnAnyMessage,
|
||||||
|
OnActivityChange;
|
||||||
}
|
}
|
@ -1,14 +1,17 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<Version>1.0.5</Version>
|
<Version>1.1.0</Version>
|
||||||
<Title>CS2GSI</Title>
|
<Title>CS2GSI</Title>
|
||||||
<Authors>Glax</Authors>
|
<Authors>Glax</Authors>
|
||||||
<RepositoryUrl>https://github.com/C9Glax/CS2GSI</RepositoryUrl>
|
<RepositoryUrl>https://github.com/C9Glax/CS2GSI</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<PackageProjectUrl>https://github.com/C9Glax/CS2GSI</PackageProjectUrl>
|
||||||
|
<PackageLicenseUrl></PackageLicenseUrl>
|
||||||
|
<TargetFrameworks>net8.0;net9.0;net7.0</TargetFrameworks>
|
||||||
|
<LangVersion>latestmajor</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
2
CS2GSI/CS2GSI.csproj.DotSettings.user
Normal file
2
CS2GSI/CS2GSI.csproj.DotSettings.user
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<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/CodeEditing/Localization/MoveToResource/LastResourceFile/@EntryValue">F2272524-6CDD-4ACD-8CFF-64B9AF98D54A/f:Resources.resx</s:String></wpf:ResourceDictionary>
|
@ -42,8 +42,8 @@ internal static class GsiConfigInstaller
|
|||||||
path = "~/.local/share/Steam/steamapps/libraryfolders.vdf";
|
path = "~/.local/share/Steam/steamapps/libraryfolders.vdf";
|
||||||
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||||
path = "~/Library/Application Support/Steam/steamapps/libraryfolders.vdf";
|
path = "~/Library/Application Support/Steam/steamapps/libraryfolders.vdf";
|
||||||
else throw new Exception("Could not get Installation FolderPath");
|
else throw new Exception(Resources.No_Installation_Folderpath);
|
||||||
return path ?? throw new FileNotFoundException("No libraryfolders.vdf found");
|
return path ?? throw new FileNotFoundException(Resources.No_Libraryfolders_vdf);
|
||||||
}
|
}
|
||||||
|
|
||||||
[SupportedOSPlatform("windows")]
|
[SupportedOSPlatform("windows")]
|
||||||
@ -51,7 +51,7 @@ internal static class GsiConfigInstaller
|
|||||||
{
|
{
|
||||||
string steamInstallation =
|
string steamInstallation =
|
||||||
(string)(Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Valve\Steam", "SteamPath", null) ??
|
(string)(Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Valve\Steam", "SteamPath", null) ??
|
||||||
throw new DirectoryNotFoundException("No Steam Installation found."));
|
throw new DirectoryNotFoundException(Resources.No_Steam));
|
||||||
return Path.Combine(steamInstallation, "steamapps\\libraryfolders.vdf");
|
return Path.Combine(steamInstallation, "steamapps\\libraryfolders.vdf");
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -8,14 +8,24 @@ namespace CS2GSI;
|
|||||||
|
|
||||||
internal class GSIServer
|
internal class GSIServer
|
||||||
{
|
{
|
||||||
|
public static GSIServer? Instance { get; private set; }
|
||||||
private HttpListener HttpListener { get; init; }
|
private HttpListener HttpListener { get; init; }
|
||||||
internal delegate void OnMessageEventHandler(string content);
|
|
||||||
internal event OnMessageEventHandler? OnMessage;
|
|
||||||
private bool _keepRunning = true;
|
private bool _keepRunning = true;
|
||||||
internal bool IsRunning { get; private set; }
|
internal bool IsRunning { get; private set; }
|
||||||
private ILogger? logger;
|
private ILogger? logger;
|
||||||
|
|
||||||
|
internal delegate void OnMessageEventHandler(string content);
|
||||||
|
internal event OnMessageEventHandler? OnMessage;
|
||||||
|
|
||||||
internal GSIServer(int port, ILogger? logger = null)
|
public static GSIServer Create(int port, ILogger? logger = null)
|
||||||
|
{
|
||||||
|
Instance = new GSIServer(port, logger);
|
||||||
|
return Instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
private GSIServer(){}
|
||||||
|
|
||||||
|
private GSIServer(int port, ILogger? logger = null)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
string prefix = $"http://127.0.0.1:{port}/";
|
string prefix = $"http://127.0.0.1:{port}/";
|
||||||
|
@ -4,7 +4,7 @@ namespace CS2GSI.GameState;
|
|||||||
|
|
||||||
public record CS2GameState : GameState
|
public record CS2GameState : GameState
|
||||||
{
|
{
|
||||||
public string ProviderSteamId;
|
public string ProviderSteamId = null!;
|
||||||
public int Timestamp;
|
public int Timestamp;
|
||||||
public Map? Map;
|
public Map? Map;
|
||||||
public Player? Player;
|
public Player? Player;
|
||||||
|
@ -4,10 +4,10 @@ namespace CS2GSI.GameState;
|
|||||||
|
|
||||||
public record Map : GameState
|
public record Map : GameState
|
||||||
{
|
{
|
||||||
public string Mode, MapName;
|
public string Mode = null!, MapName = null!;
|
||||||
public MapPhase Phase;
|
public MapPhase Phase;
|
||||||
public int Round, NumMatchesToWinSeries;
|
public int Round, NumMatchesToWinSeries;
|
||||||
public GameStateTeam GameStateTeamCT, GameStateTeamT;
|
public GameStateTeam GameStateTeamCT = null!, GameStateTeamT = null!;
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@ namespace CS2GSI.GameState;
|
|||||||
|
|
||||||
public record Player : GameState
|
public record Player : GameState
|
||||||
{
|
{
|
||||||
public string SteamId, Name;
|
public string SteamId = null!, Name = null!;
|
||||||
public PlayerActivity Activity;
|
public PlayerActivity Activity;
|
||||||
public CS2Team? Team;
|
public CS2Team? Team;
|
||||||
public int? ObserverSlot;
|
public int? ObserverSlot;
|
||||||
|
72
CS2GSI/Resources.Designer.cs
generated
72
CS2GSI/Resources.Designer.cs
generated
@ -89,5 +89,77 @@ namespace CS2GSI {
|
|||||||
return ResourceManager.GetString("GSI_CFG_Content", resourceCulture);
|
return ResourceManager.GetString("GSI_CFG_Content", resourceCulture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Installing GSI-Configfile....
|
||||||
|
/// </summary>
|
||||||
|
internal static string Installing_GSI_File {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Installing_GSI_File", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Could not install GSI-Configfile. Exiting..
|
||||||
|
/// </summary>
|
||||||
|
internal static string Installing_GSI_File_Failed {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Installing_GSI_File_Failed", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Could not get Steam-Installation FolderPath.
|
||||||
|
/// </summary>
|
||||||
|
internal static string No_Installation_Folderpath {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("No_Installation_Folderpath", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to No libraryfolders.vdf found.
|
||||||
|
/// </summary>
|
||||||
|
internal static string No_Libraryfolders_vdf {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("No_Libraryfolders_vdf", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to No Steam Installation found..
|
||||||
|
/// </summary>
|
||||||
|
internal static string No_Steam {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("No_Steam", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Received State.
|
||||||
|
/// </summary>
|
||||||
|
internal static string Received_State {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Received_State", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Unknown Event.
|
||||||
|
/// </summary>
|
||||||
|
internal static string Unknown_Event {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Unknown_Event", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Updated Local State.
|
||||||
|
/// </summary>
|
||||||
|
internal static string Updated_Local_State {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("Updated_Local_State", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
38
CS2GSI/Resources.de.resx
Normal file
38
CS2GSI/Resources.de.resx
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
<root>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>1.3</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<data name="Installing_GSI_File" xml:space="preserve">
|
||||||
|
<value>Installiere GSI-Konfigurationsdatei...</value>
|
||||||
|
</data>
|
||||||
|
<data name="Installing_GSI_File_Failed" xml:space="preserve">
|
||||||
|
<value>GSI-Konfigurationsdatei nicht installiert.</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Installation_Folderpath" xml:space="preserve">
|
||||||
|
<value>Steam-Installationspfad konnte nicht gefunden werden.</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Libraryfolders_vdf" xml:space="preserve">
|
||||||
|
<value>libraryfolders.vdf nicht gefunden</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Steam" xml:space="preserve">
|
||||||
|
<value>Keine Steam Installation gefunden.</value>
|
||||||
|
</data>
|
||||||
|
<data name="Received_State" xml:space="preserve">
|
||||||
|
<value>Erhaltener Zustand</value>
|
||||||
|
</data>
|
||||||
|
<data name="Unknown_Event" xml:space="preserve">
|
||||||
|
<value>Unbekanntes Ereignis</value>
|
||||||
|
</data>
|
||||||
|
<data name="Updated_Local_State" xml:space="preserve">
|
||||||
|
<value>Erneuerter Lokaler Zustand</value>
|
||||||
|
</data>
|
||||||
|
</root>
|
@ -21,4 +21,29 @@
|
|||||||
<data name="GSI_CFG_Content" type="System.Resources.ResXFileRef">
|
<data name="GSI_CFG_Content" type="System.Resources.ResXFileRef">
|
||||||
<value>gamestate_integration_cs2gsi.cfg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral</value>
|
<value>gamestate_integration_cs2gsi.cfg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Unknown_Event" xml:space="preserve">
|
||||||
|
<value>Unknown Event</value>
|
||||||
|
<comment>Event is not defined</comment>
|
||||||
|
</data>
|
||||||
|
<data name="Installing_GSI_File" xml:space="preserve">
|
||||||
|
<value>Installing GSI-Configfile...</value>
|
||||||
|
</data>
|
||||||
|
<data name="Installing_GSI_File_Failed" xml:space="preserve">
|
||||||
|
<value>Could not install GSI-Configfile. Exiting.</value>
|
||||||
|
</data>
|
||||||
|
<data name="Received_State" xml:space="preserve">
|
||||||
|
<value>Received State</value>
|
||||||
|
</data>
|
||||||
|
<data name="Updated_Local_State" xml:space="preserve">
|
||||||
|
<value>Updated Local State</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Installation_Folderpath" xml:space="preserve">
|
||||||
|
<value>Could not get Steam-Installation FolderPath</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Libraryfolders_vdf" xml:space="preserve">
|
||||||
|
<value>No libraryfolders.vdf found</value>
|
||||||
|
</data>
|
||||||
|
<data name="No_Steam" xml:space="preserve">
|
||||||
|
<value>No Steam Installation found.</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
@ -4,7 +4,7 @@
|
|||||||
[](https://github.com/C9Glax/CS2GSI)
|
[](https://github.com/C9Glax/CS2GSI)
|
||||||
[](https://github.com/C9Glax/CS2GSI/releases/latest)
|
[](https://github.com/C9Glax/CS2GSI/releases/latest)
|
||||||
|
|
||||||
|
## .net7.0, .net8.0, .net9.0
|
||||||
|
|
||||||
|
|
||||||
## Example Usage
|
## Example Usage
|
||||||
@ -21,6 +21,8 @@ public static void Main(string[] args)
|
|||||||
|
|
||||||
### Events
|
### Events
|
||||||
|
|
||||||
|
All Events with IDs here: https://github.com/C9Glax/CS2GSI/blob/master/CS2GSI/CS2Event.cs
|
||||||
|
|
||||||
`EventName` (_ParameterType_) Description
|
`EventName` (_ParameterType_) Description
|
||||||
|
|
||||||
* `OnKill` (_int_) Number of Kills in Match
|
* `OnKill` (_int_) Number of Kills in Match
|
||||||
@ -49,4 +51,5 @@ public static void Main(string[] args)
|
|||||||
* `OnBombDefused`
|
* `OnBombDefused`
|
||||||
* `OnBombExploded`
|
* `OnBombExploded`
|
||||||
* `AnyEvent`
|
* `AnyEvent`
|
||||||
* `AnyMessage`
|
* `AnyMessage`
|
||||||
|
* `OnActivityChange` (_string_) Activity
|
@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
|
||||||
|
<LangVersion>latestmajor</LangVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
Reference in New Issue
Block a user