Merge pull request #920 from maximegmd/revert-912-master

Revert "Expose mod input handlers for better integration between mods"
maximegmd · Jan 31, 2024 · 2edfe6d · 2edfe6d
2 parents e7ecc73 + ed0e3ec
commit 2edfe6d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 61 deletions.
diff --git a/src/VKBindings.h b/src/VKBindings.h
@@ -19,7 +19,6 @@ struct VKBind
     std::string DisplayName{};
     std::variant<std::string, std::function<void()>> Description{};
     std::variant<std::function<TVKBindHotkeyCallback>, std::function<TVKBindInputCallback>> Handler{};
-    sol::function VmHandler{};
 
     [[nodiscard]] std::function<void()> DelayedCall(const bool acIsDown) const;
     void Call(const bool acIsDown) const;

diff --git a/src/scripting/LuaSandbox.cpp b/src/scripting/LuaSandbox.cpp
@@ -101,7 +101,7 @@ static constexpr const char* s_cPostInitializeTweakDBProtectedList[] = {
 
 static constexpr const char* s_cPostInitializeModsProtectedList[] = {
     // initialized by Scripting
-    "NewObject", "GetSingleton", "GetMods", "GetMod", "GameDump", "Dump", "DumpType", "DumpAllTypeNames", "DumpVtables", "DumpReflection", "Game",
+    "NewObject", "GetSingleton", "GetMod", "GameDump", "Dump", "DumpType", "DumpAllTypeNames", "DumpVtables", "DumpReflection", "Game",
 
     // initialized by RTTIMapper
     "Vector3", "ToVector3", "Vector4", "ToVector4", "EulerAngles", "ToEulerAngles", "Quaternion", "ToQuaternion", "ItemID", "ToItemID"};

diff --git a/src/scripting/ScriptContext.cpp b/src/scripting/ScriptContext.cpp
@@ -146,7 +146,7 @@ ScriptContext::ScriptContext(LuaSandbox& aLuaSandbox, const std::filesystem::pat
             return;
         }
 
-        m_vkBinds.emplace_back(acID, acDisplayName, wrapDescription(acDescription), wrapHandler(aCallback, acIsHotkey), aCallback);
+        m_vkBinds.emplace_back(acID, acDisplayName, wrapDescription(acDescription), wrapHandler(aCallback, acIsHotkey));
     };
 
     env["registerHotkey"] = sol::overload(
@@ -294,38 +294,6 @@ sol::object ScriptContext::GetRootObject() const
     return m_object;
 }
 
-sol::object ScriptContext::GetInputHandlers() const
-{
-    auto lockedState = m_sandbox.GetLockedState();
-    const auto& bindings = CET::Get().GetBindings();
-    sol::table res(lockedState.Get(), sol::create);
-    for (const auto& bind : m_vkBinds)
-    {
-        sol::table info(lockedState.Get(), sol::create);
-        info["id"] = bind.ID;
-        info["displayName"] = bind.DisplayName;
-        info["callback"] = bind.VmHandler;
-        info["isHotkey"] = bind.IsHotkey();
-        info["isBound"] = bindings.IsBound({m_name, bind.ID});
-        if (std::holds_alternative<std::string>(bind.Description))
-        {
-            info["description"] = std::get<std::string>(bind.Description);
-        }
-        res[bind.ID] = info;
-    }
-    return res;
-}
-
-sol::object ScriptContext::GetMod() const
-{
-    auto lockedState = m_sandbox.GetLockedState();
-    sol::table modInfo(lockedState.Get(), sol::create);
-    modInfo["name"] = m_name;
-    modInfo["rootObject"] = GetRootObject();
-    modInfo["inputHandlers"] = GetInputHandlers();
-    return modInfo;
-}
-
 void ScriptContext::TriggerOnShutdown() const
 {
     auto lockedState = m_sandbox.GetLockedState();

diff --git a/src/scripting/ScriptContext.h b/src/scripting/ScriptContext.h
@@ -23,8 +23,6 @@ struct ScriptContext
     void TriggerOnOverlayClose() const;
 
     [[nodiscard]] sol::object GetRootObject() const;
-    [[nodiscard]] sol::object GetInputHandlers() const;
-    [[nodiscard]] sol::object GetMod() const;
 
 private:
     void TriggerOnShutdown() const;

diff --git a/src/scripting/ScriptStore.cpp b/src/scripting/ScriptStore.cpp
@@ -147,22 +147,11 @@ void ScriptStore::TriggerOnOverlayClose() const
         mod.TriggerOnOverlayClose();
 }
 
-sol::object ScriptStore::GetMods() const
-{
-    auto lockedState = m_sandbox.GetLockedState();
-    sol::table res(lockedState.Get(), sol::create);
-    for (const auto& [name, context] : m_contexts)
-    {
-        res[name] = context.GetMod();
-    }
-    return res;
-}
-
 sol::object ScriptStore::GetMod(const std::string& acName) const
 {
     const auto it = m_contexts.find(acName);
     if (it != m_contexts.cend())
-        return it->second.GetMod();
+        return it->second.GetRootObject();
 
     return sol::nil;
 }
diff --git a/src/scripting/ScriptStore.h b/src/scripting/ScriptStore.h
@@ -23,7 +23,6 @@ struct ScriptStore
     void TriggerOnOverlayOpen() const;
     void TriggerOnOverlayClose() const;
 
-    [[nodiscard]] sol::object GetMods() const;
     [[nodiscard]] sol::object GetMod(const std::string& acName) const;
 
 private:

diff --git a/src/scripting/Scripting.cpp b/src/scripting/Scripting.cpp
@@ -427,11 +427,6 @@ void Scripting::PostInitializeScripting()
         return this->GetSingletonHandle(acName, aThisEnv);
     };
 
-    globals["GetMods"] = [this]() -> sol::object
-    {
-        return GetMods();
-    };
-
     globals["GetMod"] = [this](const std::string& acName) -> sol::object
     {
         return GetMod(acName);
@@ -604,11 +599,6 @@ void Scripting::TriggerOnOverlayClose() const
     m_store.TriggerOnOverlayClose();
 }
 
-sol::object Scripting::GetMods() const
-{
-    return m_store.GetMods();
-}
-
 sol::object Scripting::GetMod(const std::string& acName) const
 {
     return m_store.GetMod(acName);

diff --git a/src/scripting/Scripting.h b/src/scripting/Scripting.h
@@ -31,7 +31,6 @@ struct Scripting
     void TriggerOnOverlayOpen() const;
     void TriggerOnOverlayClose() const;
 
-    sol::object GetMods() const;
     sol::object GetMod(const std::string& acName) const;
     void UnloadAllMods();
     void ReloadAllMods();