isaacscript-common 15.3.0 → 15.3.1

package/dist/index.d.ts

@@ -10721,12 +10721,22 @@ declare class ModdedElementSets extends Feature {
  */
 export declare class ModFeature {
     private mod;
+    private initialized;
     constructor(mod: ModUpgradedBase, init?: boolean);
     /**
      * Runs the `Mod.AddCallback` and `ModUpgraded.AddCallbackCustom` methods for all of the decorated
      * callbacks. Additionally, subscribes the `v` object to the save data manager, if present.
+     *
+     * @param init Optional. Whether to initialize or uninitialize. Default is true.
      */
     init(init?: boolean): void;
+    /**
+     * Runs the `Mod.RemoveCallback` and `ModUpgraded.RemoveCallbackCustom` methods for all of the
+     * decorated callbacks. Additionally, unsubscribes the `v` object from the save data manager, if
+     * present.
+     *
+     * This is just an alias for `ModFeature.init(false)`.
+     */
     uninit(): void;
 }
 

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.3.0
+isaacscript-common 15.3.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -48341,8 +48341,9 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local initDecoratedCallbacks, initSaveDataManager, WRAPPED_CALLBACK_METHODS_KEY, WRAPPED_CUSTOM_CALLBACK_METHODS_KEY
+local initDecoratedCallbacks, addCallback, removeCallback, initSaveDataManager, WRAPPED_CALLBACK_METHODS_KEY, WRAPPED_CUSTOM_CALLBACK_METHODS_KEY
 local ____array = require("src.functions.array")
 local isArray = ____array.isArray
 local ____deepCopy = require("src.functions.deepCopy")
@@ -48351,6 +48352,8 @@ local ____tstlClass = require("src.functions.tstlClass")
 local getTSTLClassConstructor = ____tstlClass.getTSTLClassConstructor
 local getTSTLClassName = ____tstlClass.getTSTLClassName
 local ____types = require("src.functions.types")
+local isFunction = ____types.isFunction
+local isNumber = ____types.isNumber
 local isTable = ____types.isTable
 function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, vanilla, init)
     local modFeatureConstructor = constructor
@@ -48368,51 +48371,88 @@ function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, va
         end
         local parameters = deepCopy(nil, args)
         local modCallback = table.remove(parameters, 1)
-        if modCallback == nil then
+        if not isNumber(nil, modCallback) then
             error("Failed to get the callback number from the parameters for class: " .. tstlClassName)
         end
         local callback = table.remove(parameters, 1)
-        if callback == nil then
+        if not isFunction(nil, callback) then
             error("Failed to get the callback function from the parameters for class: " .. tstlClassName)
         end
         local mod = modFeature.mod
         if init then
-            local function wrappedCallback(____, ...)
-                callback(modFeature, ...)
-            end
-            if vanilla then
-                local modCallbackVanilla = modCallback
-                local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
-                wrappedMethodsMap:set(modCallbackVanilla, wrappedCallback)
-            else
-                local modCallbackCustom = modCallback
-                local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
-                wrappedMethodsMap:set(modCallbackCustom, wrappedCallback)
-            end
-            if vanilla then
-                mod:AddCallback(
-                    modCallback,
-                    wrappedCallback,
-                    table.unpack(parameters)
-                )
-            else
-                mod:AddCallbackCustom(
-                    modCallback,
-                    wrappedCallback,
-                    table.unpack(parameters)
-                )
-            end
-        elseif vanilla then
-            local modCallbackVanilla = modCallback
-            local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
-            local wrappedCallback = wrappedMethodsMap:get(modCallbackVanilla)
-            mod:RemoveCallback(modCallback, wrappedCallback)
+            addCallback(
+                nil,
+                modFeature,
+                modFeatureConstructor,
+                mod,
+                modCallback,
+                callback,
+                parameters,
+                vanilla
+            )
         else
