Merge branch 'main' of https://github.com/geode-sdk/geode

loader/include/Geode/utils/JsonValidation.hpp

@@ -192,7 +192,14 @@ namespace geode {
             if (this->isError()) return *this;
 
             if (self().m_json.template is<A>()) {
-                target = self().m_json.template as<A>();
+                try {
+                    target = self().m_json.template as<A>();
+                }
+                catch(matjson::JsonException const& e) {
+                    this->setError(
+                        self().m_hierarchy + ": Error parsing JSON: " + std::string(e.what())
+                    );
+                }
             }
             else {
                 this->setError(

loader/src/ui/internal/info/ModInfoPopup.cpp

@@ -174,24 +174,40 @@ void ModInfoPopup::onRepository(CCObject*) {
 
 void ModInfoPopup::onInfo(CCObject*) {
     auto info = this->getMetadata();
-    FLAlertLayer::create(
-        nullptr,
-        ("About " + info.getName()).c_str(),
-        fmt::format(
+    auto about = std::string();
+    if (info.getID() == "geode.loader") {
+        about = fmt::format(
             "<cr>ID:</c> {}\n"
             "<cg>Version:</c> {}\n"
             "<cy>Developers:</c> {}\n"
-            "<cy>Path:</c> {}\n",
+            "<ca>Bindings Commit Hash:</c> {}\n"
+            "<cp>Loader Commit Hash:</c> {}",
+            info.getID(),
+            info.getVersion().toString(),
+            ranges::join(info.getDevelopers(), ", "),
+            about::getBindingsCommitHash(),
+            about::getLoaderCommitHash()
+        );
+    }
+    else {
+        about = fmt::format(
+            "<cr>ID:</c> {}\n"
+            "<cg>Version:</c> {}\n"
+            "<cy>Developers:</c> {}\n"
+            "<ca>Path:</c> {}\n",
             info.getID(),
             info.getVersion().toString(),
             ranges::join(info.getDevelopers(), ", "),
             info.getPath().string()
-        ),
-        "OK",
+        );
+    }
+    FLAlertLayer::create(
         nullptr,
+        ("About " + info.getName()).c_str(),
+        about,
+        "OK", nullptr,
         400.f
-    )
-        ->show();
+    )->show();
 }
 
 void ModInfoPopup::onChangelog(CCObject* sender) {
@@ -410,22 +426,6 @@ bool LocalModInfoPopup::init(Mod* mod, ModListLayer* list) {
             }
         }
     }
-    if (mod == Mod::get()) {
-        // we're showing the internal geode mod :-)
-        auto* label = CCLabelBMFont::create(
-            fmt::format(
-                "Bindings: {}\nLoader: {}",
-                about::getBindingsCommitHash(),
-                about::getLoaderCommitHash()
-            ).c_str(),
-            "chatFont.fnt"
-        );
-        label->setAlignment(kCCTextAlignmentRight);
-        label->setAnchorPoint({ .0f, .5f });
-        label->setScale(.5f);
-        label->setOpacity(89);
-        m_mainLayer->addChildAtPosition(label, Anchor::BottomRight, ccp(5, 0));
-    }
 
     // issue report button
     if (mod->getMetadata().getIssues()) {

loader/src/utils/cocos.cpp

@@ -121,20 +121,20 @@ ccColor4B matjson::Serialize<ccColor4B>::from_json(matjson::Value const& json) {
 }
 
 Result<ccColor3B> geode::cocos::cc3bFromHexString(std::string const& rawHexValue, bool permissive) {
+    if (permissive && rawHexValue.empty()) {
+        return Ok(ccc3(255, 255, 255));
+    }
     auto hexValue = rawHexValue;
     if (hexValue[0] == '#') {
         hexValue.erase(hexValue.begin());
     }
-    if (permissive && hexValue.empty()) {
-        return Ok(ccc3(255, 255, 255));
-    }
     if (hexValue.size() > 6) {
         return Err("Hex value too large");
     }
-    int numValue;
+    size_t numValue;
     auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16);
     if (res.ec != std::errc()) {
-        return Err("Invalid hex value");
+        return Err("Invalid hex value '{}'", hexValue);
     }
     switch (hexValue.size()) {
         case 6: {
@@ -179,20 +179,20 @@ Result<ccColor3B> geode::cocos::cc3bFromHexString(std::string const& rawHexValue
 }
 
 Result<ccColor4B> geode::cocos::cc4bFromHexString(std::string const& rawHexValue, bool requireAlpha, bool permissive) {
+    if (permissive && rawHexValue.empty()) {
+        return Ok(ccc4(255, 255, 255, 255));
+    }
     auto hexValue = rawHexValue;
     if (hexValue[0] == '#') {
         hexValue.erase(hexValue.begin());
     }
-    if (permissive && hexValue.empty()) {
-        return Ok(ccc4(255, 255, 255, 255));
-    }
     if (hexValue.size() > 8) {
         return Err("Hex value too large");
     }
-    int numValue;
+    size_t numValue;
     auto res = std::from_chars(hexValue.data(), hexValue.data() + hexValue.size(), numValue, 16);
     if (res.ec != std::errc()) {
-        return Err("Invalid hex value");
+        return Err("Invalid hex value '{}'", hexValue);
     }
     switch (hexValue.size()) {
         case 8: {