isaacscript-common 18.2.1 → 18.3.1

package/src/classes/callbacks/PostRockUpdate.ts

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

package/src/classes/callbacks/PostRoomClearChanged.ts

@@ -21,11 +21,11 @@ export class PostRoomClearChanged extends CustomCallback<T> {
 
     this.callbacksUsed = [
       // 1
-      [ModCallback.POST_UPDATE, [this.postUpdate]],
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
   }
 

package/src/classes/callbacks/PostSacrifice.ts

@@ -1,9 +1,4 @@
-import {
-  DamageFlag,
-  EntityType,
-  ModCallback,
-  RoomType,
-} from "isaac-typescript-definitions";
+import { DamageFlag, RoomType } from "isaac-typescript-definitions";
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { hasFlag } from "../../functions/flag";
@@ -20,31 +15,21 @@ export class PostSacrifice extends CustomCallback<ModCallbackCustom.POST_SACRIFI
   constructor() {
     super();
 
-    this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
     ];
   }
 
   protected override shouldFire = shouldFirePlayer;
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallbackCustom.ENTITY_TAKE_DMG
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     _amount: float,
     damageFlags: BitFlags<DamageFlag>,
     _source: EntityRef,
     _countdownFrames: int,
   ): boolean | undefined => {
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
     const room = game.GetRoom();
     const roomType = room.GetType();
     const isSpikeDamage = hasFlag(damageFlags, DamageFlag.SPIKES);

package/src/classes/callbacks/PostSlotCollision.ts

@@ -10,7 +10,7 @@ export class PostSlotCollision extends CustomCallback<ModCallbackCustom.POST_SLO
 
     this.callbacksUsed = [
       // 33
-      [ModCallback.PRE_PLAYER_COLLISION, [this.prePlayerCollision]],
+      [ModCallback.PRE_PLAYER_COLLISION, this.prePlayerCollision],
     ];
   }
 

package/src/classes/callbacks/PostSlotDestroyed.ts

@@ -26,14 +26,15 @@ export class PostSlotDestroyed extends CustomCallback<ModCallbackCustom.POST_SLO
       // 67
       [
         ModCallback.POST_ENTITY_REMOVE,
-        [this.postEntityRemoveSlot, EntityType.SLOT],
+        this.postEntityRemoveSlot,
+        [EntityType.SLOT],
       ],
     ];
 
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED,
-        [this.postSlotAnimationChanged],
+        this.postSlotAnimationChanged,
       ],
     ];
   }

package/src/classes/callbacks/PostSpikesRender.ts

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

package/src/classes/callbacks/PostSpikesUpdate.ts

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

package/src/classes/callbacks/PostTNTRender.ts

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

package/src/classes/callbacks/PostTNTUpdate.ts

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

package/src/classes/callbacks/PostTearInitLate.ts

@@ -15,7 +15,7 @@ export class PostTearInitLate extends CustomCallback<ModCallbackCustom.POST_TEAR
 
     this.callbacksUsed = [
       // 40
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
+      [ModCallback.POST_TEAR_UPDATE, this.postTearUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTearInitVeryLate.ts

@@ -15,7 +15,7 @@ export class PostTearInitVeryLate extends CustomCallback<ModCallbackCustom.POST_
 
     this.callbacksUsed = [
       // 40
-      [ModCallback.POST_TEAR_UPDATE, [this.postTearUpdate]],
+      [ModCallback.POST_TEAR_UPDATE, this.postTearUpdate],
     ];
   }
 

package/src/classes/callbacks/PostTransformation.ts

@@ -29,7 +29,7 @@ export class PostTransformation extends CustomCallback<T> {
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PostTrinketBreak.ts

@@ -1,7 +1,6 @@
 import {
   DamageFlag,
   EntityType,
-  ModCallback,
   PickupVariant,
   TrinketType,
 } from "isaac-typescript-definitions";
@@ -30,38 +29,25 @@ export class PostTrinketBreak extends CustomCallback<ModCallbackCustom.POST_TRIN
   constructor() {
     super();
 
-    this.callbacksUsed = [
-      // 11
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ],
-    ];
-
     this.customCallbacksUsed = [
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }
 
   protected override shouldFire = shouldFireTrinketType;
 
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
   private entityTakeDmgPlayer = (
-    entity: Entity,
+    player: EntityPlayer,
     _amount: float,
     _damageFlags: BitFlags<DamageFlag>,
     _source: EntityRef,
     _countdownFrames: int,
   ): boolean | undefined => {
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
     const trinketMap = defaultMapGetPlayer(
       this.v.run.playersTrinketMap,
       player,

package/src/classes/callbacks/PreBerserkDeath.ts

@@ -13,7 +13,7 @@ export class PreBerserkDeath extends CustomCallback<ModCallbackCustom.PRE_BERSER
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
+        this.postPEffectUpdateReordered,
       ],
     ];
   }

package/src/classes/callbacks/PreGetPedestal.ts

@@ -15,7 +15,8 @@ export class PreGetPedestal extends CustomCallback<ModCallbackCustom.PRE_GET_PED
       // 38
       [
         ModCallback.PRE_PICKUP_COLLISION,
-        [this.prePickupCollision, PickupVariant.COLLECTIBLE],
+        this.prePickupCollision,
+        [PickupVariant.COLLECTIBLE],
       ],
     ];
   }

