spt/assembly-tool
spt/assembly-tool
0
0
Fork 0
mirror of https://github.com/sp-tarkov/assembly-tool.git synced 2025-02-13 01:30:45 -05:00
Code

Fix AutoMatcher to work with System.Text

Browse Source
This commit is contained in:
Cj 2025-01-11 22:31:58 -05:00
parent ceb7bf8b39
commit 94f68148e1
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReCodeItCLI/Commands/AutoMatcher.cs
View File

@ -1,5 +1,5 @@
// Uncomment this to have the application wait for a debugger to attach before running. // Uncomment this to have the application wait for a debugger to attach before running.
#define WAIT_FOR_DEBUGGER //#define WAIT_FOR_DEBUGGER
using System.Diagnostics; using System.Diagnostics;
using CliFx; using CliFx;

3
RecodeItLib/Remapper/AutoMatcher.cs
View File

@ -123,6 +123,7 @@ public class AutoMatcher(List<RemapModel> mappings, string mappingPath)
if (remapModel.Succeeded) if (remapModel.Succeeded)
{ {
ProcessEndQuestions(remapModel, assemblyPath); ProcessEndQuestions(remapModel, assemblyPath);
return;
} }
} }
@ -402,7 +403,7 @@ public class AutoMatcher(List<RemapModel> mappings, string mappingPath)
} }
mappings.Add(remapModel); mappings.Add(remapModel);
DataProvider.UpdateMapping(mappingPath, mappings); DataProvider.UpdateMapping(mappingPath, mappings, false);
} }
Logger.LogSync("Would you like to run the remap process?... (y/n)", ConsoleColor.Yellow); Logger.LogSync("Would you like to run the remap process?... (y/n)", ConsoleColor.Yellow);

6
RecodeItLib/Utils/DataProvider.cs
View File

@ -41,7 +41,7 @@ public static class DataProvider
return remaps ?? []; return remaps ?? [];
} }
public static void UpdateMapping(string path, List<RemapModel> remaps, bool ignoreNull = true) public static void UpdateMapping(string path, List<RemapModel> remaps, bool respectNullableAnnotations = true)
{ {
if (!File.Exists(path)) if (!File.Exists(path))
{ {
@ -51,7 +51,9 @@ public static class DataProvider
JsonSerializerOptions settings = new() JsonSerializerOptions settings = new()
{ {
WriteIndented = true, WriteIndented = true,
RespectNullableAnnotations = ignoreNull, RespectNullableAnnotations = !respectNullableAnnotations,
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
}; };
var jsonText = JsonSerializer.Serialize(remaps, settings); var jsonText = JsonSerializer.Serialize(remaps, settings);

10
RecodeItLib/Utils/Logger.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using Newtonsoft.Json; using System.Text.Json;
using System.Text.Json.Serialization;
using ReCodeItLib.Models; using ReCodeItLib.Models;
namespace ReCodeItLib.Utils; namespace ReCodeItLib.Utils;
@ -123,12 +124,13 @@ public static class Logger
public static void LogRemapModel(RemapModel remapModel) public static void LogRemapModel(RemapModel remapModel)
{ {
var settings = new JsonSerializerSettings() JsonSerializerOptions settings = new()
{ {
NullValueHandling = NullValueHandling.Ignore WriteIndented = true,
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
}; };
var str = JsonConvert.SerializeObject(remapModel, Formatting.Indented, settings); var str = JsonSerializer.Serialize(remapModel, settings);
LogSync(str, ConsoleColor.Blue); LogSync(str, ConsoleColor.Blue);
} }