isaacscript-common 18.3.0 → 18.3.2

package/src/classes/features/other/ExtraConsoleCommands.ts

@@ -2,12 +2,12 @@ import {
   CacheFlag,
   CollectibleType,
   DamageFlag,
-  EntityType,
   LevelCurse,
   ModCallback,
   TearVariant,
 } from "isaac-typescript-definitions";
 import { Exported } from "../../../decorators";
+import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { addFlag, bitFlags } from "../../../functions/flag";
 import { getMapPartialMatch } from "../../../functions/map";
 import {
@@ -30,46 +30,48 @@ export class ExtraConsoleCommands extends Feature {
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
 
       // 8
       [
         ModCallback.EVALUATE_CACHE,
-        [this.evaluateCacheDamage, CacheFlag.DAMAGE], // 1 << 0
+        this.evaluateCacheDamage,
+        [CacheFlag.DAMAGE], // 1 << 0
       ],
 
       // 8
       [
         ModCallback.EVALUATE_CACHE,
-        [this.evaluateCacheFireDelay, CacheFlag.FIRE_DELAY], // 1 << 1
+        this.evaluateCacheFireDelay,
+        [CacheFlag.FIRE_DELAY], // 1 << 1
       ],
 
       // 8
       [
         ModCallback.EVALUATE_CACHE,
-        [this.evaluateCacheSpeed, CacheFlag.SPEED], // 1 << 4
+        this.evaluateCacheSpeed,
+        [CacheFlag.SPEED], // 1 << 4
       ],
 
       // 8
       [
         ModCallback.EVALUATE_CACHE,
-        [this.evaluateCacheFlying, CacheFlag.FLYING], // 1 << 7
-      ],
-
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
+        this.evaluateCacheFlying,
+        [CacheFlag.FLYING], // 1 << 7
       ],
 
       // 12
-      [ModCallback.POST_CURSE_EVAL, [this.postCurseEval]],
+      [ModCallback.POST_CURSE_EVAL, this.postCurseEval],
 
       // 22
-      [ModCallback.EXECUTE_CMD, [this.executeCmd]],
+      [ModCallback.EXECUTE_CMD, this.executeCmd],
 
       // 61
-      [ModCallback.POST_FIRE_TEAR, [this.postFireTear]],
+      [ModCallback.POST_FIRE_TEAR, this.postFireTear],
+    ];
+
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
     ];
 
     for (const [funcName, func] of Object.entries(commands)) {
@@ -117,22 +119,6 @@ export class ExtraConsoleCommands extends Feature {
     }
   };
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
-  private entityTakeDmgPlayer = (
-    _entity: Entity,
-    _damageAmount: float,
-    _damageFlags: BitFlags<DamageFlag>,
-    _damageSource: EntityRef,
-    _damageCountdownFrames: int,
-  ) => {
-    if (this.v.persistent.spamBloodRights) {
-      return false;
-    }
-
-    return undefined;
-  };
-
   // ModCallback.POST_CURSE_EVAL (12)
   private postCurseEval = (
     curses: BitFlags<LevelCurse>,
@@ -206,6 +192,21 @@ export class ExtraConsoleCommands extends Feature {
     }
   };
 
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
+  private entityTakeDmgPlayer = (
+    _player: EntityPlayer,
+    _damageAmount: float,
+    _damageFlags: BitFlags<DamageFlag>,
+    _damageSource: EntityRef,
+    _damageCountdownFrames: int,
+  ) => {
+    if (this.v.persistent.spamBloodRights) {
+      return false;
+    }
+
+    return undefined;
+  };
+
   /**
    * Helper function to add a custom console command.
    *

package/src/classes/features/other/FadeInRemover.ts

@@ -14,7 +14,7 @@ export class FadeInRemover extends Feature {
 
     this.callbacksUsed = [
       // 15
-      [ModCallback.POST_GAME_STARTED, [this.postGameStarted]],
+      [ModCallback.POST_GAME_STARTED, this.postGameStarted],
     ];
   }
 

package/src/classes/features/other/FastReset.ts

@@ -20,7 +20,7 @@ export class FastReset extends Feature {
 
     this.callbacksUsed = [
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/features/other/ModdedElementDetection.ts

@@ -49,7 +49,7 @@ export class ModdedElementDetection extends Feature {
 
     this.callbacksUsed = [
       // 9
-      [ModCallback.POST_PLAYER_INIT, [this.postPlayerInit]],
+      [ModCallback.POST_PLAYER_INIT, this.postPlayerInit],
     ];
   }
 

package/src/classes/features/other/NoSirenSteal.ts

@@ -24,7 +24,8 @@ export class NoSirenSteal extends Feature {
       // 27
       [
         ModCallback.POST_NPC_INIT,
-        [this.postNPCInitSirenHelper, EntityType.SIREN_HELPER],
+        this.postNPCInitSirenHelper,
+        [EntityType.SIREN_HELPER],
       ],
     ];
   }

package/src/classes/features/other/Pause.ts

@@ -47,12 +47,13 @@ export class Pause extends Feature {
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
 
       // 13
       [
         ModCallback.INPUT_ACTION,
-        [this.inputActionGetActionValue, InputHook.GET_ACTION_VALUE],
+        this.inputActionGetActionValue,
+        [InputHook.GET_ACTION_VALUE],
       ],
     ];
 

package/src/classes/features/other/PersistentEntities.ts

@@ -56,11 +56,11 @@ export class PersistentEntities extends Feature {
 
     this.callbacksUsed = [
       // 67
-      [ModCallback.POST_ENTITY_REMOVE, [this.postEntityRemove]],
+      [ModCallback.POST_ENTITY_REMOVE, this.postEntityRemove],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
 
     this.roomHistory = roomHistory;

package/src/classes/features/other/PickupIndexCreation.ts

@@ -55,12 +55,13 @@ export class PickupIndexCreation extends Feature {
 
     this.callbacksUsed = [
       // 34
-      [ModCallback.POST_PICKUP_INIT, [this.postPickupInit]],
+      [ModCallback.POST_PICKUP_INIT, this.postPickupInit],
 
       // 67
       [
         ModCallback.POST_ENTITY_REMOVE,
-        [this.postEntityRemovePickup, EntityType.PICKUP],
+        this.postEntityRemovePickup,
+        [EntityType.PICKUP],
       ],
     ];
 

package/src/classes/features/other/PlayerInventory.ts

@@ -31,11 +31,11 @@ export class PlayerInventory extends Feature {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED,
-        [this.postCollectibleAdded],
+        this.postCollectibleAdded,
       ],
       [
         ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED,
-        [this.postCollectibleRemoved],
+        this.postCollectibleRemoved,
       ],
     ];
   }

package/src/classes/features/other/PonyDetection.ts

@@ -32,7 +32,7 @@ export class PonyDetection extends Feature {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/features/other/PressInput.ts

@@ -24,7 +24,8 @@ export class PressInput extends Feature {
       // 13
       [
         ModCallback.INPUT_ACTION,
-        [this.isActionTriggered, InputHook.IS_ACTION_TRIGGERED],
+        this.isActionTriggered,
+        [InputHook.IS_ACTION_TRIGGERED],
       ],
     ];
   }

package/src/classes/features/other/PreventChildEntities.ts

@@ -16,7 +16,7 @@ export class PreventChildEntities extends Feature {
 
     this.callbacksUsed = [
       // 27
-      [ModCallback.POST_NPC_INIT, [this.postNPCInit]],
+      [ModCallback.POST_NPC_INIT, this.postNPCInit],
     ];
   }
 

package/src/classes/features/other/PreventCollectibleRotation.ts

@@ -37,13 +37,15 @@ export class PreventCollectibleRotation extends Feature {
       // 5
       [
         ModCallback.POST_USE_CARD,
-        [this.useCardSoulOfIsaac, CardType.SOUL_ISAAC],
+        this.useCardSoulOfIsaac,
+        [CardType.SOUL_ISAAC],
       ],
 
       // 35
       [
         ModCallback.POST_PICKUP_UPDATE,
-        [this.postPickupUpdateCollectible, PickupVariant.COLLECTIBLE],
+        this.postPickupUpdateCollectible,
+        [PickupVariant.COLLECTIBLE],
       ],
     ];
   }

package/src/classes/features/other/PreventGridEntityRespawn.ts

@@ -49,12 +49,13 @@ export class PreventGridEntityRespawn extends Feature {
       // 23
       [
         ModCallback.PRE_USE_ITEM,
-        [this.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER],
+        this.preUseItemWeNeedToGoDeeper,
+        [CollectibleType.WE_NEED_TO_GO_DEEPER],
       ],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
 
     this.runInNFrames = runInNFrames;

package/src/classes/features/other/RoomClearFrame.ts

@@ -19,7 +19,7 @@ export class RoomClearFrame extends Feature {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_ROOM_CLEAR_CHANGED,
-        [this.postRoomClearChangedTrue],
+        this.postRoomClearChangedTrue,
       ],
     ];
   }

package/src/classes/features/other/RoomHistory.ts

@@ -28,7 +28,7 @@ export class RoomHistory extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_EARLY, [this.postNewRoomEarly]],
+      [ModCallbackCustom.POST_NEW_ROOM_EARLY, this.postNewRoomEarly],
     ];
   }
 

package/src/classes/features/other/RunInNFrames.ts

@@ -40,10 +40,10 @@ export class RunInNFrames extends Feature {
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
 
       // 2
-      [ModCallback.POST_RENDER, [this.postRender]],
+      [ModCallback.POST_RENDER, this.postRender],
     ];
   }
 

package/src/classes/features/other/RunNextRoom.ts

@@ -21,7 +21,7 @@ export class RunNextRoom extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
   }
 

package/src/classes/features/other/SaveDataManager.ts

@@ -90,21 +90,22 @@ export class SaveDataManager extends Feature {
       // 3
       [
         ModCallback.POST_USE_ITEM,
-        [this.postUseItemGlowingHourGlass, CollectibleType.GLOWING_HOUR_GLASS],
+        this.postUseItemGlowingHourGlass,
+        [CollectibleType.GLOWING_HOUR_GLASS],
       ],
 
       // 9
-      [ModCallback.POST_PLAYER_INIT, [this.postPlayerInit]],
+      [ModCallback.POST_PLAYER_INIT, this.postPlayerInit],
 
       // 17
-      [ModCallback.PRE_GAME_EXIT, [this.preGameExit]],
+      [ModCallback.PRE_GAME_EXIT, this.preGameExit],
 
       // 18
-      [ModCallback.POST_NEW_LEVEL, [this.postNewLevel]],
+      [ModCallback.POST_NEW_LEVEL, this.postNewLevel],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_EARLY, [this.postNewRoomEarly]],
+      [ModCallbackCustom.POST_NEW_ROOM_EARLY, this.postNewRoomEarly],
     ];
 
     this.mod = mod;

package/src/classes/features/other/StageHistory.ts

@@ -27,10 +27,7 @@ export class StageHistory extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [
-        ModCallbackCustom.POST_NEW_LEVEL_REORDERED,
-        [this.postNewLevelReordered],
-      ],
+      [ModCallbackCustom.POST_NEW_LEVEL_REORDERED, this.postNewLevelReordered],
     ];
   }
 

package/src/classes/features/other/TaintedLazarusPlayers.ts

@@ -40,7 +40,7 @@ export class TaintedLazarusPlayers extends Feature {
 
     this.callbacksUsed = [
       // 9
-      [ModCallback.POST_PLAYER_INIT, [this.postPlayerInit]],
+      [ModCallback.POST_PLAYER_INIT, this.postPlayerInit],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayBomb.ts

@@ -11,7 +11,7 @@ export class DebugDisplayBomb extends Feature {
 
     this.callbacksUsed = [
       // 59
-      [ModCallback.POST_BOMB_RENDER, [this.postBombRender]],
+      [ModCallback.POST_BOMB_RENDER, this.postBombRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayDoor.ts

@@ -10,7 +10,7 @@ export class DebugDisplayDoor extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_DOOR_RENDER, [this.postDoorRender]],
+      [ModCallbackCustom.POST_DOOR_RENDER, this.postDoorRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayEffect.ts

@@ -11,7 +11,7 @@ export class DebugDisplayEffect extends Feature {
 
     this.callbacksUsed = [
       // 56
-      [ModCallback.POST_EFFECT_RENDER, [this.postEffectRender]],
+      [ModCallback.POST_EFFECT_RENDER, this.postEffectRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayFamiliar.ts

@@ -11,7 +11,7 @@ export class DebugDisplayFamiliar extends Feature {
 
     this.callbacksUsed = [
       // 25
-      [ModCallback.POST_FAMILIAR_RENDER, [this.postFamiliarRender]],
+      [ModCallback.POST_FAMILIAR_RENDER, this.postFamiliarRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayKnife.ts

@@ -11,7 +11,7 @@ export class DebugDisplayKnife extends Feature {
 
     this.callbacksUsed = [
       // 52
-      [ModCallback.POST_KNIFE_RENDER, [this.postKnifeRender]],
+      [ModCallback.POST_KNIFE_RENDER, this.postKnifeRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayLaser.ts

@@ -11,7 +11,7 @@ export class DebugDisplayLaser extends Feature {
 
     this.callbacksUsed = [
       // 49
-      [ModCallback.POST_LASER_RENDER, [this.postLaserRender]],
+      [ModCallback.POST_LASER_RENDER, this.postLaserRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayNPC.ts

@@ -11,7 +11,7 @@ export class DebugDisplayNPC extends Feature {
 
     this.callbacksUsed = [
       // 28
-      [ModCallback.POST_NPC_RENDER, [this.postNPCRender]],
+      [ModCallback.POST_NPC_RENDER, this.postNPCRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayPickup.ts

@@ -11,7 +11,7 @@ export class DebugDisplayPickup extends Feature {
 
     this.callbacksUsed = [
       // 36
-      [ModCallback.POST_PICKUP_RENDER, [this.postPickupRender]],
+      [ModCallback.POST_PICKUP_RENDER, this.postPickupRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayPit.ts

@@ -10,7 +10,7 @@ export class DebugDisplayPit extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_PIT_RENDER, [this.postPitRender]],
+      [ModCallbackCustom.POST_PIT_RENDER, this.postPitRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayPlayer.ts

@@ -11,7 +11,7 @@ export class DebugDisplayPlayer extends Feature {
 
     this.callbacksUsed = [
       // 32
-      [ModCallback.POST_PLAYER_RENDER, [this.postPlayerRender]],
+      [ModCallback.POST_PLAYER_RENDER, this.postPlayerRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayPoop.ts

@@ -10,7 +10,7 @@ export class DebugDisplayPoop extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_POOP_RENDER, [this.postPoopRender]],
+      [ModCallbackCustom.POST_POOP_RENDER, this.postPoopRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayPressurePlate.ts

@@ -12,7 +12,7 @@ export class DebugDisplayPressurePlate extends Feature {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PRESSURE_PLATE_RENDER,
-        [this.postPressurePlateRender],
+        this.postPressurePlateRender,
       ],
     ];
   }

package/src/classes/features/other/debugDisplay/DebugDisplayProjectile.ts

@@ -11,7 +11,7 @@ export class DebugDisplayProjectile extends Feature {
 
     this.callbacksUsed = [
       // 45
-      [ModCallback.POST_PROJECTILE_RENDER, [this.postProjectileRender]],
+      [ModCallback.POST_PROJECTILE_RENDER, this.postProjectileRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayRock.ts

@@ -10,7 +10,7 @@ export class DebugDisplayRock extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_ROCK_RENDER, [this.postRockRender]],
+      [ModCallbackCustom.POST_ROCK_RENDER, this.postRockRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplaySlot.ts

@@ -10,7 +10,7 @@ export class DebugDisplaySlot extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_SLOT_RENDER, [this.postSlotRender]],
+      [ModCallbackCustom.POST_SLOT_RENDER, this.postSlotRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplaySpikes.ts

@@ -10,7 +10,7 @@ export class DebugDisplaySpikes extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_SPIKES_RENDER, [this.postSpikesRender]],
+      [ModCallbackCustom.POST_SPIKES_RENDER, this.postSpikesRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayTNT.ts

@@ -10,7 +10,7 @@ export class DebugDisplayTNT extends Feature {
     super();
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_TNT_RENDER, [this.postTNTRender]],
+      [ModCallbackCustom.POST_TNT_RENDER, this.postTNTRender],
     ];
   }
 

package/src/classes/features/other/debugDisplay/DebugDisplayTear.ts

@@ -11,7 +11,7 @@ export class DebugDisplayTear extends Feature {
 
     this.callbacksUsed = [
       // 41
-      [ModCallback.POST_TEAR_RENDER, [this.postTearRender]],
+      [ModCallback.POST_TEAR_RENDER, this.postTearRender],
     ];
   }
 

package/src/classes/private/CustomCallback.ts

@@ -1,6 +1,7 @@
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { AddCallbackParametersCustom } from "../../interfaces/private/AddCallbackParametersCustom";
-import { AllButFirst } from "../../types/private/AllButFirst";
+import { AllButFirst } from "../../types/AllButFirst";
+import { AnyFunction } from "../../types/AnyFunction";
 import { Feature } from "./Feature";
 
 export type FireArgs<T extends ModCallbackCustom> = Parameters<
@@ -10,6 +11,11 @@ export type OptionalArgs<T extends ModCallbackCustom> = AllButFirst<
   AddCallbackParametersCustom[T]
 >;
 
+type Subscription<T extends ModCallbackCustom> = [
+  callbackFunc: AddCallbackParametersCustom[T][0],
+  optionalArgs: AllButFirst<AddCallbackParametersCustom[T]>,
+];
+
 /**
  * The base class for a custom callback. Individual custom callbacks (and validation callbacks) will
  * extend from this class.
@@ -17,10 +23,14 @@ export type OptionalArgs<T extends ModCallbackCustom> = AllButFirst<
 export abstract class CustomCallback<
   T extends ModCallbackCustom,
 > extends Feature {
-  private subscriptions: Array<AddCallbackParametersCustom[T]> = [];
+  private subscriptions: Array<Subscription<T>> = [];
 
-  public addSubscriber(...args: AddCallbackParametersCustom[T]): void {
-    this.subscriptions.push(args);
+  public addSubscriber(
+    callbackFunc: AddCallbackParametersCustom[T][0],
+    ...optionalArgs: AllButFirst<AddCallbackParametersCustom[T]>
+  ): void {
+    const subscription: Subscription<T> = [callbackFunc, optionalArgs];
+    this.subscriptions.push(subscription);
   }
 
   /**
@@ -42,20 +52,14 @@ export abstract class CustomCallback<
   public fire = (
     ...fireArgs: FireArgs<T>
   ): ReturnType<AddCallbackParametersCustom[T][0]> => {
-    for (const [callback, ...optionalArgsArray] of this.subscriptions) {
-      // The TypeScript compiler is bugged with the spread operator here, as it converts the
-      // optional arguments to an array instead of a tuple.
-      const optionalArgs = optionalArgsArray as OptionalArgs<T>;
+    for (const subscription of this.subscriptions) {
+      const [callbackFunc, optionalArgs] = subscription;
 
       if (this.shouldFire(fireArgs, optionalArgs)) {
-        // The TypeScript compiler is not smart enough to know that the fire args match the callback
-        // signature.
-        const callbackCasted = callback as (
-          ...args: FireArgs<T>
-        ) => ReturnType<AddCallbackParametersCustom[T][0]>;
-        const value = callbackCasted(...fireArgs);
+        // TypeScript is not smart enough to know that the arguments match the function.
+        const value = (callbackFunc as AnyFunction)(...fireArgs);
         if (value !== undefined) {
-          return value;
+          return value as ReturnType<AddCallbackParametersCustom[T][0]>;
         }
       }
     }