so it turns out we doin 3.7.0 already

geode-sdk · Sep 15, 2024 · 84122dc · 84122dc
1 parent 8f88913
commit 84122dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/loader/include/Geode/loader/ModSettingsManager.hpp b/loader/include/Geode/loader/ModSettingsManager.hpp
@@ -47,15 +47,14 @@ namespace geode {
          */
         void save(matjson::Value& json);
 
-        // todo in 3.7.0: add this
         /**
          * Get the savedata for settings, aka the JSON object that contains all 
          * the settings' saved states that was loaded up from disk and will be 
          * saved to disk
          * @warning Modifying this will modify the value of the settings - use 
          * carefully!
          */
-        // matjson::Value& getSaveData();
+        matjson::Value& getSaveData();
 
         Result<> registerCustomSettingType(std::string_view type, SettingGenerator generator);
         // todo in v4: remove this

diff --git a/loader/src/loader/Mod.cpp b/loader/src/loader/Mod.cpp
@@ -48,8 +48,9 @@ matjson::Value& Mod::getSaveContainer() {
     return m_impl->getSaveContainer();
 }
 
-// todo in 3.7.0: move Mod::getSavedSettingsData() back here from 
-// ModSettingsManager.cpp and make it use ModSettingsManager::getSaveData()
+matjson::Value& Mod::getSavedSettingsData() {
+    return m_impl->m_settings->getSaveData();
+}
 
 bool Mod::isEnabled() const {
     return m_impl->isEnabled();

diff --git a/loader/src/loader/ModSettingsManager.cpp b/loader/src/loader/ModSettingsManager.cpp
@@ -235,9 +235,9 @@ void ModSettingsManager::save(matjson::Value& json) {
     // Doing this since `ModSettingsManager` is expected to manage savedata fully
     json = m_impl->savedata;
 }
-// matjson::Value& ModSettingsManager::getSaveData() {
-//     return m_impl->savedata;
-// }
+matjson::Value& ModSettingsManager::getSaveData() {
+    return m_impl->savedata;
+}
 
 std::shared_ptr<SettingV3> ModSettingsManager::get(std::string_view key) {
     auto id = std::string(key);
@@ -274,9 +274,3 @@ std::optional<Setting> ModSettingsManager::getLegacyDefinition(std::string_view
 bool ModSettingsManager::restartRequired() const {
     return m_impl->restartRequired;
 }
-
-// todo in 3.7.0: move Mod::getSavedSettingsData() back to Mod.cpp and make it 
-// use ModSettingsManager::getSaveData()
-matjson::Value& Mod::getSavedSettingsData() {
-    return m_impl->m_settings->m_impl->savedata;
-}