i don't have time

hiimjustin000 · Oct 25, 2024 · 630de24 · 630de24
1 parent 66b09ea
commit 630de24
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(IntegratedDemonlist VERSION 1.6.3)
+project(IntegratedDemonlist VERSION 1.6.4)
 
 add_library(${PROJECT_NAME} SHARED
     src/IDListLayer.cpp

diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 # Integrated Demonlist Changelog
+## v1.6.4 (2024-10-24)
+- Temporarily fixed a crashing issue with the Pemonlist that would cause the game to not launch
+
 ## v1.6.3 (2024-09-04)
 - Fixed the Pemonlist not loading at all
 

diff --git a/mod.json b/mod.json
@@ -1,16 +1,15 @@
 {
-    "geode": "3.4.0",
+    "geode": "3.8.1",
     "gd": {
         "android": "2.206",
         "win": "2.206",
         "mac": "2.206"
     },
-    "version": "v1.6.3",
+    "version": "v1.6.4",
     "id": "hiimjustin000.integrated_demonlist",
     "name": "Integrated Demonlist",
     "developer": "hiimjustin000",
     "description": "A mod that integrates aredl.net and pemonlist.com into Geometry Dash.",
-    "repository": "https://github.com/hiimjustin000/IntegratedDemonlist",
     "resources": {
         "sprites": [
             "resources/*.png"

diff --git a/src/IntegratedDemonlist.cpp b/src/IntegratedDemonlist.cpp
@@ -2,12 +2,16 @@
 
 #define AREDL_URL "https://api.aredl.net/api/aredl/levels"
 #define AREDL_PACKS_URL "https://api.aredl.net/api/aredl/packs"
-#define PEMONLIST_URL "https://pemonlist.com/api/list"
+#define PEMONLIST_URL "https://pemonlist.com/api/list?version=1"
 
 void IntegratedDemonlist::initializeDemons(web::WebResponse* res, bool pemonlist) {
     auto& list = pemonlist ? PEMONLIST : AREDL;
     list.clear();
-    for (auto const& level : res->json().value().as_array()) {
+    auto str = res->string().value();
+    std::string error;
+    auto json = matjson::parse(str, error).value_or(matjson::Array());
+    if (!error.empty()) log::error("Failed to parse {}: {}", pemonlist ? "Pemonlist" : "AREDL", error);
+    if (json.is_array()) for (auto const& level : json.as_array()) {
         if (pemonlist || ((!level.contains("legacy") || !level["legacy"].as_bool()) && !level["two_player"].as_bool())) list.push_back({
             level["level_id"].as_int(),
             level["name"].as_string(),