isaacscript-common 13.3.4 → 14.0.0

package/src/enums/ModCallbackCustom2.ts

@@ -0,0 +1,17 @@
+/** TODO */
+export enum ModCallbackCustom2 {
+  POST_AMBUSH_FINISHED,
+  POST_AMBUSH_STARTED,
+  POST_BOMB_EXPLODED,
+  POST_BOMB_INIT_LATE,
+  POST_BONE_SWING,
+  POST_COLLECTIBLE_EMPTY,
+  POST_COLLECTIBLE_INIT_FIRST,
+  POST_CURSED_TELEPORT,
+
+  POST_KNIFE_INIT_LATE,
+  POST_NEW_ROOM_EARLY,
+  POST_PIT_RENDER,
+  POST_ROOM_CLEAR_CHANGED,
+  POST_SPIKES_RENDER,
+}

package/src/features/{setHotkey.ts → customHotkeys.ts}

@@ -3,7 +3,7 @@ import { DefaultMap } from "../classes/DefaultMap";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { isKeyboardPressed } from "../functions/input";
 
-const FEATURE_NAME = "setHotkey";
+const FEATURE_NAME = "customHotkeys";
 
 /**
  * The keys are the keyboard keys that trigger the hotkey. The values are the functions that contain
@@ -23,7 +23,7 @@ const dynamicHotkeyFunctionMap = new Map<
 const keyPressedMap = new DefaultMap<Keyboard, boolean>(false);
 
 /** @internal */
-export function setHotkeyInit(mod: Mod): void {
+export function customHotkeysInit(mod: Mod): void {
   mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2
 }
 

package/src/features/customPickup.ts

@@ -4,12 +4,14 @@ import {
   ModCallback,
   PickupVariant,
 } from "isaac-typescript-definitions";
+import { LadderSubTypeCustom } from "../enums/LadderSubTypeCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import {
   getEntityID,
   getEntityIDFromConstituents,
 } from "../functions/entities";
 import { spawnEffect } from "../functions/entitiesSpecific";
+import { asNumber } from "../functions/types";
 
 const FEATURE_NAME = "customPickup";
 
