Browse Source

Fix feature parsing

pull/73/head
Anairkoen Schno 2 years ago
parent
commit
83e491dbad
Signed by: DaNike GPG Key ID: BEFB74D5F3FC4387
9 changed files with 13 additions and 11 deletions
  1. +2
    -1
      IPA.Injector/Updates.cs
  2. +5
    -6
      IPA.Loader/JsonConverters/FeaturesFieldConverter.cs
  3. +6
    -4
      IPA.Loader/Loader/manifest.json
  4. BIN
      Refs/UnityEngine.CoreModule.Net4.dll
  5. BIN
      Refs/UnityEngine.CoreModule.net3.dll
  6. BIN
      Refs/UnityEngine.Net4.dll
  7. BIN
      Refs/UnityEngine.UnityWebRequestModule.Net4.dll
  8. BIN
      Refs/UnityEngine.UnityWebRequestModule.net3.dll
  9. BIN
      Refs/UnityEngine.net3.dll

+ 2
- 1
IPA.Injector/Updates.cs View File

@ -54,7 +54,8 @@ namespace IPA.Injector
_ = Process.Start(new ProcessStartInfo _ = Process.Start(new ProcessStartInfo
{ {
FileName = path, 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 UseShellExecute = false
}); });


+ 5
- 6
IPA.Loader/JsonConverters/FeaturesFieldConverter.cs View File

@ -4,10 +4,7 @@ using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace IPA.JsonConverters namespace IPA.JsonConverters
{ {
@ -34,15 +31,17 @@ namespace IPA.JsonConverters
while (reader.TokenType == JsonToken.PropertyName) while (reader.TokenType == JsonToken.PropertyName)
{ {
var name = reader.ReadAsString();
var name = (string)reader.Value;
Assert(reader.Read());
var list = reader.TokenType == JsonToken.StartObject var list = reader.TokenType == JsonToken.StartObject
? (new() { serializer.Deserialize<JObject>(reader) }) ? (new() { serializer.Deserialize<JObject>(reader) })
: serializer.Deserialize<List<JObject>>(reader); : serializer.Deserialize<List<JObject>>(reader);
dict.Add(name, list); dict.Add(name, list);
Assert(reader.Read());
} }
Assert(reader.TokenType == JsonToken.EndObject && reader.Read());
return dict; return dict;
} }


+ 6
- 4
IPA.Loader/Loader/manifest.json View File

@ -11,10 +11,12 @@
"version": "4.2.1", "version": "4.2.1",
"icon": "IPA.icon_white.png", "icon": "IPA.icon_white.png",
"features": { "features": {
"IPA.DefineFeature": {
"type": "IPA.Loader.Features.ConfigProviderFeature",
"name": "IPA.ConfigProvider"
}
"IPA.DefineFeature": [
{
"type": "IPA.Loader.Features.ConfigProviderFeature",
"name": "IPA.ConfigProvider"
}
]
}, },
"links": { "links": {
"project-home": "https://bsmg.github.io/BeatSaber-IPA-Reloaded/index.html", "project-home": "https://bsmg.github.io/BeatSaber-IPA-Reloaded/index.html",


BIN
Refs/UnityEngine.CoreModule.Net4.dll View File


BIN
Refs/UnityEngine.CoreModule.net3.dll View File


BIN
Refs/UnityEngine.Net4.dll View File


BIN
Refs/UnityEngine.UnityWebRequestModule.Net4.dll View File


BIN
Refs/UnityEngine.UnityWebRequestModule.net3.dll View File


BIN
Refs/UnityEngine.net3.dll View File


Loading…
Cancel
Save