-            local modCallbackCustom = modCallback
-            local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
-            local wrappedCallback = wrappedMethodsMap:get(modCallbackCustom)
-            mod:RemoveCallbackCustom(modCallback, wrappedCallback)
+            removeCallback(
+                nil,
+                modFeatureConstructor,
+                mod,
+                modCallback,
+                vanilla
+            )
+        end
+    end
+end
+function addCallback(self, modFeature, modFeatureConstructor, mod, modCallback, callback, parameters, vanilla)
+    local function wrappedCallback(____, ...)
+        callback(nil, modFeature, ...)
+    end
+    if vanilla then
+        local modCallbackVanilla = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            wrappedMethodsMap = __TS__New(Map)
+            modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY] = wrappedMethodsMap
         end
+        wrappedMethodsMap:set(modCallbackVanilla, wrappedCallback)
+    else
+        local modCallbackCustom = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            wrappedMethodsMap = __TS__New(Map)
+            modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY] = wrappedMethodsMap
+        end
+        wrappedMethodsMap:set(modCallbackCustom, wrappedCallback)
+    end
+    if vanilla then
+        mod:AddCallback(
+            modCallback,
+            wrappedCallback,
+            table.unpack(parameters)
+        )
+    else
+        mod:AddCallbackCustom(
+            modCallback,
+            wrappedCallback,
+            table.unpack(parameters)
+        )
+    end
+end
+function removeCallback(self, modFeatureConstructor, mod, modCallback, vanilla)
+    if vanilla then
+        local modCallbackVanilla = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            return
+        end
+        local wrappedCallback = wrappedMethodsMap:get(modCallbackVanilla)
+        mod:RemoveCallback(modCallback, wrappedCallback)
+    else
+        local modCallbackCustom = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            return
+        end
+        local wrappedCallback = wrappedMethodsMap:get(modCallbackCustom)
+        mod:RemoveCallbackCustom(modCallback, wrappedCallback)
     end
 end
 function initSaveDataManager(self, modFeature, tstlClassName, init)
@@ -48450,6 +48490,7 @@ function ModFeature.prototype.____constructor(self, mod, init)
     if init == nil then
         init = true
     end
+    self.initialized = false
     self.mod = mod
     if init then
         self:init()
@@ -48459,11 +48500,15 @@ function ModFeature.prototype.init(self, init)
     if init == nil then
         init = true
     end
+    if self.initialized == init then
+        return
+    end
+    self.initialized = init
     local constructor = getTSTLClassConstructor(nil, self)
     if constructor == nil then
         error("Failed to get the TSTL class constructor for a mod feature.")
     end
-    local tstlClassName = getTSTLClassName(nil, constructor)
+    local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to get the TSTL class name for a mod feature.")
     end

package/dist/src/classes/ModFeature.d.ts

@@ -33,12 +33,22 @@ export declare const ADD_CALLBACK_CUSTOM_ARGS_KEY = "__addCallbackCustomArgs";
  */
 export declare class ModFeature {
     private mod;
+    private initialized;
     constructor(mod: ModUpgradedBase, init?: boolean);
     /**
      * Runs the `Mod.AddCallback` and `ModUpgraded.AddCallbackCustom` methods for all of the decorated
      * callbacks. Additionally, subscribes the `v` object to the save data manager, if present.
+     *
+     * @param init Optional. Whether to initialize or uninitialize. Default is true.
      */
     init(init?: boolean): void;
+    /**
+     * Runs the `Mod.RemoveCallback` and `ModUpgraded.RemoveCallbackCustom` methods for all of the
+     * decorated callbacks. Additionally, unsubscribes the `v` object from the save data manager, if
+     * present.
+     *
+     * This is just an alias for `ModFeature.init(false)`.
+     */
     uninit(): void;
 }
 //# sourceMappingURL=ModFeature.d.ts.map

