isaacscript-common 18.3.0 → 18.3.2

package/dist/src/objects/directionToMoveAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directionToMoveAction.d.ts","sourceRoot":"","sources":["../../../src/objects/directionToMoveAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,8BAA8B,CAAC;AAGvE,eAAO,MAAM,wBAAwB;;;;;;CAMmC,CAAC"}

package/dist/src/objects/directionToMoveAction.lua

@@ -0,0 +1,12 @@
+local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ButtonAction = ____isaac_2Dtypescript_2Ddefinitions.ButtonAction
+local Direction = ____isaac_2Dtypescript_2Ddefinitions.Direction
+____exports.DIRECTION_TO_MOVE_ACTION = {
+    [Direction.NO_DIRECTION] = nil,
+    [Direction.LEFT] = ButtonAction.LEFT,
+    [Direction.UP] = ButtonAction.UP,
+    [Direction.RIGHT] = ButtonAction.RIGHT,
+    [Direction.DOWN] = ButtonAction.DOWN
+}
+return ____exports

package/dist/src/objects/directionToShootAction.d.ts

@@ -0,0 +1,9 @@
+import { ButtonAction } from "isaac-typescript-definitions";
+export declare const DIRECTION_TO_SHOOT_ACTION: {
+    readonly [-1]: undefined;
+    readonly 0: ButtonAction.SHOOT_LEFT;
+    readonly 1: ButtonAction.SHOOT_UP;
+    readonly 2: ButtonAction.SHOOT_RIGHT;
+    readonly 3: ButtonAction.SHOOT_DOWN;
+};
+//# sourceMappingURL=directionToShootAction.d.ts.map

package/dist/src/objects/directionToShootAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directionToShootAction.d.ts","sourceRoot":"","sources":["../../../src/objects/directionToShootAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,8BAA8B,CAAC;AAGvE,eAAO,MAAM,yBAAyB;;;;;;CAMkC,CAAC"}

package/dist/src/objects/directionToShootAction.lua

@@ -0,0 +1,12 @@
+local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ButtonAction = ____isaac_2Dtypescript_2Ddefinitions.ButtonAction
+local Direction = ____isaac_2Dtypescript_2Ddefinitions.Direction
+____exports.DIRECTION_TO_SHOOT_ACTION = {
+    [Direction.NO_DIRECTION] = nil,
+    [Direction.LEFT] = ButtonAction.SHOOT_LEFT,
+    [Direction.UP] = ButtonAction.SHOOT_UP,
+    [Direction.RIGHT] = ButtonAction.SHOOT_RIGHT,
+    [Direction.DOWN] = ButtonAction.SHOOT_DOWN
+}
+return ____exports

package/dist/src/types/ModUpgraded.d.ts

@@ -26,7 +26,7 @@ type ISCFeaturesToKeys<T extends readonly ISCFeature[]> = Omit<TupleToIntersecti
  * same private fields will cause a `never` type.
  */
 type ISCFeatureTupleToClassTuple<T extends ISCFeature[]> = {
-    [K in keyof T]: PublicInterface<ISCFeatureToClass[T[K]]>;
+    [Key in keyof T]: PublicInterface<ISCFeatureToClass[T[Key]]>;
 };
 export {};
 //# sourceMappingURL=ModUpgraded.d.ts.map

