File tree Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Expand file tree Collapse file tree 3 files changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -47,15 +47,14 @@ namespace geode {
47
47
*/
48
48
void save (matjson::Value& json);
49
49
50
- // todo in 3.7.0: add this
51
50
/* *
52
51
* Get the savedata for settings, aka the JSON object that contains all
53
52
* the settings' saved states that was loaded up from disk and will be
54
53
* saved to disk
55
54
* @warning Modifying this will modify the value of the settings - use
56
55
* carefully!
57
56
*/
58
- // matjson::Value& getSaveData();
57
+ matjson::Value& getSaveData ();
59
58
60
59
Result<> registerCustomSettingType (std::string_view type, SettingGenerator generator);
61
60
// todo in v4: remove this
Original file line number Diff line number Diff line change @@ -48,8 +48,9 @@ matjson::Value& Mod::getSaveContainer() {
48
48
return m_impl->getSaveContainer ();
49
49
}
50
50
51
- // todo in 3.7.0: move Mod::getSavedSettingsData() back here from
52
- // ModSettingsManager.cpp and make it use ModSettingsManager::getSaveData()
51
+ matjson::Value& Mod::getSavedSettingsData () {
52
+ return m_impl->m_settings ->getSaveData ();
53
+ }
53
54
54
55
bool Mod::isEnabled () const {
55
56
return m_impl->isEnabled ();
Original file line number Diff line number Diff line change @@ -235,9 +235,9 @@ void ModSettingsManager::save(matjson::Value& json) {
235
235
// Doing this since `ModSettingsManager` is expected to manage savedata fully
236
236
json = m_impl->savedata ;
237
237
}
238
- // matjson::Value& ModSettingsManager::getSaveData() {
239
- // return m_impl->savedata;
240
- // }
238
+ matjson::Value& ModSettingsManager::getSaveData () {
239
+ return m_impl->savedata ;
240
+ }
241
241
242
242
std::shared_ptr<SettingV3> ModSettingsManager::get (std::string_view key) {
243
243
auto id = std::string (key);
@@ -274,9 +274,3 @@ std::optional<Setting> ModSettingsManager::getLegacyDefinition(std::string_view
274
274
bool ModSettingsManager::restartRequired () const {
275
275
return m_impl->restartRequired ;
276
276
}
277
-
278
- // todo in 3.7.0: move Mod::getSavedSettingsData() back to Mod.cpp and make it
279
- // use ModSettingsManager::getSaveData()
280
- matjson::Value& Mod::getSavedSettingsData () {
281
- return m_impl->m_settings ->m_impl ->savedata ;
282
- }
You can’t perform that action at this time.
0 commit comments