package/dist/src/classes/ModFeature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModFeature.d.ts","sourceRoot":"","sources":["../../../src/classes/ModFeature.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AACzD,eAAO,MAAM,4BAA4B,4BAA4B,CAAC;AAWtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,qBAAa,UAAU;IACrB,OAAO,CAAC,GAAG,CAAkB;gBAEjB,GAAG,EAAE,eAAe,EAAE,IAAI,UAAO;IAQ7C;;;OAGG;IACI,IAAI,CAAC,IAAI,UAAO,GAAG,IAAI;IAgBvB,MAAM,IAAI,IAAI;CAGtB"}
+{"version":3,"file":"ModFeature.d.ts","sourceRoot":"","sources":["../../../src/classes/ModFeature.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AACzD,eAAO,MAAM,4BAA4B,4BAA4B,CAAC;AAatE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,qBAAa,UAAU;IACrB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,WAAW,CAAS;gBAEhB,GAAG,EAAE,eAAe,EAAE,IAAI,UAAO;IAQ7C;;;;;OAKG;IACI,IAAI,CAAC,IAAI,UAAO,GAAG,IAAI;IAqB9B;;;;;;OAMG;IACI,MAAM,IAAI,IAAI;CAGtB"}

package/dist/src/classes/ModFeature.lua

@@ -1,8 +1,9 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local initDecoratedCallbacks, initSaveDataManager, WRAPPED_CALLBACK_METHODS_KEY, WRAPPED_CUSTOM_CALLBACK_METHODS_KEY
+local initDecoratedCallbacks, addCallback, removeCallback, initSaveDataManager, WRAPPED_CALLBACK_METHODS_KEY, WRAPPED_CUSTOM_CALLBACK_METHODS_KEY
 local ____array = require("src.functions.array")
 local isArray = ____array.isArray
 local ____deepCopy = require("src.functions.deepCopy")
@@ -11,6 +12,8 @@ local ____tstlClass = require("src.functions.tstlClass")
 local getTSTLClassConstructor = ____tstlClass.getTSTLClassConstructor
 local getTSTLClassName = ____tstlClass.getTSTLClassName
 local ____types = require("src.functions.types")
+local isFunction = ____types.isFunction
+local isNumber = ____types.isNumber
 local isTable = ____types.isTable
 function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, vanilla, init)
     local modFeatureConstructor = constructor
@@ -28,53 +31,90 @@ function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, va
         end
         local parameters = deepCopy(nil, args)
         local modCallback = table.remove(parameters, 1)
-        if modCallback == nil then
+        if not isNumber(nil, modCallback) then
             error("Failed to get the callback number from the parameters for class: " .. tstlClassName)
         end
         local callback = table.remove(parameters, 1)
-        if callback == nil then
+        if not isFunction(nil, callback) then
             error("Failed to get the callback function from the parameters for class: " .. tstlClassName)
         end
         local mod = modFeature.mod
         if init then
-            local function wrappedCallback(____, ...)
-                callback(modFeature, ...)
-            end
-            if vanilla then
-                local modCallbackVanilla = modCallback
-                local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
-                wrappedMethodsMap:set(modCallbackVanilla, wrappedCallback)
-            else
-                local modCallbackCustom = modCallback
-                local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
-                wrappedMethodsMap:set(modCallbackCustom, wrappedCallback)
-            end
-            if vanilla then
-                mod:AddCallback(
-                    modCallback,
-                    wrappedCallback,
-                    table.unpack(parameters)
-                )
-            else
-                mod:AddCallbackCustom(
-                    modCallback,
-                    wrappedCallback,
-                    table.unpack(parameters)
-                )
-            end
-        elseif vanilla then
-            local modCallbackVanilla = modCallback
-            local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
-            local wrappedCallback = wrappedMethodsMap:get(modCallbackVanilla)
-            mod:RemoveCallback(modCallback, wrappedCallback)
+            addCallback(
+                nil,
+                modFeature,
+                modFeatureConstructor,
+                mod,
+                modCallback,
+                callback,
+                parameters,
+                vanilla
+            )
         else