package/dist/src/types/ModUpgraded.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModUpgraded.d.ts","sourceRoot":"","sources":["../../../src/types/ModUpgraded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC;;;;;;;;;GASG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,SAAS,UAAU,EAAE,GAAG,EAAE,IAC1D,eAAe,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEzC;;;GAGG;AACH,KAAK,iBAAiB,CAAC,CAAC,SAAS,SAAS,UAAU,EAAE,IAAI,IAAI,CAC5D,mBAAmB,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,MAAM,OAAO,CACd,CAAC;AAEF;;;GAGG;AACH,KAAK,2BAA2B,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI;KACxD,CAAC,IAAI,MAAM,CAAC,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzD,CAAC"}
+{"version":3,"file":"ModUpgraded.d.ts","sourceRoot":"","sources":["../../../src/types/ModUpgraded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC;;;;;;;;;GASG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,SAAS,UAAU,EAAE,GAAG,EAAE,IAC1D,eAAe,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEzC;;;GAGG;AACH,KAAK,iBAAiB,CAAC,CAAC,SAAS,SAAS,UAAU,EAAE,IAAI,IAAI,CAC5D,mBAAmB,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,MAAM,OAAO,CACd,CAAC;AAEF;;;GAGG;AACH,KAAK,2BAA2B,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI;KACxD,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7D,CAAC"}

package/dist/src/types/private/CallbackTuple.d.ts

@@ -1,20 +1,29 @@
 import { ModCallback } from "isaac-typescript-definitions";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { AddCallbackParametersCustom } from "../../interfaces/private/AddCallbackParametersCustom";
+import { AllButFirst } from "../AllButFirst";
 /**
- * A mapping of the callback enum to the associated callback functions (and optional arguments).
- * This is so that the respective callback functions can be added/removed on demand as subscribers
- * get added/removed.
+ * A mapping of the callback enum to the associated callback function and optional arguments. This
+ * is so that the respective callback functions can be added/removed on demand as subscribers get
+ * added/removed.
  */
 export type CallbackTuple = {
-    [K in ModCallback]: [K, AddCallbackParameters[K]];
+    [Key in ModCallback]: [
+        modCallback: Key,
+        callbackFunc: AddCallbackParameters[Key][0],
+        optionalArgs?: AllButFirst<AddCallbackParameters[Key]>
+    ];
 }[ModCallback];
 /**
- * A mapping of the custom callback enum to the associated callback functions (and optional
- * arguments). This is so that the respective callback functions can be added/removed on demand as
- * subscribers get added/removed.
+ * A mapping of the custom callback enum to the associated callback function and optional arguments.
+ * This is so that the respective callback functions can be added/removed on demand as subscribers
+ * get added/removed.
  */
 export type CustomCallbackTuple = {
-    [K in ModCallbackCustom]: [K, AddCallbackParametersCustom[K]];
+    [Key in ModCallbackCustom]: [
+        modCallback: Key,
+        callbackFunc: AddCallbackParametersCustom[Key][0],
+        optionalArgs?: AllButFirst<AddCallbackParametersCustom[Key]>
+    ];
 }[ModCallbackCustom];
 //# sourceMappingURL=CallbackTuple.d.ts.map

package/dist/src/types/private/CallbackTuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallbackTuple.d.ts","sourceRoot":"","sources":["../../../../src/types/private/CallbackTuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAEnG;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;KACzB,CAAC,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;CAClD,CAAC,WAAW,CAAC,CAAC;AAEf;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,iBAAiB,GAAG,CAAC,CAAC,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;CAC9D,CAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"CallbackTuple.d.ts","sourceRoot":"","sources":["../../../../src/types/private/CallbackTuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;KACzB,GAAG,IAAI,WAAW,GAAG;QACpB,WAAW,EAAE,GAAG;QAChB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3C,YAAY,CAAC,EAAE,WAAW,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;KACvD;CACF,CAAC,WAAW,CAAC,CAAC;AAEf;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG;KAC/B,GAAG,IAAI,iBAAiB,GAAG;QAC1B,WAAW,EAAE,GAAG;QAChB,YAAY,EAAE,2BAA2B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjD,YAAY,CAAC,EAAE,WAAW,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC;KAC7D;CACF,CAAC,iBAAiB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "18.3.0",
+  "version": "18.3.2",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/ModFeature.ts

@@ -1,7 +1,6 @@
 import { ModCallback } from "isaac-typescript-definitions";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { isArray } from "../functions/array";
-import { deepCopy } from "../functions/deepCopy";
 import {
   getTSTLClassConstructor,
   getTSTLClassName,
@@ -11,14 +10,26 @@ import { TSTLClassMetatable } from "../interfaces/TSTLClassMetatable";
 import { AnyFunction } from "../types/AnyFunction";
 import { ModUpgradedBase } from "./ModUpgradedBase";
 
-export const ADD_CALLBACK_ARGS_KEY = "__addCallbackArgs";
-export const ADD_CALLBACK_CUSTOM_ARGS_KEY = "__addCallbackCustomArgs";
+export const MOD_FEATURE_CALLBACKS_KEY = "__callbacks";
+export const MOD_FEATURE_CUSTOM_CALLBACKS_KEY = "__customCallbacks";
 const WRAPPED_CALLBACK_METHODS_KEY = "__wrappedCallbackMethods";
 const WRAPPED_CUSTOM_CALLBACK_METHODS_KEY = "__wrappedCustomCallbacksMethods";
 
 type ModFeatureConstructor = TSTLClassMetatable["constructor"] & {
-  [ADD_CALLBACK_ARGS_KEY]: unknown | undefined;
-  [ADD_CALLBACK_CUSTOM_ARGS_KEY]: unknown | undefined;
+  [MOD_FEATURE_CALLBACKS_KEY]:
+    | [
+        modCallback: ModCallback,
+        callbackFunc: AnyFunction,
+        parameters: unknown[],
+      ]
+    | undefined;
+  [MOD_FEATURE_CUSTOM_CALLBACKS_KEY]:
+    | [
+        modCallbackCustom: ModCallbackCustom,
+        callbackFunc: AnyFunction,
+        parameters: unknown[],
+      ]
+    | undefined;
   [WRAPPED_CALLBACK_METHODS_KEY]: Map<ModCallback, AnyFunction> | undefined;
   [WRAPPED_CUSTOM_CALLBACK_METHODS_KEY]:
     | Map<ModCallbackCustom, AnyFunction>
@@ -138,40 +149,51 @@ function initDecoratedCallbacks(
   init: boolean,
 ) {
   const modFeatureConstructor = constructor as ModFeatureConstructor;
-  const argsKey = vanilla
-    ? ADD_CALLBACK_ARGS_KEY
-    : ADD_CALLBACK_CUSTOM_ARGS_KEY;
-  const addCallbackArgs = modFeatureConstructor[argsKey];
-  if (addCallbackArgs === undefined) {
+  const callbackTuplesKey = vanilla
+    ? MOD_FEATURE_CALLBACKS_KEY
+    : MOD_FEATURE_CUSTOM_CALLBACKS_KEY;
+  const callbackTuples = modFeatureConstructor[callbackTuplesKey];
+  if (callbackTuples === undefined) {
     return;
   }
 
-  if (!isArray(addCallbackArgs)) {
+  if (!isArray(callbackTuples)) {
     error(
-      `Failed to initialize/uninitialize the decorated callbacks on a mod feature since the callback arguments on the key of "${argsKey}" was not an array.`,
+      `Failed to initialize/uninitialize the decorated callbacks on a mod feature since the callback arguments on the key of "${callbackTuplesKey}" was not an array and was instead of type: ${type(
+        callbackTuples,
+      )}`,
     );
   }
 
-  for (const args of addCallbackArgs) {
-    if (!isArray(args)) {
+  for (const callbackTuple of callbackTuples) {
+    if (!isArray(callbackTuple)) {
       error(
-        "Failed to initialize/uninitialize the decorated callbacks on a mod feature since one of the callback arguments was not an array.",
+        `Failed to initialize/uninitialize the decorated callbacks on a mod feature since one of the callback arguments on the key of "${callbackTuplesKey}" was not an array and was instead of type: ${type(
+          callbackTuple,
+        )}`,
       );
     }
 
-    const parameters = deepCopy(args);
-
-    const modCallback = parameters.shift();
+    const modCallback = callbackTuple[0];
     if (!isNumber(modCallback)) {
       error(
-        `Failed to get the callback number from the parameters for class: ${tstlClassName}`,
+        `Failed to get the callback number from the callback tuple for class: ${tstlClassName}`,
       );
     }
 
-    const callback = parameters.shift();
+    const callback = callbackTuple[1];
     if (!isFunction(callback)) {
       error(
-        `Failed to get the callback function from the parameters for class: ${tstlClassName}`,
+        `Failed to get the callback function from the callback tuple for class: ${tstlClassName}`,
+      );
+    }
+
+    const parameters = callbackTuple[2];
+    // We must pass false as the second argument to `isArray` since the callback parameters may not
+    // necessarily be contiguous. (They might be separated by `undefined` values.)
+    if (!isArray(parameters, false)) {
+      error(
+        `Failed to get the callback parameters from the callback tuple for class: ${tstlClassName}`,
       );
     }
 

package/src/classes/ModUpgradedBase.ts

@@ -292,15 +292,25 @@ export class ModUpgradedBase implements Mod {
 
     if (feature.callbacksUsed !== undefined) {
       for (const callbackTuple of feature.callbacksUsed) {
-        const [modCallback, callbackArgs] = callbackTuple;
-        this.AddCallback(modCallback, ...callbackArgs);
+        const [modCallback, callbackFunc, optionalArgs] = callbackTuple;
+        // TypeScript is not smart enough to know that the arguments match the function.
+        (this.AddCallback as AnyFunction)(
+          modCallback,
+          callbackFunc,
+          ...(optionalArgs ?? []),
+        );
       }
     }
 
     if (feature.customCallbacksUsed !== undefined) {
       for (const callbackTuple of feature.customCallbacksUsed) {
-        const [modCallback, callbackArgs] = callbackTuple;
-        this.AddCallbackCustom(modCallback, ...callbackArgs);
+        const [modCallback, callbackFunc, optionalArgs] = callbackTuple;
+        // TypeScript is not smart enough to know that the arguments match the function.
+        (this.AddCallbackCustom as AnyFunction)(
+          modCallback,
+          callbackFunc,
+          ...(optionalArgs ?? []),
+        );
       }
     }
 
@@ -355,17 +365,15 @@ export class ModUpgradedBase implements Mod {
 
     if (feature.callbacksUsed !== undefined) {
       for (const callbackTuple of feature.callbacksUsed) {
-        const [modCallback, callbackArgs] = callbackTuple;
-        const callback = callbackArgs[0];
-        this.RemoveCallback(modCallback, callback);
+        const [modCallback, callbackFunc] = callbackTuple;
+        this.RemoveCallback(modCallback, callbackFunc);
       }
     }
 
     if (feature.customCallbacksUsed !== undefined) {
       for (const callbackTuple of feature.customCallbacksUsed) {
-        const [modCallback, callbackArgs] = callbackTuple;
-        const callback = callbackArgs[0];
-        this.RemoveCallbackCustom(modCallback, callback);
+        const [modCallback, callbackFunc] = callbackTuple;
+        this.RemoveCallbackCustom(modCallback, callbackFunc);
       }
     }
 

package/src/classes/callbacks/EntityTakeDmgFilter.ts

@@ -9,7 +9,7 @@ export class EntityTakeDmgFilter extends CustomCallback<ModCallbackCustom.ENTITY
 
     this.callbacksUsed = [
       // 11
-      [ModCallback.ENTITY_TAKE_DMG, [this.entityTakeDmg]],
+      [ModCallback.ENTITY_TAKE_DMG, this.entityTakeDmg],
     ];
   }
 

package/src/classes/callbacks/EntityTakeDmgPlayer.ts

@@ -15,7 +15,8 @@ export class EntityTakeDmgPlayer extends CustomCallback<ModCallbackCustom.ENTITY
       // 11
       [
         ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
+        this.entityTakeDmgPlayer,
+        [EntityType.PLAYER],
       ],
     ];
   }

package/src/classes/callbacks/InputActionFilter.ts

@@ -18,7 +18,7 @@ export class InputActionFilter extends CustomCallback<T> {
 
     this.callbacksUsed = [
       // 13
-      [ModCallback.INPUT_ACTION, [this.inputAction]],
+      [ModCallback.INPUT_ACTION, this.inputAction],
     ];
   }
 

package/src/classes/callbacks/InputActionPlayer.ts

@@ -18,7 +18,7 @@ export class InputActionPlayer extends CustomCallback<T> {
 
     this.callbacksUsed = [
       // 13
-      [ModCallback.INPUT_ACTION, [this.inputAction]],
+      [ModCallback.INPUT_ACTION, this.inputAction],
     ];
   }
 

package/src/classes/callbacks/PostAmbushFinished.ts

@@ -17,7 +17,7 @@ export class PostAmbushFinished extends CustomCallback<ModCallbackCustom.POST_AM
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostAmbushStarted.ts

@@ -17,7 +17,7 @@ export class PostAmbushStarted extends CustomCallback<ModCallbackCustom.POST_AMB
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostBombExploded.ts

@@ -10,7 +10,7 @@ export class PostBombExploded extends CustomCallback<ModCallbackCustom.POST_BOMB
 
     this.callbacksUsed = [
       // 58
-      [ModCallback.POST_BOMB_UPDATE, [this.postBombUpdate]],
+      [ModCallback.POST_BOMB_UPDATE, this.postBombUpdate],
     ];
   }
 

package/src/classes/callbacks/PostBombInitLate.ts

@@ -15,7 +15,7 @@ export class PostBombInitLate extends CustomCallback<ModCallbackCustom.POST_BOMB
 
     this.callbacksUsed = [
       // 58
-      [ModCallback.POST_BOMB_UPDATE, [this.postBombUpdate]],
+      [ModCallback.POST_BOMB_UPDATE, this.postBombUpdate],
     ];
   }
 

package/src/classes/callbacks/PostBoneSwing.ts

@@ -20,7 +20,7 @@ export class PostBoneSwing extends CustomCallback<ModCallbackCustom.POST_BONE_SW
 
     this.callbacksUsed = [
       // 52
-      [ModCallback.POST_KNIFE_RENDER, [this.postKnifeRender]],
+      [ModCallback.POST_KNIFE_RENDER, this.postKnifeRender],
     ];
   }
 

package/src/classes/callbacks/PostCollectibleEmpty.ts

@@ -26,7 +26,8 @@ export class PostCollectibleEmpty extends CustomCallback<T> {
       // 35
       [
         ModCallback.POST_PICKUP_UPDATE,
-        [this.postPickupUpdateCollectible, PickupVariant.COLLECTIBLE],
+        this.postPickupUpdateCollectible,
+        [PickupVariant.COLLECTIBLE],
       ],
     ];
   }

package/src/classes/callbacks/PostCollectibleInitFirst.ts

@@ -19,7 +19,8 @@ export class PostCollectibleInitFirst extends CustomCallback<ModCallbackCustom.P
       // 34
       [
         ModCallback.POST_PICKUP_INIT,
-        [this.postPickupInitCollectible, PickupVariant.COLLECTIBLE],
+        this.postPickupInitCollectible,
+        [PickupVariant.COLLECTIBLE],
       ],
     ];
   }

package/src/classes/callbacks/PostCursedTeleport.ts

@@ -1,7 +1,6 @@
 import {
   CollectibleType,
   DamageFlag,
-  EntityType,
   ModCallback,
   PlayerVariant,
   RoomType,
@@ -39,47 +38,82 @@ export class PostCursedTeleport extends CustomCallback<ModCallbackCustom.POST_CU
     super();
 
     this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
-
       // 32
       [
         ModCallback.POST_PLAYER_RENDER,
         // Co-op babies cannot perform Cursed Eye teleports.
-        [this.postPlayerRenderPlayer, PlayerVariant.PLAYER],
+        this.postPlayerRenderPlayer,
+        [PlayerVariant.PLAYER],
       ],
     ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
+    ];
   }
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallback.POST_PLAYER_RENDER (32)
+  // PlayerVariant.PLAYER (0)
+  private postPlayerRenderPlayer = (
+    player: EntityPlayer,
+    _renderOffset: Vector,
+  ): void => {
+    // Retrieve information about this player.
+    const trackingArray = mapGetPlayer(
+      this.v.run.playersDamageFrameMap,
+      player,
+    );
+    if (trackingArray === undefined) {
+      return;
+    }
+    const [lastDamageFrame, callbackActivatedOnThisFrame] = trackingArray;
+
+    if (!playerIsTeleportingFromCursedTeleport(player, lastDamageFrame)) {
+      return;
+    }
+
+    // Do nothing if the callback already fired on this frame.
+    if (callbackActivatedOnThisFrame) {
+      return;
+    }
+
+    const gameFrameCount = game.GetFrameCount();
+    const newTrackingArray = [gameFrameCount, true];
+    mapSetPlayer(this.v.run.playersDamageFrameMap, player, newTrackingArray);
+
+    this.fire(player);
+  };
+
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     _amount: float,
     damageFlags: BitFlags<DamageFlag>,
     _source: EntityRef,
     _countdownFrames: int,
   ): boolean | undefined => {
     this.incrementNumSacrifices(damageFlags); // Has to be before setting the damage frame.
-    this.setDamageFrame(entity, damageFlags);
+    this.setDamageFrame(player, damageFlags);
 
     return undefined;
   };
 
+  private incrementNumSacrifices(damageFlags: BitFlags<DamageFlag>): void {
+    const room = game.GetRoom();
+    const roomType = room.GetType();
+    const isSpikeDamage = hasFlag(damageFlags, DamageFlag.SPIKES);
+
+    if (roomType === RoomType.SACRIFICE && isSpikeDamage) {
+      this.v.level.numSacrifices++;
+    }
+  }
+
   private setDamageFrame(
-    entity: Entity,
+    player: EntityPlayer,
     damageFlags: BitFlags<DamageFlag>,
   ): void {
     const gameFrameCount = game.GetFrameCount();
 
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return;
-    }
-
     // Don't do anything if we already activated the callback on this frame.
     const trackingArray = mapGetPlayer(
       this.v.run.playersDamageFrameMap,
@@ -116,48 +150,6 @@ export class PostCursedTeleport extends CustomCallback<ModCallbackCustom.POST_CU
       (this.v.level.numSacrifices === 6 || this.v.level.numSacrifices >= 12)
     );
   }
