v1.0.3 - misc changes

Author: GDColon

README.md

@@ -103,7 +103,7 @@ Default keybind is HOME
 **Button properties** can be a string, OR an object with any of:
 - `content` (string or Text) - The message on the button
 - `background` (string) - Button color
-    - green, cyan, pink, grey, darkgrey, red, geodeblue, geodepink, geodepurple, or trans
+    - green, cyan, pink, grey, darkgrey, red, geodeblue, geodepink, geodepurple, geodeblack or trans
     - Uses GJ_button_0#.png texture in resources folder
 - `texture` ([filename](#texture-files-can-be-read-from)) - Custom button texture, overrides background
     - Use a name in the resources folder, e.g. "GJ_button_03.png"
@@ -417,11 +417,13 @@ Here's an example of a popup that plays a looping, rising tone:
 ## Extra resources
 
 ### Sound object
-The "sound" and "playSound" properties support a string filename such as "explode_11.ogg", or an object with:
+The "sound", "playSound", and other sound-related properties support a string filename such as "explode_11.ogg", or an object with:
 - `name` ([filename](#sound-files-can-be-read-from)) - Sound filename, must be in resources or a texture pack folder
 - `volume` (float) - Volume to play at, default is 1
 - `speed` (float) - Speed adjustment, in semitones. Default is 0 and a full octave (200% speed) is 12
 
+Additionally, you can provide an array with multiple sound objects and it will choose one randomly.
+
 ### Dialogue Portrait Strings
 If you don't want to find portraits by their ID, you can enter these strings instead. I don't recommend it, but it works if you're lazy or just want to make something quick.
 

changelog.md

@@ -1,3 +1,10 @@
+# 1.0.3
+- `Sound` object now supports an array of sounds to randomly choose from
+- Improved error popup (now shows location of JSON errors)
+- Added "geodeblack" button color
+- SHIFT+ESC keybind now also cancels delayed callbacks
+- Fixed crash when `width` property of popups is too low
+
 # 1.0.2
 - Added links, tags, and previews to mod
 

mod.json

@@ -6,7 +6,7 @@
 	},
 	"id": "colon.customtextboxes",
 	"name": "Custom Textboxes",
-	"version": "v1.0.2",
+	"version": "v1.0.3",
 	"developer": "Colon",
 	"description": "Display custom popups, chests, and more",
 	"resources": {

src/Callback.hpp

@@ -54,6 +54,7 @@ class CallerBackerInator {
             if (delay <= 0) return handleCallback(data, forced);
 
             auto timer = CCNode::create();
+            timer->setID("custom_callback_timer"_spr);
             CCScene::get()->addChild(timer);
 
             timer->runAction(

src/CustomAlert.cpp

@@ -5,15 +5,8 @@
 
 void CustomAlert::showPopup(std::string id)
 {
-    auto rawJSON = readJSON(CustomAlert::jsonFilePath);
-    if (rawJSON == nullptr) return FLAlertLayer::create("Custom Textboxes", "Error loading <cy>custom alert</c> JSON! Maybe it has errors?", "OK")->show();
-
-    if (!rawJSON.contains(id)) {
-        if (Mod::get()->getSettingValue<bool>("missingIDWarn")) FLAlertLayer::create("Custom Textboxes", fmt::format("Popup ID not found!\nID: <cy>{}</c> ", id), "OK")->show();
-        return;
-    };
-
-    matjson::Value data = rawJSON[id];
+    auto data = getTextboxByID(CustomAlert::jsonFilePath, CustomAlert::jsonFileName, id, "Popup");
+    if (data == nullptr) return;
 
     std::string alertType = getStr(data, "type", "alert");
 
@@ -160,13 +153,16 @@ void CustomAlert::showPopup(std::string id)
 
     // Normal popup
     else {
+        auto width = getNum(data, "width", 350.0f);
+        if (width < 100) width = 100.0f;
+
         FLAlertLayer* popup = FLAlertLayer::create(
             nullptr,
             title.c_str(),
             hasContent ? getText(content, "").c_str() : "",
             hasButton ? getText(button1, "OK").c_str() : "OK",
             data.contains("button2") ? getText(data["button2"], "Cancel").c_str() : nullptr,
-            getNum(data, "width", 350.0f)
+            width
         );
         popup->setID("custom_alertpopup"_spr);
         popup->show();

src/CustomAlert.hpp

@@ -58,5 +58,6 @@ inline std::map<std::string, std::string> EXTRA_BUTTON_COLORS = {
     { "geodeblue", "geode.loader/GE_button_01.png" },
     { "geodepink", "geode.loader/GE_button_02.png" },
     { "geodepurple", "geode.loader/GE_button_03.png" },
+    { "geodeblack", "geode.loader/GE_button_05.png" },
     { "trans", "geode.loader/GE_button_04.png" }
 };  

src/CustomChest.cpp

@@ -23,15 +23,8 @@ class $modify(MyRUL, RewardUnlockLayer) {
 
 void CustomChest::showChest(std::string id) {
 
-    auto rawJSON = readJSON(CustomChest::jsonFilePath);
-    if (rawJSON == nullptr) return FLAlertLayer::create("Custom Textboxes", "Error loading <cy>custom chest</c> JSON! Maybe it has errors?", "OK")->show();
-
-    if (!rawJSON.contains(id)) {
-        if (Mod::get()->getSettingValue<bool>("missingIDWarn")) FLAlertLayer::create("Custom Textboxes", fmt::format("Chest ID not found!\nID: <cy>{}</c> ", id), "OK")->show();
-        return;
-    };
-
-    matjson::Value data = rawJSON[id];
+    auto data = getTextboxByID(CustomChest::jsonFilePath, CustomChest::jsonFileName, id, "Chest");
+    if (data == nullptr) return;
 
     int chestType = getKey(data, "type", CHEST_TYPES, 1);
 

src/CustomTextbox.cpp

@@ -19,7 +19,7 @@ struct CustomDialogData {
 };
 std::map<int, CustomDialogData> storedCustomData;
 
-SoundData blipSound;
+matjson::Value blipSound;
 bool activeBlipSound = false;
 
 void dialogCallback(matjson::Value data, bool forced = false) {
@@ -58,7 +58,7 @@ class $modify(CustomDialogLayer, DialogLayer) {
 
         // Blip sound
         if (data.blipSound != nullptr) {
-            blipSound = getCustomSound(data.blipSound);
+            blipSound = data.blipSound;
             activeBlipSound = true;
         }
 
@@ -130,15 +130,9 @@ class $modify(CCFadeIn) {
 };
 
 void CustomTextbox::showTextbox(std::string id) {
-    auto rawJSON = readJSON(CustomTextbox::jsonFilePath);
-    if (rawJSON == nullptr) return FLAlertLayer::create("Custom Textboxes", "Error loading <cy>custom textbox</c> JSON! Maybe it has errors?", "OK")->show();
+    auto data = getTextboxByID(CustomTextbox::jsonFilePath, CustomTextbox::jsonFileName, id, "Dialogue");
+    if (data == nullptr) return;
 
-    if (!rawJSON.contains(id)) {
-        if (Mod::get()->getSettingValue<bool>("missingIDWarn")) FLAlertLayer::create("Custom Textboxes", fmt::format("Dialogue ID not found!\nID: <cy>{}</c> ", id), "OK")->show();
-        return;
-    };
-
-    matjson::Value data = rawJSON[id];
     bool pausesMusic = false;
 
     auto dialogLines = CCArray::create();

src/main.cpp

@@ -48,7 +48,8 @@ std::string getTargetID(std::string path, bool alt) {
 		checkMissingFiles();
     }
 
-	auto rawJSON = readJSON(path);
+	std::string err = "";
+	auto rawJSON = readJSON(path, err);
     if (rawJSON == nullptr) return "";
 
 	auto k = alt ? altShowKey : showKey;

src/utils.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include <Geode/Geode.hpp>
 #include <matjson.hpp>
+#include <regex>
 
 #include "CustomAlert.hpp"
 #include "CustomChest.hpp"
@@ -102,16 +103,37 @@ inline std::map<std::string, int> ITEM_TYPES = {
     { "spiderAnimationFast", 19 },
 };
 
-inline matjson::Value readJSON(std::filesystem::path path) {
+inline std::regex errorPattern(R"(>:(\d+):(\d+)$)");
+
+inline matjson::Value readJSON(std::filesystem::path path, std::string& err) {
 	std::ifstream jsonFile(path);
     auto parsed = matjson::parse(jsonFile);
     if (!parsed) {
-        geode::log::error("{}", parsed.unwrapErr());
+        err = parsed.unwrapErr();
+        geode::log::error("{}", err);
         return nullptr;
     }
     else return parsed.unwrap();
 }
 
+// Read JSON or display an error popup
+inline matjson::Value getTextboxByID(std::filesystem::path path, std::filesystem::path shortPath, std::string id, std::string typeStr) {
+    std::string err;
+    auto rawJSON = readJSON(path, err);
+    if (rawJSON == nullptr) {
+        err = std::regex_replace(err, errorPattern, "line $1, position $2");
+        FLAlertLayer::create("Custom Textboxes", fmt::format("Failed to load <cy>{}</c>\n\nError: <cr>{}</c>", shortPath, err), "OK")->show();
+        return nullptr;
+    }
+    
+    if (!rawJSON.contains(id)) {
+        if (Mod::get()->getSettingValue<bool>("missingIDWarn")) FLAlertLayer::create("Custom Textboxes", fmt::format("{} ID not found!\nID: <cy>{}</c> ", typeStr, id), "OK")->show();
+        return nullptr;
+    };
+    
+    return rawJSON[id];
+}
+
 inline std::string getStr(matjson::Value data, char const* key, char const* fallback) {
     if (!data.contains(key)) return fallback;
     else return data[key].asString().unwrapOr(fallback);
@@ -247,6 +269,15 @@ inline IconData getIcon(matjson::Value data, char const* key) {
 }
 
 inline SoundData getCustomSound(matjson::Value data) {
+    if (data.isArray()) {
+        auto arr = data.asArray().unwrap();
+        if (arr.size() == 1) return getCustomSound(arr[0]);
+        else if (arr.size() > 1) {
+            auto val = arr[rand() % arr.size()];
+            if (val != nullptr && !val.isArray()) return getCustomSound(val);
+        }
+    }
+
     float vol = 1.0f;
     float speed = 0.0f;
     std::string sound;