Add KKS_Fix_CharacterListOptimizations

IllusionFixes.sln

@@ -313,6 +313,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AI-HS2_Fix_DynamicBones", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HS2_Fix_PersonalityCorrector", "src\HS2_Fix_PersonalityCorrector\HS2_Fix_PersonalityCorrector.csproj", "{018A823B-2248-419E-8A7A-3F7E4D65FDA9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KKS_Fix_CharacterListOptimizations", "src\KKS_Fix_CharacterListOptimizations\KKS_Fix_CharacterListOptimizations.csproj", "{27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -747,6 +749,10 @@ Global
  {018A823B-2248-419E-8A7A-3F7E4D65FDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {018A823B-2248-419E-8A7A-3F7E4D65FDA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {018A823B-2248-419E-8A7A-3F7E4D65FDA9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -864,6 +870,7 @@ Global
  {B02CE742-4626-4D73-9E2A-8789EFF525E9} = {EEAF0BD9-2427-4B92-BD7F-7D2D8D2D2045}
  {C68CDDBC-570F-403A-92E3-B44EB3A31D31} = {1EF89218-A9E1-492D-8F37-61B2F1668886}
  {018A823B-2248-419E-8A7A-3F7E4D65FDA9} = {40715440-0FF3-47D1-BC1F-96AC7FDAF26E}
+ {27D21C00-8152-4D1F-8A1C-1DC2E875AF3F} = {BA2338CF-E35A-4ABA-BF89-8538E433B29D}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {D3F10C8B-FD6C-43DA-94B4-1D9688BBE11B}
@@ -901,6 +908,7 @@ Global
  src\Core_Fix_HairShadows\Core_Fix_HairShadows.projitems*{1e682890-be19-4118-a249-f57615e2e094}*SharedItemsImports = 4
  src\Common\Common.projitems*{1f49b69e-9c3c-4a0f-b0eb-28a8e907e6d6}*SharedItemsImports = 4
  src\Core_Fix_PersonalityCorrector\Core_Fix_PersonalityCorrector.projitems*{1f49b69e-9c3c-4a0f-b0eb-28a8e907e6d6}*SharedItemsImports = 4
+ src\Common\Common.projitems*{27d21c00-8152-4d1f-8a1c-1dc2e875af3f}*SharedItemsImports = 4
  src\Common\Common.projitems*{2a4bad8c-b5c8-440d-87aa-bba45d52dcc9}*SharedItemsImports = 4
  src\Core_Fix_ManifestCorrector\Core_Fix_ManifestCorrector.projitems*{2a4bad8c-b5c8-440d-87aa-bba45d52dcc9}*SharedItemsImports = 4
  src\Common\Common.projitems*{2c6d522c-2830-4ccf-8f49-3e0aa36a273e}*SharedItemsImports = 4

src/KKS_Fix_CharacterListOptimizations/CharacterListOptimizations.cs

@@ -0,0 +1,83 @@
+using BepInEx;
+using ChaCustom;
+using Common;
+using ExtensibleSaveFormat;
+using HarmonyLib;
+using System.Collections;
+using System.Diagnostics;
+using BepInEx.Logging;
+using Localize.Translate;
+using UnityEngine.Events;
+
+namespace IllusionFixes
+{
+ [BepInProcess(Constants.GameProcessName)]
+ [BepInProcess(Constants.VRProcessName)]
+ [BepInPlugin(GUID, PluginName, Constants.PluginsVersion)]
+ public class CharacterListOptimizations : BaseUnityPlugin
+ {
+ public const string GUID = "KKS_Fix_CharacterListOptimizations";
+ public const string PluginName = "Character List Optimizations";
+
+ private static new ManualLogSource Logger;
+
+ private Harmony _hi;
+
+ private void Awake()
+ {
+ Logger = base.Logger;
+ _hi = Harmony.CreateAndPatchAll(typeof(Hooks));
+ }
+
+#if DEBUG
+ private void OnDestroy()
+ {
+ _hi?.UnpatchSelf();
+ }
+#endif
+
+ private class Hooks
+ {
+ /// <summary>
+ /// Turn off ExtensibleSaveFormat events as the card list is loaded. Speeds things up substantially for modded cards.
+ /// </summary>
+ [HarmonyPrefix, HarmonyPatch(typeof(CustomFileListSelecter), nameof(CustomFileListSelecter.Initialize))]
+ private static void FileListInitializePre(out Stopwatch __state)
+ {
+ ExtendedSave.LoadEventsEnabled = false;
+ __state = Stopwatch.StartNew();
+ }
+
+ [HarmonyPostfix, HarmonyPatch(typeof(CustomFileListSelecter), nameof(CustomFileListSelecter.Initialize))]
+ private static void FileListInitializePost(Stopwatch __state)
+ {
+ ExtendedSave.LoadEventsEnabled = true;
+ Logger.LogDebug("Character list load took " + __state.ElapsedMilliseconds + "ms");
+ }
+
+ /// <summary>
+ /// Fix turning off ExtensibleSaveFormat events causing card picked in the card list not having any ExtensibleSaveFormat data on it.
+ /// </summary>
+ [HarmonyPostfix, HarmonyPatch(typeof(CustomFileListSelecter), nameof(CustomFileListSelecter.Start))]
+ private static void CustomFileListSelecterHook(CustomFileListSelecter __instance, ref IEnumerator __result)
+ {
+ __result = __result.AppendCo(Postfix);
+
+ void Postfix()
+ {
+ // Keep track of the currently selected card
+ CustomFileInfo currentInfo = null;
+ __instance.listCtrl.eventOnPointerClick += info => currentInfo = info ?? currentInfo;
+
+ foreach (var button in __instance.enter)
+ {
+ // Add a call to the Accept button that happens before the base game call to grab the card and close the list
+ // This is needed to load extended data of the card, since it is skipped in the patches above
+ button.onClick.m_Calls.m_RuntimeCalls.Insert(0, new InvokableCall(() => __instance.info.Value.LoadCharaFile(currentInfo.FullPath)));
+ }
+ }
+ }
+
+ }
+ }
+}

src/KKS_Fix_CharacterListOptimizations/KKS_Fix_CharacterListOptimizations.csproj

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{27D21C00-8152-4D1F-8A1C-1DC2E875AF3F}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>IllusionFixes</RootNamespace>
+ <AssemblyName>KKS_Fix_CharacterListOptimizations</AssemblyName>
+ <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <Deterministic>true</Deterministic>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>embedded</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin\BepInEx\plugins\IllusionFixes\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;KKS</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>embedded</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\bin\BepInEx\plugins\IllusionFixes\</OutputPath>
+ <DefineConstants>TRACE;KKS</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <DebugSymbols>true</DebugSymbols>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\lib\net35\0Harmony.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.2021.9.17\lib\net46\Assembly-CSharp.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="BepInEx, Version=5.4.20.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.BepInEx.5.4.20\lib\net35\BepInEx.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="KKS_ExtensibleSaveFormat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.8.1\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Sirenix.Serialization, Version=2.1.13.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\lib\net46\Sirenix.Serialization.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Xml" />
+ <Reference Include="UniRx, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.UniRx.2021.9.17\lib\net46\UniRx.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\lib\net46\UnityEngine.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\lib\net46\UnityEngine.CoreModule.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.2019.4.9\lib\net46\UnityEngine.UI.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="CharacterListOptimizations.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="..\Common\Common.projitems" Label="Shared" />
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="..\..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets" Condition="Exists('..\..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\IllusionLibs.BepInEx.Harmony.2.9.0\build\IllusionLibs.BepInEx.Harmony.targets'))" />
+ <Error Condition="!Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UniRx.2021.9.17\build\IllusionLibs.KoikatsuSunshine.UniRx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\IllusionLibs.KoikatsuSunshine.UniRx.2021.9.17\build\IllusionLibs.KoikatsuSunshine.UniRx.targets'))" />
+ <Error Condition="!Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.targets'))" />
+ <Error Condition="!Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.2021.9.17\build\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.2021.9.17\build\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.targets'))" />
+ <Error Condition="!Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.targets'))" />
+ </Target>
+ <Import Project="..\..\packages\IllusionLibs.KoikatsuSunshine.UniRx.2021.9.17\build\IllusionLibs.KoikatsuSunshine.UniRx.targets" Condition="Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UniRx.2021.9.17\build\IllusionLibs.KoikatsuSunshine.UniRx.targets')" />
+ <Import Project="..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.targets" Condition="Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule.targets')" />
+ <Import Project="..\..\packages\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.2021.9.17\build\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.targets" Condition="Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.2021.9.17\build\IllusionLibs.KoikatsuSunshine.Assembly-CSharp.targets')" />
+ <Import Project="..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.targets" Condition="Exists('..\..\packages\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.2019.4.9\build\IllusionLibs.KoikatsuSunshine.UnityEngine.UI.targets')" />
+</Project>

src/KKS_Fix_CharacterListOptimizations/Properties/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle(IllusionFixes.CharacterListOptimizations.GUID)]
+[assembly: AssemblyProduct(IllusionFixes.CharacterListOptimizations.GUID)]
+[assembly: AssemblyDescription(IllusionFixes.CharacterListOptimizations.PluginName)]

src/KKS_Fix_CharacterListOptimizations/packages.config

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.8.1" targetFramework="net462" developmentDependency="true" />
+ <package id="IllusionLibs.BepInEx" version="5.4.20" targetFramework="net462" />
+ <package id="IllusionLibs.BepInEx.Harmony" version="2.9.0" targetFramework="net462" />
+ <package id="IllusionLibs.KoikatsuSunshine.Assembly-CSharp" version="2021.9.17" targetFramework="net462" />
+ <package id="IllusionLibs.KoikatsuSunshine.UniRx" version="2021.9.17" targetFramework="net462" />
+ <package id="IllusionLibs.KoikatsuSunshine.UnityEngine.CoreModule" version="2019.4.9" targetFramework="net462" />
+ <package id="IllusionLibs.KoikatsuSunshine.UnityEngine.UI" version="2019.4.9" targetFramework="net462" />
+</packages>