package/src/classes/callbacks/PreNPCCollisionFilter.ts

@@ -9,7 +9,7 @@ export class PreNPCCollisionFilter extends CustomCallback<ModCallbackCustom.PRE_
 
     this.callbacksUsed = [
       // 30
-      [ModCallback.PRE_NPC_COLLISION, [this.preNPCCollision]],
+      [ModCallback.PRE_NPC_COLLISION, this.preNPCCollision],
     ];
   }
 

package/src/classes/callbacks/PreNPCUpdateFilter.ts

@@ -9,7 +9,7 @@ export class PreNPCUpdateFilter extends CustomCallback<ModCallbackCustom.PRE_NPC
 
     this.callbacksUsed = [
       // 69
-      [ModCallback.PRE_NPC_UPDATE, [this.preNPCUpdate]],
+      [ModCallback.PRE_NPC_UPDATE, this.preNPCUpdate],
     ];
   }
 

package/src/classes/callbacks/PreNewLevel.ts

@@ -21,7 +21,7 @@ export class PreNewLevel extends CustomCallback<ModCallbackCustom.PRE_NEW_LEVEL>
 
     this.callbacksUsed = [
       // 32
-      [ModCallback.POST_PLAYER_RENDER, [this.postPlayerRender]],
+      [ModCallback.POST_PLAYER_RENDER, this.postPlayerRender],
     ];
   }
 

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