-            local modCallbackCustom = modCallback
-            local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
-            local wrappedCallback = wrappedMethodsMap:get(modCallbackCustom)
-            mod:RemoveCallbackCustom(modCallback, wrappedCallback)
+            removeCallback(
+                nil,
+                modFeatureConstructor,
+                mod,
+                modCallback,
+                vanilla
+            )
         end
     end
 end
+function addCallback(self, modFeature, modFeatureConstructor, mod, modCallback, callback, parameters, vanilla)
+    local function wrappedCallback(____, ...)
+        callback(nil, modFeature, ...)
+    end
+    if vanilla then
+        local modCallbackVanilla = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            wrappedMethodsMap = __TS__New(Map)
+            modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY] = wrappedMethodsMap
+        end
+        wrappedMethodsMap:set(modCallbackVanilla, wrappedCallback)
+    else
+        local modCallbackCustom = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            wrappedMethodsMap = __TS__New(Map)
+            modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY] = wrappedMethodsMap
+        end
+        wrappedMethodsMap:set(modCallbackCustom, wrappedCallback)
+    end
+    if vanilla then
+        mod:AddCallback(
+            modCallback,
+            wrappedCallback,
+            table.unpack(parameters)
+        )
+    else
+        mod:AddCallbackCustom(
+            modCallback,
+            wrappedCallback,
+            table.unpack(parameters)
+        )
+    end
+end
+function removeCallback(self, modFeatureConstructor, mod, modCallback, vanilla)
+    if vanilla then
+        local modCallbackVanilla = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            return
+        end
+        local wrappedCallback = wrappedMethodsMap:get(modCallbackVanilla)
+        mod:RemoveCallback(modCallback, wrappedCallback)
+    else
+        local modCallbackCustom = modCallback
+        local wrappedMethodsMap = modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]
+        if wrappedMethodsMap == nil then
+            return
+        end
+        local wrappedCallback = wrappedMethodsMap:get(modCallbackCustom)
+        mod:RemoveCallbackCustom(modCallback, wrappedCallback)
+    end
+end
 function initSaveDataManager(self, modFeature, tstlClassName, init)
     local ____modFeature_0 = modFeature
     local v = ____modFeature_0.v
@@ -138,6 +178,7 @@ function ModFeature.prototype.____constructor(self, mod, init)
     if init == nil then
         init = true
     end
+    self.initialized = false
     self.mod = mod
     if init then
         self:init()
@@ -147,11 +188,15 @@ function ModFeature.prototype.init(self, init)
     if init == nil then
         init = true
     end
+    if self.initialized == init then
+        return
+    end
+    self.initialized = init
     local constructor = getTSTLClassConstructor(nil, self)
     if constructor == nil then
         error("Failed to get the TSTL class constructor for a mod feature.")
     end
-    local tstlClassName = getTSTLClassName(nil, constructor)
+    local tstlClassName = getTSTLClassName(nil, self)
     if tstlClassName == nil then
         error("Failed to get the TSTL class name for a mod feature.")
     end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "15.3.0",
+  "version": "15.3.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^9.0.3"
+    "isaac-typescript-definitions": "^9.0.4"
   }
 }

package/src/classes/ModFeature.ts

@@ -6,7 +6,7 @@ import {
   getTSTLClassConstructor,
   getTSTLClassName,
 } from "../functions/tstlClass";
-import { isTable } from "../functions/types";
+import { isFunction, isNumber, isTable } from "../functions/types";
 import { TSTLClassMetatable } from "../interfaces/TSTLClassMetatable";
 import { AnyFunction } from "../types/AnyFunction";
 import { ModUpgradedBase } from "./ModUpgradedBase";
