diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1f8747d..4a7bb52 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -109,6 +109,7 @@
"HintPath",
"BonelabPath",
"BoneworksPath",
+ "LiveSplitPath",
"PostBuildEvent"
]
}
diff --git a/SlzMods.sln b/SlzMods.sln
index 6645603..8f90a0f 100644
--- a/SlzMods.sln
+++ b/SlzMods.sln
@@ -21,7 +21,7 @@ Project("{D4EFCE32-FB9C-666F-CB8A-DA081F9BDB07}") = "BonelabHundredStatus", "pro
EndProject
Project("{D4EFCE32-FB9C-666F-CB8A-DA081F9BDABC}") = "BoneworksDebugStats", "projects\LiveSplit\BoneworksDebugStats\BoneworksDebugStats.csproj", "{E782BFCA-90AA-A92F-22E9-85589F109ABC}"
EndProject
-Project("{D4EFCE32-FB9C-666F-CB8A-DA081F9BDB08}") = "BoneworksHundredStatus", "projects\LiveSplit\BoneworksHundredStatus\BoneworksHundredStatus.csproj", "{E782BFCA-90AA-A92F-22E9-85589F10913C}"
+Project("{D4EFCE32-FB9C-666F-CB8A-DA081F9BDB08}") = "BoneworksHundredStatus", "projects\LiveSplit\BoneworksHundredStatus\Project.csproj", "{E782BFCA-90AA-A92F-22E9-85589F10913C}"
EndProject
Project("{81FCC4E8-8A09-AD74-7CAB-31A3DCAD4264}") = "BonelabAmmoBugFix", "projects\Bonelab\AmmoBugFix\AmmoBugFix.csproj", "{59614574-AE6C-55D4-024A-21B97605D6F1}"
EndProject
diff --git a/projects/LiveSplit/BoneworksHundredStatus/BoneworksHundredStatus.csproj b/projects/LiveSplit/BoneworksHundredStatus/BoneworksHundredStatus.csproj
deleted file mode 100644
index 5a52e95..0000000
--- a/projects/LiveSplit/BoneworksHundredStatus/BoneworksHundredStatus.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
- Debug
- {EAE1410F-B5CF-47D6-8764-2FCAEE822C9D}
- Library
- Properties
- BoneworksHundredStatus
- BoneworksHundredStatus
- v4.7.2
- 512
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\references\LiveSplit\LiveSplit.Core.dll
-
-
- ..\..\..\references\LiveSplit\UpdateManager.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
- COPY "$(TargetPath)" "C:\Users\jakzo\Downloads\LiveSplit_1.8.28\Components\LiveSplit.BoneworksHundredStatus.dll"
-
-
-
\ No newline at end of file
diff --git a/projects/LiveSplit/BoneworksHundredStatus/Project.csproj b/projects/LiveSplit/BoneworksHundredStatus/Project.csproj
new file mode 100644
index 0000000..4558b51
--- /dev/null
+++ b/projects/LiveSplit/BoneworksHundredStatus/Project.csproj
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ true
+
+ {EAE1410F-B5CF-47D6-8764-2FCAEE822C9D}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/LiveSplit/BoneworksHundredStatus/src/BoneworksStateUpdater.cs b/projects/LiveSplit/BoneworksHundredStatus/src/BoneworksStateUpdater.cs
index 5073541..859d680 100644
--- a/projects/LiveSplit/BoneworksHundredStatus/src/BoneworksStateUpdater.cs
+++ b/projects/LiveSplit/BoneworksHundredStatus/src/BoneworksStateUpdater.cs
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Web.Script.Serialization;
using Sst.Common.Boneworks;
using Sst.Common.LiveSplit;
@@ -13,8 +13,10 @@ class BoneworksStateUpdater : IDisposable {
public Dictionary LevelCollectableIndexes;
private readonly Common.Ipc.Client _client;
+ private readonly JavaScriptSerializer _serializer;
public BoneworksStateUpdater() {
+ _serializer = new JavaScriptSerializer();
_client = new Common.Ipc.Client(HundredPercentState.NAMED_PIPE);
_client.OnConnected += () => {
Log.Info("Connected");
@@ -57,7 +59,7 @@ private void OnMessage(string message) {
private HundredPercentState ParseLine(string line) {
try {
- return JsonConvert.DeserializeObject(line);
+ return _serializer.Deserialize(line);
} catch (Exception err) {
Log.Error($"Error reading pipe message as JSON: {err.Message}");
return null;
diff --git a/projects/LiveSplit/Directory.Build.props b/projects/LiveSplit/Directory.Build.props
new file mode 100644
index 0000000..92119a0
--- /dev/null
+++ b/projects/LiveSplit/Directory.Build.props
@@ -0,0 +1,89 @@
+
+
+
+ true
+
+
+
+ Debug
+ net472
+
+ C:\Users\jakzo\Downloads\LiveSplit_1.8.28
+
+
+ disable
+ disable
+ default
+ false
+ en-US
+ false
+ false
+
+ TRACE
+
+ $([System.IO.Path]::GetFileName($(MSBuildProjectDirectory)))
+ Sst.$(ComponentName)
+ $(ComponentName)
+ bin\$(Configuration)\
+ Library
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(DefineConstants);DEBUG
+ true
+ full
+ false
+ prompt
+ 4
+
+
+
+ $(DefineConstants);RELEASE
+ pdbonly
+ true
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+ $(FullPath)
+ false
+
+
+
+
\ No newline at end of file