isaacscript-common 87.5.0 → 87.6.0

package/src/callbackClasses.ts

@@ -25,6 +25,7 @@ export { PostEffectRenderFilter } from "./classes/callbacks/PostEffectRenderFilt
 export { PostEffectStateChanged } from "./classes/callbacks/PostEffectStateChanged";
 export { PostEffectUpdateFilter } from "./classes/callbacks/PostEffectUpdateFilter";
 export { PostEntityKillFilter } from "./classes/callbacks/PostEntityKillFilter";
+export { PostEntityRemoveFilter } from "./classes/callbacks/PostEntityRemoveFilter";
 export { PostEsauJr } from "./classes/callbacks/PostEsauJr";
 export { PostFamiliarInitFilter } from "./classes/callbacks/PostFamiliarInitFilter";
 export { PostFamiliarInitLate } from "./classes/callbacks/PostFamiliarInitLate";
@@ -64,15 +65,15 @@ export { PostLaserInitFilter } from "./classes/callbacks/PostLaserInitFilter";
 export { PostLaserInitLate } from "./classes/callbacks/PostLaserInitLate";
 export { PostLaserRenderFilter } from "./classes/callbacks/PostLaserRenderFilter";
 export { PostLaserUpdateFilter } from "./classes/callbacks/PostLaserUpdateFilter";
+export { PostNewLevelReordered } from "./classes/callbacks/PostNewLevelReordered";
+export { PostNewRoomEarly } from "./classes/callbacks/PostNewRoomEarly";
+export { PostNewRoomReordered } from "./classes/callbacks/PostNewRoomReordered";
 export { PostNPCDeathFilter } from "./classes/callbacks/PostNPCDeathFilter";
 export { PostNPCInitFilter } from "./classes/callbacks/PostNPCInitFilter";
 export { PostNPCInitLate } from "./classes/callbacks/PostNPCInitLate";
 export { PostNPCRenderFilter } from "./classes/callbacks/PostNPCRenderFilter";
 export { PostNPCStateChanged } from "./classes/callbacks/PostNPCStateChanged";
 export { PostNPCUpdateFilter } from "./classes/callbacks/PostNPCUpdateFilter";
-export { PostNewLevelReordered } from "./classes/callbacks/PostNewLevelReordered";
-export { PostNewRoomEarly } from "./classes/callbacks/PostNewRoomEarly";
-export { PostNewRoomReordered } from "./classes/callbacks/PostNewRoomReordered";
 export { PostPEffectUpdateReordered } from "./classes/callbacks/PostPEffectUpdateReordered";
 export { PostPickupChanged } from "./classes/callbacks/PostPickupChanged";
 export { PostPickupCollect } from "./classes/callbacks/PostPickupCollect";
@@ -117,14 +118,14 @@ export { PostSlotRender } from "./classes/callbacks/PostSlotRender";
 export { PostSlotUpdate } from "./classes/callbacks/PostSlotUpdate";
 export { PostSpikesRender } from "./classes/callbacks/PostSpikesRender";
 export { PostSpikesUpdate } from "./classes/callbacks/PostSpikesUpdate";
-export { PostTNTRender } from "./classes/callbacks/PostTNTRender";
-export { PostTNTUpdate } from "./classes/callbacks/PostTNTUpdate";
 export { PostTearInitFilter } from "./classes/callbacks/PostTearInitFilter";
 export { PostTearInitLate } from "./classes/callbacks/PostTearInitLate";
 export { PostTearInitVeryLate } from "./classes/callbacks/PostTearInitVeryLate";
 export { PostTearKill } from "./classes/callbacks/PostTearKill";
 export { PostTearRenderFilter } from "./classes/callbacks/PostTearRenderFilter";
 export { PostTearUpdateFilter } from "./classes/callbacks/PostTearUpdateFilter";
+export { PostTNTRender } from "./classes/callbacks/PostTNTRender";
+export { PostTNTUpdate } from "./classes/callbacks/PostTNTUpdate";
 export { PostTransformation } from "./classes/callbacks/PostTransformation";
 export { PostTrinketBreak } from "./classes/callbacks/PostTrinketBreak";
 export { PostUsePillFilter } from "./classes/callbacks/PostUsePillFilter";
