[KKS] Implement Get/SetExtendedData in Game controllers; Require Exte…

…nsibleSaveFormat 16.7
IllusionMods · Sep 5, 2021 · 488392d · 488392d
1 parent 632d8b0
commit 488392d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/src/KKSAPI/KKSAPI.csproj b/src/KKSAPI/KKSAPI.csproj
@@ -60,7 +60,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="KKS_ExtensibleSaveFormat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.5.0\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
+      <HintPath>..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.7.0\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.10.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

diff --git a/src/KKSAPI/KKSAPI.nuspec b/src/KKSAPI/KKSAPI.nuspec
@@ -11,7 +11,7 @@
     <tags>Koikatu Sunshine</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6" >
-        <dependency id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.5.0" />
+        <dependency id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.7.0" />
         <dependency id="IllusionLibs.KoikatsuSunshine.Assembly-CSharp" version="2021.8.27.2" />
         <dependency id="IllusionLibs.KoikatsuSunshine.Assembly-CSharp-firstpass" version="2021.8.27.2" />
         <dependency id="IllusionLibs.KoikatsuSunshine.UniRx" version="2021.8.27.2" />

diff --git a/src/KKSAPI/MainGame/GameCustomFunctionController.cs b/src/KKSAPI/MainGame/GameCustomFunctionController.cs
@@ -27,26 +27,20 @@ public abstract class GameCustomFunctionController : MonoBehaviour
         /// <summary>
         /// Get extended data based on supplied ExtendedDataId. When in chara maker loads data from character that's being loaded. 
         /// </summary>
-        [Obsolete("Not implemented yet")]
         public PluginData GetExtendedData()
         {
-            throw new NotImplementedException("Not implemented yet");
-            //todo
-            //if (ExtendedDataId == null) throw new ArgumentException(nameof(ExtendedDataId));
-            //return ExtendedSave.GetExtendedDataById(Manager.Game.saveData, ExtendedDataId);
+            if (ExtendedDataId == null) throw new ArgumentException(nameof(ExtendedDataId)); 
+            return ExtendedSave.GetExtendedDataById(Manager.Game.saveData, ExtendedDataId);
         }
 
         /// <summary>
         /// Save your custom data to the character card under the ID you specified when registering this controller.
         /// </summary>
         /// <param name="data">Your custom data to be written to the character card. Can be null to remove the data.</param>
-        [Obsolete("Not implemented yet")]
         public void SetExtendedData(PluginData data)
         {
-            throw new NotImplementedException("Not implemented yet");
-            //todo
-            //if (ExtendedDataId == null) throw new ArgumentException(nameof(ExtendedDataId));
-            //ExtendedSave.SetExtendedDataById(Manager.Game.instance.saveData, ExtendedDataId, data);
+            if (ExtendedDataId == null) throw new ArgumentException(nameof(ExtendedDataId));
+            ExtendedSave.SetExtendedDataById(Manager.Game.saveData, ExtendedDataId, data);
         }
 
         /// <summary>

diff --git a/src/KKSAPI/packages.config b/src/KKSAPI/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.5.0" targetFramework="net46" developmentDependency="true" />
+  <package id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.7.0" targetFramework="net46" developmentDependency="true" />
   <package id="IllusionLibs.BepInEx" version="5.4.15" targetFramework="net46" developmentDependency="true" />
   <package id="IllusionLibs.BepInEx.Harmony" version="2.5.4" targetFramework="net46" developmentDependency="true" />
   <package id="IllusionLibs.BepInEx.Mono.Cecil" version="0.10.4.1" targetFramework="net46" developmentDependency="true" />