Refactor with jasmine-tools

Author: hiimjasmine00

CMakeLists.txt

@@ -23,4 +23,7 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
+CPMAddPackage("gh:hiimjasmine00/[email protected]")
+target_link_libraries(${PROJECT_NAME} jasmine-tools)
+
 setup_geode_mod(${PROJECT_NAME})

src/DeveloperBadges.cpp

@@ -2,8 +2,9 @@
 #include <Geode/binding/FLAlertLayer.hpp>
 #include <Geode/loader/GameEvent.hpp>
 #include <Geode/loader/Mod.hpp>
-#include <Geode/utils/web.hpp>
 #include <hiimjasmine00.optional_settings/include/OptionalColor3BSetting.hpp>
+#include <jasmine/setting.hpp>
+#include <jasmine/web.hpp>
 
 using namespace geode::prelude;
 using namespace optional_settings;
@@ -22,12 +23,13 @@ constexpr std::array settings = {
     auto& data = mod->getSavedSettingsData();
     if (!mod->setSavedValue("migrated-colors", true)) {
         for (auto [key, toggle] : settings) {
-            auto oldColorValue = data.get<ccColor3B>(key);
-            auto oldColorEnabled = data.get<bool>(toggle);
-            if (oldColorValue.isOk() && oldColorEnabled.isOk()) {
-                auto setting = std::static_pointer_cast<OptionalColor3BSetting>(mod->getSetting(key));
-                setting->setStoredValue(oldColorValue.unwrap());
-                setting->setEnabled(oldColorEnabled.unwrap());
+            if (auto setting = jasmine::setting::get<std::optional<ccColor3B>>(key)) {
+                auto oldColorValue = data.get<ccColor3B>(key);
+                auto oldColorEnabled = data.get<bool>(toggle);
+                if (oldColorValue.isOk() && oldColorEnabled.isOk()) {
+                    setting->setStoredValue(oldColorValue.unwrap());
+                    setting->setEnabled(oldColorEnabled.unwrap());
+                }
             }
         }
     }
@@ -36,12 +38,7 @@ constexpr std::array settings = {
         web::WebRequest().get("https://badges.hiimjasmine00.com/developer").listen([](web::WebResponse* res) {
             if (!res->ok()) return;
 
-            Result<std::vector<matjson::Value>> json = res->json().andThen([](matjson::Value&& v) {
-                return std::move(v).asArray();
-            });
-            if (!json.isOk()) return;
-
-            for (auto& value : json.unwrap()) {
+            for (auto& value : jasmine::web::getArray(res)) {
                 auto id = value.get<int>("id");
                 if (!id.isOkAnd([](int id) { return id > 0; })) continue;
 

src/hooks/CommentCell.cpp

@@ -5,6 +5,7 @@
 #include <Geode/binding/TextArea.hpp>
 #include <Geode/modify/CommentCell.hpp>
 #include <hiimjasmine00.optional_settings/include/OptionalColor3BSetting.hpp>
+#include <jasmine/setting.hpp>
 
 using namespace geode::prelude;
 
@@ -52,8 +53,8 @@ class $modify(DBCommentCell, CommentCell) {
 
         if (badgeType < 1 || badgeType > colors.size()) return;
 
-        if (auto commentColor = Mod::get()->getSettingValue<std::optional<cocos2d::ccColor3B>>(colors[badgeType - 1])) {
-            auto color = *commentColor;
+        if (auto commentColor = jasmine::setting::getValue<std::optional<cocos2d::ccColor3B>>(colors[badgeType - 1])) {
+            auto color = commentColor.value();
 
             if (auto commentTextLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("comment-text-label"))) {
                 commentTextLabel->setColor(color);