-
-  private incrementNumSacrifices(damageFlags: BitFlags<DamageFlag>): void {
-    const room = game.GetRoom();
-    const roomType = room.GetType();
-    const isSpikeDamage = hasFlag(damageFlags, DamageFlag.SPIKES);
-
-    if (roomType === RoomType.SACRIFICE && isSpikeDamage) {
-      this.v.level.numSacrifices++;
-    }
-  }
-
-  // ModCallback.POST_PLAYER_RENDER (32)
-  // PlayerVariant.PLAYER (0)
-  private postPlayerRenderPlayer = (
-    player: EntityPlayer,
-    _renderOffset: Vector,
-  ): void => {
-    // Retrieve information about this player.
-    const trackingArray = mapGetPlayer(
-      this.v.run.playersDamageFrameMap,
-      player,
-    );
-    if (trackingArray === undefined) {
-      return;
-    }
-    const [lastDamageFrame, callbackActivatedOnThisFrame] = trackingArray;
-
-    if (!playerIsTeleportingFromCursedTeleport(player, lastDamageFrame)) {
-      return;
-    }
-
-    // Do nothing if the callback already fired on this frame.
-    if (callbackActivatedOnThisFrame) {
-      return;
-    }
-
-    const gameFrameCount = game.GetFrameCount();
-    const newTrackingArray = [gameFrameCount, true];
-    mapSetPlayer(this.v.run.playersDamageFrameMap, player, newTrackingArray);
-
-    this.fire(player);
-  };
 }
 
 function playerIsTeleportingFromCursedTeleport(

package/src/classes/callbacks/PostDiceRoomActivated.ts

@@ -28,7 +28,8 @@ export class PostDiceRoomActivated extends CustomCallback<T> {
       // 55
       [
         ModCallback.POST_EFFECT_UPDATE,
-        [this.postEffectUpdateDiceFloor, EffectVariant.DICE_FLOOR],
+        this.postEffectUpdateDiceFloor,
+        [EffectVariant.DICE_FLOOR],
       ],
     ];
   }

