- Updated libraries to latest version

- Updated SessionManagerPatch to latest version
- Fixed custom helm patch injection by replacing SynthDataController with SynthController and post-hooking into the SynthsDataLoaded function

CSPL/CSPL.csproj

@@ -23,6 +23,7 @@
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  <Prefer32Bit>false</Prefer32Bit>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugType>pdbonly</DebugType>
@@ -79,7 +80,7 @@
  <Compile Include="src\Patches\SessionsManagerPatch.cs" />
  <Compile Include="src\CSPLPlugin.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="src\Patches\SynthDataControllerPatch.cs" />
+ <Compile Include="src\Patches\SynthControllerPatch.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

CSPL/src/Patches/SessionsManagerPatch.cs

@@ -8,12 +8,12 @@ public static class SessionsManagerPatch
  {
  [HarmonyPrefix]
  [HarmonyPatch(typeof(SessionsManager), nameof(SessionsManager.SaveSessionAs))]
- public static void SaveSessionAs_Prefix(SessionsManager __instance, ref bool isInCloud, ref bool isCommunity)
+ public static void SaveSessionAs_Prefix(SessionsManager __instance, ref SessionSaveData sessionSaveData)
  {
- if (isCommunity == true)
+ if (sessionSaveData.IsShared || sessionSaveData.IsCloud)
  {
- isCommunity = false;
- isInCloud = true;
+ sessionSaveData.IsShared = false;
+ sessionSaveData.IsCloud = false;
  CSPLPlugin.Log.LogInfo("Preventing session from being shared to community...");
  CSPLPlugin.Log.LogInfo("Session will be uploaded to cloud instead!");
  }

CSPL/src/Patches/SynthDataControllerPatch.cs → CSPL/src/Patches/SynthControllerPatch.cs

@@ -7,26 +7,28 @@
 namespace CSPL.Patches
 {
  [HarmonyPatch]
- public static class SynthDataControllerPatch
+ public static class SynthControllerPatch
  {
  [HarmonyPostfix]
- [HarmonyPatch(typeof(SynthDataController), nameof(SynthDataController.ApplyDefaults))]
- public static void ApplyDefaults_Postfix(SynthDataController __instance)
+ [HarmonyPatch(typeof(SynthController), nameof(SynthController.SynthsDataLoaded))]
+ public static void SynthsDataLoaded_Postfix(SynthController __instance, ref InstrumentDataController dataController)
  {
  var directory = Directory.GetCurrentDirectory() + "\\import\\patches\\";
  var dirInfo = new DirectoryInfo(directory);
  var files = dirInfo.GetFiles("*.helm", SearchOption.AllDirectories);
  if (files.Length > 0)
  {
+ CSPLPlugin.Log.LogInfo($"Loading custom patches...");
  for (var i = 0; i < files.Length; i++)
  {
  try
  {
  var patch = UnityEngine.JsonUtility.FromJson<HelmPatchFormat>(File.ReadAllText(files[i].FullName));
  patch.patch_name = Path.GetFileNameWithoutExtension(files[i].Name);
  patch.folder_name = "CustomPatches";
- __instance.AddPatch(patch);
- CSPLPlugin.Log.LogInfo($"Added custom patch {patch.patch_name}");
+ __instance.SynthDataController._defaultPatches.Add(new PatchSettings(patch));
+ __instance.SynthDataController.AddPatch(patch);
+ CSPLPlugin.Log.LogInfo($"Added custom patch \"{patch.patch_name}\"");
  }
  catch (Exception ex)
  {