v1.0.14

Author: Minemaker0430

.gitignore

@@ -51,3 +51,6 @@
 
 # clangd
 .cache/
+
+# CMake
+CMakeSettings.json

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
     set(CMAKE_OSX_ARCHITECTURES "arm64")
@@ -19,12 +19,12 @@ add_library(${PROJECT_NAME} SHARED
     src/hooks/LevelCell.cpp
     src/hooks/PlayLayer.cpp
     src/popups/StatsPopup.cpp
-    src/Utils.cpp
+    src/DPUtils.cpp
     src/menus/DPListLayer.cpp
     src/menus/DPLayer.cpp
+    src/menus/DPPackCell.cpp
     src/menus/RecommendedLayer.cpp
     src/popups/SupportPopup.cpp
-    src/popups/NewsPopup.cpp
     src/XPUtils.cpp
     src/popups/XPPopup.cpp
     src/RecommendedUtils.cpp

changelog.md

@@ -1,3 +1,13 @@
+# v1.0.14
+
+* Updated for Geode v5 & GD v2.2081
+* Any GDDP Level can have a startpos now
+* Attempted to fix a weird crash involving top levels
+* Hopefully finally fixed Gauntlet Mode on the Roulette 
+
+Known Issues:
+* Monthly Timer Desyncs
+
 # v1.0.13
 
 * Moved Practice copies to their respective levels instead of one big menu

mod.json

@@ -1,12 +1,12 @@
 {
-		"geode": "4.10.0",
+		"geode": "5.0.0-beta.1",
 		"gd": {
-			"win": "2.2074",
-			"android": "2.2074",
-			"ios": "2.2074",
-			"mac": "2.2074"
+			"win": "2.2081",
+			"android": "2.2081",
+			"ios": "2.2081",
+			"mac": "2.2081"
 		},
-		"version": "v1.0.13",
+		"version": "v1.0.14",
 		"id": "minemaker0430.gddp_integration",
 		"name": "GDDP - Demon Progression",
 		"developer": "ItsMochaTheOtter",
@@ -48,13 +48,12 @@
 			"content"
 		],
 
-		"dependencies": [
-			{
-				"id": "geode.node-ids",
-				"version": ">=1.21.1",
+		"dependencies": {
+			"geode.node-ids": {
+				"version": ">=1.22.0",
 				"importance": "required"
 			}
-		],
+		},
 
 	"settings": {
 		"refresh-stats": {

src/Utils.cpp src/DPUtils.cppsrc/Utils.cpp renamed to src/DPUtils.cpp

@@ -4,12 +4,12 @@
 #include <Geode/loader/Event.hpp>
 #include <Geode/utils/web.hpp>
 
-#include "Utils.hpp"
+#include "DPUtils.hpp"
 
 //geode namespace
 using namespace geode::prelude;
 
-std::vector<std::string> Utils::substring(std::string s, std::string d) {
+std::vector<std::string> DPUtils::substring(std::string s, std::string d) {
 	std::vector<std::string> res;
 	std::string delim = d;
 	std::string token = "";
@@ -33,7 +33,7 @@ std::vector<std::string> Utils::substring(std::string s, std::string d) {
 	return res;
 };
 
-int Utils::safe_stoi(std::string input, int fallback) {
+int DPUtils::safe_stoi(std::string input, int fallback) {
 	std::string result = "";
 	std::string allowedChars = "0123456789";
 

src/Utils.hpp src/DPUtils.hppsrc/Utils.hpp renamed to src/DPUtils.hpp

@@ -5,7 +5,7 @@
 //geode namespace
 using namespace geode::prelude;
 
-class Utils {
+class DPUtils {
 public:
 	static std::vector<std::string> substring(std::string string, std::string delim);
 	static int safe_stoi(std::string input, int fallback = 0);

src/RouletteUtils.cpp

@@ -5,7 +5,7 @@
 #include <random>
 
 #include "RouletteUtils.hpp"
-#include "Utils.hpp"
+#include "DPUtils.hpp"
 
 //geode namespace
 using namespace geode::prelude;
@@ -123,7 +123,7 @@ void RouletteUtils::exportSettings(std::string settings, int seed) {
 
 std::vector<std::string> RouletteUtils::importSettings(std::string str) {
     auto decodedStr = ZipUtils::base64URLDecode(str);
-    auto values = Utils::substring(decodedStr, ";");
+    auto values = DPUtils::substring(decodedStr, ";");
 
     //verify settings string
     if (values[0] != "GDDPSettingsFormat" || values.size() != 4 || values[3] != "END") { 
@@ -208,7 +208,7 @@ void RouletteUtils::importSave(std::string saveStr, bool fromFile) {
         log::info("TODO: Import save from file.");
     } else {
         auto decodedStr = ZipUtils::base64URLDecode(saveStr);
-        auto values = Utils::substring(decodedStr, ";");
+        auto values = DPUtils::substring(decodedStr, ";");
 
         //verify save string
         if (values[0] != "GDDPSaveFormat" || values.size() != 9 || values[8] != "END") { 
@@ -256,7 +256,7 @@ void RouletteUtils::importSave(std::string saveStr, bool fromFile) {
 
         std::vector<int> lvls = setupLevels(packs, values[2], Utils::safe_stoi(values[3]));*/
         std::vector<int> lvls = {};
-        auto lvlStrings = Utils::substring(values[3], ",");
+        auto lvlStrings = DPUtils::substring(values[3], ",");
 
         if (lvlStrings[0] != "LVLS") { 
             FLAlertLayer::create(
@@ -269,18 +269,18 @@ void RouletteUtils::importSave(std::string saveStr, bool fromFile) {
 
         for (std::string str : lvlStrings) {
             if (str != "LVLS") {
-                lvls.push_back(Utils::safe_stoi(str));
+                lvls.push_back(DPUtils::safe_stoi(str));
             }
         }
 
         auto save = RouletteSaveFormat{
             .name = values[1],
             .settings = values[2],
-            .seed = Utils::safe_stoi(values[4], -1),
+            .seed = DPUtils::safe_stoi(values[4], -1),
             .levels = lvls,
-            .progress = Utils::safe_stoi(values[5]),
-            .skips = Utils::safe_stoi(values[6]),
-            .score = Utils::safe_stoi(values[7])
+            .progress = DPUtils::safe_stoi(values[5]),
+            .skips = DPUtils::safe_stoi(values[6]),
+            .score = DPUtils::safe_stoi(values[7])
         };
 
         auto rouletteSaves = Mod::get()->getSavedValue<std::vector<RouletteSaveFormat>>("roulette-saves", {});

src/hooks/CreatorLayer.cpp

@@ -17,7 +17,7 @@ class $modify(CreatorLayer) {
 	bool init() {
 		if (!CreatorLayer::init()) return false;
 
-		if (Mod::get()->getSavedValue<int>("database-version", 48) < 48) { 
+		if (Mod::get()->getSavedValue<int>("database-version", 161) < 161) { 
 			auto alert = FLAlertLayer::create(
 			"IMPORTANT",
 			"Your GDDP Data is outdated. Go into the Progression Menu to refresh it.",

src/hooks/LevelInfoLayer.cpp

@@ -190,8 +190,9 @@ class $modify(DemonProgression, LevelInfoLayer) {
 			log::info("{}", Mod::get()->getSavedValue<bool>("in-gddp"));
 
 			if (!Mod::get()->getSettingValue<bool>("restore-bg-color")) {
-				auto bg = typeinfo_cast<CCSprite*>(this->getChildByID("background"));
-				bg->setColor({ 18, 18, 86 });
+				if (auto bg = typeinfo_cast<CCSprite*>(this->getChildByID("background"))) {
+					bg->setColor({ 18, 18, 86 });
+				}
 			}
 
 			auto type = Mod::get()->getSavedValue<std::string>("current-pack-type", "main");
@@ -204,7 +205,10 @@ class $modify(DemonProgression, LevelInfoLayer) {
 
 			auto hasRank = Mod::get()->getSavedValue<ListSaveFormat>(saveID).hasRank;
 
-			auto diffSpr = typeinfo_cast<GJDifficultySprite*>(this->getChildByID("difficulty-sprite"));
+			GJDifficultySprite* diffSpr;
+			if (this->getChildByID("difficulty-sprite")) {
+				diffSpr = typeinfo_cast<GJDifficultySprite*>(this->getChildByID("difficulty-sprite"));
+			}
 
 			auto skillsetData = Mod::get()->getSavedValue<matjson::Value>("skillset-info", matjson::makeObject({
 				{"unknown", matjson::makeObject({
@@ -274,7 +278,7 @@ class $modify(DemonProgression, LevelInfoLayer) {
 					auto desc = skillsetData[skillID]["description"].asString().unwrapOr("erm that\'s awkward");
 					auto spriteName = fmt::format("{}.png", skillsetData[skillID]["sprite"].asString().unwrapOr("DP_Skill_Unknown"));
 
-					CCSprite* sprite;
+					CCSprite* sprite = CCSprite::createWithSpriteFrameName("DP_Skill_Unknown.png"_spr);
 					if (CCSprite::createWithSpriteFrameName(Mod::get()->expandSpriteName(spriteName).data()) == nullptr) {
 						if (skillsetData[skillID]["type"].asString().unwrapOr("none") == "special") {
 							spriteName = fmt::format("{}.png", skillsetData["unknown"]["sprite"].asString().unwrapOr("DP_Skill_Special"));