@@ -19,8 +19,10 @@ const WRAPPED_CUSTOM_CALLBACK_METHODS_KEY = "__wrappedCustomCallbacksMethods";
 type ModFeatureConstructor = TSTLClassMetatable["constructor"] & {
   [ADD_CALLBACK_ARGS_KEY]: unknown | undefined;
   [ADD_CALLBACK_CUSTOM_ARGS_KEY]: unknown | undefined;
-  [WRAPPED_CALLBACK_METHODS_KEY]: Map<ModCallback, AnyFunction>;
-  [WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]: Map<ModCallbackCustom, AnyFunction>;
+  [WRAPPED_CALLBACK_METHODS_KEY]: Map<ModCallback, AnyFunction> | undefined;
+  [WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]:
+    | Map<ModCallbackCustom, AnyFunction>
+    | undefined;
 };
 
 /**
@@ -56,6 +58,7 @@ type ModFeatureConstructor = TSTLClassMetatable["constructor"] & {
 
 export class ModFeature {
   private mod: ModUpgradedBase;
+  private initialized = false;
 
   constructor(mod: ModUpgradedBase, init = true) {
     this.mod = mod;
@@ -68,14 +71,21 @@ export class ModFeature {
   /**
    * Runs the `Mod.AddCallback` and `ModUpgraded.AddCallbackCustom` methods for all of the decorated
    * callbacks. Additionally, subscribes the `v` object to the save data manager, if present.
+   *
+   * @param init Optional. Whether to initialize or uninitialize. Default is true.
    */
   public init(init = true): void {
+    if (this.initialized === init) {
+      return;
+    }
+    this.initialized = init;
+
     const constructor = getTSTLClassConstructor(this);
     if (constructor === undefined) {
       error("Failed to get the TSTL class constructor for a mod feature.");
     }
 
-    const tstlClassName = getTSTLClassName(constructor);
+    const tstlClassName = getTSTLClassName(this);
     if (tstlClassName === undefined) {
       error("Failed to get the TSTL class name for a mod feature.");
     }
@@ -85,6 +95,13 @@ export class ModFeature {
     initSaveDataManager(this, tstlClassName, init);
   }
 
+  /**
+   * Runs the `Mod.RemoveCallback` and `ModUpgraded.RemoveCallbackCustom` methods for all of the
+   * decorated callbacks. Additionally, unsubscribes the `v` object from the save data manager, if
+   * present.
+   *
+   * This is just an alias for `ModFeature.init(false)`.
+   */
   public uninit(): void {
     this.init(false);
   }
@@ -122,16 +139,14 @@ function initDecoratedCallbacks(
     const parameters = deepCopy(args);
 
     const modCallback = parameters.shift();
-    if (modCallback === undefined) {
+    if (!isNumber(modCallback)) {
       error(
         `Failed to get the callback number from the parameters for class: ${tstlClassName}`,
       );
     }
 
-    const callback = parameters.shift() as
-      | ((this: void, ...callbackArgs: unknown[]) => void)
-      | undefined;
-    if (callback === undefined) {
+    const callback = parameters.shift();
+    if (!isFunction(callback)) {
       error(
         `Failed to get the callback function from the parameters for class: ${tstlClassName}`,
       );
@@ -141,51 +156,99 @@ function initDecoratedCallbacks(
     const mod = modFeature["mod"];
 
     if (init) {
-      // We need to wrap the callback in a new function so that we can explicitly pass the class as
-      // the first argument. (Otherwise, the method will not be able to properly access `this`.
-      const wrappedCallback = (...callbackArgs: unknown[]) => {
-        callback(modFeature, ...callbackArgs);
-      };
-
-      // We need to save the wrapped function for later (so we can unregister them).
-      if (vanilla) {
-        const modCallbackVanilla = modCallback as ModCallback;
-        const wrappedMethodsMap =
-          modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY];
-        wrappedMethodsMap.set(modCallbackVanilla, wrappedCallback);
-      } else {
-        const modCallbackCustom = modCallback as ModCallbackCustom;
-        const wrappedMethodsMap =
-          modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY];
-        wrappedMethodsMap.set(modCallbackCustom, wrappedCallback);
-      }
-
-      if (vanilla) {
-        (mod.AddCallback as AnyFunction)(
-          modCallback,
-          wrappedCallback,
-          ...parameters,
-        );
-      } else {
-        (mod.AddCallbackCustom as AnyFunction)(
-          modCallback,
-          wrappedCallback,
-          ...parameters,
-        );
-      }
-    } else if (vanilla) {
-      const modCallbackVanilla = modCallback as ModCallback;
-      const wrappedMethodsMap =
-        modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY];
-      const wrappedCallback = wrappedMethodsMap.get(modCallbackVanilla);
-      (mod.RemoveCallback as AnyFunction)(modCallback, wrappedCallback);
+      addCallback(
+        modFeature,
+        modFeatureConstructor,
+        mod,
+        modCallback,
+        callback,
+        parameters,
+        vanilla,
+      );
     } else {
-      const modCallbackCustom = modCallback as ModCallbackCustom;
-      const wrappedMethodsMap =
-        modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY];
-      const wrappedCallback = wrappedMethodsMap.get(modCallbackCustom);
-      (mod.RemoveCallbackCustom as AnyFunction)(modCallback, wrappedCallback);
+      removeCallback(modFeatureConstructor, mod, modCallback, vanilla);
+    }
+  }
+}
+
+function addCallback(
+  modFeature: ModFeature,
+  modFeatureConstructor: ModFeatureConstructor,
+  mod: ModUpgradedBase,
+  modCallback: unknown,
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  callback: Function,
+  parameters: unknown[],
+  vanilla: boolean,
+) {
+  // We need to wrap the callback in a new function so that we can explicitly pass the class as the
+  // first argument. (Otherwise, the method will not be able to properly access `this`.
+  const wrappedCallback = (...callbackArgs: unknown[]) => {
+    callback(modFeature, ...callbackArgs);
+  };
+
+  // We need to save the wrapped function for later (so we can unregister them).
+  if (vanilla) {
+    const modCallbackVanilla = modCallback as ModCallback;
+    let wrappedMethodsMap = modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY];
+    if (wrappedMethodsMap === undefined) {
+      wrappedMethodsMap = new Map();
+      modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY] = wrappedMethodsMap;
+    }
+    wrappedMethodsMap.set(modCallbackVanilla, wrappedCallback);
+  } else {
+    const modCallbackCustom = modCallback as ModCallbackCustom;
+    let wrappedMethodsMap =
+      modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY];
+    if (wrappedMethodsMap === undefined) {
+      wrappedMethodsMap = new Map();
+      modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY] =
+        wrappedMethodsMap;
     }
