fix(list-fetcher, roulette-layer): Fix roulette showing same levels. Fix weird blink transition

Author: SpaghettDev

CHANGELOG.md

@@ -5,7 +5,15 @@ 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/).
 
-# [4.0.0] - 2025-01-31
+## [4.0.1] - 2025-01-31
+
+### Fixed
+
+- Android crash
+- Roulette would only show the same levels from page 1
+- Weird blink transition when exiting Roulette layer
+
+## [4.0.0] - 2025-01-31
 
 The GD-Roulette UI update, featuring new UI, new UI and even more new UI!
 This update took a lot of time, so if you like it and would like more, consider donating by clicking the gift box icon below :D

mod.json

@@ -5,7 +5,7 @@
 		"android": "2.2074",
 		"mac": "2.2074"
 	},
-	"version": "v4.0.0",
+	"version": "v4.0.1",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",

src/listfetcher/ListFetcher.cpp

@@ -18,12 +18,16 @@ ListFetcher::ListFetcher()
 
 matjson::Value ListFetcher::normalListCacheFunction()
 {
+	matjson::Value defaultObj{};
+
 	for (const auto& difficulty : {
 		GJDifficulty::Easy, GJDifficulty::Normal, GJDifficulty::Hard,
 		GJDifficulty::Harder, GJDifficulty::Insane, static_cast<GJDifficulty>(-2),
 		GJDifficulty::DemonEasy, GJDifficulty::DemonMedium, GJDifficulty::Demon,
 		GJDifficulty::DemonInsane, GJDifficulty::DemonExtreme
 	}) {
+		defaultObj[fmt::format("{}", static_cast<int>(difficulty))] = 100;
+
 		WebRequestQueue::get().enqueue(WebRequestQueue::Request{
 			web::WebRequest()
 				.userAgent("")
@@ -58,7 +62,7 @@ matjson::Value ListFetcher::normalListCacheFunction()
 
 	WebRequestQueue::get().flush();
 
-	return {};
+	return defaultObj;
 }
 
 void ListFetcher::getRandomNormalListLevel(GJDifficulty difficulty, geode::Result<level_pair_t>& result)

src/managers/CacheManager.hpp

@@ -53,9 +53,9 @@ struct CacheManager : public SingletonBase<CacheManager>
 	void save();
 
 	template <CMKey key>
-	[[nodiscard]] const CMKeyTrait<key>::type& getValue()
+	[[nodiscard]] CMKeyTrait<key>::type getValue()
 	{
-		if (auto cached = m_cache.get<matjson::Value>(getKeyString<key>()); cached.isOk())
+		if (auto cached = m_cache.get<matjson::Value>(getKeyString<key>()); cached.isOkAnd([](const matjson::Value& v) { return v.contains("time") && v.contains("value"); }))
 		{
 			auto time = cached.unwrap().template get<std::uint64_t>("time").unwrapOr(0);
 
@@ -65,22 +65,20 @@ struct CacheManager : public SingletonBase<CacheManager>
 		else
 			setValue<key>(callCacheFunction<key>());
 
-		if (auto res = m_cache[getKeyString<key>()]["value"].template as<typename CMKeyTrait<key>::type>())
-			return res.unwrap();
-		else
-		{
-			setValue<key>(callCacheFunction<key>());
-			return m_cache[getKeyString<key>()]["value"].template as<typename CMKeyTrait<key>::type>().unwrap();
-		}
+		return std::move(
+			m_cache[getKeyString<key>()]["value"].template as<typename CMKeyTrait<key>::type>().unwrap()
+		);
 	}
 
 	template <CMKey key, typename R, typename P>
 	[[nodiscard]] R getValue(P keyName, R defaultValue = {}) requires(std::is_same_v<typename CMKeyTrait<key>::type, matjson::Value> && std::is_default_constructible_v<R>)
 	{
-		if constexpr (std::is_enum_v<P>)
-			return getValue<key>()[fmt::format("{}", static_cast<int>(keyName))].template as<R>().unwrapOr(defaultValue);
+		using result_t = std::conditional_t<std::is_same_v<R, int>, std::uint64_t, R>;
+
+		if constexpr (std::is_enum_v<P> || std::is_integral_v<P>)
+			return getValue<key>()[fmt::format("{}", static_cast<int>(keyName))].template as<result_t>().unwrapOr(defaultValue);
 		else
-			return getValue<key>()[keyName].template as<R>().unwrapOr(defaultValue);
+			return getValue<key>()[keyName].template as<result_t>().unwrapOr(defaultValue);
 	}
 
 	template <CMKey key>
@@ -102,9 +100,8 @@ struct CacheManager : public SingletonBase<CacheManager>
 	}
 
 	template <CMKey key>
-	void appendValue(const std::string& keyName, const CMKeyTrait<key>::type& value) requires(
-			std::is_same_v<typename CMKeyTrait<key>::type, matjson::Value>
-		)
+	void appendValue(const std::string& keyName, const CMKeyTrait<key>::type& value)
+		requires(std::is_same_v<typename CMKeyTrait<key>::type, matjson::Value>)
 	{
 		m_cache[getKeyString<key>()]["time"] = rl::utils::getUnixEpoch();
 		m_cache[getKeyString<key>()]["value"][keyName] = value;

src/roulette/RLRouletteLayer.cpp

@@ -547,21 +547,23 @@ bool RLRouletteLayer::init()
 
 void RLRouletteLayer::onClose(CCObject*)
 {
+	auto& rlm = RouletteManager::get();
+
 	if (RouletteManager::get().isPlaying)
 	{
 		m_confirmation_layer = RLConfirmationAlertLayer::create({
 			"Woah there!",
 			"Would you like to <cr>quit</c> or <co>pause</c> the roulette?",
 			[&](auto cl) {
-				RouletteManager::get().gameTimer.pause();
-				RouletteManager::get().saveState();
-				RouletteManager::get().isPlaying = false;
-				RouletteManager::get().isPaused = true;
+				rlm.gameTimer.pause();
+				rlm.saveState();
+				rlm.isPlaying = false;
+				rlm.isPaused = true;
 
 				onClose(nullptr);
 			},
 			[&](auto cl) {
-				RouletteManager::get().reset();
+				rlm.reset();
 
 				onClose(nullptr);
 			},
@@ -573,8 +575,8 @@ void RLRouletteLayer::onClose(CCObject*)
 	else
 	{
 		this->setKeypadEnabled(false);
-		this->removeFromParentAndCleanup(true);
-		RouletteManager::get().rouletteLayer = nullptr;
+		this->setKeyboardEnabled(false);
+		rlm.rouletteLayer = nullptr;
 
 		CCDirector::sharedDirector()->popSceneWithTransition(
 			.5f, PopTransition::kPopTransitionFade
@@ -706,11 +708,12 @@ void RLRouletteLayer::onPlayButton(CCObject*)
 		return;
 
 	LevelInfoLayer* layer;
-	const auto& level = m_level.unwrap();
 
-	if (level.first.levelID != 0)
+	if (m_level.isOkAnd([](const auto& lvl) { return lvl.first.levelID != 0; }))
 	{
-		layer = LevelInfoLayer::create(rl::utils::createLevelFromResponse(level), false);
+		const auto& lvl = m_level.unwrap();
+
+		layer = LevelInfoLayer::create(rl::utils::createLevelFromResponse(lvl), false);
 		layer->downloadLevel();
 	}
 	else
@@ -1032,6 +1035,8 @@ void RLRouletteLayer::onListChanged()
 // set roulette button exclamation mark
 void RLRouletteLayer::onExitTransitionDidStart()
 {
+	BaseCustomLayer::onExitTransitionDidStart();
+
 	if (auto nextScene = static_cast<CCScene*>(CCDirector::sharedDirector()->m_pobScenesStack->firstObject()))
 	{
 		CCMenuItemSpriteExtra* rouletteButton = nullptr;
@@ -1073,6 +1078,8 @@ void RLRouletteLayer::onExitTransitionDidStart()
 
 void RLRouletteLayer::onEnterTransitionDidFinish()
 {
+	BaseCustomLayer::onEnterTransitionDidFinish();
+
 	auto& rlm = RouletteManager::get();
 
 	if (!rlm.isPlaying || !rlm.hasEnteredPlayLayer)

src/utils/utils.hpp

@@ -20,7 +20,7 @@ namespace rl
 {
 	namespace impl
 	{
-		inline static std::random_device rand_device;
+		inline static std::random_device rand_device{};
 		inline static std::mt19937 rand_generator(rand_device());
 	}
 
@@ -34,7 +34,8 @@ namespace rl
 		 * @tparam T type of number, floating type or integer type
 		 */
 		template <typename T1, typename T2>
-		inline T2 randomNumber(T1 min, T2 max) requires (std::is_arithmetic_v<T1> && std::is_arithmetic_v<T2> && std::is_convertible_v<T1, T2>)
+		inline T2 randomNumber(T1 min, T2 max)
+			requires(std::is_arithmetic_v<T1> && std::is_arithmetic_v<T2> && std::is_convertible_v<T1, T2>)
 		{
 			static_assert(
 				(std::is_integral_v<T1> && std::is_integral_v<T2>) ||