package/src/classes/callbacks/PostDoorRender.ts

@@ -10,7 +10,7 @@ export class PostDoorRender extends CustomCallback<ModCallbackCustom.POST_DOOR_R
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/callbacks/PostDoorUpdate.ts

@@ -10,7 +10,7 @@ export class PostDoorUpdate extends CustomCallback<ModCallbackCustom.POST_DOOR_U
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostEffectInitLate.ts

@@ -15,7 +15,7 @@ export class PostEffectInitLate extends CustomCallback<ModCallbackCustom.POST_EF
 
     this.callbacksUsed = [
       // 55
-      [ModCallback.POST_EFFECT_UPDATE, [this.postEffectUpdate]],
+      [ModCallback.POST_EFFECT_UPDATE, this.postEffectUpdate],
     ];
   }
 

package/src/classes/callbacks/PostEffectStateChanged.ts

@@ -16,7 +16,7 @@ export class PostEffectStateChanged extends CustomCallback<ModCallbackCustom.POS
 
     this.callbacksUsed = [
       // 55
-      [ModCallback.POST_EFFECT_UPDATE, [this.postEffectUpdate]],
+      [ModCallback.POST_EFFECT_UPDATE, this.postEffectUpdate],
     ];
   }
 

package/src/classes/callbacks/PostFamiliarInitLate.ts

