Fix export of ShockerActions to Json

Update Dependencies
C9Glax · Nov 3, 2024 · ffb8592 · ffb8592
1 parent 2d429fc
commit ffb8592
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/OpenCS2hock.sln.DotSettings.user b/OpenCS2hock.sln.DotSettings.user
@@ -1,5 +1,6 @@
 <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/AddReferences/RecentPaths/=C_003A_005CUsers_005CGlax_005CRiderProjects_005CCShocker_005CCShocker_005Cbin_005CDebug_005Cnet7_002E0_005CCShocker_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CGlax_005CRiderProjects_005CCShocker_005CCShocker_005Cbin_005CRelease_005Cnet7_002E0_005Cpublish_005CCShocker_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Users\Glax\RiderProjects\CShocker\CShocker\bin\Debug\net7.0\CShocker.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String>

diff --git a/OpenCS2hock/OpenCS2hock.csproj b/OpenCS2hock/OpenCS2hock.csproj
@@ -10,9 +10,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CS2GSI" Version="1.0.7" />
-      <PackageReference Include="CShocker" Version="2.4.0" />
-      <PackageReference Include="GlaxLogger" Version="1.0.6" />
+      <PackageReference Include="CS2GSI" Version="1.0.8" />
+      <PackageReference Include="CShocker" Version="2.5.1" />
+      <PackageReference Include="GlaxLogger" Version="1.0.7.2" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 

diff --git a/OpenCS2hock/Setup.cs b/OpenCS2hock/Setup.cs
@@ -125,7 +125,7 @@ private static void AddShockerApi(ref Configuration c)
         switch (selected)
         {
             case 1: //OpenShock (HTTP)
-                apiUri = QueryString("OpenShock API-Endpoint (https://api.shocklink.net):", "https://api.shocklink.net");
+                apiUri = QueryString($"OpenShock API-Endpoint ({OpenShockApi.DefaultEndpoint}):", OpenShockApi.DefaultEndpoint);
                 apiKey = QueryString("OpenShock API-Key:","");
                 api = new OpenShockHttp(apiKey, apiUri);
                 foreach(OpenShockShocker shocker in ((OpenShockHttp)api).GetShockers())
@@ -134,7 +134,7 @@ private static void AddShockerApi(ref Configuration c)
             case 2: //OpenShock (Serial)
                 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     throw new PlatformNotSupportedException("Serial is only supported on Windows.");
-                apiUri = QueryString("OpenShock API-Endpoint (https://api.shocklink.net):", "https://api.shocklink.net");
+                apiUri = QueryString($"OpenShock API-Endpoint ({OpenShockApi.DefaultEndpoint}):", OpenShockApi.DefaultEndpoint);
                 apiKey = QueryString("OpenShock API-Key:","");
                 SerialPortInfo serialPort = SelectSerialPort();
                 api = new OpenShockSerial(serialPort, apiKey, apiUri);

diff --git a/OpenCS2hock/ShockerAction.cs b/OpenCS2hock/ShockerAction.cs
@@ -9,10 +9,10 @@ public struct ShockerAction
 {
     public CS2Event TriggerEvent;
     // ReSharper disable MemberCanBePrivate.Global -> exposed
-    public readonly int ShockerId;
-    public readonly ControlAction Action;
-    public readonly bool ValueFromInput;
-    public readonly IntegerRange IntensityRange, DurationRange;
+    public int ShockerId;
+    public ControlAction Action;
+    public bool ValueFromInput;
+    public IntegerRange IntensityRange, DurationRange;
 
     public ShockerAction(CS2Event trigger, int shockerId, ControlAction action, bool valueFromInput, IntegerRange intensityRange, IntegerRange durationRange)
     {