+    wrappedMethodsMap.set(modCallbackCustom, wrappedCallback);
+  }
+
+  if (vanilla) {
+    (mod.AddCallback as AnyFunction)(
+      modCallback,
+      wrappedCallback,
+      ...parameters,
+    );
+  } else {
+    (mod.AddCallbackCustom as AnyFunction)(
+      modCallback,
+      wrappedCallback,
+      ...parameters,
+    );
+  }
+}
+
+function removeCallback(
+  modFeatureConstructor: ModFeatureConstructor,
+  mod: ModUpgradedBase,
+  modCallback: unknown,
+  vanilla: boolean,
+) {
+  if (vanilla) {
+    const modCallbackVanilla = modCallback as ModCallback;
+    const wrappedMethodsMap =
+      modFeatureConstructor[WRAPPED_CALLBACK_METHODS_KEY];
+    if (wrappedMethodsMap === undefined) {
+      return;
+    }
+
+    const wrappedCallback = wrappedMethodsMap.get(modCallbackVanilla);
+    (mod.RemoveCallback as AnyFunction)(modCallback, wrappedCallback);
+  } else {
+    const modCallbackCustom = modCallback as ModCallbackCustom;
+    const wrappedMethodsMap =
+      modFeatureConstructor[WRAPPED_CUSTOM_CALLBACK_METHODS_KEY];
+    if (wrappedMethodsMap === undefined) {
+      return;
+    }
+
+    const wrappedCallback = wrappedMethodsMap.get(modCallbackCustom);
+    (mod.RemoveCallbackCustom as AnyFunction)(modCallback, wrappedCallback);
   }
 }