Event and mod changes

Author: hiimjasmine00

include/API.hpp

@@ -27,30 +27,30 @@ namespace devtools {
     template <typename T>
     concept UnderlyingIntegral = std::is_integral_v<T> || std::is_integral_v<std::underlying_type_t<T>>;
 
-    struct RegisterNodeEvent final : geode::SimpleEvent<RegisterNodeEvent, geode::Function<void(cocos2d::CCNode*)>> {
-        using SimpleEvent::SimpleEvent;
+    struct RegisterNodeEvent final : geode::Event<RegisterNodeEvent, bool(geode::Function<void(cocos2d::CCNode*)>)> {
+        using Event::Event;
     };
 
     template <typename T>
-    struct PropertyFnEvent final : geode::SimpleEvent<PropertyFnEvent<T>, bool(*&)(const char* name, T&)> {
+    struct PropertyFnEvent final : geode::Event<PropertyFnEvent<T>, bool(bool(*&)(const char* name, T&))> {
         using Fn = bool(const char* name, T&);
-        using geode::SimpleEvent<PropertyFnEvent, Fn*&>::SimpleEvent;
+        using geode::Event<PropertyFnEvent, bool(Fn*&)>::Event;
     };
 
-    struct DrawLabelFnEvent final : geode::SimpleEvent<DrawLabelFnEvent, void(*&)(const char* text)> {
+    struct DrawLabelFnEvent final : geode::Event<DrawLabelFnEvent, bool(void(*&)(const char* text))> {
         using Fn = void(const char* text);
-        using SimpleEvent::SimpleEvent;
+        using Event::Event;
     };
 
     template <typename T>
-    struct EnumerableFnEvent final : geode::SimpleEvent<EnumerableFnEvent<T>, bool(*&)(const char* label, T* value, std::span<std::pair<T, const char*> const>)> {
+    struct EnumerableFnEvent final : geode::Event<EnumerableFnEvent<T>, bool(bool(*&)(const char* label, T* value, std::span<std::pair<T, const char*> const>))> {
         using Fn = bool(const char* label, T* value, std::span<std::pair<T, const char*> const>);
-        using geode::SimpleEvent<EnumerableFnEvent, Fn*&>::SimpleEvent;
+        using geode::Event<EnumerableFnEvent, bool(Fn*&)>::Event;
     };
 
-    struct ButtonFnEvent final : geode::SimpleEvent<ButtonFnEvent, bool(*&)(const char* label)> {
+    struct ButtonFnEvent final : geode::Event<ButtonFnEvent, bool(bool(*&)(const char* label))> {
         using Fn = bool(const char* label);
-        using SimpleEvent::SimpleEvent;
+        using Event::Event;
     };
 
     /// @brief Checks if DevTools is currently loaded.

src/main.cpp

@@ -153,8 +153,8 @@ class $modify(CCEGLView) {
 };
 
 // For the one eclipse shortcut
-struct ToggleDevToolsEvent : SimpleEvent<ToggleDevToolsEvent> {
-    using SimpleEvent::SimpleEvent;
+struct ToggleDevToolsEvent : Event<ToggleDevToolsEvent, bool()> {
+    using Event::Event;
 };
 
 $execute {

src/pages/Advanced.cpp

@@ -94,13 +94,7 @@ ModMetadata DevTools::inputMetadata(void* treePtr, ModMetadata metadata) {
                     continue;
             }
             ImGui::Text("version: %s", item.getVersion().toString().c_str());
-            const char* importance = "";
-            switch (item.getImportance()) {
-                case geode::ModMetadata::Dependency::Importance::Required: importance = "required"; break;
-                case geode::ModMetadata::Dependency::Importance::Recommended: importance = "recommended"; break;
-                case geode::ModMetadata::Dependency::Importance::Suggested: importance = "suggested"; break;
-            }
-            ImGui::Text("importance: %s", importance);
+            ImGui::Text("required: %s", item.isRequired() ? "true" : "false");
             ImGui::Text("isResolved: %s", item.isResolved() ? "true" : "false");
             if (item.getMod())
                 drawModGraphNode(item.getMod());
@@ -120,13 +114,7 @@ ModMetadata DevTools::inputMetadata(void* treePtr, ModMetadata metadata) {
                     continue;
             }
             ImGui::Text("version: %s", item.getVersion().toString().c_str());
-            const char* importance = "";
-            switch (item.getImportance()) {
-                case geode::ModMetadata::Incompatibility::Importance::Breaking: importance = "breaking"; break;
-                case geode::ModMetadata::Incompatibility::Importance::Conflicting: importance = "conflicting"; break;
-                case geode::ModMetadata::Incompatibility::Importance::Superseded: importance = "superseded"; break;
-            }
-            ImGui::Text("importance: %s", importance);
+            ImGui::Text("breaking: %s", item.isBreaking() ? "true" : "false");
             ImGui::Text("isResolved: %s", item.isResolved() ? "true" : "false");
             if (item.getMod())
                 drawModGraphNode(item.getMod());
@@ -165,7 +153,7 @@ void DevTools::drawModGraphNode(Mod* node) {
     ImColor color = ImColor(1.f, 1.f, 1.f);
     if (node->isUninstalled())
         color = ImColor(0.1f, 0.1f, 0.1f);
-    else if (!node->isEnabled())
+    else if (!node->isLoaded())
         color = ImColor(0.7f, 0.7f, 0.7f);
 
     ImGui::PushStyleColor(ImGuiCol_Text, (ImU32)color);