@@ -27,7 +29,7 @@ interface CustomPickupFunctions {
  * time passes, like most other effects.
  */
 const PICKUP_EFFECT_VARIANT = EffectVariant.LADDER;
-const PICKUP_EFFECT_SUB_TYPE = 103;
+const PICKUP_EFFECT_SUB_TYPE = LadderSubTypeCustom.CUSTOM_PICKUP;
 
 /** Indexed by entity ID. */
 const customPickupFunctionsMap = new Map<string, CustomPickupFunctions>();
@@ -85,7 +87,7 @@ function prePickupCollision(
 // ModCallback.POST_EFFECT_RENDER (56)
 // PICKUP_EFFECT_VARIANT
 function postEffectRenderPickupEffect(effect: EntityEffect) {
-  if (effect.SubType !== PICKUP_EFFECT_SUB_TYPE) {
+  if (effect.SubType !== asNumber(PICKUP_EFFECT_SUB_TYPE)) {
     return;
   }
 

package/src/features/customStage/backdrop.ts

@@ -10,6 +10,7 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../../core/cachedClasses";
 import { VectorZero } from "../../core/constants";
+import { LadderSubTypeCustom } from "../../enums/LadderSubTypeCustom";
 import { getRandomArrayElement } from "../../functions/array";
 import { spawnEffectWithSeed } from "../../functions/entitiesSpecific";
 import { newRNG } from "../../functions/rng";
@@ -83,7 +84,7 @@ const N_FLOOR_ANM2_LAYERS: readonly int[] = [18, 19];
  * time passes, like most other effects.
  */
 const BACKDROP_EFFECT_VARIANT = EffectVariant.LADDER;
-const BACKDROP_EFFECT_SUB_TYPE = 101;
+const BACKDROP_EFFECT_SUB_TYPE = LadderSubTypeCustom.CUSTOM_BACKDROP;
 
 const BACKDROP_ROOM_TYPE_SET: ReadonlySet<RoomType> = new Set([
   RoomType.DEFAULT,

package/src/features/customStage/shadows.ts

@@ -1,5 +1,6 @@
 import { EffectVariant, RoomShape } from "isaac-typescript-definitions";
 import { game } from "../../core/cachedClasses";
+import { LadderSubTypeCustom } from "../../enums/LadderSubTypeCustom";
 import { getRandomArrayElement } from "../../functions/array";
 import { spawnEffectWithSeed } from "../../functions/entitiesSpecific";
 import { removeCharactersBefore } from "../../functions/string";
@@ -18,7 +19,7 @@ type ShadowAnimation = "1x1" | "1x2" | "2x1" | "2x2";
  * time passes, like most other effects.
  */
 const SHADOW_EFFECT_VARIANT = EffectVariant.LADDER;
-const SHADOW_EFFECT_SUB_TYPE = 102;
+const SHADOW_EFFECT_SUB_TYPE = LadderSubTypeCustom.CUSTOM_SHADOW;
 
 /** The animation comes from StageAPI. */
 const ROOM_SHAPE_TO_SHADOW_ANIMATION: {

package/src/features/customTrapdoor/init.ts

@@ -125,7 +125,6 @@ function checkPixelationToBlackComplete() {
       startingRoomIndex,
       Direction.NO_DIRECTION,
       RoomTransitionAnim.PIXELATION,
-      true,
     );
   });
 }

package/src/features/firstLast.ts

@@ -1,10 +1,10 @@
 import {
   CardType,
   CollectibleType,
+  ModCallback,
   PillEffect,
   TrinketType,
 } from "isaac-typescript-definitions";
-import { ModUpgraded } from "../classes/ModUpgraded";
 import { itemConfig } from "../core/cachedClasses";
 import {
   FIRST_CARD_TYPE,
@@ -19,7 +19,6 @@ import {
   NUM_VANILLA_PILL_EFFECTS,
   NUM_VANILLA_TRINKET_TYPES,
 } from "../core/constantsFirstLast";
-import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import {
   asCardType,
@@ -35,11 +34,8 @@ const FEATURE_NAME = "firstLast";
 let atLeastOneCallbackFired = false;
 
 /** @internal */
-export function firstLastInit(mod: ModUpgraded): void {
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_NEW_ROOM_EARLY,
-    postNewRoomEarly,
-  );
+export function firstLastInit(mod: Mod): void {
+  mod.AddCallback(ModCallback.POST_NEW_ROOM, postNewRoomEarly);
 }
 
 // ModCallbackCustom.POST_NEW_ROOM_EARLY

package/src/features/saveDataManager/main.ts

@@ -1,5 +1,4 @@
 import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
-import { ModUpgraded } from "../../classes/ModUpgraded";
 import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { SaveDataKey } from "../../enums/SaveDataKey";
@@ -9,6 +8,10 @@ import { logError } from "../../functions/logMisc";
 import { onFirstFloor } from "../../functions/stage";
 import { clearTable, iterateTableInOrder } from "../../functions/table";
 import { SaveData } from "../../interfaces/SaveData";
+import {
+  CallbackTuple,
+  CustomCallbackTuple,
+} from "../../types/private/CallbackTuple";
 import {
   SAVE_DATA_MANAGER_DEBUG,
   SAVE_DATA_MANAGER_FEATURE_NAME,
@@ -31,36 +34,38 @@ const RESETTABLE_SAVE_DATA_KEYS: ReadonlySet<SaveDataKey> = new Set([
   SaveDataKey.ROOM,
 ]);
 
-let mod: ModUpgraded | null = null;
+let mod: Mod | null = null;
 let loadedDataOnThisRun = false;
 let restoreGlowingHourGlassDataOnNextRoom = false;
 
-export function saveDataManagerInit(incomingMod: ModUpgraded): void {
-  mod = incomingMod;
-
-  mod.AddCallback(
+export const SAVE_DATA_MANAGER_CALLBACKS: CallbackTuple[] = [
+  [
     ModCallback.POST_USE_ITEM,
-    postUseItemGlowingHourGlass,
-    CollectibleType.GLOWING_HOUR_GLASS,
-  ); // 3
-  mod.AddCallback(ModCallback.POST_PLAYER_INIT, postPlayerInit); // 9
-  mod.AddCallback(ModCallback.PRE_GAME_EXIT, preGameExit); // 17
-  mod.AddCallback(ModCallback.POST_NEW_LEVEL, postNewLevel); // 18
-  mod.AddCallbackCustom(
-    ModCallbackCustom.POST_NEW_ROOM_EARLY,
-    postNewRoomEarly,
-  ); // 19
+    [postUseItemGlowingHourGlass, CollectibleType.GLOWING_HOUR_GLASS],
+  ], // 3
+  [ModCallback.POST_PLAYER_INIT, [postPlayerInit]], // 9
+  [ModCallback.PRE_GAME_EXIT, [preGameExit]], // 17
+  [ModCallback.POST_NEW_LEVEL, [postNewLevel]], // 18
+];
+
+export const SAVE_DATA_MANAGER_CUSTOM_CALLBACKS: CustomCallbackTuple[] = [
+  [ModCallbackCustom.POST_NEW_ROOM_EARLY, [postNewRoomEarly]],
+];
+
+export function saveDataManagerInit(incomingMod: Mod): void {
+  mod = incomingMod;
 }
 
 // ModCallback.POST_USE_ITEM (3)
 // CollectibleType.GLOWING_HOUR_GLASS (422)
-function postUseItemGlowingHourGlass() {
+function postUseItemGlowingHourGlass(): boolean | undefined {
   restoreGlowingHourGlassDataOnNextRoom = true;
   return undefined;
 }
 
 // ModCallback.POST_PLAYER_INIT (9)
-function postPlayerInit() {
+// eslint-disable-next-line isaacscript/no-void-return-type
+function postPlayerInit(): void {
   if (mod === null) {
     error(
       `The mod for the ${SAVE_DATA_MANAGER_FEATURE_NAME} was not initialized.`,
@@ -74,6 +79,9 @@ function postPlayerInit() {
   }
   loadedDataOnThisRun = true;
 
+  // Handle the race-condition of using the Glowing Hour Glass and then resetting the run.
+  restoreGlowingHourGlassDataOnNextRoom = false;
+
   // We want to unconditionally load save data on every new run since there might be persistent data
   // that is not tied to an individual run.
   loadFromDisk(mod, saveDataMap);
@@ -89,7 +97,8 @@ function postPlayerInit() {
 }
 
 // ModCallback.PRE_GAME_EXIT (17)
-function preGameExit() {
+// eslint-disable-next-line isaacscript/no-void-return-type
+function preGameExit(): void {
   if (mod === null) {
     error(
       `The mod for the ${SAVE_DATA_MANAGER_FEATURE_NAME} was not initialized.`,
@@ -105,7 +114,8 @@ function preGameExit() {
 }
 
 // ModCallback.POST_NEW_LEVEL (18)
-function postNewLevel() {
+// eslint-disable-next-line isaacscript/no-void-return-type
+function postNewLevel(): void {
   if (mod === null) {
     error(
       `The mod for the ${SAVE_DATA_MANAGER_FEATURE_NAME} was not initialized.`,
@@ -122,7 +132,8 @@ function postNewLevel() {
 }
 
 // ModCallbackCustom.POST_NEW_ROOM_EARLY
-function postNewRoomEarly() {
+// eslint-disable-next-line isaacscript/no-void-return-type
+function postNewRoomEarly(): void {
   restoreDefaults(SaveDataKey.ROOM);
 
   // Handle the Glowing Hour Glass.

package/src/functions/ambush.ts

@@ -1,4 +1,6 @@
-import { SackSubType } from "isaac-typescript-definitions";
+import { RoomType, SackSubType } from "isaac-typescript-definitions";
+import { game } from "../core/cachedClasses";
+import { AmbushType } from "../enums/AmbushType";
 import { runNextGameFrame } from "../features/runInNFrames";
 import { removeEntities } from "./entities";
 import { getCoins, spawnSackWithSeed } from "./pickupsSpecific";
@@ -6,6 +8,29 @@ import { getCoins, spawnSackWithSeed } from "./pickupsSpecific";
 /** Hard-coding this makes it easier to clean up the pickups afterwards. */
 const SACK_SEED_THAT_SPAWNS_TWO_COINS = 6 as Seed;
 
+/**
+ * Helper function to get the corresponding ambush type for the current room. Returns undefined if
+ * the current room does not correspond to any particular ambush type.
+ */
+export function getAmbushType(): AmbushType | undefined {
+  const room = game.GetRoom();
+  const roomType = room.GetType();
+
+  switch (roomType) {
+    case RoomType.BOSS_RUSH: {
+      return AmbushType.BOSS_RUSH;
+    }
+
+    case RoomType.CHALLENGE: {
+      return AmbushType.CHALLENGE_ROOM;
+    }
+
+    default: {
+      return undefined;
+    }
+  }
+}
+
 /**
  * Helper function to start a Challenge Room or the Boss Rush.
  *

package/src/functions/minimap.ts

@@ -8,6 +8,8 @@ import { getRoomsInsideGrid } from "./rooms";
  * Helper function to add a `DisplayFlag` to a particular room's minimap display flags (e.g. whether
  * or not it is visible and so on).
  *
+ * This function automatically accounts for whether or not MinimapAPI is being used.
+ *
  * @param roomGridIndex Set to undefined to use the current room index.
  * @param displayFlag The `DisplayFlag` to set. (See the `DisplayFlag` enum.)
  * @param updateVisibility Optional. Whether to call the `Level.UpdateVisibility` method in order to
@@ -97,6 +99,8 @@ export function getRoomDisplayFlags(
  * This function automatically calls the `Level.UpdateVisibility` after setting the flags so that
  * the changes will be immediately visible.
  *
+ * This function automatically accounts for whether or not MinimapAPI is being used.
+ *
  * @param displayFlagsMap A map of the display flags that is indexed by the room's safe grid index.
  */
 export function setDisplayFlags(

package/src/functions/roomTransition.ts

@@ -1,12 +1,9 @@
 import {
   Direction,
   DoorSlot,
-  LevelCurse,
   RoomTransitionAnim,
 } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
-import { runNextRoom } from "../features/runNextRoom";
-import { hasCurse } from "./curses";
 import { getRoomData, getRoomGridIndex } from "./roomData";
 
 /**
@@ -17,12 +14,7 @@ import { getRoomData, getRoomGridIndex } from "./roomData";
  */
 export function reloadRoom(): void {
   const roomGridIndex = getRoomGridIndex();
-  teleport(
-    roomGridIndex,
-    Direction.NO_DIRECTION,
-    RoomTransitionAnim.FADE,
-    true,
-  );
+  teleport(roomGridIndex, Direction.NO_DIRECTION, RoomTransitionAnim.FADE);
 }
 
 /**
@@ -33,29 +25,20 @@ export function reloadRoom(): void {
  * Use this function instead of invoking the `Game.StartRoomTransition` method directly so that:
  * - you do not forget to set the `Level.LeaveDoor` field
  * - to prevent crashing on invalid room grid indexes
- * - to automatically handle Curse of the Maze
+ *
+ * Note that if the current floor has Curse of the Maze, it may redirect the intended teleport.
  *
  * @param roomGridIndex The room grid index of the destination room.
  * @param direction Optional. Default is `Direction.NO_DIRECTION`.
  * @param roomTransitionAnim Optional. Default is `RoomTransitionAnim.TELEPORT`.
- * @param force Optional. Whether to temporarily disable Curse of the Maze. Default is false. If set
- *              to false, then this function may not go to the provided room grid index.
  */
 export function teleport(
   roomGridIndex: int,
   direction = Direction.NO_DIRECTION,
   roomTransitionAnim = RoomTransitionAnim.TELEPORT,
-  force = false,
 ): void {
   const level = game.GetLevel();
 
-  // Before starting a room transition, we must ensure that Curse of the Maze is not in effect, or
-  // else the room transition might send us to the wrong room.
-  const shouldTempDisableCurse = force && hasCurse(LevelCurse.MAZE);
-  if (shouldTempDisableCurse) {
-    level.RemoveCurses(LevelCurse.MAZE);
-  }
-
   const roomData = getRoomData(roomGridIndex);
   if (roomData === undefined) {
     error(
@@ -68,11 +51,4 @@ export function teleport(
   level.LeaveDoor = DoorSlot.NO_DOOR_SLOT;
 
   game.StartRoomTransition(roomGridIndex, direction, roomTransitionAnim);
-
-  if (shouldTempDisableCurse) {
-    runNextRoom(() => {
-      const futureLevel = game.GetLevel();
-      futureLevel.AddCurse(LevelCurse.MAZE, false);
-    });
-  }
 }

package/src/functions/spawnCollectible.ts

@@ -1,8 +1,10 @@
 import {
   CollectibleType,
+  ItemPoolType,
   PickupVariant,
   PlayerType,
 } from "isaac-typescript-definitions";
+import { game } from "../core/cachedClasses";
 import { VectorZero } from "../core/constants";
 import { preventCollectibleRotation } from "../features/preventCollectibleRotation";
 import { areFeaturesInitialized } from "../featuresInitialized";
@@ -13,10 +15,11 @@ import { anyPlayerIs } from "./players";
 import { getRandomSeed, isRNG } from "./rng";
 
 /**
- * Helper function to spawn a collectible. Use this instead of the `Game.Spawn` method because it
- * handles the cases of Tainted Keeper collectibles costing coins and preventing quest items from
- * being rotated by Tainted Isaac's rotation mechanic. (Rotation prevention will only occur in
- * upgraded mods.)
+ * Helper function to spawn a collectible.
+ *
+ * Use this instead of the `Game.Spawn` method because it handles the cases of Tainted Keeper
+ * collectibles costing coins and preventing quest items from being rotated by Tainted Isaac's
+ * rotation mechanic. (Rotation prevention will only occur in upgraded mods.)
  *
  * @param collectibleType The collectible type to spawn.
  * @param position The position to spawn the collectible at.
@@ -74,6 +77,43 @@ export function spawnCollectible(
   return collectible;
 }
 
+/**
+ * Helper function to spawn a collectible from a specific item pool.
+ *
+ * Use this instead of the `Game.Spawn` method because it handles the cases of Tainted Keeper
+ * collectibles costing coins and preventing quest items from being rotated by Tainted Isaac's
+ * rotation mechanic. (Rotation prevention will only occur in upgraded mods.)
+ *
+ * @param itemPoolType The item pool to draw the collectible type from.
+ * @param position The position to spawn the collectible at.
+ * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
+ * @param options Optional. Set to true to make the collectible a "There's Options" style
+ *                collectible. Default is false.
+ * @param forceFreeItem Optional. Set to true to disable the logic that gives the item a price for
+ *                      Tainted Keeper. Default is false.
+ * @param spawner Optional.
+ */
+export function spawnCollectibleFromPool(
+  itemPoolType: ItemPoolType,
+  position: Vector,
+  seedOrRNG: Seed | RNG = getRandomSeed(),
+  options = false,
+  forceFreeItem = false,
+  spawner?: Entity,
+): EntityPickupCollectible {
+  const itemPool = game.GetItemPool();
+  const collectibleType = itemPool.GetCollectible(itemPoolType);
+  return spawnCollectible(
+    collectibleType,
+    position,
+    seedOrRNG,
+    options,
+    forceFreeItem,
+    spawner,
+  );
+}
+
 /**
  * Helper function to spawn an empty collectible. Doing this is tricky since spawning a collectible
  * with `CollectibleType.NULL` will result in spawning a collectible with a random type from the

package/src/functions/utils.ts

@@ -72,8 +72,13 @@ export function iRange(start: int, end?: int, increment = 1): int[] {
 }
 
 /**
- * Since this is a UI element, we do not want to draw it in water reflections. `renderOffset` will
- * be a non-zero value in reflections.
+ * Helper function to see if the current render callback is rendering a water reflection.
+ *
+ * When the player is in a room with water, things will be rendered twice: once for the normal
+ * rendering, and once for the reflecting rendering. Thus, any mod code in a render callback will
+ * run twice per frame in these situations, which may be unexpected or cause bugs.
+ *
+ * This function is typically used to early return from a render function if it returns true.
  */
 export function isReflectionRender(): boolean {
   const room = game.GetRoom();

package/src/index.ts

@@ -7,7 +7,10 @@ export * from "./core/upgradeMod";
 export * from "./enums/AmbushType";
 export * from "./enums/CornerType";
 export * from "./enums/HealthType";
+export * from "./enums/IsaacScriptCommonFeature";
+export * from "./enums/LadderSubTypeCustom";
 export * from "./enums/ModCallbackCustom";
+export * from "./enums/ModCallbackCustom2";
 export * from "./enums/PocketItemType";
 export * from "./enums/RockAltType";
 export * from "./enums/SaveDataKey";
@@ -17,8 +20,8 @@ export * from "./enums/StatType";
 export * from "./features/characterHealthConversion";
 export * from "./features/characterStats";
 export * from "./features/collectibleItemPoolType";
-export * from "./features/customDoor";
 export * from "./features/customGridEntity";
+export * from "./features/customHotkeys";
 export * from "./features/customPickup";
 export * from "./features/customStage/exports";
 export * from "./features/customTrapdoor/exports";
@@ -42,7 +45,6 @@ export * from "./features/roomClearFrame";
 export * from "./features/roomHistory";
 export * from "./features/runInNFrames";
 export * from "./features/saveDataManager/exports";
-export * from "./features/setHotkey";
 export * from "./features/sirenHelpers";
 export * from "./features/stageHistory";
 export * from "./features/taintedLazarusPlayers";

package/src/initCustomCallbacks.ts

@@ -7,7 +7,6 @@ import { postBoneSwingInit } from "./callbacks/postBoneSwing";
 import { postCollectibleEmptyInit } from "./callbacks/postCollectibleEmpty";
 import { postCollectibleInitFirstInit } from "./callbacks/postCollectibleInitFirst";
 import { postCursedTeleportInit } from "./callbacks/postCursedTeleport";
-import { postCustomDoorEnterInit } from "./callbacks/postCustomDoorEnter";
 import { postDiceRoomActivatedInit } from "./callbacks/postDiceRoomActivated";
 import { postDoorRenderInit } from "./callbacks/postDoorRender";
 import { postDoorUpdateInit } from "./callbacks/postDoorUpdate";
@@ -82,7 +81,6 @@ export function initCustomCallbacks(mod: ModUpgraded): void {
   postCollectibleEmptyInit(mod);
   postCollectibleInitFirstInit(mod);
   postCursedTeleportInit(mod);
-  postCustomDoorEnterInit();
   postDiceRoomActivatedInit(mod);
   postDoorRenderInit(mod);
   postDoorUpdateInit(mod);
@@ -103,6 +101,7 @@ export function initCustomCallbacks(mod: ModUpgraded): void {
   postItemDischargeInit(mod);
   postLaserInitLateInit(mod);
   postKnifeInitLateInit(mod);
+  // "postNewRoomEarlyCallbackInit" has already been called.
   postNPCInitLateInit(mod);
   postNPCStateChangedInit(mod);
   postPickupCollectInit(mod);

package/src/initFeatures.ts

@@ -3,6 +3,7 @@ import { characterHealthConversionInit } from "./features/characterHealthConvers
 import { characterStatsInit } from "./features/characterStats";
 import { collectibleItemPoolTypeInit } from "./features/collectibleItemPoolType";
 import { customGridEntityInit } from "./features/customGridEntity";
+import { customHotkeysInit } from "./features/customHotkeys";
 import { customPickupInit } from "./features/customPickup";
 import { customStageInit } from "./features/customStage/init";
 import { customTrapdoorInit } from "./features/customTrapdoor/init";
@@ -24,7 +25,6 @@ import { roomClearFrameInit } from "./features/roomClearFrame";
 import { roomHistoryInit } from "./features/roomHistory";
 import { runInNFramesInit } from "./features/runInNFrames";
 import { runNextRoomInit } from "./features/runNextRoom";
-import { setHotkeyInit } from "./features/setHotkey";
 import { sirenHelpersInit } from "./features/sirenHelpers";
 import { stageHistoryInit } from "./features/stageHistory";
 import { taintedLazarusPlayersInit } from "./features/taintedLazarusPlayers";
@@ -44,6 +44,7 @@ function initFeaturesMajor(mod: ModUpgraded) {
 }
 
 function initFeaturesMinor(mod: ModUpgraded) {
+  customHotkeysInit(mod);
   customPickupInit(mod);
   customTrapdoorInit(mod);
   disableAllSoundInit(mod);
@@ -63,7 +64,6 @@ function initFeaturesMinor(mod: ModUpgraded) {
   roomClearFrameInit(mod);
   roomHistoryInit(mod);
   runNextRoomInit(mod);
-  setHotkeyInit(mod);
   sirenHelpersInit(mod);
   stageHistoryInit(mod);
   taintedLazarusPlayersInit(mod);

package/src/interfaces/private/{AddCallbackParameterCustom.ts → AddCallbackParametersCustom.ts}

@@ -1,12 +1,11 @@
 import { PostAmbushFinishedRegisterParameters } from "../../callbacks/subscriptions/postAmbushFinished";
 import { PostAmbushStartedRegisterParameters } from "../../callbacks/subscriptions/postAmbushStarted";
+import { PostBombExplodedRegisterParameters } from "../../callbacks/subscriptions/postBombExploded";
 import { PostBombInitRegisterParameters } from "../../callbacks/subscriptions/postBombInitLate";
-import { PostBombExplodedRegisterParameters } from "../../callbacks/subscriptions/postBoneExploded";
 import { PostBoneSwingRegisterParameters } from "../../callbacks/subscriptions/postBoneSwing";
 import { PostCollectibleEmptyRegisterParameters } from "../../callbacks/subscriptions/postCollectibleEmpty";
 import { PostCollectibleInitFirstRegisterParameters } from "../../callbacks/subscriptions/postCollectibleInitFirst";
 import { PostCursedTeleportRegisterParameters } from "../../callbacks/subscriptions/postCursedTeleport";
-import { PostCustomDoorEnterRegisterParameters } from "../../callbacks/subscriptions/postCustomDoorEnter";
 import { PostCustomReviveRegisterParameters } from "../../callbacks/subscriptions/postCustomRevive";
 import { PostDiceRoomActivatedRegisterParameters } from "../../callbacks/subscriptions/postDiceRoomActivated";
 import { PostDoorRenderRegisterParameters } from "../../callbacks/subscriptions/postDoorRender";
@@ -103,7 +102,6 @@ export interface AddCallbackParametersCustom {
   [ModCallbackCustom.POST_COLLECTIBLE_EMPTY]: PostCollectibleEmptyRegisterParameters;
   [ModCallbackCustom.POST_COLLECTIBLE_INIT_FIRST]: PostCollectibleInitFirstRegisterParameters;
   [ModCallbackCustom.POST_CURSED_TELEPORT]: PostCursedTeleportRegisterParameters;
-  [ModCallbackCustom.POST_CUSTOM_DOOR_ENTER]: PostCustomDoorEnterRegisterParameters;
   [ModCallbackCustom.POST_CUSTOM_REVIVE]: PostCustomReviveRegisterParameters;
   [ModCallbackCustom.POST_DICE_ROOM_ACTIVATED]: PostDiceRoomActivatedRegisterParameters;
   [ModCallbackCustom.POST_DOOR_RENDER]: PostDoorRenderRegisterParameters;
@@ -148,7 +146,6 @@ export interface AddCallbackParametersCustom {
   [ModCallbackCustom.POST_PICKUP_INIT_FIRST]: PostPickupInitFirstRegisterParameters;
   [ModCallbackCustom.POST_PICKUP_INIT_LATE]: PostPickupInitLateRegisterParameters;
   [ModCallbackCustom.POST_PICKUP_STATE_CHANGED]: PostPickupStateChangedRegisterParameters;
-  [ModCallbackCustom.POST_PIT_RENDER]: PostPitRenderRegisterParameters;
   [ModCallbackCustom.POST_PIT_UPDATE]: PostPitUpdateRegisterParameters;
   [ModCallbackCustom.POST_PLAYER_CHANGE_HEALTH]: PostPlayerChangeHealthRegisterParameters;
   [ModCallbackCustom.POST_PLAYER_CHANGE_STAT]: PostPlayerChangeStatRegisterParameters;
@@ -160,6 +157,7 @@ export interface AddCallbackParametersCustom {
   [ModCallbackCustom.POST_PLAYER_INIT_LATE]: PostPlayerInitLateRegisterParameters;
   [ModCallbackCustom.POST_PLAYER_RENDER_REORDERED]: PostPlayerRenderReorderedRegisterParameters;
   [ModCallbackCustom.POST_PLAYER_UPDATE_REORDERED]: PostPlayerUpdateReorderedRegisterParameters;
+  [ModCallbackCustom.POST_PIT_RENDER]: PostPitRenderRegisterParameters;
   [ModCallbackCustom.POST_POOP_RENDER]: PostPoopRenderRegisterParameters;
   [ModCallbackCustom.POST_POOP_UPDATE]: PostPoopUpdateRegisterParameters;
   [ModCallbackCustom.POST_PRESSURE_PLATE_RENDER]: PostPressurePlateRenderRegisterParameters;
@@ -190,23 +188,3 @@ export interface AddCallbackParametersCustom {
   [ModCallbackCustom.PRE_ITEM_PICKUP]: PreItemPickupRegisterParameters;
   [ModCallbackCustom.PRE_NEW_LEVEL]: PreNewLevelRegisterParameters;
 }
-
-// Make copies of the objects we need to verify so that we can easily re-use the code block below.
-type EnumToCheck = ModCallbackCustom;
-type InterfaceToCheck = AddCallbackParametersCustom;
-
-// Throw a compiler error if InterfaceToCheck does not match the values of EnumToCheck.
-// From: https://stackoverflow.com/questions/51829842
-type KeysMissing = Exclude<EnumToCheck, keyof InterfaceToCheck>;
-type ExtraKeys = {
-  [K in keyof InterfaceToCheck]: Extract<EnumToCheck, K> extends never
-    ? K
-    : never;
-}[keyof InterfaceToCheck];
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-type Verify<
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  _Missing extends never = KeysMissing,
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  _Extra extends never = ExtraKeys,
-> = 0;