Add more hook priority utilities (#1510)

* Add more hook priority utilities

* change to string reference

Author: hiimjasmine00

loader/include/Geode/modify/Modify.hpp

@@ -244,10 +244,18 @@ namespace geode::modifier {
 
         /// @brief Set the priority of a hook to be after another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param after The mod to set the priority after
+        /// @param mod The mod to set the priority after
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityAfter(std::string_view name, Mod* mod) {
             GEODE_UNWRAP_INTO(auto hook, this->getHook(name));
+            this->setHookPriorityAfter(hook, mod);
+            return Ok();
+        }
+
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority after
+        void setHookPriorityAfter(Hook* hook, Mod* mod) {
             auto func = [=](ModStateEvent* event){
                 auto hooks = mod->getHooks();
                 for (auto modHook : hooks) {
@@ -265,7 +273,6 @@ namespace geode::modifier {
             else {
                 new EventListener(func, ModStateFilter(mod, ModEventType::Loaded));
             }
-            return Ok();
         }
 
         /// @brief Set the priority of a hook to be after another hook in different mods
@@ -278,12 +285,31 @@ namespace geode::modifier {
             return this->setHookPriorityAfter(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param after The mod id of the mod to set the priority after
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityAfter(Hook* hook, const std::string& after) {
+            auto mod = Loader::get()->getInstalledMod(after);
+            if (!mod) return Err("Mod not found");
+            this->setHookPriorityAfter(hook, mod);
+            return Ok();
+        }
+
         /// @brief Set the priority of a hook to be before another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param before The mod to set the priority before
+        /// @param mod The mod to set the priority before
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityBefore(std::string_view name, Mod* mod) {
             GEODE_UNWRAP_INTO(auto hook, this->getHook(name));
+            this->setHookPriorityBefore(hook, mod);
+            return Ok();
+        }
+
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority before
+        void setHookPriorityBefore(Hook* hook, Mod* mod) {
             auto func = [=](ModStateEvent* event){
                 auto hooks = mod->getHooks();
                 for (auto modHook : hooks) {
@@ -301,7 +327,6 @@ namespace geode::modifier {
             else {
                 new EventListener(func, ModStateFilter(mod, ModEventType::Loaded));
             }
-            return Ok();
         }
 
         /// @brief Set the priority of a hook to be before another hook in different mods
@@ -314,6 +339,17 @@ namespace geode::modifier {
             return this->setHookPriorityBefore(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param before The mod id of the mod to set the priority before
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityBefore(Hook* hook, const std::string& before) {
+            auto mod = Loader::get()->getInstalledMod(before);
+            if (!mod) return Err("Mod not found");
+            this->setHookPriorityBefore(hook, mod);
+            return Ok();
+        }
+
         /// @brief Set the priority of a hook to be after another hook in different mods
         /// @param name The name of the hook to set the priority of
         /// @param after The mod id of the mod to set the priority after
@@ -324,12 +360,27 @@ namespace geode::modifier {
 
         /// @brief Set the priority of a hook to be after another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param before The mod to set the priority after
+        /// @param mod The mod to set the priority after
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityAfterPre(std::string_view name, Mod* mod) {
             return this->setHookPriorityAfter(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param after The mod id of the mod to set the priority after
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityAfterPre(Hook* hook, const std::string& after) {
+            return this->setHookPriorityAfter(hook, after);
+        }
+
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority after
+        void setHookPriorityAfterPre(Hook* hook, Mod* mod) {
+            this->setHookPriorityAfter(hook, mod);
+        }
+
         /// @brief Set the priority of a hook to be before another hook in different mods
         /// @param name The name of the hook to set the priority of
         /// @param before The mod id of the mod to set the priority before
@@ -340,12 +391,27 @@ namespace geode::modifier {
 
         /// @brief Set the priority of a hook to be before another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param before The mod to set the priority before
+        /// @param mod The mod to set the priority before
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityBeforePre(std::string_view name, Mod* mod) {
             return this->setHookPriorityBefore(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param before The mod id of the mod to set the priority before
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityBeforePre(Hook* hook, const std::string& before) {
+            return this->setHookPriorityBefore(hook, before);
+        }
+
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority before
+        void setHookPriorityBeforePre(Hook* hook, Mod* mod) {
+            this->setHookPriorityBefore(hook, mod);
+        }
+
         /// @brief Set the priority of a hook to be after another hook in different mods
         /// @param name The name of the hook to set the priority of
         /// @param after The mod id of the mod to set the priority after
@@ -356,12 +422,27 @@ namespace geode::modifier {
 
         /// @brief Set the priority of a hook to be after another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param before The mod to set the priority after
+        /// @param mod The mod to set the priority after
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityAfterPost(std::string_view name, Mod* mod) {
             return this->setHookPriorityBefore(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param after The mod id of the mod to set the priority after
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityAfterPost(Hook* hook, const std::string& after) {
+            return this->setHookPriorityBefore(hook, after);
+        }
+
+        /// @brief Set the priority of a hook to be after another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority after
+        void setHookPriorityAfterPost(Hook* hook, Mod* mod) {
+            this->setHookPriorityBefore(hook, mod);
+        }
+
         /// @brief Set the priority of a hook to be before another hook in different mods
         /// @param name The name of the hook to set the priority of
         /// @param before The mod id of the mod to set the priority before
@@ -372,12 +453,27 @@ namespace geode::modifier {
 
         /// @brief Set the priority of a hook to be before another hook in different mods
         /// @param name The name of the hook to set the priority of
-        /// @param before The mod to set the priority before
+        /// @param mod The mod to set the priority before
         /// @returns Ok if the hook was found and the priority was set, Err if the hook was not found
         Result<> setHookPriorityBeforePost(std::string_view name, Mod* mod) {
             return this->setHookPriorityAfter(name, mod);
         }
 
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param before The mod id of the mod to set the priority before
+        /// @returns Ok if the mod was found and the priority was set, Err if the mod was not found
+        Result<> setHookPriorityBeforePost(Hook* hook, const std::string& before) {
+            return this->setHookPriorityAfter(hook, before);
+        }
+
+        /// @brief Set the priority of a hook to be before another hook in different mods
+        /// @param hook The hook to set the priority of
+        /// @param mod The mod to set the priority before
+        void setHookPriorityBeforePost(Hook* hook, Mod* mod) {
+            this->setHookPriorityAfter(hook, mod);
+        }
+
         // unordered_map<handles> idea
         ModifyBase() {
             struct EboCheck : ModifyDerived::Base {