update devtools for current state of v4

Author: Cvolton

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "3.9.0",
+	"geode": "4.0.0",
 	"version": "v1.7.1",
 	"gd": {
 		"win": "*",
@@ -10,7 +10,9 @@
 	"name": "DevTools",
 	"developer": "Geode Team",
 	"description": "Developer tools for Geode",
-	"repository": "https://github.com/geode-sdk/DevTools",
+	"links": {
+		"source": "https://github.com/geode-sdk/DevTools"
+	},
 	"issues": {
 		"url": "https://github.com/geode-sdk/DevTools/issues",
 		"info": "If you encounter an issue using DevTools, please report it to the GitHub issues page."

src/DevTools.cpp

@@ -13,36 +13,34 @@
 
 template<>
 struct matjson::Serialize<Settings> {
-    static Settings from_json(const matjson::Value& value) {
-        return Settings {
-            .GDInWindow = value["game_in_window"].as_bool(),
-            .attributesInTree = value["attributes_in_tree"].as_bool(),
-            .alwaysHighlight = value["always_highlight"].as_bool(),
-            .highlightLayouts = value["highlight_layouts"].as_bool(),
-            .arrowExpand = value["arrow_expand"].as_bool(),
-            .orderChildren = value["order_children"].as_bool(),
-            .advancedSettings = value["advanced_settings"].as_bool(),
-            .showMemoryViewer = value["show_memory_viewer"].as_bool(),
-            .theme = value["theme"].as_string(),
-        };
+    static Result<Settings> fromJson(const matjson::Value& value) {
+        Settings defaults;
+
+        return Ok(Settings {
+            .GDInWindow = value["game_in_window"].asBool().unwrapOr(std::move(defaults.GDInWindow)),
+            .attributesInTree = value["attributes_in_tree"].asBool().unwrapOr(std::move(defaults.attributesInTree)),
+            .alwaysHighlight = value["always_highlight"].asBool().unwrapOr(std::move(defaults.alwaysHighlight)),
+            .highlightLayouts = value["highlight_layouts"].asBool().unwrapOr(std::move(defaults.highlightLayouts)),
+            .arrowExpand = value["arrow_expand"].asBool().unwrapOr(std::move(defaults.arrowExpand)),
+            .orderChildren = value["order_children"].asBool().unwrapOr(std::move(defaults.orderChildren)),
+            .advancedSettings = value["advanced_settings"].asBool().unwrapOr(std::move(defaults.advancedSettings)),
+            .showMemoryViewer = value["show_memory_viewer"].asBool().unwrapOr(std::move(defaults.showMemoryViewer)),
+            .theme = value["theme"].asString().unwrapOr(std::move(defaults.theme)),
+        });
     }
 
-    static matjson::Value to_json(const Settings& settings) {
-        auto obj = matjson::Object();
-        obj["game_in_window"] = settings.GDInWindow;
-        obj["attributes_in_tree"] = settings.attributesInTree;
-        obj["always_highlight"] = settings.alwaysHighlight;
-        obj["highlight_layouts"] = settings.highlightLayouts;
-        obj["arrow_expand"] = settings.arrowExpand;
-        obj["order_children"] = settings.orderChildren;
-        obj["advanced_settings"] = settings.advancedSettings;
-        obj["show_memory_viewer"] = settings.showMemoryViewer;
-        obj["theme"] = settings.theme;
-        return obj;
-    }
-
-    static bool is_json(matjson::Value const& val) {
-        return val.is_object();
+    static matjson::Value toJson(const Settings& settings) {
+        return matjson::makeObject({
+            { "game_in_window", settings.GDInWindow },
+            { "attributes_in_tree", settings.attributesInTree },
+            { "always_highlight", settings.alwaysHighlight },
+            { "highlight_layouts", settings.highlightLayouts },
+            { "arrow_expand", settings.arrowExpand },
+            { "order_children", settings.orderChildren },
+            { "advanced_settings", settings.advancedSettings },
+            { "show_memory_viewer", settings.showMemoryViewer },
+            { "theme", settings.theme },
+        });
     }
 };
 
@@ -169,7 +167,7 @@ void DevTools::draw(GLRenderCtx* ctx) {
         }
 
         m_dockspaceID = ImGui::DockSpaceOverViewport(
-            0, nullptr, ImGuiDockNodeFlags_PassthruCentralNode
+            0, nullptr, ImGuiDockNodeFlags_PassthruCentralNode
         );
 
         ImGui::PushFont(m_defaultFont);

src/pages/Advanced.cpp

@@ -77,7 +77,9 @@ ModMetadata DevTools::inputMetadata(void* treePtr, ModMetadata metadata) {
     metadata.setDetails(inputTextMultiline("details", metadata.getDetails()));
     metadata.setChangelog(inputTextMultiline("changelog", metadata.getChangelog()));
     metadata.setSupportInfo(inputTextMultiline("supportInfo", metadata.getSupportInfo()));
-    metadata.setRepository(inputTextMultiline("repository", metadata.getRepository()));
+    metadata.setRepository(inputTextMultiline("community", metadata.getLinks().getCommunityURL()));
+    metadata.setRepository(inputTextMultiline("homepage", metadata.getLinks().getHomepageURL()));
+    metadata.setRepository(inputTextMultiline("source", metadata.getLinks().getSourceURL()));
     metadata.setIssues(inputIssues(metadata.getIssues()));
     metadata.setNeedsEarlyLoad(inputBool("needsEarlyLoad", metadata.needsEarlyLoad()));
     metadata.setIsAPI(inputBool("isAPI", metadata.isAPI()));
@@ -141,7 +143,8 @@ ModMetadata DevTools::inputMetadata(void* treePtr, ModMetadata metadata) {
         ImGui::TreePop();
     }
 
-    if (ImGui::TreeNode(reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(treePtr) + 4), "settings")) {
+    //TODO: fix idc enough
+    /*if (ImGui::TreeNode(reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(treePtr) + 4), "settings")) {
         for (auto const& [id, setting] : metadata.getSettings()) {
             if (!ImGui::TreeNode(id.data(), "%s", id.c_str()))
                 continue;
@@ -152,7 +155,7 @@ ModMetadata DevTools::inputMetadata(void* treePtr, ModMetadata metadata) {
             ImGui::TreePop();
         }
         ImGui::TreePop();
-    }
+    }*/
 
     return metadata;
 }

src/pages/Memory.cpp

@@ -333,9 +333,11 @@ void DevTools::drawMemory() {
             } else if (auto maybeStr = findStdString(ptr); maybeStr) {
                 auto str = maybeStr->substr(0, 30);
                 // escapes new lines and stuff for me :3
-                auto fmted = matjson::Value(std::string(str)).dump(0);
-                texts.push_back(fmt::format("[{:04x}] maybe std::string {}, {}", offset, maybeStr->size(), fmted));
-                textSaving.push_back(fmt::format("{:x}: s {}", offset, fmted));
+                if(auto fmted = matjson::Value(std::string(str)).dump(0)) {
+                    auto fmtedStr = fmted.unwrap();
+                    texts.push_back(fmt::format("[{:04x}] maybe std::string {}, {}", offset, maybeStr->size(), fmtedStr));
+                    textSaving.push_back(fmt::format("{:x}: s {}", offset, fmtedStr));
+                }
             } else if (auto valueOpt = ptr.read_opt<uintptr_t>()) {
                 auto value = *valueOpt;
                 auto data = std::span(reinterpret_cast<uint8_t*>(&value), sizeof(void*));