@@ -48,14 +48,16 @@ export class CustomGridEntities extends Feature {
     this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
 
     this.callbacksUsed = [
+      // 23
       [
         ModCallback.PRE_USE_ITEM,
-        [this.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER],
-      ], // 23
+        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/callbackLogic/CustomRevive.ts

@@ -60,17 +60,18 @@ export class CustomRevive extends Feature {
     this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
-      [ModCallback.POST_PEFFECT_UPDATE, [this.postPEffectUpdate]], // 4
+      // 2
+      [ModCallback.POST_RENDER, this.postRender],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
       [
-        ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE,
-        [this.postPlayerFatalDamage],
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectUpdateReordered,
       ],
-      [ModCallbackCustom.PRE_BERSERK_DEATH, [this.preBerserkDeath]],
+      [ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, this.postPlayerFatalDamage],
+      [ModCallbackCustom.PRE_BERSERK_DEATH, this.preBerserkDeath],
     ];
 
     this.preCustomRevive = preCustomRevive;
@@ -89,8 +90,18 @@ export class CustomRevive extends Feature {
     sfxManager.Stop(SoundEffect.ONE_UP);
   };
 
-  // ModCallback.POST_PEFFECT_UPDATE (4)
-  private postPEffectUpdate = (player: EntityPlayer): void => {
+  // ModCallbackCustom.POST_NEW_ROOM_REORDERED
+  private postNewRoomReordered = (): void => {
+    if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
+      return;
+    }
+
+    this.v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION;
+    this.logStateChanged();
+  };
+
+  // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
+  private postPEffectUpdateReordered = (player: EntityPlayer): void => {
     this.checkWaitingForItemAnimation(player);
   };
 
@@ -138,16 +149,6 @@ export class CustomRevive extends Feature {
     this.logStateChanged();
   }
 
-  // ModCallbackCustom.POST_NEW_ROOM_REORDERED
-  private postNewRoomReordered = (): void => {
-    if (this.v.run.state !== CustomReviveState.WAITING_FOR_ROOM_TRANSITION) {
-      return;
-    }
-
-    this.v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION;
-    this.logStateChanged();
-  };
-
   // ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE
   private postPlayerFatalDamage = (
     player: EntityPlayer,

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

@@ -26,10 +26,14 @@ export class EsauJrDetection extends Feature {
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, this.postUpdate],
+
+      // 3
       [
         ModCallback.POST_USE_ITEM,
-        [this.useItemEsauJr, CollectibleType.ESAU_JR],
+        this.useItemEsauJr,
+        [CollectibleType.ESAU_JR],
       ],
     ];
 

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

@@ -24,7 +24,8 @@ export class FlipDetection extends Feature {
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_USE_ITEM, [this.useItemFlip, CollectibleType.FLIP]], // 3
+      // 3
+      [ModCallback.POST_USE_ITEM, this.useItemFlip, [CollectibleType.FLIP]],
     ];
 
     this.postFlip = postFlip;

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

@@ -49,13 +49,21 @@ export class GameReorderedCallbacks extends Feature {
     super();
 
     this.callbacksUsed = [
+      // 3
       [
         ModCallback.POST_USE_ITEM,
-        [this.useItemGlowingHourGlass, CollectibleType.GLOWING_HOUR_GLASS],
-      ], // 3
-      [ModCallback.POST_GAME_STARTED, [this.postGameStarted]], // 15
-      [ModCallback.POST_NEW_LEVEL, [this.postNewLevel]], // 18
-      [ModCallback.POST_NEW_ROOM, [this.postNewRoom]], // 19
+        this.useItemGlowingHourGlass,
+        [CollectibleType.GLOWING_HOUR_GLASS],
+      ],
+
+      // 15
+      [ModCallback.POST_GAME_STARTED, this.postGameStarted],
+
+      // 18
+      [ModCallback.POST_NEW_LEVEL, this.postNewLevel],
+
+      // 19
+      [ModCallback.POST_NEW_ROOM, this.postNewRoom],
     ];
 
     this.postGameStartedReordered = postGameStartedReordered;

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

@@ -31,7 +31,8 @@ export class GridEntityCollisionDetection extends Feature {
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
 
     this.postGridEntityCollision = postGridEntityCollision;

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

@@ -18,7 +18,8 @@ export class GridEntityRenderDetection extends Feature {
     super();
 
     this.callbacksUsed = [
-      [ModCallback.POST_RENDER, [this.postRender]], // 2
+      // 2
+      [ModCallback.POST_RENDER, this.postRender],
     ];
 
     this.postGridEntityRender = postGridEntityRender;

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

@@ -62,11 +62,12 @@ export class GridEntityUpdateDetection extends Feature {
     this.featuresUsed = [ISCFeature.RUN_IN_N_FRAMES];
 
     this.callbacksUsed = [
-      [ModCallback.POST_UPDATE, [this.postUpdate]], // 1
+      // 1
+      [ModCallback.POST_UPDATE, this.postUpdate],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, [this.postNewRoomReordered]],
+      [ModCallbackCustom.POST_NEW_ROOM_REORDERED, this.postNewRoomReordered],
     ];
 
     this.postGridEntityInit = postGridEntityInit;

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

@@ -1,9 +1,9 @@
 import {
   CollectibleType,
   ItemType,
-  ModCallback,
   TrinketType,
 } from "isaac-typescript-definitions";
+import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { defaultMapGetPlayer } from "../../../functions/playerDataStructures";
 import { asNumber } from "../../../functions/types";
 import {
@@ -32,16 +32,19 @@ export class ItemPickupDetection extends Feature {
   constructor(postItemPickup: PostItemPickup, preItemPickup: PreItemPickup) {
     super();
 
-    this.callbacksUsed = [
-      [ModCallback.POST_PEFFECT_UPDATE, [this.postPEffectUpdate]], // 4
+    this.customCallbacksUsed = [
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectUpdateReordered,
+      ],
     ];
 
     this.postItemPickup = postItemPickup;
     this.preItemPickup = preItemPickup;
   }
 
-  // ModCallback.POST_PEFFECT_UPDATE (4)
-  private postPEffectUpdate = (player: EntityPlayer) => {
+  // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
+  private postPEffectUpdateReordered = (player: EntityPlayer) => {
     const pickingUpItem = defaultMapGetPlayer(
       this.v.run.playersPickingUpItemMap,
       player,

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

@@ -2,7 +2,6 @@ import {
   ActiveSlot,
   CollectibleType,
   DamageFlag,
-  EntityType,
   ItemType,
   ModCallback,
   PlayerType,
@@ -61,16 +60,17 @@ export class PlayerCollectibleDetection extends Feature {
     ];
 
     this.callbacksUsed = [
-      [ModCallback.POST_USE_ITEM, [this.useItemD4, CollectibleType.D4]], // 3
-      [ModCallback.POST_PEFFECT_UPDATE, [this.postPEffectUpdate]], // 4
-      [
-        ModCallback.ENTITY_TAKE_DMG,
-        [this.entityTakeDmgPlayer, EntityType.PLAYER],
-      ], // 11
+      // 3
+      [ModCallback.POST_USE_ITEM, this.useItemD4, [CollectibleType.D4]],
     ];
 
     this.customCallbacksUsed = [
-      [ModCallbackCustom.POST_ITEM_PICKUP, [this.postItemPickup]],
+      [ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, this.entityTakeDmgPlayer],
+      [ModCallbackCustom.POST_ITEM_PICKUP, this.postItemPickup],
+      [
+        ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
+        this.postPEffectUpdateReordered,
+      ],
     ];
 
     this.postPlayerCollectibleAdded = postPlayerCollectibleAdded;
@@ -156,8 +156,65 @@ export class PlayerCollectibleDetection extends Feature {
     return undefined;
   };
 
-  // ModCallback.POST_PEFFECT_UPDATE (4)
-  private postPEffectUpdate = (player: EntityPlayer) => {
+  /** We need to handle the case of Tainted Eden taking damage. */
+  // ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER
+  private entityTakeDmgPlayer = (
+    player: EntityPlayer,
+    _amount: float,
+    damageFlags: BitFlags<DamageFlag>,
+    _source: EntityRef,
+    _countdownFrames: int,
+  ): boolean | undefined => {
+    // Tainted Eden's mechanic does not apply if she e.g. uses Dull Razor.
+    if (hasFlag(damageFlags, DamageFlag.FAKE)) {
+      return undefined;
+    }
+
+    const character = player.GetPlayerType();
+    if (character !== PlayerType.EDEN_B) {
+      return undefined;
+    }
+
+    // The items will only be rerolled after the damage is successfully applied.
+    const entityPtr = EntityPtr(player);
+    this.runInNFrames.runNextGameFrame(() => {
+      const futurePlayer = getPlayerFromPtr(entityPtr);
+      if (futurePlayer !== undefined) {
+        this.updateCollectibleMapAndFire(player, undefined);
+      }
+    });
+
+    return undefined;
+  };
+
+  /**
+   * We need to handle TMTRAINER collectibles, since they do not cause the player's collectible
+   * count to change.
+   */
+  // ModCallbackCustom.POST_ITEM_PICKUP
+  private postItemPickup = (
+    player: EntityPlayer,
+    pickingUpItem: PickingUpItem,
+  ) => {
+    if (
+      pickingUpItem.itemType === ItemType.TRINKET ||
+      pickingUpItem.itemType === ItemType.NULL
+    ) {
+      return;
+    }
+
+    const newCollectibleCount = player.GetCollectibleCount();
+    mapSetPlayer(
+      this.v.run.playersCollectibleCount,
+      player,
+      newCollectibleCount,
+    );
+
+    this.updateCollectibleMapAndFire(player, 1);
+  };
+
+  // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
+  private postPEffectUpdateReordered = (player: EntityPlayer) => {
     const oldCollectibleCount = defaultMapGetPlayer(
       this.v.run.playersCollectibleCount,
       player,
@@ -220,65 +277,4 @@ export class PlayerCollectibleDetection extends Feature {
       this.updateCollectibleMapAndFire(player, undefined);
     }
   }
-
-  // ModCallback.ENTITY_TAKE_DMG (11)
-  // EntityType.PLAYER (1)
-  // We need to handle the case of Tainted Eden taking damage.
-  private entityTakeDmgPlayer = (
-    entity: Entity,
-    _amount: float,
-    damageFlags: BitFlags<DamageFlag>,
-    _source: EntityRef,
-    _countdownFrames: int,
-  ): boolean | undefined => {
-    // Tainted Eden's mechanic does not apply if she e.g. uses Dull Razor.
-    if (hasFlag(damageFlags, DamageFlag.FAKE)) {
-      return undefined;
-    }
-
-    const player = entity.ToPlayer();
-    if (player === undefined) {
-      return undefined;
-    }
-
-    const character = player.GetPlayerType();
-    if (character !== PlayerType.EDEN_B) {
-      return undefined;
-    }
-
-    // The items will only be rerolled after the damage is successfully applied.
-    const entityPtr = EntityPtr(player);
-    this.runInNFrames.runNextGameFrame(() => {
-      const futurePlayer = getPlayerFromPtr(entityPtr);
-      if (futurePlayer !== undefined) {
-        this.updateCollectibleMapAndFire(player, undefined);
-      }
-    });
-
-    return undefined;
-  };
-
-  // ModCallbackCustom.POST_ITEM_PICKUP
-  // We need to handle TMTRAINER collectibles, since they do not cause the player's collectible
-  // count to change.
-  private postItemPickup = (
-    player: EntityPlayer,
-    pickingUpItem: PickingUpItem,
-  ) => {
-    if (
-      pickingUpItem.itemType === ItemType.TRINKET ||
-      pickingUpItem.itemType === ItemType.NULL
-    ) {
-      return;
-    }
-
-    const newCollectibleCount = player.GetCollectibleCount();
-    mapSetPlayer(
-      this.v.run.playersCollectibleCount,
-      player,
-      newCollectibleCount,
-    );
-
-    this.updateCollectibleMapAndFire(player, 1);
-  };
 }