@@ -136,9 +137,9 @@ export { PreFamiliarCollisionFilter } from "./classes/callbacks/PreFamiliarColli
 export { PreGetPedestal } from "./classes/callbacks/PreGetPedestal";
 export { PreItemPickup } from "./classes/callbacks/PreItemPickup";
 export { PreKnifeCollisionFilter } from "./classes/callbacks/PreKnifeCollisionFilter";
+export { PreNewLevel } from "./classes/callbacks/PreNewLevel";
 export { PreNPCCollisionFilter } from "./classes/callbacks/PreNPCCollisionFilter";
 export { PreNPCUpdateFilter } from "./classes/callbacks/PreNPCUpdateFilter";
-export { PreNewLevel } from "./classes/callbacks/PreNewLevel";
 export { PreProjectileCollisionFilter } from "./classes/callbacks/PreProjectileCollisionFilter";
 export { PreRoomEntitySpawnFilter } from "./classes/callbacks/PreRoomEntitySpawnFilter";
 export { PreTearCollisionFilter } from "./classes/callbacks/PreTearCollisionFilter";

package/src/callbacks.ts

@@ -28,6 +28,7 @@ const MOD_CALLBACK_CUSTOM_TO_CLASS = {
   [ModCallbackCustom.POST_EFFECT_STATE_CHANGED]: cc.PostEffectStateChanged,
   [ModCallbackCustom.POST_EFFECT_UPDATE_FILTER]: cc.PostEffectUpdateFilter,
   [ModCallbackCustom.POST_ENTITY_KILL_FILTER]: cc.PostEntityKillFilter,
+  [ModCallbackCustom.POST_ENTITY_REMOVE_FILTER]: cc.PostEntityRemoveFilter,
   [ModCallbackCustom.POST_ESAU_JR]: cc.PostEsauJr,
   [ModCallbackCustom.POST_FAMILIAR_INIT_FILTER]: cc.PostFamiliarInitFilter,
   [ModCallbackCustom.POST_FAMILIAR_INIT_LATE]: cc.PostFamiliarInitLate,

package/src/classes/DefaultMap.ts

@@ -165,10 +165,13 @@ export class DefaultMap<Key, Value, Args extends unknown[] = []> extends Map<
   }
 }
 
-// eslint-disable-next-line isaacscript/complete-sentences-jsdoc
 /**
  * A function that creates the default value for your `DefaultMap`. For example, if it was a
- * `DefaultMap` containing maps, the factory function would be: `() => new Map()`
+ * `DefaultMap` containing maps, the factory function would be:
+ *
+ * ```ts
+ * () => new Map()
+ * ```
  */
 export type FactoryFunction<V, Args extends unknown[]> = (...args: Args) => V;
 

package/src/classes/ModFeature.ts

