fix a copious amount of unnecessary ModMetadata and event callback copies

Author: dankmeme01

loader/include/Geode/loader/Event.hpp

@@ -39,7 +39,7 @@ namespace geode {
 
     template <class... Args>
     class DispatchFilter;
-    
+
     class GEODE_DLL DefaultEventListenerPool : public EventListenerPool {
     protected:
         // fix this in Geode 4.0.0
@@ -66,7 +66,7 @@ namespace geode {
         friend class DispatchEvent;
 
         template <class... Args>
-        friend class DispatchFilter;        
+        friend class DispatchFilter;
     };
 
     class GEODE_DLL EventListenerProtocol {
@@ -92,7 +92,7 @@ namespace geode {
 
     template <typename T>
     concept is_event = std::is_base_of_v<Event, T>;
-    
+
     template <is_event T>
     class EventFilter {
     protected:
@@ -102,7 +102,8 @@ namespace geode {
         using Callback = ListenerResult(T*);
         using Event = T;
 
-        ListenerResult handle(std::function<Callback> fn, T* e) {
+        template <typename F> requires (std::is_invocable_r_v<ListenerResult, F, T*>)
+        ListenerResult handle(F&& fn, T* e) {
             return fn(e);
         }
 
@@ -203,11 +204,11 @@ namespace geode {
             m_filter.setListener(this);
             other.disable();
 
-            return *this; 
+            return *this;
         }
 
         void bind(std::function<Callback> fn) {
-            m_callback = fn;
+            m_callback = std::move(fn);
         }
 
         template <typename C>
@@ -216,7 +217,7 @@ namespace geode {
         }
 
         void setFilter(T filter) {
-            m_filter = filter;
+            m_filter = std::move(filter);
             m_filter.setListener(this);
         }
 
@@ -252,7 +253,7 @@ namespace geode {
         ListenerResult post() {
             return postFromMod(getMod());
         }
-        
+
         virtual ~Event();
     };
 

loader/include/Geode/loader/Mod.hpp

@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace geode {    
+namespace geode {
     template <class T>
     struct HandleToSaved : public T {
         Mod* m_mod;
@@ -99,7 +99,11 @@ namespace geode {
         bool isOrWillBeEnabled() const;
         bool isInternal() const;
         bool needsEarlyLoad() const;
-        ModMetadata getMetadata() const;
+
+        [[deprecated("Use Mod::getMetadataRef which is better for efficiency")]]
+        ModMetadata getMetadata() const; // TODO: remove in v5
+        ModMetadata const& getMetadataRef() const;
+
         std::filesystem::path getTempDir() const;
         /**
          * Get the path to the mod's platform binary (.dll on Windows, .dylib
@@ -113,11 +117,11 @@ namespace geode {
         std::filesystem::path getResourcesDir() const;
 
         /**
-         * Get the dependency settings for a specific dependency via its ID. For 
-         * example, if this mod depends on Custom Keybinds, it can specify the 
-         * keybinds it wants to add in `mod.json` under 
+         * Get the dependency settings for a specific dependency via its ID. For
+         * example, if this mod depends on Custom Keybinds, it can specify the
+         * keybinds it wants to add in `mod.json` under
          * `dependencies."geode.custom-keybinds".settings.keybinds`
-         * @returns Null JSON value if there are no settings or if the mod 
+         * @returns Null JSON value if there are no settings or if the mod
          * doesn't depend on the given mod ID
          */
         matjson::Value getDependencySettingsFor(std::string_view dependencyID) const;
@@ -129,13 +133,13 @@ namespace geode {
 
         using CheckUpdatesTask = Task<Result<std::optional<VersionInfo>, std::string>>;
         /**
-         * Check if this Mod has updates available on the mods index. If 
-         * you're using this for automatic update checking, use 
-         * `openInfoPopup` from the `ui/GeodeUI.hpp` header to open the Mod's 
+         * Check if this Mod has updates available on the mods index. If
+         * you're using this for automatic update checking, use
+         * `openInfoPopup` from the `ui/GeodeUI.hpp` header to open the Mod's
          * page to let the user install the update
-         * @returns A task that resolves to an option, either the latest 
-         * available version on the index if there are updates available, or 
-         * `std::nullopt` if there are no updates. On error, the Task returns 
+         * @returns A task that resolves to an option, either the latest
+         * available version on the index if there are updates available, or
+         * `std::nullopt` if there are no updates. On error, the Task returns
          * an error
          */
         CheckUpdatesTask checkUpdates() const;
@@ -162,26 +166,26 @@ namespace geode {
          */
         bool hasSettings() const;
         /**
-         * Get a list of all this mod's setting keys (in the order they were 
+         * Get a list of all this mod's setting keys (in the order they were
          * declared in `mod.json`)
          */
         std::vector<std::string> getSettingKeys() const;
         bool hasSetting(std::string_view key) const;
 
         /**
-         * Get the definition of a setting, or null if the setting was not found, 
-         * or if it's a custom setting that has not yet been registered using 
+         * Get the definition of a setting, or null if the setting was not found,
+         * or if it's a custom setting that has not yet been registered using
          * `Mod::registerCustomSettingType`
          * @param key The key of the setting as defined in `mod.json`
          */
         std::shared_ptr<Setting> getSetting(std::string_view key) const;
 
         /**
-         * Register a custom setting type. See 
+         * Register a custom setting type. See
          * [the setting docs](https://docs.geode-sdk.org/mods/settings) for more
-         * @param type The type of the setting. This should **not** include the 
+         * @param type The type of the setting. This should **not** include the
          * `custom:` prefix!
-         * @param generator A pointer to a function that, when called, returns a 
+         * @param generator A pointer to a function that, when called, returns a
          * newly-created instance of the setting type
          */
         Result<> registerCustomSettingType(std::string_view type, SettingGenerator generator);
@@ -229,9 +233,9 @@ namespace geode {
         matjson::Value& getSavedSettingsData();
 
         /**
-         * Get the value of a [setting](https://docs.geode-sdk.org/mods/settings). 
-         * To use this for custom settings, first specialize the 
-         * `SettingTypeForValueType` class, and then make sure your custom 
+         * Get the value of a [setting](https://docs.geode-sdk.org/mods/settings).
+         * To use this for custom settings, first specialize the
+         * `SettingTypeForValueType` class, and then make sure your custom
          * setting type has a `getValue` function which returns the value
          */
         template <class T>
@@ -475,13 +479,13 @@ namespace geode {
         void setLogLevel(Severity level);
 
         /**
-         * If this mod is built for an outdated GD or Geode version, returns the 
-         * `LoadProblem` describing the situation. Otherwise `nullopt` if the 
+         * If this mod is built for an outdated GD or Geode version, returns the
+         * `LoadProblem` describing the situation. Otherwise `nullopt` if the
          * mod is made for the correct version of the game and Geode
          */
         std::optional<LoadProblem> targetsOutdatedVersion() const;
         /**
-         * @note Make sure to also call `targetsOutdatedVersion` if you want to 
+         * @note Make sure to also call `targetsOutdatedVersion` if you want to
          * make sure the mod is actually loadable
          */
         bool hasLoadProblems() const;