@@ -15,7 +15,7 @@ export class PostFamiliarInitLate extends CustomCallback<ModCallbackCustom.POST_
 
     this.callbacksUsed = [
       // 6
-      [ModCallback.POST_FAMILIAR_UPDATE, [this.postFamiliarUpdate]],
+      [ModCallback.POST_FAMILIAR_UPDATE, this.postFamiliarUpdate],
     ];
   }
 

package/src/classes/callbacks/PostFamiliarStateChanged.ts

@@ -16,7 +16,7 @@ export class PostFamiliarStateChanged extends CustomCallback<ModCallbackCustom.P
 
     this.callbacksUsed = [
       // 6
-      [ModCallback.POST_FAMILIAR_UPDATE, [this.postFamiliarUpdate]],
+      [ModCallback.POST_FAMILIAR_UPDATE, this.postFamiliarUpdate],
     ];
   }
 

package/src/classes/callbacks/PostGreedModeWave.ts

@@ -16,7 +16,7 @@ export class PostGreedModeWave extends CustomCallback<ModCallbackCustom.POST_GRE
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
   }
 

package/src/classes/callbacks/PostHolyMantleRemoved.ts

@@ -22,7 +22,7 @@ export class PostHolyMantleRemoved extends CustomCallback<ModCallbackCustom.POST
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }