From d45c978cefd88f94dc4609ff2e5b157efc82c924 Mon Sep 17 00:00:00 2001
From: dankmeme01 <42031238+dankmeme01@users.noreply.github.com>
Date: Sat, 5 Sep 2026 23:36:29 +0200
Subject: [PATCH] add getModifyClassName

---
 loader/include/Geode/loader/Hook.hpp   | 14 ++++++++++++++
 loader/include/Geode/modify/Modify.hpp |  7 +++++++
 loader/src/loader/Hook.cpp             |  8 ++++++++
 loader/src/loader/HookImpl.cpp         | 10 ++++++++++
 loader/src/loader/HookImpl.hpp         |  4 ++++
 5 files changed, 43 insertions(+)

diff --git a/loader/include/Geode/loader/Hook.hpp b/loader/include/Geode/loader/Hook.hpp
index bc4cd430af..d3e94682bb 100644
--- a/loader/include/Geode/loader/Hook.hpp
+++ b/loader/include/Geode/loader/Hook.hpp
@@ -144,6 +144,20 @@ namespace geode {
          * @param priority Priority
          */
         void setPriority(int32_t priority);
+
+        /**
+         * Get the name of the modify class this hook belongs to, or `std::nullopt` if unavailable.
+         * This is the final, user-specified (or auto generated) name of the modify class, not the name of the modified class.
+         * This will not work for manual hooks or hooks in mods compiled with an older version of Geode.
+         * @returns Name of the modify class this hook belongs to
+         */
+        std::optional<std::string_view> getModifyClassName() const;
+
+        /**
+         * Set the name of the modify class this hook belongs to.
+         * For internal usage only.
+         */
+        void setModifyClassName(std::string name);
     };
 
     class GEODE_DLL Patch final {
diff --git a/loader/include/Geode/modify/Modify.hpp b/loader/include/Geode/modify/Modify.hpp
index a700c23f52..f9ab20707f 100644
--- a/loader/include/Geode/modify/Modify.hpp
+++ b/loader/include/Geode/modify/Modify.hpp
@@ -10,6 +10,7 @@
 #include <Geode/loader/Mod.hpp>
 #include <iostream>
 #include <tulip/TulipHook.hpp>
+#include <arc/future/PollableMetadata.hpp>
 
 #define GEODE_APPLY_MODIFY_FOR_FUNCTION(AddressInline_, Convention_, ClassName_, FunctionName_, ...)          \
     do {                                                                                                      \
@@ -411,6 +412,7 @@ namespace geode::modifier {
             ModifyDerived::Derived::onModify(*this);
             std::vector<std::string> added;
             for (auto& [uuid, hook] : m_hooks) {
+                hook->setModifyClassName(std::string{ModifyDerived::Derived::SELF_NAME});
                 auto res = Mod::get()->claimHook(hook);
                 if (!res) {
                     log::error("Failed to claim hook {}: {}", hook->getDisplayName(), res.unwrapErr());
@@ -461,6 +463,11 @@ namespace geode {
     public:
         using Self = Derived;
 
+        static inline constexpr std::string_view SELF_NAME = [] {
+            auto [ptr, size] = arc::getTypename<Self>();
+            return std::string_view{ptr, size};
+        }();
+
         // abusing the internal stuff
         // basically we dont want modify to invoke base ctors and dtors
         Modify() : Base(CutoffConstructor, sizeof(Base)) {}
diff --git a/loader/src/loader/Hook.cpp b/loader/src/loader/Hook.cpp
index 462ffc68d8..8c22e63e24 100644
--- a/loader/src/loader/Hook.cpp
+++ b/loader/src/loader/Hook.cpp
@@ -75,3 +75,11 @@ int32_t Hook::getPriority() const {
 void Hook::setPriority(int32_t priority) {
     return m_impl->setPriority(priority);
 }
+
+std::optional<std::string_view> Hook::getModifyClassName() const {
+    return m_impl->getModifyClassName();
+}
+
+void Hook::setModifyClassName(std::string name) {
+    return m_impl->setModifyClassName(std::move(name));
+}
diff --git a/loader/src/loader/HookImpl.cpp b/loader/src/loader/HookImpl.cpp
index f02c91e6b4..9c4e0e7c9a 100644
--- a/loader/src/loader/HookImpl.cpp
+++ b/loader/src/loader/HookImpl.cpp
@@ -151,6 +151,16 @@ void Hook::Impl::setPriority(int32_t priority) {
     }
 }
 
+std::optional<std::string_view> Hook::Impl::getModifyClassName() const {
+    return m_modifyClassName.transform([](auto& s) {
+        return std::string_view{s};
+    });
+}
+
+void Hook::Impl::setModifyClassName(std::string name) {
+    m_modifyClassName = std::move(name);
+}
+
 Result<> Hook::Impl::updateHookMetadata() {
     if (!m_enabled) return Ok();
     GEODE_UNWRAP_INTO(auto handler, LoaderImpl::get()->getHandler(m_address));
diff --git a/loader/src/loader/HookImpl.hpp b/loader/src/loader/HookImpl.hpp
index 7c435cd24a..ed26e5da97 100644
--- a/loader/src/loader/HookImpl.hpp
+++ b/loader/src/loader/HookImpl.hpp
@@ -43,6 +43,7 @@ class Hook::Impl final : ModPatch {
     void* m_address;
     void* m_detour;
     std::string m_displayName;
+    std::optional<std::string> m_modifyClassName;
     tulip::hook::HandlerMetadata m_handlerMetadata;
     tulip::hook::HookMetadata m_hookMetadata;
     tulip::hook::HookHandle m_handle = 0;
@@ -60,6 +61,9 @@ class Hook::Impl final : ModPatch {
     int32_t getPriority() const;
     void setPriority(int32_t priority);
 
+    std::optional<std::string_view> getModifyClassName() const;
+    void setModifyClassName(std::string name);
+
     Result<> updateHookMetadata();
 
     friend class Hook;