diff --git a/IPA.Injector/Updates.cs b/IPA.Injector/Updates.cs index ee9ec1de..bfe9658d 100644 --- a/IPA.Injector/Updates.cs +++ b/IPA.Injector/Updates.cs @@ -54,7 +54,8 @@ namespace IPA.Injector _ = Process.Start(new ProcessStartInfo { FileName = path, - Arguments = $"\"-nw={Process.GetCurrentProcess().Id},s={string.Join(" ", Environment.GetCommandLineArgs().Skip(1).StrJP()).Replace("\\", "\\\\").Replace(",", "\\,")}\"", + Arguments = $"\"-nw={Process.GetCurrentProcess().Id}," + + $"s={string.Join(" ", Environment.GetCommandLineArgs().Skip(1).StrJP()).Replace("\\", "\\\\").Replace(",", "\\,")}\"", UseShellExecute = false }); diff --git a/IPA.Loader/JsonConverters/FeaturesFieldConverter.cs b/IPA.Loader/JsonConverters/FeaturesFieldConverter.cs index 8dc3c635..c5f00090 100644 --- a/IPA.Loader/JsonConverters/FeaturesFieldConverter.cs +++ b/IPA.Loader/JsonConverters/FeaturesFieldConverter.cs @@ -4,10 +4,7 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; namespace IPA.JsonConverters { @@ -34,15 +31,17 @@ namespace IPA.JsonConverters while (reader.TokenType == JsonToken.PropertyName) { - var name = reader.ReadAsString(); + var name = (string)reader.Value; + Assert(reader.Read()); + var list = reader.TokenType == JsonToken.StartObject ? (new() { serializer.Deserialize(reader) }) : serializer.Deserialize>(reader); + dict.Add(name, list); + Assert(reader.Read()); } - Assert(reader.TokenType == JsonToken.EndObject && reader.Read()); - return dict; } diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json index 1ff25d94..fdc66190 100644 --- a/IPA.Loader/Loader/manifest.json +++ b/IPA.Loader/Loader/manifest.json @@ -11,10 +11,12 @@ "version": "4.2.1", "icon": "IPA.icon_white.png", "features": { - "IPA.DefineFeature": { - "type": "IPA.Loader.Features.ConfigProviderFeature", - "name": "IPA.ConfigProvider" - } + "IPA.DefineFeature": [ + { + "type": "IPA.Loader.Features.ConfigProviderFeature", + "name": "IPA.ConfigProvider" + } + ] }, "links": { "project-home": "https://bsmg.github.io/BeatSaber-IPA-Reloaded/index.html", diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll index 17925d3a..a971cd1a 100644 Binary files a/Refs/UnityEngine.CoreModule.Net4.dll and b/Refs/UnityEngine.CoreModule.Net4.dll differ diff --git a/Refs/UnityEngine.CoreModule.net3.dll b/Refs/UnityEngine.CoreModule.net3.dll index 477584ab..7e4b2a8e 100644 Binary files a/Refs/UnityEngine.CoreModule.net3.dll and b/Refs/UnityEngine.CoreModule.net3.dll differ diff --git a/Refs/UnityEngine.Net4.dll b/Refs/UnityEngine.Net4.dll index 071390ac..f0ec9628 100644 Binary files a/Refs/UnityEngine.Net4.dll and b/Refs/UnityEngine.Net4.dll differ diff --git a/Refs/UnityEngine.UnityWebRequestModule.Net4.dll b/Refs/UnityEngine.UnityWebRequestModule.Net4.dll index 6a7c60cd..7c1820bd 100644 Binary files a/Refs/UnityEngine.UnityWebRequestModule.Net4.dll and b/Refs/UnityEngine.UnityWebRequestModule.Net4.dll differ diff --git a/Refs/UnityEngine.UnityWebRequestModule.net3.dll b/Refs/UnityEngine.UnityWebRequestModule.net3.dll index bcf496ea..12c5d32b 100644 Binary files a/Refs/UnityEngine.UnityWebRequestModule.net3.dll and b/Refs/UnityEngine.UnityWebRequestModule.net3.dll differ diff --git a/Refs/UnityEngine.net3.dll b/Refs/UnityEngine.net3.dll index bec8c389..446cd53e 100644 Binary files a/Refs/UnityEngine.net3.dll and b/Refs/UnityEngine.net3.dll differ