feat(save-data): Fix android crashing on mod launch

Author: SpaghettDev

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.1] - 2024-11-28
+
+### Fixed
+
+- Fixed Android crashing
+
 ## [3.0.0-beta.1] - 2024-11-28
 
 ### Changed

mod.json

@@ -4,7 +4,7 @@
 		"win": "2.2074",
 		"mac": "2.2074"
 	},
-	"version": "v3.0.0-beta.1",
+	"version": "v3.0.1",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",

src/roulette/manager/DataManager.hpp

@@ -29,15 +29,27 @@ namespace DataManager
 {
 	namespace values
 	{
-		const std::unordered_map<DMArrayKey, std::string_view> ARRAY_KEY_TO_NAME{
-			{ DMArrayKey::DIFFICULTY_ARRAY, "difficulty-array" },
-			{ DMArrayKey::DEMON_DIFFICULTY_ARRAY, "demon-difficulty-array" },
-			{ DMArrayKey::SELECTED_LIST_ARRAY, "selected-list-array" },
-		};
+		template <DMArrayKey key>
+		std::string_view getKeyString()
+		{
+			if constexpr (key == DMArrayKey::DIFFICULTY_ARRAY)
+				return "difficulty-array";
+			else if constexpr (key == DMArrayKey::DEMON_DIFFICULTY_ARRAY)
+				return "demon-difficulty-array";
+			else if constexpr (key == DMArrayKey::SELECTED_LIST_ARRAY)
+				return "selected-list-array";
+
+			std::unreachable();
+		}
 
-		const std::unordered_map<DMMiscKey, std::string_view> MISC_KEY_TO_NAME{
-			{ DMMiscKey::GD_LIST_ID, "gd-list-id" },
-		};
+		template <DMMiscKey key>
+		std::string_view getKeyString()
+		{
+			if constexpr (key == DMMiscKey::GD_LIST_ID)
+				return "gd-list-id";
+
+			std::unreachable();
+		}
 
 		struct SavedArrayInfo
 		{
@@ -180,7 +192,7 @@ namespace DataManager
 	template <DMArrayKey key>
 	void set(const std::vector<matjson::Value>& value)
 	{
-		geode::Mod::get()->setSavedValue(values::ARRAY_KEY_TO_NAME.at(key), value);
+		geode::Mod::get()->setSavedValue(values::getKeyString<key>(), value);
 	}
 
 	/**
@@ -194,7 +206,7 @@ namespace DataManager
 	void set(std::size_t idx, bool value)
 	{
 		geode::Mod::get()->getSaveContainer().get(
-			values::ARRAY_KEY_TO_NAME.at(key)
+			values::getKeyString<key>()
 		).unwrap().asArray().unwrap().at(idx) = value;
 	}
 
@@ -210,7 +222,7 @@ namespace DataManager
 		if constexpr (key == DMMiscKey::SAVE_DATA)
 			writeGameState(value);
 		else
-			geode::Mod::get()->setSavedValue(values::MISC_KEY_TO_NAME.at(key), value);
+			geode::Mod::get()->setSavedValue(values::getKeyString<key>(), value);
 	}
 
 
@@ -225,16 +237,16 @@ namespace DataManager
 	{
 		auto& container = geode::Mod::get()->getSaveContainer();
 
-		if (auto res = container.get(values::ARRAY_KEY_TO_NAME.at(key)); res.isOk())
+		if (auto res = container.get(values::getKeyString<key>()); res.isOk())
 			if (auto resv = res.unwrap().asArray(); resv.isOkAnd([](auto&& vec) {
 					return vec.size() == values::ARRAY_TO_SAI.at(key).size &&
 						std::all_of(vec.begin(), vec.end(), [](auto& v) { return v.asBool().isOk(); });
 			}))
 				return resv.unwrap();
 
-		container.set(values::ARRAY_KEY_TO_NAME.at(key), values::ARRAY_TO_SAI.at(key).default_value);
+		container.set(values::getKeyString<key>(), values::ARRAY_TO_SAI.at(key).default_value);
 
-		return container.get(values::ARRAY_KEY_TO_NAME.at(key)).unwrap().asArray().unwrap();
+		return container.get(values::getKeyString<key>()).unwrap().asArray().unwrap();
 	}
 
 	/**
@@ -255,11 +267,11 @@ namespace DataManager
 		{
 			auto& container = geode::Mod::get()->getSaveContainer();
 
-			if (auto res = container.get(values::MISC_KEY_TO_NAME.at(key)); res.isOk())
-				if (auto resv = res.unwrap().as<save_container_t>(); resv.isOk())
+			if (auto res = container.get(values::getKeyString<key>()); res.isOk())
+				if (auto resv = res.unwrap().template as<save_container_t>(); resv.isOk())
 					return resv.unwrap();
 
-			container.set(values::MISC_KEY_TO_NAME.at(key), value_t{});
+			container.set(values::getKeyString<key>(), value_t{});
 
 			return value_t{};
 		}

src/roulette/manager/RouletteManager.hpp

@@ -1,6 +1,6 @@
 #pragma once
+
 #include <atomic>
-#include <matjson/stl_serialize.hpp>
 
 #include <Geode/loader/Mod.hpp>
 #include <Geode/Enums.hpp>
@@ -37,8 +37,6 @@ struct RouletteManager
 	{
 		if (!m_hasInitManager)
 		{
-			auto& saveContainer = Mod::get()->getSaveContainer();
-
 			static_cast<void>(DataManager::setDefaultSafe<DMArrayKey::DIFFICULTY_ARRAY>());
 			static_cast<void>(DataManager::setDefaultSafe<DMArrayKey::DEMON_DIFFICULTY_ARRAY>());
 			static_cast<void>(DataManager::setDefaultSafe<DMArrayKey::SELECTED_LIST_ARRAY>());

src/utils.hpp

@@ -202,6 +202,17 @@ namespace rl
 
 			~ScopedVar() { V = m_dtor_val; }
 		};
+
+		template <typename T>
+		bool verifyChecksum(const T& value, unsigned int checksum)
+		{
+			unsigned int sum = 0;
+
+			for (int i = 0; i < sizeof(T); i++)
+				sum += reinterpret_cast<unsigned char*>(value)[i];
+
+			return sum == checksum;
+		}
 	}
 
 	namespace constants