@@ -225,7 +225,7 @@ function initDecoratedCallbacks(
         modFeature,
         modFeatureConstructor,
         mod,
-        modCallback, // eslint-disable-line isaacscript/strict-enums
+        modCallback, // eslint-disable-line complete/strict-enums
         priority,
         callback,
         parameters,
@@ -235,7 +235,7 @@ function initDecoratedCallbacks(
       removeCallback(
         modFeatureConstructor,
         mod,
-        modCallback, // eslint-disable-line isaacscript/strict-enums
+        modCallback, // eslint-disable-line complete/strict-enums
         vanilla,
       );
     }
@@ -248,7 +248,7 @@ function addCallback(
   mod: ModUpgraded,
   modCallback: ModCallback | ModCallbackCustom,
   priority: CallbackPriority | int,
-  callback: Function, // eslint-disable-line @typescript-eslint/ban-types
+  callback: Function, // eslint-disable-line @typescript-eslint/no-unsafe-function-type
   parameters: readonly unknown[],
   vanilla: boolean,
 ) {

package/src/classes/ModUpgraded.ts

@@ -119,8 +119,8 @@ export class ModUpgraded implements Mod {
 
         const elapsedTime = getElapsedTimeSince(startTime);
         if (
-          this.timeThreshold === undefined ||
-          this.timeThreshold <= elapsedTime
+          this.timeThreshold === undefined
+          || this.timeThreshold <= elapsedTime
         ) {
           Isaac.DebugString(`${signature} - END - time: ${elapsedTime}`);
         } else {
@@ -197,7 +197,7 @@ export class ModUpgraded implements Mod {
   ): void {
     const callbackClass = this.callbacks[modCallbackCustom];
     // @ts-expect-error The compiler is not smart enough to figure out that the parameters match.
-    // eslint-disable-next-line isaacscript/require-variadic-function-argument
+    // eslint-disable-next-line complete/require-variadic-function-argument
     callbackClass.addSubscriber(priority, ...args);
     this.initFeature(callbackClass);
   }
@@ -295,9 +295,7 @@ export class ModUpgraded implements Mod {
     feature.initialized = true;
 
     if (feature.v !== undefined) {
-      if (feature.featuresUsed === undefined) {
-        feature.featuresUsed = [];
-      }
+      feature.featuresUsed ??= [];
       if (!feature.featuresUsed.includes(ISCFeature.SAVE_DATA_MANAGER)) {
         feature.featuresUsed.unshift(ISCFeature.SAVE_DATA_MANAGER);
       }

package/src/classes/callbacks/InputActionFilter.ts

@@ -24,9 +24,9 @@ export class InputActionFilter extends CustomCallback<T> {
     const [callbackInputHook, callbackButtonAction] = optionalArgs;
 
     return (
-      (callbackInputHook === undefined || callbackInputHook === inputHook) &&
-      (callbackButtonAction === undefined ||
-        callbackButtonAction === buttonAction)
+      (callbackInputHook === undefined || callbackInputHook === inputHook)
+      && (callbackButtonAction === undefined
+        || callbackButtonAction === buttonAction)
     );
   };
 

package/src/classes/callbacks/InputActionPlayer.ts

@@ -31,12 +31,12 @@ export class InputActionPlayer extends CustomCallback<T> {
     const character = player.GetPlayerType();
 
     return (
-      (callbackPlayerVariant === undefined ||
-        callbackPlayerVariant === player.Variant) &&
-      (callbackCharacter === undefined || callbackCharacter === character) &&
-      (callbackInputHook === undefined || callbackInputHook === inputHook) &&
-      (callbackButtonAction === undefined ||
-        callbackButtonAction === buttonAction)
+      (callbackPlayerVariant === undefined
+        || callbackPlayerVariant === player.Variant)
+      && (callbackCharacter === undefined || callbackCharacter === character)
+      && (callbackInputHook === undefined || callbackInputHook === inputHook)
+      && (callbackButtonAction === undefined
+        || callbackButtonAction === buttonAction)
     );
   };
 

package/src/classes/callbacks/PostBoneSwing.ts

@@ -47,8 +47,8 @@ export class PostBoneSwing extends CustomCallback<ModCallbackCustom.POST_BONE_SW
     v.room.boneClubAnimations.set(ptrHash, animation);
 
     if (
-      animationOnLastFrame !== undefined &&
-      animation !== animationOnLastFrame
+      animationOnLastFrame !== undefined
+      && animation !== animationOnLastFrame
     ) {
       this.boneClubAnimationChanged(knife, animation);
     }

package/src/classes/callbacks/PostCollectibleEmpty.ts

@@ -39,8 +39,8 @@ export class PostCollectibleEmpty extends CustomCallback<T> {
     const [callbackCollectibleType] = optionalArgs;
 
     return (
-      callbackCollectibleType === undefined ||
-      callbackCollectibleType === oldCollectibleType
+      callbackCollectibleType === undefined
+      || callbackCollectibleType === oldCollectibleType
     );
   };
 
@@ -53,9 +53,7 @@ export class PostCollectibleEmpty extends CustomCallback<T> {
 
     const ptrHash = GetPtrHash(collectible);
     let oldCollectibleType = v.room.collectibleTypeMap.get(ptrHash);
-    if (oldCollectibleType === undefined) {
-      oldCollectibleType = collectible.SubType;
-    }
+    oldCollectibleType ??= collectible.SubType;
     v.room.collectibleTypeMap.set(ptrHash, collectible.SubType);
 
     if (oldCollectibleType !== collectible.SubType) {

package/src/classes/callbacks/PostCursedTeleport.ts

@@ -107,9 +107,9 @@ export class PostCursedTeleport extends CustomCallback<ModCallbackCustom.POST_CU
     // Don't record the frame if we are potentially going to the Angel Room or the Dark Room from a
     // Sacrifice Room.
     return (
-      roomType === RoomType.SACRIFICE &&
-      isSpikeDamage &&
-      (v.level.numSacrifices === 6 || v.level.numSacrifices >= 12)
+      roomType === RoomType.SACRIFICE
+      && isSpikeDamage
+      && (v.level.numSacrifices === 6 || v.level.numSacrifices >= 12)
     );
   }
 
@@ -154,8 +154,8 @@ export class PostCursedTeleport extends CustomCallback<ModCallbackCustom.POST_CU
     // Check to see if this is the 1st frame that we are teleporting.
     const sprite = player.GetSprite();
     if (
-      !sprite.IsPlaying("TeleportUp") ||
-      sprite.GetFrame() !== 1 // The 0th frame never fires
+      !sprite.IsPlaying("TeleportUp")
+      || sprite.GetFrame() !== 1 // The 0th frame never fires
     ) {
       return false;
     }

package/src/classes/callbacks/PostDiceRoomActivated.ts

@@ -38,8 +38,8 @@ export class PostDiceRoomActivated extends CustomCallback<T> {
     const [callbackDiceFloorSubType] = optionalArgs;
 
     return (
-      callbackDiceFloorSubType === undefined ||
-      diceFloorSubType === callbackDiceFloorSubType
+      callbackDiceFloorSubType === undefined
+      || diceFloorSubType === callbackDiceFloorSubType
     );
   };
 

package/src/classes/callbacks/PostEntityRemoveFilter.ts

@@ -0,0 +1,22 @@
+import { ModCallback } from "isaac-typescript-definitions";
+import type { ModCallbackCustom } from "../../enums/ModCallbackCustom";
+import { shouldFireEntity } from "../../shouldFire";
+import { CustomCallback } from "../private/CustomCallback";
+
+export class PostEntityRemoveFilter extends CustomCallback<ModCallbackCustom.POST_ENTITY_REMOVE_FILTER> {
+  constructor() {
+    super();
+
+    this.callbacksUsed = [
+      // 67
+      [ModCallback.POST_ENTITY_REMOVE, this.postEntityRemove],
+    ];
+  }
+
+  protected override shouldFire = shouldFireEntity;
+
+  // ModCallback.POST_ENTITY_REMOVE (67)
+  private readonly postEntityRemove = (entity: Entity) => {
+    this.fire(entity);
+  };
+}

package/src/classes/callbacks/PostGridEntityCollision.ts

@@ -29,16 +29,16 @@ export class PostGridEntityCollision extends CustomCallback<T> {
     const gridEntityVariant = gridEntity.GetVariant();
 
     return (
-      (callbackGridEntityType === undefined ||
-        callbackGridEntityType === gridEntityType) &&
-      (callbackGridEntityVariant === undefined ||
-        callbackGridEntityVariant === gridEntityVariant) &&
-      (callbackEntityType === undefined ||
-        callbackEntityType === entity.Type) &&
-      (callbackEntityVariant === undefined ||
-        callbackEntityVariant === entity.Variant) &&
-      (callbackEntitySubType === undefined ||
-        callbackEntitySubType === entity.SubType)
+      (callbackGridEntityType === undefined
+        || callbackGridEntityType === gridEntityType)
+      && (callbackGridEntityVariant === undefined
+        || callbackGridEntityVariant === gridEntityVariant)
+      && (callbackEntityType === undefined
+        || callbackEntityType === entity.Type)
+      && (callbackEntityVariant === undefined
+        || callbackEntityVariant === entity.Variant)
+      && (callbackEntitySubType === undefined
+        || callbackEntitySubType === entity.SubType)
     );
   };
 }

package/src/classes/callbacks/PostGridEntityCustomCollision.ts

@@ -25,14 +25,14 @@ export class PostGridEntityCustomCollision extends CustomCallback<T> {
     ] = optionalArgs;
 
     return (
-      (callbackGridEntityTypeCustom === undefined ||
-        callbackGridEntityTypeCustom === gridEntityTypeCustom) &&
-      (callbackEntityType === undefined ||
-        callbackEntityType === entity.Type) &&
-      (callbackEntityVariant === undefined ||
-        callbackEntityVariant === entity.Variant) &&
-      (callbackEntitySubType === undefined ||
-        callbackEntitySubType === entity.SubType)
+      (callbackGridEntityTypeCustom === undefined
+        || callbackGridEntityTypeCustom === gridEntityTypeCustom)
+      && (callbackEntityType === undefined
+        || callbackEntityType === entity.Type)
+      && (callbackEntityVariant === undefined
+        || callbackEntityVariant === entity.Variant)
+      && (callbackEntitySubType === undefined
+        || callbackEntitySubType === entity.SubType)
     );
   };
 }

package/src/classes/callbacks/PostGridEntityCustomRemove.ts

@@ -20,8 +20,8 @@ export class PostGridEntityCustomRemove extends CustomCallback<T> {
     const [callbackGridEntityTypeCustom] = optionalArgs;
 
     return (
-      callbackGridEntityTypeCustom === undefined ||
-      callbackGridEntityTypeCustom === gridEntityTypeCustom
+      callbackGridEntityTypeCustom === undefined
+      || callbackGridEntityTypeCustom === gridEntityTypeCustom
     );
   };
 }

package/src/classes/callbacks/PostGridEntityRemove.ts

@@ -20,9 +20,9 @@ export class PostGridEntityRemove extends CustomCallback<T> {
     const [callbackGridEntityType, callbackVariant] = optionalArgs;
 
     return (
-      (callbackGridEntityType === undefined ||
-        callbackGridEntityType === gridEntityType) &&
-      (callbackVariant === undefined || callbackVariant === variant)
+      (callbackGridEntityType === undefined
+        || callbackGridEntityType === gridEntityType)
+      && (callbackVariant === undefined || callbackVariant === variant)
     );
   };
 }

package/src/classes/callbacks/PostItemDischarge.ts

@@ -72,8 +72,8 @@ export class PostItemDischarge extends CustomCallback<T> {
     const [callbackCollectibleType] = optionalArgs;
 
     return (
-      callbackCollectibleType === undefined ||
-      callbackCollectibleType === collectibleType
+      callbackCollectibleType === undefined
+      || callbackCollectibleType === collectibleType
     );
   };
 
@@ -83,6 +83,7 @@ export class PostItemDischarge extends CustomCallback<T> {
     npc: EntityNPC,
     collider: Entity,
   ): boolean | undefined => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
     if (npc.Variant === SuckerVariant.BULB) {
       return this.preNPCCollisionBulb(npc, collider);
     }
@@ -132,9 +133,7 @@ export class PostItemDischarge extends CustomCallback<T> {
     for (const activeSlot of ACTIVE_SLOT_VALUES) {
       const currentActiveItem = player.GetActiveItem();
       let previousActiveItem = activeItemMap.get(activeSlot);
-      if (previousActiveItem === undefined) {
-        previousActiveItem = currentActiveItem;
-      }
+      previousActiveItem ??= currentActiveItem;
       activeItemMap.set(activeSlot, currentActiveItem);
 
       if (currentActiveItem !== previousActiveItem) {
@@ -145,9 +144,7 @@ export class PostItemDischarge extends CustomCallback<T> {
 
       const currentCharge = getTotalCharge(player, activeSlot);
       let previousCharge = chargeMap.get(activeSlot);
-      if (previousCharge === undefined) {
-        previousCharge = currentCharge;
-      }
+      previousCharge ??= currentCharge;
       chargeMap.set(activeSlot, currentCharge);
 
       if (this.playerRecentlyCollidedWithBulb(player)) {

package/src/classes/callbacks/PostKeyboardChanged.ts

@@ -34,8 +34,8 @@ export class PostKeyboardChanged extends CustomCallback<T> {
     const [callbackKeyboard, callbackPressed] = optionalArgs;
 
     return (
-      (callbackKeyboard === undefined || callbackKeyboard === keyboard) &&
-      (callbackPressed === undefined || callbackPressed === pressed)
+      (callbackKeyboard === undefined || callbackKeyboard === keyboard)
+      && (callbackPressed === undefined || callbackPressed === pressed)
     );
   };
 

package/src/classes/callbacks/PostNPCStateChanged.ts

@@ -8,7 +8,7 @@ import { CustomCallback } from "../private/CustomCallback";
 const v = {
   run: {
     stateMap: new DefaultMap<PtrHash, NPCState, [NPCState]>(
-      (state) => state, // eslint-disable-line isaacscript/strict-enums
+      (state) => state, // eslint-disable-line complete/strict-enums
     ),
   },
 };

package/src/classes/callbacks/PostNewRoomEarly.ts

@@ -21,7 +21,7 @@ export class PostNewRoomEarly extends CustomCallback<ModCallbackCustom.POST_NEW_
 
     this.callbacksUsed = [
       // 19
-      // eslint-disable-next-line deprecation/deprecation
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
       [ModCallback.POST_NEW_ROOM, this.postNewRoom],
 
       // 24
@@ -95,8 +95,8 @@ export class PostNewRoomEarly extends CustomCallback<ModCallbackCustom.POST_NEW_
     this.currentRoomTopLeftWallPtrHash2 = GetPtrHash(topLeftWall2);
 
     return (
-      oldTopLeftWallPtrHash !== this.currentRoomTopLeftWallPtrHash ||
-      oldTopLeftWallPtrHash2 !== this.currentRoomTopLeftWallPtrHash2
+      oldTopLeftWallPtrHash !== this.currentRoomTopLeftWallPtrHash
+      || oldTopLeftWallPtrHash2 !== this.currentRoomTopLeftWallPtrHash2
     );
   }
 }

package/src/classes/callbacks/PostPickupSelectionFilter.ts

@@ -29,9 +29,10 @@ export class PostPickupSelectionFilter extends CustomCallback<T> {
     const [callbackPickupVariant, callbackPickupSubType] = optionalArgs;
 
     return (
-      (callbackPickupVariant === undefined ||
-        callbackPickupVariant === pickupVariant) &&
-      (callbackPickupSubType === undefined || callbackPickupSubType === subType)
+      (callbackPickupVariant === undefined
+        || callbackPickupVariant === pickupVariant)
+      && (callbackPickupSubType === undefined
+        || callbackPickupSubType === subType)
     );
   };
 

package/src/classes/callbacks/PostPlayerChangeHealth.ts

@@ -47,8 +47,8 @@ export class PostPlayerChangeHealth extends CustomCallback<ModCallbackCustom.POS
       playerHealthMap.set(healthType, currentHealthValue);
 
       if (
-        storedHealthValue !== undefined &&
-        storedHealthValue !== currentHealthValue
+        storedHealthValue !== undefined
+        && storedHealthValue !== currentHealthValue
       ) {
         const difference = currentHealthValue - storedHealthValue;
         this.fire(

package/src/classes/callbacks/PostPlayerChangeType.ts

@@ -15,7 +15,7 @@ const v = {
       PlayerIndex,
       PlayerType,
       [character: PlayerType]
-    >((character: PlayerType) => character), // eslint-disable-line isaacscript/strict-enums
+    >((character: PlayerType) => character), // eslint-disable-line complete/strict-enums
   },
 };
 

package/src/classes/callbacks/PostPurchase.ts

@@ -60,10 +60,10 @@ export class PostPurchase extends CustomCallback<T> {
     const [callbackPickupVariant, callbackPickupSubType] = optionalArgs;
 
     return (
-      (callbackPickupVariant === undefined ||
-        callbackPickupVariant === pickup.Variant) &&
-      (callbackPickupSubType === undefined ||
-        callbackPickupSubType === pickup.SubType)
+      (callbackPickupVariant === undefined
+        || callbackPickupVariant === pickup.Variant)
+      && (callbackPickupSubType === undefined
+        || callbackPickupSubType === pickup.SubType)
     );
   };
 
@@ -111,9 +111,9 @@ export class PostPurchase extends CustomCallback<T> {
     // Assume that if the player did not use an active item, card, or pill recently, then they
     // purchased an item.
     if (
-      !wasHoldingItemOnLastFrame &&
-      isHoldingItem &&
-      !this.playerUsedItemRecently(player)
+      !wasHoldingItemOnLastFrame
+      && isHoldingItem
+      && !this.playerUsedItemRecently(player)
     ) {
       this.playerPickedUpNewItem(player);
     }
@@ -126,8 +126,8 @@ export class PostPurchase extends CustomCallback<T> {
       player,
     );
     return (
-      gameFrameCount === usedCollectibleOnFrame ||
-      gameFrameCount === usedCollectibleOnFrame + 1
+      gameFrameCount === usedCollectibleOnFrame
+      || gameFrameCount === usedCollectibleOnFrame + 1
     );
   }
 

package/src/classes/callbacks/PostTransformation.ts

@@ -55,9 +55,7 @@ export class PostTransformation extends CustomCallback<T> {
     for (const playerForm of PLAYER_FORM_VALUES) {
       const hasForm = player.HasPlayerForm(playerForm);
       let storedForm = playerTransformationsMap.get(playerForm);
-      if (storedForm === undefined) {
-        storedForm = false;
-      }
+      storedForm ??= false;
 
       if (hasForm !== storedForm) {
         playerTransformationsMap.set(playerForm, hasForm);

package/src/classes/callbacks/PostTrinketBreak.ts

@@ -55,9 +55,7 @@ export class PostTrinketBreak extends CustomCallback<ModCallbackCustom.POST_TRIN
     for (const trinketType of TRINKETS_THAT_CAN_BREAK) {
       const numTrinketsHeld = player.GetTrinketMultiplier(trinketType);
       let oldNumTrinketsHeld = trinketMap.get(trinketType);
-      if (oldNumTrinketsHeld === undefined) {
-        oldNumTrinketsHeld = 0;
-      }
+      oldNumTrinketsHeld ??= 0;
 
       if (numTrinketsHeld >= oldNumTrinketsHeld) {
         continue;

package/src/classes/callbacks/PostUsePillFilter.ts

@@ -76,8 +76,8 @@ export class PostUsePillFilter extends CustomCallback<ModCallbackCustom.POST_USE
           (pocketItem) => pocketItem.slot === PocketItemSlot.SLOT_1,
         );
         if (
-          oldPocketItemSlot1 !== undefined &&
-          oldPocketItemSlot1.type === PocketItemType.PILL
+          oldPocketItemSlot1 !== undefined
+          && oldPocketItemSlot1.type === PocketItemType.PILL
         ) {
           return oldPocketItemSlot1.subType;
         }

package/src/classes/callbacks/PreBerserkDeath.ts

@@ -36,10 +36,10 @@ export class PreBerserkDeath extends CustomCallback<ModCallbackCustom.PRE_BERSER
 
     // If the Berserk effect will end on the next frame and we have no hearts left.
     if (
-      berserkEffect !== undefined &&
-      berserkEffect.Cooldown === 1 &&
-      numHitsRemaining === 0 &&
-      !willPlayerRevive(player)
+      berserkEffect !== undefined
+      && berserkEffect.Cooldown === 1
+      && numHitsRemaining === 0
+      && !willPlayerRevive(player)
     ) {
       this.fire(player);
     }

package/src/classes/callbacks/PreEntitySpawnFilter.ts

@@ -24,9 +24,9 @@ export class PreEntitySpawnFilter extends CustomCallback<T> {
     const [callbackEntityType, callbackVariant, callbackSubType] = optionalArgs;
 
     return (
-      (callbackEntityType === undefined || callbackEntityType === entityType) &&
-      (callbackVariant === undefined || callbackVariant === variant) &&
-      (callbackSubType === undefined || callbackSubType === subType)
+      (callbackEntityType === undefined || callbackEntityType === entityType)
+      && (callbackVariant === undefined || callbackVariant === variant)
+      && (callbackSubType === undefined || callbackSubType === subType)
     );
   };
 

package/src/classes/callbacks/PreRoomEntitySpawnFilter.ts

@@ -31,11 +31,11 @@ export class PreRoomEntitySpawnFilter extends CustomCallback<T> {
     ] = optionalArgs;
 
     return (
-      (callbackEntityTypeOrGridEntityXMLType === undefined ||
-        callbackEntityTypeOrGridEntityXMLType ===
-          entityTypeOrGridEntityXMLType) &&
-      (callbackVariant === undefined || callbackVariant === variant) &&
-      (callbackSubType === undefined || callbackSubType === subType)
+      (callbackEntityTypeOrGridEntityXMLType === undefined
+        || callbackEntityTypeOrGridEntityXMLType
+          === entityTypeOrGridEntityXMLType)
+      && (callbackVariant === undefined || callbackVariant === variant)
+      && (callbackSubType === undefined || callbackSubType === subType)
     );
   };
 

package/src/classes/features/callbackLogic/CustomGridEntities.ts

@@ -348,7 +348,7 @@ export class CustomGridEntities extends Feature {
    * @public
    */
   @Exported
-  public getCustomGridEntities(): Array<{
+  public getCustomGridEntities(): ReadonlyArray<{
     gridEntity: GridEntity;
     data: GridEntityCustomData;
   }> {

package/src/classes/features/callbackLogic/EsauJrDetection.ts

@@ -45,8 +45,8 @@ export class EsauJrDetection extends Feature {
 
     // Check to see if it is the frame after the player has used Esau Jr.
     if (
-      v.run.usedEsauJrFrame === null ||
-      gameFrameCount < v.run.usedEsauJrFrame + 1
+      v.run.usedEsauJrFrame === null
+      || gameFrameCount < v.run.usedEsauJrFrame + 1
     ) {
       return;
     }