Fixed KKAPI controllers not loading

IllusionMods · Jul 5, 2019 · 3da2b64 · 3da2b64
1 parent b6da75c
commit 3da2b64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/JannieReplacer/JannieReplacer.cs b/JannieReplacer/JannieReplacer.cs
@@ -8,6 +8,7 @@
 using Logger = BepInEx.Logger;
 using BepInEx.Logging;
 using System;
+using System.Linq;
 
 namespace JannieReplacer {
     [BepInProcess("Koikatu")]
@@ -18,10 +19,10 @@ public class JannieReplacer : BaseUnityPlugin {
 
         public const string GUID = "kokaiinum.janniereplacer";
         public const string Name = "Janitor Replacer";
-        public const string Version = "1.3";
+        public const string Version = "1.4";
 
 
-        public const string FileExtension = ".png";
+        public const string FileExtension = ".png";
         public const string Filter = "Koikatu cards (*.png)|*.png|All files|*.*";
 
 
@@ -95,14 +96,18 @@ private static bool IsKoiCard(string path) {
         private void Awake() {
             Enabled = new ConfigWrapper<bool>("Enabled", GUID, true);
             FilePath = new ConfigWrapper<string>(nameof(FilePath), GUID, null);
-            var harmony = HarmonyInstance.Create(GUID);
-            harmony.PatchAll(typeof(JannieReplacer));
+            // There's no reason to install this plugin on a game without Darkness, but just in case someone does so anyway,
+            // this check prevents a MissingMethodExcetpion being thrown.
+            if (typeof(ChaControl).GetProperties(AccessTools.all).Any(p => p.Name == "exType")) {
+                var harmony = HarmonyInstance.Create(GUID);
+                harmony.PatchAll(typeof(JannieReplacer));
+            }
         }
 
         [HarmonyPrefix]
         [HarmonyPatch(typeof(ChaControl), "LoadPreset")]
         public static bool LoadPresetPrefix(int _exType, ChaControl __instance) {
-            if (Enabled.Value) {
+            if (Enabled.Value) {                
                 if (!FilePath.Value.IsNullOrEmpty()) {
                     if (_exType == 1) {
                         if (!File.Exists(FilePath.Value)) {
@@ -115,13 +120,13 @@ public static bool LoadPresetPrefix(int _exType, ChaControl __instance) {
                             FilePath.Value = null;
                             return true;
                         }
-                        __instance.chaFile.LoadFileLimited(FilePath.Value);
+                        __instance.chaFile.LoadCharaFile(FilePath.Value);                        
                         return false;
                     }
                 }
             }
             return true;
-        }
+        }   
 
         [HarmonyPrefix]
         [HarmonyPatch(typeof(FreeHScene), "SetMainCanvasObject")]

diff --git a/JannieReplacer/Properties/AssemblyInfo.cs b/JannieReplacer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]