isaacscript-common 13.3.4 → 14.1.0

package/dist/index.d.ts

@@ -88,7 +88,6 @@ declare 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;
@@ -133,7 +132,6 @@ declare 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;
@@ -145,6 +143,7 @@ declare 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;
@@ -176,6 +175,204 @@ declare interface AddCallbackParametersCustom {
     [ModCallbackCustom.PRE_NEW_LEVEL]: PreNewLevelRegisterParameters;
 }
 
+declare interface AddCallbackParametersCustom2 {
+    [ModCallbackCustom2.POST_AMBUSH_FINISHED]: [
+    callback: (ambushType: AmbushType) => void,
+    ambushType?: AmbushType
+    ];
+    [ModCallbackCustom2.POST_AMBUSH_STARTED]: [
+    callback: (ambushType: AmbushType) => void,
+    ambushType?: AmbushType
+    ];
+    [ModCallbackCustom2.POST_BOMB_EXPLODED]: [
+    callback: (bomb: EntityBomb) => void,
+    bombVariant?: BombVariant
+    ];
+    [ModCallbackCustom2.POST_BOMB_INIT_LATE]: [
+    callback: (bomb: EntityBomb) => void,
+    bombVariant?: BombVariant
+    ];
+    [ModCallbackCustom2.POST_BONE_SWING]: [
+    callback: (knife: EntityKnife) => void
+    ];
+    [ModCallbackCustom2.POST_COLLECTIBLE_EMPTY]: [
+    callback: (collectible: EntityPickupCollectible, oldCollectibleType: CollectibleType) => void,
+    collectibleType?: CollectibleType
+    ];
+    [ModCallbackCustom2.POST_COLLECTIBLE_INIT_FIRST]: [
+    callback: (collectible: EntityPickupCollectible) => void,
+    collectibleType?: CollectibleType
+    ];
+    [ModCallbackCustom2.POST_CURSED_TELEPORT]: [
+    callback: (player: EntityPlayer) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_CUSTOM_REVIVE]: [
+    callback: (player: EntityPlayer, revivalType: int) => void,
+    revivalType?: int
+    ];
+    [ModCallbackCustom2.POST_DICE_ROOM_ACTIVATED]: [
+    callback: (player: EntityPlayer, diceFloorSubType: DiceFloorSubType) => void,
+    diceFloorSubType?: DiceFloorSubType
+    ];
+    [ModCallbackCustom2.POST_DOOR_RENDER]: [
+    callback: (door: GridEntityDoor) => void,
+    doorVariant?: DoorVariant
+    ];
+    [ModCallbackCustom2.POST_DOOR_UPDATE]: [
+    callback: (door: GridEntityDoor) => void,
+    doorVariant?: DoorVariant
+    ];
+    [ModCallbackCustom2.POST_EFFECT_INIT_LATE]: [
+    callback: (effect: EntityEffect) => void,
+    effectVariant?: EffectVariant
+    ];
+    [ModCallbackCustom2.POST_EFFECT_STATE_CHANGED]: [
+    callback: (effect: EntityEffect, previousState: int, currentState: int) => void,
+    effectVariant?: EffectVariant
+    ];
+    [ModCallbackCustom2.POST_ESAU_JR]: [callback: (player: EntityPlayer) => void];
+    [ModCallbackCustom2.POST_FAMILIAR_INIT_LATE]: [
+    callback: (familiar: EntityFamiliar) => void,
+    familiarVariant?: FamiliarVariant
+    ];
+    [ModCallbackCustom2.POST_FAMILIAR_STATE_CHANGED]: [
+    callback: (familiar: EntityFamiliar, previousState: int, currentState: int) => void,
+    familiarVariant?: FamiliarVariant
+    ];
+    [ModCallbackCustom2.POST_FIRST_ESAU_JR]: [
+    callback: (player: EntityPlayer) => void
+    ];
+    [ModCallbackCustom2.POST_FIRST_FLIP]: [
+    callback: (newLazarus: EntityPlayer, oldLazarus: EntityPlayer) => void
+    ];
+    [ModCallbackCustom2.POST_FLIP]: [
+    callback: (newLazarus: EntityPlayer, oldLazarus: EntityPlayer) => void
+    ];
+    [ModCallbackCustom2.POST_GAME_STARTED_REORDERED]: [
+    callback: (isContinued: boolean) => void
+    ];
+    [ModCallbackCustom2.POST_GAME_STARTED_REORDERED_LAST]: [
+    callback: (isContinued: boolean) => void
+    ];
+    [ModCallbackCustom2.POST_GREED_MODE_WAVE]: [
+    callback: (oldWave: int, newWave: int) => void
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_BROKEN]: [
+    callback: (gridEntity: GridEntity) => void,
+    gridEntityType?: GridEntityType,
+    variant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_COLLISION]: [
+    callback: (gridEntity: GridEntity, entity: Entity) => void,
+    gridEntityType?: GridEntityType,
+    gridEntityVariant?: int,
+    entityType?: EntityType,
+    entityVariant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_BROKEN]: [
+    callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
+    gridEntityTypeCustom?: GridEntityType
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_COLLISION]: [
+    callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType, entity: Entity) => void,
+    gridEntityTypeCustom?: GridEntityType,
+    entityType?: EntityType,
+    entityVariant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_INIT]: [
+    callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
+    gridEntityTypeCustom?: GridEntityType
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_REMOVE]: [
+    callback: (gridIndex: int, gridEntityTypeCustom: GridEntityType) => void,
+    gridEntityTypeCustom?: GridEntityType
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_STATE_CHANGED]: [
+    callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType, oldState: int, newState: int) => void,
+    gridEntityTypeCustom?: GridEntityType
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_UPDATE]: [
+    callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
+    gridEntityTypeCustom?: GridEntityType
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_INIT]: [
+    callback: (gridEntity: GridEntity) => void,
+    gridEntityType?: GridEntityType,
+    variant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_REMOVE]: [
+    callback: (gridIndex: int, gridEntityType: GridEntityType, variant: int) => void,
+    gridEntityType?: GridEntityType,
+    variant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_STATE_CHANGED]: [
+    callback: (gridEntity: GridEntity, oldState: int, newState: int) => void,
+    gridEntityType?: GridEntityType,
+    variant?: int
+    ];
+    [ModCallbackCustom2.POST_GRID_ENTITY_UPDATE]: [
+    callback: (gridEntity: GridEntity) => void,
+    gridEntityType?: GridEntityType,
+    variant?: int
+    ];
+    [ModCallbackCustom2.POST_HOLY_MANTLE_REMOVED]: [
+    callback: (player: EntityPlayer, oldNumHolyMantles: int, newNumHolyMantles: int) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_NEW_LEVEL_REORDERED]: [callback: () => void];
+    [ModCallbackCustom2.POST_KNIFE_INIT_LATE]: [
+    callback: (knife: EntityKnife) => void,
+    knifeVariant?: KnifeVariant
+    ];
+    [ModCallbackCustom2.POST_NEW_ROOM_EARLY]: [callback: () => void];
+    [ModCallbackCustom2.POST_NEW_ROOM_REORDERED]: [callback: () => void];
+    [ModCallbackCustom2.POST_PEFFECT_UPDATE_REORDERED]: [
+    callback: (player: EntityPlayer) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_PIT_RENDER]: [
+    callback: (pit: GridEntityPit) => void,
+    pitVariant?: PitVariant
+    ];
+    [ModCallbackCustom2.POST_PLAYER_FATAL_DAMAGE]: [
+    callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_PLAYER_RENDER_REORDERED]: [
+    callback: (player: EntityPlayer) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_PLAYER_UPDATE_REORDERED]: [
+    callback: (player: EntityPlayer) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.POST_ROOM_CLEAR_CHANGED]: [
+    callback: (roomClear: boolean) => void,
+    roomClear?: boolean
+    ];
+    [ModCallbackCustom2.POST_SPIKES_RENDER]: [
+    callback: (spikes: GridEntitySpikes) => void,
+    variant?: int
+    ];
+    [ModCallbackCustom2.PRE_BERSERK_DEATH]: [
+    callback: (player: EntityPlayer) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+    [ModCallbackCustom2.PRE_CUSTOM_REVIVE]: [
+    callback: (player: EntityPlayer) => int | undefined,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+    ];
+}
+
 /**
  * Helper function to add a charge to the player's active item. Will flash the HUD and play the
  * appropriate sound effect, depending on whether the charge is partially full or completely full.
@@ -188,14 +385,14 @@ declare interface AddCallbackParametersCustom {
  * - AAA Battery
  *
  * @param player The player to grant the charges to.
- * @param activeSlot The slot to grant the charges to.
+ * @param activeSlot Optional. The slot to grant the charges to. Default is `ActiveSlot.PRIMARY`.
  * @param numCharges Optional. The amount of charges to grant. Default is 1.
  * @param playSoundEffect Optional. Whether to play a charge-related sound effect. Default is true.
  * @returns The amount of charges that were actually granted. For example, if the active item was
  *          only one away from a full charge, but the `numCharges` provided to this function was 2,
  *          then this function would return 1.
  */
-export declare function addCharge(player: EntityPlayer, activeSlot: ActiveSlot, numCharges?: number, playSoundEffect?: boolean): int;
+export declare function addCharge(player: EntityPlayer, activeSlot?: ActiveSlot, numCharges?: number, playSoundEffect?: boolean): int;
 
 export declare function addCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType): void;
 
@@ -284,18 +481,21 @@ export declare function addRoomClearCharges(bigRoomDoubleCharge?: boolean): void
  * - Not charging active items with `chargetype="special"`
  *
  * @param player The player to grant the charges to.
- * @param activeSlot The active item slot to grant the charges to.
+ * @param activeSlot Optional. The active item slot to grant the charges to. Default is
+ *                   `ActiveSlot.PRIMARY`.
  * @param bigRoomDoubleCharge Optional. If set to false, it will treat the current room as a 1x1
  *                            room for the purposes of calculating how much charge to grant. Default
  *                            is true.
  * @param playSoundEffect Optional. Whether to play a charge-related sound effect. Default is true.
  */
-export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlot: ActiveSlot, bigRoomDoubleCharge?: boolean, playSoundEffect?: boolean): void;
+export declare function addRoomClearChargeToSlot(player: EntityPlayer, activeSlot?: ActiveSlot, bigRoomDoubleCharge?: boolean, playSoundEffect?: boolean): void;
 
 /**
  * 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
@@ -333,6 +533,18 @@ export declare const ALL_DISPLAY_FLAGS: BitFlags<number & {
     readonly __displayFlagBrand: symbol;
 }>;
 
+export declare type AllButFirst<T extends unknown[]> = T extends [
+unknown,
+...infer Tail
+] ? Tail : unknown[];
+
+declare type AllButFirst_2<T extends unknown[]> = T extends [
+unknown,
+...infer Tail
+] ? Tail : unknown[];
+
+export declare type AllButLast<T extends unknown[]> = T extends [...infer Head, unknown] ? Head : unknown[];
+
 /** This is used by the `POST_AMBUSH_STARTED` and `POST_AMBUSH_FINISHED` custom callbacks. */
 export declare enum AmbushType {
     CHALLENGE_ROOM = 0,
@@ -612,6 +824,37 @@ export declare function calculateStageType(stage: LevelStage): StageType;
  */
 export declare function calculateStageTypeRepentance(stage: LevelStage): StageType;
 
+/**
+ * A decorator function that signifies that the decorated class method should be automatically
+ * registered with `Mod.AddCallback`.
+ */
+export declare function Callback<T extends ModCallback>(modCallback: T, ...optionalArgs: AllButFirst<AddCallbackParameters[T]>): <Class extends ModFeature, Fn extends AddCallbackParameters[T][0]>(target: Class, propertyKey: string, _descriptor: TypedPropertyDescriptor<Fn>) => void;
+
+/**
+ * A decorator function that signifies that the decorated class method should be automatically
+ * registered with `ModUpgraded.AddCallbackCustom`.
+ */
+export declare function CallbackCustom<T extends ModCallbackCustom2>(modCallbackCustom: T, ...optionalArgs: AllButFirst<AddCallbackParametersCustom2[T]>): <Class extends {
+    mod: ModUpgraded;
+}>(target: Class, propertyKey: string) => void;
+
+declare type CallbackSignatureGridEntity = ((gridEntity: GridEntity) => void) | ((gridEntity: GridEntity, oldState: int, newState: int) => void);
+
+declare type CallbackSignatureGridEntityCustom = ((gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void) | ((gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType, oldState: int, newState: int) => void);
+
+declare type CallbackSignaturePlayer = ((player: EntityPlayer) => void) | ((player: EntityPlayer) => int | undefined) | ((player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined);
+
+declare type CallbackSignatureRevive = (player: EntityPlayer, revivalType: int) => void;
+
+/**
+ * A mapping of the callback enum to the associated callback functions (and optional arguments).
+ * This is so that the respective callback functions can be added/removed on demand as subscribers
+ * get added/removed.
+ */
+declare type CallbackTuple = {
+    [K in ModCallback]: [K, AddCallbackParameters[K]];
+}[ModCallback];
+
 /**
  * Helper function to see if the provided player can pick up an eternal heart. (If a player already
  * has an eternal heart and full heart containers, they are not able to pick up any additional
@@ -887,6 +1130,8 @@ export declare function combineArrays<T>(...arrays: Array<T[] | readonly T[]>):
  */
 export declare function combineSets<T>(...sets: Array<Set<T> | ReadonlySet<T>>): Set<T>;
 
+export declare type Constructor = new (...args: any[]) => {};
+
 /**
  * Helper function to get the enum name for the specified `Controller` value. Note that this will
  * trim off the "BUTTON_" prefix.
@@ -1016,6 +1261,215 @@ export declare const CUSTOM_FLOOR_STAGE: LevelStage;
  */
 export declare const CUSTOM_FLOOR_STAGE_TYPE = StageType.WRATH_OF_THE_LAMB;
 
+/**
+ * The base class for a custom callback. Individual custom callbacks (and validation callbacks) will
+ * extend from this class.
+ */
+declare abstract class CustomCallback<T extends ModCallbackCustom2> extends Feature {
+    private subscriptions;
+    hasSubscriptions(): boolean;
+    add(...args: AddCallbackParametersCustom2[T]): void;
+    /**
+     * If the submitted function does not match any of the existing subscriptions, this method will do
+     * nothing.
+     */
+    remove(callback: AddCallbackParametersCustom2[T][0]): void;
+    fire: (...fireArgs: FireArgs<T>) => ReturnType<AddCallbackParametersCustom2[T][0]>;
+    /**
+     * This method needs to be overwritten for any callback that has optional filtration arguments.
+     */
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
+declare class CustomCallbackGridEntity<T extends ModCallbackCustomGridEntity> extends CustomCallback<T> {
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
+declare class CustomCallbackGridEntityCustom<T extends ModCallbackCustomGridEntityCustom> extends CustomCallback<T> {
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
+declare class CustomCallbackPlayer<T extends ModCallbackCustomPlayer> extends CustomCallback<T> {
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
+declare class CustomCallbackRevive<T extends ModCallbackCustomRevive> extends CustomCallback<T> {
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
+/**
+ * A mapping of the custom callback enum to the associated callback functions (and optional
+ * arguments). This is so that the respective callback functions can be added/removed on demand as
+ * subscribers get added/removed.
+ */
+declare type CustomCallbackTuple = {
+    [K in ModCallbackCustom2]: [K, AddCallbackParametersCustom2[K]];
+}[ModCallbackCustom2];
+
+declare class CustomGridEntities extends Feature {
+    v: {
+        level: {
+            /** Indexed by room list index and grid index. */
+            customGridEntities: DefaultMap<number, Map<number, GridEntityCustomData>, []>;
+        };
+        room: {
+            genericPropPtrHashes: Set<PtrHash>;
+            manuallyUsingShovel: boolean;
+        };
+    };
+    private runInNFrames;
+    constructor(runInNFrames: RunInNFrames);
+    private preUseItemWeNeedToGoDeeper;
+    private postNewRoomReordered;
+    /**
+     * Helper function to spawn a custom grid entity. Custom grid entities are persistent in that they
+     * will reappear if the player leaves and re-enters the room. (It will be manually respawned in
+     * the `POST_NEW_ROOM` callback.)
+     *
+     * Custom grid entities are built on top of real grid entities. You can use any existing grid
+     * entity type as a base. For example, if you want to create a custom rock that would be breakable
+     * like a normal rock, then you should specify `GridEntityType.ROCK` as the base grid entity type.
+     *
+     * Once a custom grid entity is spawned, you can take advantage of the custom grid callbacks such
+     * as `POST_GRID_ENTITY_CUSTOM_UPDATE`. Note that the "normal" grid entities callbacks will not
+     * fire for custom entities. For example, if you had a custom grid entity based on
+     * `GridEntityType.ROCK`, and you also had a subscription to the `POST_GRID_ENTITY_UPDATE`
+     * callback, the callback would only fire for normal rocks and not the custom entity.
+     *
+     * Custom grid entities are an IsaacScript feature because the vanilla game does not support any
+     * custom grid entities.
+     *
+     * For example, this would be code to create a custom rock called a "Silver Rock" that produces a
+     * dime when destroyed:
+     *
+     * ```ts
+     * // This is local to the mod and can safely overlap with the values of `GridEntityType`.
+     * const GridEntityTypeCustom = {
+     *   SILVER_ROCK: 0 as GridEntityType,
+     * } as const;
+     *
+     * // This is copied from "gfx/grid/grid_rock.anm2" with some tweaks to make it look special.
+     * const SILVER_ROCK_ANM2_PATH = "gfx/grid/grid_rock_silver.anm2";
+     *
+     * export function silverRockInit(mod: ModUpgraded): void {
+     *   mod.AddCallbackCustom(
+     *     ModCallbackCustom.POST_GRID_ENTITY_CUSTOM_BROKEN,
+     *     postGridEntityCustomBrokenSilverRock,
+     *     GridEntityTypeCustom.SILVER_ROCK,
+     *   );
+     * }
+     *
+     * function postGridEntityCustomBrokenSilverRock(gridEntity: GridEntity) {
+     *   spawnCoin(CoinSubType.DIME, gridEntity.Position);
+     * }
+     *
+     * export function spawnSilverRock(mod: ModUpgraded, gridIndex: int): GridEntity {
+     *   return mod.spawnCustomGridEntity(
+     *     GridEntityTypeCustom.SILVER_ROCK,
+     *     gridIndex,
+     *     undefined,
+     *     SILVER_ROCK_ANM2_PATH,
+     *     undefined,
+     *     GridEntityType.ROCK,
+     *   );
+     * }
+     * ```
+     *
+     * @param gridEntityTypeCustom An integer that identifies what kind of grid entity you are
+     *                             creating. It should correspond to a local enum value created in
+     *                             your mod. The integer can be any unique value and will not
+     *                             correspond to the actual grid entity type used. (This integer is
+     *                             used in the various custom grid entity callbacks.)
+     * @param gridIndexOrPosition The grid index or position in the room that you want to spawn the
+     *                            grid entity at. If a position is specified, the closest grid index
+     *                            will be used.
+     * @param gridCollisionClass Optional. The collision class that you want the custom grid entity to
+     *                           have. If not specified, the grid collision class from the base grid
+     *                           entity will be used.
+     * @param anm2Path Optional. The path to the ANM2 file to use for the sprite. If not specified,
+     *                 the normal sprite from the base grid entity will be used.
+     * @param defaultAnimation Optional. The name of the animation to play after the sprite is
+     *                         initialized and after the player re-enters a room with this grid entity
+     *                         in it. If not specified, the default animation in the anm2 will be
+     *                         used.
+     * @param baseGridEntityType Optional. The type of the grid entity to use as a "base" for this
+     *                           custom grid entity. Default is `GridEntityType.DECORATION`.
+     * @param baseGridEntityVariant Optional. The variant of the grid entity to use as a "base" for
+     *                              this custom grid entity. Default is 0.
+     */
+    spawnCustomGridEntity(gridEntityTypeCustom: GridEntityType, gridIndexOrPosition: int | Vector, gridCollisionClass?: GridCollisionClass, anm2Path?: string, defaultAnimation?: string, baseGridEntityType?: GridEntityType, baseGridEntityVariant?: number): GridEntity;
+    /**
+     * Helper function to remove a custom grid entity created by the `spawnCustomGrid` function.
+     *
+     * @param gridIndexOrPositionOrGridEntity You can specify the custom grid entity to remove by
+     *                                providing the grid index, the room position, or the grid entity
+     *                                itself.
+     * @param updateRoom Optional. Whether or not to update the room after the grid entity is removed.
+     *                   Default is true. This is generally a good idea because if the room is not
+     *                   updated, you will be unable to spawn another grid entity on the same tile
+     *                   until a frame has passed. However, doing this is expensive, since it involves
+     *                   a call to `Isaac.GetRoomEntities`, so set it to false if you need to run this
+     *                   function multiple times.
+     * @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
+     *          given location or if the given grid entity was not a custom grid entity.
+     */
+    removeCustomGridEntity(gridIndexOrPositionOrGridEntity: int | Vector | GridEntity, updateRoom?: boolean): GridEntity | undefined;
+    /**
+     * Helper function to get the custom grid entities in the current room. Returns an array of tuples
+     * containing the raw decoration grid entity and the associated entity data.
+     */
+    getCustomGridEntities(): Array<[
+    gridEntity: GridEntity,
+    data: GridEntityCustomData
+    ]>;
+    /**
+     * Helper function to get the custom `GridEntityType` from a `GridEntity` or grid index. Returns
+     * undefined if the provided `GridEntity` is not a custom grid entity, or if there was not a grid
+     * entity on the provided grid index.
+     */
+    getCustomGridEntityType(gridEntityOrGridIndex: GridEntity | int): GridEntityType | undefined;
+    /**
+     * Helper function to check if a `GridEntity` is a custom grid entity or if a grid index has a
+     * custom grid entity.
+     */
+    isCustomGridEntity(gridEntityOrGridIndex: GridEntity | int): boolean;
+}
+
+declare class CustomRevive extends Feature {
+    v: {
+        run: {
+            state: CustomReviveState;
+            revivalType: number | null;
+            dyingPlayerIndex: PlayerIndex | null;
+        };
+    };
+    private preCustomRevive;
+    private postCustomRevive;
+    constructor(preCustomRevive: PreCustomRevive, postCustomRevive: PostCustomRevive);
+    private postRender;
+    private postNewRoomReordered;
+    private postPEffectUpdateReordered;
+    private checkWaitingForItemAnimation;
+    private postPlayerFatalDamage;
+    private preBerserkDeath;
+    /**
+     * The player is about to die, which will immediately delete the save data for the run. To prevent
+     * this from happening, we grant the 1-Up item.
+     */
+    private playerIsAboutToDie;
+    private logStateChanged;
+}
+
+declare enum CustomReviveState {
+    DISABLED = 0,
+    /**
+     * We can't immediately jump to waiting for an item animation because it is possible for a player
+     * to be holding an item above their head as they are dying (e.g. with Razor Blade).
+     */
+    WAITING_FOR_ROOM_TRANSITION = 1,
+    WAITING_FOR_ITEM_ANIMATION = 2
+}
+
 /**
  * An object that represents a possible boss for a custom stage. This can be for a vanilla boss or a
  * custom boss.
@@ -2146,6 +2600,21 @@ declare type ErrorCustomClassNotSerializable = "Error: Custom classes with one o
 
 declare type ErrorIsaacAPIClassIsNotSerializable = "Error: Isaac API classes (such as e.g. `Entity` or `RoomConfig`) are not serializable. For more information, see: https://isaacscript.github.io/main/gotchas#isaac-api-classes-are-not-serializable";
 
+declare class EsauJrDetection extends Feature {
+    v: {
+        run: {
+            usedEsauJrFrame: number | null;
+            usedEsauJrControllerIndex: ControllerIndex | null;
+            usedEsauJrAtLeastOnce: boolean;
+        };
+    };
+    private postEsauJr;
+    private postFirstEsauJr;
+    constructor(postEsauJr: PostEsauJr, postFirstEsauJr: PostFirstEsauJr);
+    private postUpdate;
+    private useItemEsauJr;
+}
+
 /**
  * These are a collection of functions for non-TypeScript users so that they can access some of
  * useful methods offered on the `Array` class in the JavaScript standard library.
@@ -2169,6 +2638,22 @@ export declare function every<T>(array: T[], func: (value: T, index: number, arr
  */
 export declare type FactoryFunction<V, Args extends unknown[]> = (...args: Args) => V;
 
+/**
+ * The IsaacScript standard library contains many optional features, such as the ability to create
+ * custom pickups. All features are optional and are only initialized when needed. This class
+ * contains elements to facilitate that.
+ *
+ * Additionally, all custom callbacks extend from this class.
+ */
+declare class Feature {
+    initialized: boolean;
+    v?: SaveData;
+    featuresUsed?: ISCFeature[];
+    callbacksUsed?: CallbackTuple[];
+    customCallbacksUsed?: CustomCallbackTuple[];
+    exportedMethods: string[];
+}
+
 export declare function fillLevelWithRedRooms(): void;
 
 /**
@@ -2201,6 +2686,8 @@ export declare function find<T>(array: T[], func: (value: T, index: number, arra
  */
 export declare function findFreePosition(startingPosition: Vector, avoidActiveEntities?: boolean, minimumDistance?: float): Vector;
 
+declare type FireArgs<T extends ModCallbackCustom2> = Parameters<AddCallbackParametersCustom2[T][0]>;
+
 /**
  * Helper function to make an NPC fire one or more projectiles. Returns the fired projectile(s).
  *
@@ -2265,6 +2752,19 @@ export declare const FIRST_STAGE = LevelStage.BASEMENT_1;
 /** Equal to `TrinketType.SWALLOWED_PENNY`. */
 export declare const FIRST_TRINKET_TYPE = TrinketType.SWALLOWED_PENNY;
 
+declare class FlipDetection extends Feature {
+    v: {
+        run: {
+            /** We don't consider the case of a multiplayer game with more than one Tainted Lazarus. */
+            usedFlipAtLeastOnce: boolean;
+        };
+    };
+    private postFlip;
+    private postFirstFlip;
+    constructor(postFlip: PostFlip, postFirstFlip: PostFirstFlip);
+    private useItemFlip;
+}
+
 /**
  * An object containing all 7 vanilla fonts that are pre-loaded and ready to use.
  *
@@ -2318,6 +2818,11 @@ export declare function forgottenSwitch(): void;
 
 declare type FunctionIsNotSerializable = "Error: Functions are not serializable. For more information, see: https://isaacscript.github.io/main/gotchas#functions-are-not-serializable";
 
+export declare type FunctionTuple = [
+name: string,
+func: (...args: unknown[]) => unknown
+];
+
 /**
  * A cached version of the class returned from the `Game()` constructor.
  *
@@ -2331,6 +2836,27 @@ export declare const game: Game;
 /** Game frames are what is returned by the `Game.GetFrameCount` method. */
 export declare const GAME_FRAMES_PER_SECOND = 30;
 
+declare class GameReorderedCallbacks extends Feature {
+    private currentStage;
+    private currentStageType;
+    private usedGlowingHourGlass;
+    private forceNewLevel;
+    private forceNewRoom;
+    private postGameStartedReordered;
+    private postNewLevelReordered;
+    private postNewRoomReordered;
+    private postGameStartedReorderedLast;
+    constructor(postGameStartedReordered: PostGameStartedReordered, postNewLevelReordered: PostNewLevelReordered, postNewRoomReordered: PostNewRoomReordered, postGameStartedReorderedLast: PostGameStartedReorderedLast);
+    private useItemGlowingHourGlass;
+    private postGameStarted;
+    private postNewLevel;
+    private postNewRoom;
+    private recordCurrentStage;
+    forceNewLevelCallback(): void;
+    forceNewRoomCallback(): void;
+    reorderedCallbacksSetStage(stage: LevelStage, stageType: StageType): void;
+}
+
 /**
  * Helper function to find the active slot that the player has the corresponding collectible type
  * in. Returns undefined if the player does not have the collectible in any active slot.
@@ -2470,6 +2996,12 @@ export declare function getAllPlayers(): EntityPlayer[];
 /** Helper function to get the room safe grid index for every room on the entire floor. */
 export declare function getAllRoomGridIndexes(): int[];
 
+/**
+ * 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 declare function getAmbushType(): AmbushType | undefined;
+
 export declare function getAngelRoomDoor(): GridEntityDoor | undefined;
 
 export declare function getAngleDifference(angle1: float, angle2: float): float;
@@ -2657,8 +3189,11 @@ export declare function getCharacters(): PlayerType[];
  * This function accounts for The Battery. For example, if the player has 2/6 charges on a D6, this
  * function will return 10 (because there are 4 charges remaining on the base charge and 6 charges
  * remaining on The Battery charge).
+ *
+ * @param player The player to get the charges from.
+ * @param activeSlot Optional. The slot to get the charges from. Default is `ActiveSlot.PRIMARY`.
  */
-export declare function getChargesAwayFromMax(player: EntityPlayer, activeSlot: ActiveSlot): int;
+export declare function getChargesAwayFromMax(player: EntityPlayer, activeSlot?: ActiveSlot): int;
 
 /**
  * Helper function to get an array of equidistant points on the circumference around a circle.
@@ -4155,6 +4690,12 @@ export declare function getPlayerFromEntity(entity: Entity): EntityPlayer | unde
  */
 export declare function getPlayerFromIndex(playerIndex: PlayerIndex): EntityPlayer | undefined;
 
+/**
+ * Helper function to get an `EntityPlayer` object from an `EntityPtr`. Returns undefined if the
+ * entity has gone out of scope or if the associated entity is not a player.
+ */
+export declare function getPlayerFromPtr(entityPtr: EntityPtr): EntityPlayer | undefined;
+
 /**
  * Helper function to get an object representing the player's health. You can use this in
  * combination with the `setPlayerHealth` function to restore the player's health back to a certain
@@ -5237,8 +5778,11 @@ export declare function getTopLeftWallGridIndex(): int;
  * Helper function to get the combined normal charge and the battery charge for the player's active
  * item. This is useful because you have to add these two values together when setting the active
  * charge.
+ *
+ * @param player The player to get the charges from.
+ * @param activeSlot Optional. The slot to get the charges from. Default is `ActiveSlot.PRIMARY`.
  */
-export declare function getTotalCharge(player: EntityPlayer, activeSlot: ActiveSlot): int;
+export declare function getTotalCharge(player: EntityPlayer, activeSlot?: ActiveSlot): int;
 
 /**
  * Returns the total number of collectibles amongst all players. For example, if player 1 has 1 Sad
@@ -5360,14 +5904,24 @@ export declare function getTrinketsForCacheFlag(cacheFlag: CacheFlag): ReadonlyS
 export declare function getTrinketTypes(): TrinketType[];
 
 /**
- * Helper function to get the name of a TypeScriptToLua class. TSTL classes are Lua tables created
- * with the `__TS__Class` Lua function from the TSTL lualib. Their name is contained within
- * "constructor.name" metatable key.
+ * Helper function to get the constructor from an instantiated TypeScriptToLua class, which is
+ * located on the metatable.
+ *
+ * Returns undefined if passed a non-table or if the provided table does not have a metatable.
+ */
+export declare function getTSTLClassConstructor(object: unknown): TSTLClassMetatable["constructor"] | undefined;
+
+export declare function getTSTLClassMethods(object: unknown): FunctionTuple[];
+
+/**
+ * Helper function to get the name of a TypeScriptToLua class from the instantiated class object.
+ *
+ * TSTL classes are Lua tables created with the `__TS__Class` Lua function from the TSTL lualib.
+ * Their name is contained within "constructor.name" metatable key.
  *
  * For example, a `Map` class is has a name of "Map".
  *
- * Returns undefined if the object is not a table or if the aforementioned metatable key does not
- * exist.
+ * Returns undefined if passed a non-table or if the provided table does not have a metatable.
  */
 export declare function getTSTLClassName(object: unknown): string | undefined;
 
@@ -5455,6 +6009,20 @@ export declare const GRID_INDEX_CENTER_OF_1X1_ROOM = 67;
  */
 export declare function gridCoordinatesToWorldPosition(x: int, y: int): Vector;
 
+declare class GridEntityCollisionDetection extends Feature {
+    v: {
+        room: {
+            /** Indexed by grid entity pointer hash. */
+            collidingEntitiesMap: DefaultMap<PtrHash, Set<PtrHash>, []>;
+        };
+    };
+    private postGridEntityCollision;
+    private postGridEntityCustomCollision;
+    private customGridEntities;
+    constructor(postGridEntityCollision: PostGridEntityCollision, postGridEntityCustomCollision: PostGridEntityCustomCollision, customGridEntities: CustomGridEntities);
+    private postUpdate;
+}
+
 /**
  * This is meta-data that describes a custom grid entity.
  *
@@ -5474,6 +6042,39 @@ export declare interface GridEntityCustomData {
     defaultAnimation?: string;
 }
 
+declare class GridEntityDetection extends Feature {
+    v: {
+        room: {
+            /** Indexed by grid index. */
+            initializedGridEntities: Map<number, GridEntityTuple>;
+        };
+    };
+    private postGridEntityInit;
+    private postGridEntityCustomInit;
+    private postGridEntityUpdate;
+    private postGridEntityCustomUpdate;
+    private postGridEntityRemove;
+    private postGridEntityCustomRemove;
+    private postGridEntityStateChanged;
+    private postGridEntityCustomStateChanged;
+    private postGridEntityBroken;
+    private postGridEntityCustomBroken;
+    private customGridEntities;
+    constructor(postGridEntityInit: PostGridEntityInit, postGridEntityCustomInit: PostGridEntityCustomInit, postGridEntityUpdate: PostGridEntityUpdate, postGridEntityCustomUpdate: PostGridEntityCustomUpdate, postGridEntityRemove: PostGridEntityRemove, postGridEntityCustomRemove: PostGridEntityCustomRemove, postGridEntityStateChanged: PostGridEntityStateChanged, postGridEntityCustomStateChanged: PostGridEntityCustomStateChanged, postGridEntityBroken: PostGridEntityBroken, postGridEntityCustomBroken: PostGridEntityCustomBroken, customGridEntities: CustomGridEntities);
+    private postUpdate;
+    private checkGridEntitiesRemoved;
+    private checkGridEntityStateChanged;
+    private checkNewGridEntity;
+    private updateTupleInMap;
+    private postNewRoomReordered;
+}
+
+declare type GridEntityTuple = [
+gridEntityType: GridEntityType,
+variant: int,
+state: int
+];
+
 /**
  * Helper function to convert a grid index to a grid position.
  *
@@ -5489,6 +6090,32 @@ export declare function gridIndexToGridPosition(gridIndex: int, roomShape: RoomS
  */
 export declare function gridPositionToWorldPosition(gridPosition: Vector): Vector;
 
+/**
+ * A helper type to ensure that an object contains a key for every enum member. Use this with `as
+ * const` and `satisfies` to prevent narrowing the type of the object.
+ *
+ * For example:
+ *
+ * ```ts
+ * enum MyEnum {
+ *   Value1,
+ *   Value2,
+ *   Value3,
+ * }
+ *
+ * const MyEnumToString = {
+ *   [MyEnum.Value1]: "foo",
+ *   [MyEnum.Value2]: "bar",
+ *   [MyEnum.Value3]: "baz",
+ * } as const satisfies HasAllEnumKeys<MyEnum>;
+ *
+ * const value = MyEnumToString[MyEnum.Value2];
+ * ```
+ */
+export declare type HasAllEnumKeys<T extends string | number> = {
+    readonly [key in T]: unknown;
+};
+
 /**
  * Helper function to see if a particular entity has armor. In this context, armor refers to the
  * damage scaling mechanic. For example, Ultra Greed has armor, but a Gaper does not.
@@ -5712,33 +6339,6 @@ export declare function inHomeCloset(): boolean;
  */
 export declare function initArray<T>(defaultValue: T, size: int): T[];
 
-/**
- * `isaacscript-common` provides custom doors that can be spawned where any wall segment is. If you
- * use this feature, you must first call this initialization function at the beginning of your mod.
- *
- * Each kind of custom door that you create must have an entry in the "content/entities2.xml" file,
- * like so:
- *
- * ```xml
- * <entity id="1000" name="Foo Custom Door" anm2path="grid/door_foo.anm2" />
- * ```
- *
- * (Custom door entities must have an id of "1000", which corresponds to an effect. If you do not
- * specify the variant, then the game will automatically assign it.)
- *
- * Next, pass the variant into this function:
- *
- * ```ts
- * const modVanilla = RegisterMod("My Mod", 1);
- * const mod = upgradeMod(modVanilla);
- * const fooEffectVariant = Isaac.GetEntityVariantByName("Foo Custom Door");
- * initCustomDoor(mod, fooEffectVariant);
- * ```
- *
- * Also see the `spawnCustomDoor` function.
- */
-export declare function initCustomDoor(mod: ModUpgraded, effectVariant: EffectVariant): void;
-
 /** Helper function to determine if the current room shape is one of the four L room shapes. */
 export declare function inLRoom(): boolean;
 
@@ -5794,6 +6394,17 @@ export declare function inSecretShop(): boolean;
  */
 export declare function inStartingRoom(): boolean;
 
+/**
+ * Used for `setInterval` functions.
+ *
+ * The return value is whether or not to continue the function from firing.
+ */
+declare type IntervalFunctionTuple = [
+frameCountToFire: int,
+func: () => boolean,
+numIntervalFrames: int
+];
+
 /**
  * Helper function to return an array of integers with the specified range, inclusive on both ends.
  * (The "i" stands for inclusive.)
@@ -5842,9 +6453,22 @@ export declare function isActionTriggeredOnAnyInput(buttonAction: ButtonAction):
 /** Returns true if the item type in the item config is equal to `ItemType.ITEM_ACTIVE`. */
 export declare function isActiveCollectible(collectibleType: CollectibleType): boolean;
 
-export declare function isActiveSlotDoubleCharged(player: EntityPlayer, activeSlot: ActiveSlot): boolean;
+/**
+ * Helper function to check if a player's active item is "double charged", meaning that it has both
+ * a full normal charge and a full charge from The Battery.
+ *
+ * @param player The player to check.
+ * @param activeSlot Optional. The slot to check. Default is `ActiveSlot.PRIMARY`.
+ */
+export declare function isActiveSlotDoubleCharged(player: EntityPlayer, activeSlot?: ActiveSlot): boolean;
 
-export declare function isActiveSlotEmpty(player: EntityPlayer, activeSlot: ActiveSlot): boolean;
+/**
+ * Helper function to check if the active slot of a particular player is empty.
+ *
+ * @param player The player to check.
+ * @param activeSlot Optional. The active slot to check. Default is `ActiveSlot.PRIMARY`.
+ */
+export declare function isActiveSlotEmpty(player: EntityPlayer, activeSlot?: ActiveSlot): boolean;
 
 /**
  * Checks for specific NPCs that have "CanShutDoors" set to true naturally by the game, but should
@@ -5940,6 +6564,30 @@ export declare function isCardPickup(pickup: EntityPickup): pickup is EntityPick
 /** Returns whether or not the given card type matches the specified item config card type. */
 export declare function isCardType(cardType: CardType, itemConfigCardType: ItemConfigCardType): boolean;
 
+export declare enum ISCFeature {
+    CUSTOM_REVIVE = "CustomRevive",
+    ESAU_JR_DETECTION = "EsauJrDetection",
+    FLIP_DETECTION = "FlipDetection",
+    GRID_ENTITY_COLLISION_DETECTION = "GridEntityCollisionDetection",
+    GRID_ENTITY_DETECTION = "GridEntityDetection",
+    GAME_REORDERED_CALLBACKS = "GameReorderedCallbacks",
+    PLAYER_REORDERED_CALLBACKS = "PlayerReorderedCallbacks",
+    CUSTOM_GRID_ENTITIES = "CustomGridEntities",
+    RUN_IN_N_FRAMES = "runInNFrames"
+}
+
+declare interface ISCFeatureToClass {
+    [ISCFeature.CUSTOM_REVIVE]: CustomRevive;
+    [ISCFeature.ESAU_JR_DETECTION]: EsauJrDetection;
+    [ISCFeature.FLIP_DETECTION]: FlipDetection;
+    [ISCFeature.GRID_ENTITY_COLLISION_DETECTION]: GridEntityCollisionDetection;
+    [ISCFeature.GRID_ENTITY_DETECTION]: GridEntityDetection;
+    [ISCFeature.GAME_REORDERED_CALLBACKS]: GameReorderedCallbacks;
+    [ISCFeature.PLAYER_REORDERED_CALLBACKS]: PlayerReorderedCallbacks;
+    [ISCFeature.CUSTOM_GRID_ENTITIES]: CustomGridEntities;
+    [ISCFeature.RUN_IN_N_FRAMES]: RunInNFrames;
+}
+
 /**
  * Helper function to check if a player is a specific character (i.e. `PlayerType`).
  *
@@ -6179,6 +6827,12 @@ export declare function isGlitchedCollectible(pickup: EntityPickup): boolean;
 
 export declare function isGoldenTrinketType(trinketType: TrinketType): boolean;
 
+/**
+ * Helper function to check if the difficulty of the current run is equal to `Difficulty.GREED` or
+ * `Difficulty.GREEDIER`.
+ */
+export declare function isGreedMode(): boolean;
+
 /** Helper function to detect if a variable is of type `GridEntity`. */
 export declare function isGridEntity(variable: unknown): variable is GridEntity;
 
@@ -6408,8 +7062,13 @@ export declare function isRedHeart(pickup: EntityPickup): boolean;
 export declare function isRedKeyRoom(roomGridIndex?: int): boolean;
 
 /**
- * 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 declare function isReflectionRender(): boolean;
 
@@ -6548,6 +7207,9 @@ export declare function isSuitCard(cardType: CardType): boolean;
 
 export declare function isTable(variable: unknown): variable is LuaMap<AnyNotNil, unknown>;
 
+/** Helper function to check if a Lua table has 0 keys. */
+export declare function isTableEmpty(luaMap: LuaMap<AnyNotNil, unknown>): boolean;
+
 /** Helper function for detecting if a player is one of the Tainted characters. */
 export declare function isTainted(player: EntityPlayer): boolean;
 
@@ -6603,16 +7265,18 @@ export declare function isTrinket(pickup: EntityPickup): pickup is EntityPickupT
 /**
  * Helper function to determine if a given object is a TypeScriptToLua `Map`.
  *
- * It is not reliable to use the `instanceof` operator to determine this because each Lua module has
- * their own copies of the entire lualib and thus their own instantiated version of a `Map`.
+ * It is not reliable to use the `instanceof` operator to determine this because each Lua module
+ * might have their own copy of the entire lualib and thus their own instantiated version of a
+ * `Map`.
  */
 export declare function isTSTLMap(object: unknown): object is Map<AnyNotNil, unknown>;
 
 /**
  * Helper function to determine if a given object is a TypeScriptToLua `Set`.
  *
- * It is not reliable to use the `instanceof` operator to determine this because each Lua module has
- * their own copies of the entire lualib and thus their own instantiated version of a `Set`.
+ * It is not reliable to use the `instanceof` operator to determine this because each Lua module
+ * might have their own copy of the entire lualib and thus their own instantiated version of a
+ * `Set`.
  */
 export declare function isTSTLSet(object: unknown): object is Set<AnyNotNil>;
 
@@ -6858,6 +7522,25 @@ export declare function kColorEquals(kColor1: KColor, kColor2: KColor): boolean;
  */
 export declare function keyboardToString(keyboard: Keyboard, uppercase: boolean): string | undefined;
 
+declare type KeysToScrubFromModClass = keyof Feature | LowercaseKeys<ModUpgraded>;
+
+/**
+ * For `EntityType.EFFECT` (1000), `EffectVariant.LADDER` (8).
+ *
+ * Note that vanilla ladders only use a sub-type of 0. The `isaacscript-common` library uses ladders
+ * to represent custom objects, since they are non-interacting and will not automatically despawn
+ * after time passes, unlike most other effects.
+ *
+ * This enum tracks the kinds of custom objects that are represented by vanilla ladders. We start
+ * assigning sub-types after 100 as to not interfere with any possible modded ladder variants.
+ */
+export declare enum LadderSubTypeCustom {
+    LADDER = 0,
+    CUSTOM_BACKDROP = 101,
+    CUSTOM_SHADOW = 102,
+    CUSTOM_PICKUP = 103
+}
+
 /**
  * Equal to `PillColor.HORSE_WHITE_YELLOW`.
  *
@@ -7058,6 +7741,8 @@ export declare function logUserdata(userdata: unknown): void;
 
 export declare function logVector(vector: Vector, round?: boolean): void;
 
+export declare type LowercaseKeys<T> = StartsWithLowercase<keyof T>;
+
 /**
  * Helper function for non-TypeScript users to convert all of the elements in an array to something
  * else.
@@ -7122,6 +7807,20 @@ export declare function mapSetHash<V>(map: Map<PtrHash, V>, entity: Entity, valu
  */
 export declare function mapSetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer, value: V): void;
 
+/**
+ * A helper type used to get the matching `ModCallbackCustom` enum values that match the provided
+ * callback function signature.
+ *
+ * "T extends T" is necessary because of distributive conditional types:
+ * https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
+ *
+ * "extends Parameters<FuncSignature>" is necessary because "() => void" will match "(arg1: number)
+ * => void", since in JavaScript, functions ignore extra arguments.
+ *
+ * "extends ReturnType<FuncSignature>" is necessary because "() => void" will match "() => number".
+ */
+declare type MatchingCallbackCustom<FuncSignature extends (...args: any[]) => unknown, T extends ModCallbackCustom2 = ModCallbackCustom2> = T extends T ? AddCallbackParametersCustom2[T][0] extends FuncSignature ? Parameters<AddCallbackParametersCustom2[T][0]> extends Parameters<FuncSignature> ? ReturnType<AddCallbackParametersCustom2[T][0]> extends ReturnType<FuncSignature> ? T : never : never : never : never;
+
 /**
  * The floor is represented by a 13x13 grid. Room indexes start at 0. The first row is represented
  * by grid indexes from 0 to 12. The second row is represented by grid indexes from 13 to 25, and so
@@ -7182,8 +7881,9 @@ export declare enum ModCallbackCustom {
      * Fires from the `POST_UPDATE` callback when a Challenge Room or Boss Rush is started.
      * Specifically, this happens on the first frame that `Room.IsAmbushDone` is true.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if for the `AmbushType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the `AmbushType`
+     * provided.
      *
      * ```ts
      * function postAmbushFinished(ambushType: AmbushType): void {}
@@ -7194,8 +7894,9 @@ export declare enum ModCallbackCustom {
      * Fires from the `POST_UPDATE` callback when a Challenge Room or Boss Rush is completed.
      * Specifically, this happens on the first frame that `Room.IsAmbushActive` is true.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if for the `AmbushType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the `AmbushType`
+     * provided.
      *
      * ```ts
      * function postAmbushStarted(ambushType: AmbushType): void {}
@@ -7205,8 +7906,9 @@ export declare enum ModCallbackCustom {
     /**
      * Fires on the `POST_BOMB_UPDATE` callback that it explodes.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the bomb variant matches the `BombVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `BombVariant` provided.
      *
      * ```ts
      * function postBombDetonated(bomb: EntityBomb): void {}
@@ -7219,8 +7921,9 @@ export declare enum ModCallbackCustom {
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_BOMB_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the bomb variant matches the `BombVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `BombVariant` provided.
      *
      * ```ts
      * function postBombInitLate(bomb: EntityBomb): void {}
@@ -7239,8 +7942,9 @@ export declare enum ModCallbackCustom {
      * Fires from the `POST_PICKUP_UPDATE` callback when a collectible goes from a non-zero sub-type
      * to `CollectibleType.NULL` (i.e. an "empty" pedestal).
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the collectible type changed from the `CollectibleType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if the pedestal changed from
+     * the `CollectibleType` provided.
      *
      * ```ts
      * function postCollectibleEmpty(
@@ -7259,11 +7963,12 @@ export declare enum ModCallbackCustom {
      * upon re-entering the room. Additionally, when playing as Tainted Isaac, the `POST_PICKUP_INIT`
      * callback will fire every time the item shifts.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the collectible type matches the `CollectibleType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `CollectibleType` provided.
      *
      * ```ts
-     * function postCollectibleInitLate(collectible: EntityPickup): void {}
+     * function postCollectibleInitLate(collectible: EntityPickupCollectible): void {}
      * ```
      */
     POST_COLLECTIBLE_INIT_FIRST = 6,
@@ -7272,28 +7977,17 @@ export declare enum ModCallbackCustom {
      * begins playing after a player triggers a Cursed Eye teleport or a Cursed Skull teleport. (Both
      * of these have the same effect in causing Isaac to be teleported to a random room.)
      *
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
+     *
      * ```ts
      * function postCursedTeleport(player: EntityPlayer): void {}
      * ```
      */
     POST_CURSED_TELEPORT = 7,
-    /**
-     * Fires from the `POST_PEFFECT_UPDATE` callback when a player enters the loading zone of a custom
-     * door created with the `spawnCustomDoor` helper function.
-     *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `DoorVariant` provided.
-     *
-     * ```ts
-     * function postCustomDoorEnter(
-     *   player: EntityPlayer,
-     *   effectVariant: int,
-     *   doorSlot: DoorSlot,
-     *   direction: Direction,
-     * ): void {}
-     * ```
-     */
-    POST_CUSTOM_DOOR_ENTER = 8,
     /**
      * Fires from the `POST_PLAYER_UPDATE` callback after the player has finished the death animation,
      * has teleported to the previous room, and is ready to play the animation for the modded revival
@@ -7303,20 +7997,22 @@ export declare enum ModCallbackCustom {
      * `player.AnimateCollectible(CollectibleTypeCustom.COLLECTIBLE_MY_REVIVAL_ITEM);`, otherwise the
      * animation for a 1-Up will play.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the revival type matches the one provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if the revival type matches
+     * the one provided.
      *
      * ```ts
      * function postCustomRevive(player: EntityPlayer, revivalType: int): void {}
      * ```
      */
-    POST_CUSTOM_REVIVE = 9,
+    POST_CUSTOM_REVIVE = 8,
     /**
      * Fires from the `EFFECT_POST_UPDATE` callback after a player has entered the range of a Dice
      * Room floor.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the `DiceFloorSubType` type matches the one provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `DiceFloorSubType` provided.
      *
      * ```ts
      * function postDiceRoomActivated(
@@ -7325,49 +8021,53 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_DICE_ROOM_ACTIVATED = 10,
+    POST_DICE_ROOM_ACTIVATED = 9,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a door exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postDoorRender(door: GridEntityDoor): void {}
      * ```
      */
-    POST_DOOR_RENDER = 11,
+    POST_DOOR_RENDER = 10,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a door exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postDoorUpdate(door: GridEntityDoor): void {}
      * ```
      */
-    POST_DOOR_UPDATE = 12,
+    POST_DOOR_UPDATE = 11,
     /**
      * Fires on the first `POST_EFFECT_UPDATE` frame for each effect.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_EFFECT_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the effect variant matches the `EffectVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `EffectVariant` provided.
      *
      * ```ts
      * function postEffectInitLate(effect: EntityEffect): void {}
      * ```
      */
-    POST_EFFECT_INIT_LATE = 13,
+    POST_EFFECT_INIT_LATE = 12,
     /**
      * Fires from the `POST_EFFECT_UPDATE` callback when an effect's state has changed from what it
      * was on the previous frame. (In this context, "state" refers to the `EntityEffect.State` field.)
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `EffectVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `EffectVariant` provided.
      *
      * ```ts
      * function postEffectStateChanged(
@@ -7377,7 +8077,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_EFFECT_STATE_CHANGED = 14,
+    POST_EFFECT_STATE_CHANGED = 13,
     /**
      * Fires one `POST_UPDATE` frame after the player has used the Esau Jr. item. (The player is not
      * updated to the new character until a game frame has passed.)
@@ -7386,28 +8086,30 @@ export declare enum ModCallbackCustom {
      * function postEsauJr(player: EntityPlayer): void {}
      * ```
      */
-    POST_ESAU_JR = 15,
+    POST_ESAU_JR = 14,
     /**
      * Fires on the first `FAMILIAR_UPDATE` frame for each familiar.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_TEAR_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the familiar variant matches the `FamiliarVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `FamiliarVariant` provided.
      *
      * ```ts
      * function postFamiliarInitLate(familiar: EntityFamiliar): void {}
      * ```
      */
-    POST_FAMILIAR_INIT_LATE = 16,
+    POST_FAMILIAR_INIT_LATE = 15,
     /**
      * Fires from the `POST_FAMILIAR_UPDATE` callback when a familiar's state has changed from what it
      * was on the previous frame. (In this context, "state" refers to the `EntityFamiliar.State`
      * field.)
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `FamiliarVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `FamiliarVariant` provided.
      *
      * ```ts
      * function postFamiliarStateChanged(
@@ -7417,7 +8119,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_FAMILIAR_STATE_CHANGED = 17,
+    POST_FAMILIAR_STATE_CHANGED = 16,
     /**
      * Fires one `POST_UPDATE` frame after the player has first used the Esau Jr. item. (The player is
      * not updated to the new character until a game frame has passed.)
@@ -7429,7 +8131,7 @@ export declare enum ModCallbackCustom {
      * function postFirstEsauJr(player: EntityPlayer): void {}
      * ```
      */
-    POST_FIRST_ESAU_JR = 18,
+    POST_FIRST_ESAU_JR = 17,
     /**
      * Fires after the player has used the Flip item for the first time. Unlike the vanilla `USE_ITEM`
      * callback, this callback will return the player object for the new Lazarus (not the one who used
@@ -7442,7 +8144,7 @@ export declare enum ModCallbackCustom {
      * function postFirstFlip(newLazarus: EntityPlayer, oldLazarus: EntityPlayer): void {}
      * ```
      */
-    POST_FIRST_FLIP = 19,
+    POST_FIRST_FLIP = 18,
     /**
      * Fires after the player has used the Flip item. Unlike the vanilla `USE_ITEM` callback, this
      * callback will return the player object for the new Lazarus (not the one who used the Flip
@@ -7455,7 +8157,7 @@ export declare enum ModCallbackCustom {
      * function postFlip(newLazarus: EntityPlayer, oldLazarus: EntityPlayer): void {}
      * ```
      */
-    POST_FLIP = 20,
+    POST_FLIP = 19,
     /**
      * Similar to the vanilla callback of the same name, but fires in the correct order with respect
      * to the `POST_NEW_LEVEL` and the `POST_NEW_ROOM` callbacks:
@@ -7466,7 +8168,7 @@ export declare enum ModCallbackCustom {
      * function postGameStartedReordered(isContinued: boolean): void {}
      * ```
      */
-    POST_GAME_STARTED_REORDERED = 21,
+    POST_GAME_STARTED_REORDERED = 20,
     /**
      * Similar to the `POST_GAME_STARTED_REORDERED` callback, but fires after all of the subscribed
      * callbacks have finished firing. Thus, you can use this callback to do perform things after a
@@ -7477,7 +8179,7 @@ export declare enum ModCallbackCustom {
      * function postGameStartedReorderedLast(isContinued: boolean): void {}
      * ```
      */
-    POST_GAME_STARTED_REORDERED_LAST = 22,
+    POST_GAME_STARTED_REORDERED_LAST = 21,
     /**
      * Fires from the `POST_UPDATE` callback when the Greed Mode wave increases.
      *
@@ -7485,7 +8187,7 @@ export declare enum ModCallbackCustom {
      * function postGreedModeWave(oldWave: int, newWave: int): void {}
      * ```
      */
-    POST_GREED_MODE_WAVE = 23,
+    POST_GREED_MODE_WAVE = 22,
     /**
      * Fires from the `POST_UPDATE` callback when a grid entity changes to a state that corresponds to
      * the broken state for the respective grid entity type. (For example, this will fire for a
@@ -7494,16 +8196,17 @@ export declare enum ModCallbackCustom {
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_BROKEN` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityBroken(gridEntity: GridEntity): void {}
      * ```
      */
-    POST_GRID_ENTITY_BROKEN = 24,
+    POST_GRID_ENTITY_BROKEN = 23,
     /**
      * Fires from the `POST_UPDATE` callback when a new entity collides with a grid entity. (After
      * this, the callback will not continue to fire. It will only fire again once the entity moves out
@@ -7512,14 +8215,15 @@ export declare enum ModCallbackCustom {
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_COLLISION` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided (for the grid entity).
-     * - When registering the callback, takes an optional fourth argument that will make the callback
-     *   only fire if the colliding entity matches the `EntityType` provided.
-     * - When registering the callback, takes an optional fifth argument that will make the callback
-     *   only fire if the colliding entity matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided (for the grid entity).
+     * - You can provide an optional fifth argument that will make the callback only fire if the
+     *   colliding entity matches the `EntityType` provided.
+     * - You can provide an optional sixth argument that will make the callback only fire if the
+     *   colliding entity matches the variant provided.
      *
      * ```ts
      * function postGridEntityCollision(
@@ -7528,14 +8232,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_COLLISION = 25,
+    POST_GRID_ENTITY_COLLISION = 24,
     /**
      * The same as the `POST_GRID_ENTITY_BROKEN` callback, but only fires for grid entities created
      * with the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomBroken(
@@ -7544,18 +8249,19 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_BROKEN = 26,
+    POST_GRID_ENTITY_CUSTOM_BROKEN = 25,
     /**
      * The same as the `POST_GRID_ENTITY_COLLISION` callback, but only fires for grid entities created
      * with the `spawnCustomGridEntity` helper function.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     *   variants, so there is no need for an optional third argument to filter by variant.)
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the the colliding entity matches the `EntityType` provided.
-     * - When registering the callback, takes an optional fourth argument that will make the callback
-     *   only fire if the the colliding entity matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the custom `GridEntityType` provided. (Custom grid entities do not have variants, so
+     *   there is no need for an optional argument to filter by variant.)
+     * - You can provide an optional fourth argument that will make the callback only fire if the
+     *   colliding entity matches the `EntityType` provided.
+     * - You can provide an optional fifth argument that will make the callback only fire if the
+     *   colliding entity matches the variant provided.
      *
      * ```ts
      * function postGridEntityCustomCollision(
@@ -7565,14 +8271,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_COLLISION = 27,
+    POST_GRID_ENTITY_CUSTOM_COLLISION = 26,
     /**
      * The same as the `POST_GRID_ENTITY_INIT` callback, but only fires for grid entities created with
      * the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomInit(
@@ -7581,14 +8288,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_INIT = 28,
+    POST_GRID_ENTITY_CUSTOM_INIT = 27,
     /**
      * The same as the `POST_GRID_ENTITY_REMOVE` callback, but only fires for grid entities created
      * with the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomRemove(
@@ -7597,14 +8305,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_REMOVE = 29,
+    POST_GRID_ENTITY_CUSTOM_REMOVE = 28,
     /**
      * The same as the `POST_GRID_ENTITY_RENDER` callback, but only fires for grid entities created
      * with the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomRender(
@@ -7613,14 +8322,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_RENDER = 30,
+    POST_GRID_ENTITY_CUSTOM_RENDER = 29,
     /**
      * The same as the `POST_GRID_ENTITY_STATE_CHANGED` callback, but only fires for grid entities
      * created with the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomStateChanged(
@@ -7631,14 +8341,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_STATE_CHANGED = 31,
+    POST_GRID_ENTITY_CUSTOM_STATE_CHANGED = 30,
     /**
      * The same as the `POST_GRID_ENTITY_UPDATE` callback, but only fires for grid entities created
      * with the `spawnCustomGridEntity` helper function.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `GridEntityType` provided. (Custom grid entities do not have
-     * variants, so there is no need for an optional third argument to filter by variant.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the custom
+     * `GridEntityType` provided. (Custom grid entities do not have variants, so there is no need for
+     * an optional argument to filter by variant.)
      *
      * ```ts
      * function postGridEntityCustomUpdate(
@@ -7647,7 +8358,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_CUSTOM_UPDATE = 32,
+    POST_GRID_ENTITY_CUSTOM_UPDATE = 31,
     /**
      * Fires when a new grid entity is initialized. Specifically, this is either:
      *
@@ -7659,16 +8370,17 @@ export declare enum ModCallbackCustom {
      * For grid entities created with `spawnCustomGridEntity`, use the `POST_GRID_ENTITY_CUSTOM_INIT`
      * callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityInit(gridEntity: GridEntity): void {}
      * ```
      */
-    POST_GRID_ENTITY_INIT = 33,
+    POST_GRID_ENTITY_INIT = 32,
     /**
      * Fires from the `POST_UPDATE` callback when a new grid entity is removed. Specifically, this on
      * the frame after it no longer exists (where it did exist a frame ago).
@@ -7680,10 +8392,11 @@ export declare enum ModCallbackCustom {
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_REMOVE` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityRemove(
@@ -7692,23 +8405,24 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_REMOVE = 34,
+    POST_GRID_ENTITY_REMOVE = 33,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a grid entity exists.
      *
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_RENDER` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityRender(gridEntity: GridEntity): void {}
      * ```
      */
-    POST_GRID_ENTITY_RENDER = 35,
+    POST_GRID_ENTITY_RENDER = 34,
     /**
      * Fires from the `POST_UPDATE` callback when a grid entity changes its state. (In this context,
      * "state" refers to the `GridEntity.State` field.)
@@ -7716,10 +8430,11 @@ export declare enum ModCallbackCustom {
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_STATE_CHANGED` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityStateChanged(
@@ -7729,23 +8444,24 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_GRID_ENTITY_STATE_CHANGED = 36,
+    POST_GRID_ENTITY_STATE_CHANGED = 35,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a grid entity exists.
      *
      * For grid entities created with `spawnCustomGridEntity`, use the
      * `POST_GRID_ENTITY_CUSTOM_UPDATE` callback instead.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `GridEntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `GridEntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postGridEntityUpdate(gridEntity: GridEntity): void {}
      * ```
      */
-    POST_GRID_ENTITY_UPDATE = 37,
+    POST_GRID_ENTITY_UPDATE = 36,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when the player loses a Holy Mantle temporary
      * collectible effect.
@@ -7754,10 +8470,11 @@ export declare enum ModCallbackCustom {
      * from an enemy. Normally, you would accomplish this via the `ENTITY_TAKE_DMG` callback, but that
      * callback never fires if the player has a Holy Mantle shield.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerInitReordered(
@@ -7767,7 +8484,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_HOLY_MANTLE_REMOVED = 38,
+    POST_HOLY_MANTLE_REMOVED = 37,
     /**
      * Fires from `POST_PEFFECT_UPDATE` callback when the player loses charge on their active
      * collectible item, implying that the item was just used.
@@ -7778,8 +8495,9 @@ export declare enum ModCallbackCustom {
      * Note that this callback will not fire if the active item is both discharged and swapped for
      * another item / discharged on the same frame, like in the case of Alabaster Box.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `CollectibleType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `CollectibleType` provided.
      *
      * ```ts
      * function postItemDischarge(
@@ -7789,7 +8507,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_ITEM_DISCHARGE = 39,
+    POST_ITEM_DISCHARGE = 38,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when an item is no longer queued (i.e. when the
      * animation of the player holding the item above their head is finished and the item is actually
@@ -7797,10 +8515,11 @@ export declare enum ModCallbackCustom {
      *
      * Note that this callback will only fire once per Forgotten/Soul pair.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `ItemType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the `CollectibleType` or the `TrinketType` matches the sub-type provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `ItemType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if the
+     *   sub-type matches the `CollectibleType` or the `TrinketType` provided.
      *
      * ```ts
      * function postItemPickup(
@@ -7809,35 +8528,37 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_ITEM_PICKUP = 40,
+    POST_ITEM_PICKUP = 39,
     /**
      * Fires on the first `POST_KNIFE_UPDATE` frame for each knife.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_KNIFE_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the knife variant matches the `KnifeVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `KnifeVariant` provided.
      *
      * ```ts
      * function postKnifeInitLate(knife: EntityKnife): void {}
      * ```
      */
-    POST_KNIFE_INIT_LATE = 41,
+    POST_KNIFE_INIT_LATE = 40,
     /**
      * Fires on the first `POST_LASER_UPDATE` frame for each laser.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_LASER_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the laser variant matches the `LaserVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `LaserVariant` provided.
      *
      * ```ts
      * function postLaserInitLate(laser: EntityLaser): void {}
      * ```
      */
-    POST_LASER_INIT_LATE = 42,
+    POST_LASER_INIT_LATE = 41,
     /**
      * The same as the vanilla callback of the same name, but fires in the correct order with respect
      * to the `POST_GAME_STARTED` and the `POST_NEW_ROOM` callbacks:
@@ -7854,7 +8575,7 @@ export declare enum ModCallbackCustom {
      * function postNewLevelReordered(): void {}
      * ```
      */
-    POST_NEW_LEVEL_REORDERED = 43,
+    POST_NEW_LEVEL_REORDERED = 42,
     /**
      * Fires on the first `POST_NEW_ROOM` or `PRE_ENTITY_SPAWN` callback where being in a new room is
      * detected. This is useful because the vanilla `POST_NEW_ROOM` callback fires only after entities
@@ -7865,7 +8586,7 @@ export declare enum ModCallbackCustom {
      * function postNewRoomEarly(): void {}
      * ```
      */
-    POST_NEW_ROOM_EARLY = 44,
+    POST_NEW_ROOM_EARLY = 43,
     /**
      * The same as the vanilla callback of the same name, but fires in the correct order with respect
      * to the `POST_GAME_STARTED` and the `POST_NEW_LEVEL` callbacks:
@@ -7882,29 +8603,31 @@ export declare enum ModCallbackCustom {
      * function postNewRoomReordered(): void {}
      * ```
      */
-    POST_NEW_ROOM_REORDERED = 45,
+    POST_NEW_ROOM_REORDERED = 44,
     /**
      * Fires on the first `NPC_UPDATE` frame for each NPC.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_NPC_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the NPC's entity type matches the entity type provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the `EntityType`
+     * provided.
      *
      * ```ts
      * function postNPCInitLate(npc: EntityNPC): void {}
      * ```
      */
-    POST_NPC_INIT_LATE = 46,
+    POST_NPC_INIT_LATE = 45,
     /**
      * Fires from the `POST_NPC_UPDATE` callback when an NPC's state has changed from what it was on
      * the previous frame. (In this context, "state" refers to the `EntityNPC.State` field.)
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `EntityType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `EntityType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the variant provided.
      *
      * ```ts
      * function postNPCStateChanged(
@@ -7914,7 +8637,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_NPC_STATE_CHANGED = 47,
+    POST_NPC_STATE_CHANGED = 46,
     /**
      * Similar to the vanilla callback of the same name, but fires after the
      * `POST_GAME_STARTED_REORDERED` callback fires (if the player is being updated on the 0th game
@@ -7929,29 +8652,31 @@ export declare enum ModCallbackCustom {
      *    callback. For example, since the level is not generated yet, you will not be able to access
      *    any rooms.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPEffectUpdateReordered(player: EntityPlayer): void {}
      * ```
      */
-    POST_PEFFECT_UPDATE_REORDERED = 48,
+    POST_PEFFECT_UPDATE_REORDERED = 47,
     /**
      * Fires on the first `POST_RENDER` frame that a pickup plays the "Collect" animation.
      *
      * Use this callback to know when a pickup is added to the player's inventory or health.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the pickup variant matches the `PickupVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `PickupVariant` provided.
      *
      * ```ts
      * function postPickupCollect(pickup: EntityPickup, player: EntityPlayer): void {}
      * ```
      */
-    POST_PICKUP_COLLECT = 49,
+    POST_PICKUP_COLLECT = 48,
     /**
      * Fires from the `POST_PICKUP_INIT` callback on the first time that a player has seen the
      * respective pickup on the run.
@@ -7959,34 +8684,37 @@ export declare enum ModCallbackCustom {
      * This callback is useful because pickups will despawn upon leaving the room and respawn upon
      * re-entering the room.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the collectible type matches the `PickupVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `PickupVariant` provided.
      *
      * ```ts
      * function postPickupInitFirst(pickup: EntityPickup): void {}
      * ```
      */
-    POST_PICKUP_INIT_FIRST = 50,
+    POST_PICKUP_INIT_FIRST = 49,
     /**
      * Fires on the first `POST_PICKUP_UPDATE` frame for each pickup.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_PICKUP_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the pickup variant matches the `PickupVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `PickupVariant` provided.
      *
      * ```ts
      * function postPickupInitLate(pickup: EntityPickup): void {}
      * ```
      */
-    POST_PICKUP_INIT_LATE = 51,
+    POST_PICKUP_INIT_LATE = 50,
     /**
      * Fires from the `POST_PICKUP_UPDATE` callback when a pickup's state has changed from what it was
      * on the previous frame. (In this context, "state" refers to the `EntityPickup.State` field.)
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `PickupVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `PickupVariant` provided.
      *
      * ```ts
      * function postPickupStateChanged(
@@ -7996,37 +8724,40 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PICKUP_STATE_CHANGED = 52,
+    POST_PICKUP_STATE_CHANGED = 51,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a pit exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPitRender(pit: GridEntityPit): void {}
      * ```
      */
-    POST_PIT_RENDER = 53,
+    POST_PIT_RENDER = 52,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a pit exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPitUpdate(pit: GridEntityPit): void {}
      * ```
      */
-    POST_PIT_UPDATE = 54,
+    POST_PIT_UPDATE = 53,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's health (i.e. hearts) is different
      * than what it was on the previous frame. For more information, see the `PlayerHealth` enum.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerChangeHealth(
@@ -8038,7 +8769,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PLAYER_CHANGE_HEALTH = 55,
+    POST_PLAYER_CHANGE_HEALTH = 54,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when one of the player's stats change from what
      * they were on the previous frame.
@@ -8052,10 +8783,11 @@ export declare enum ModCallbackCustom {
      * numbers. (For these cases, you should examine the `oldValue` and `newValue` arguments
      * accordingly.)
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerChangeStat(
@@ -8067,7 +8799,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PLAYER_CHANGE_STAT = 56,
+    POST_PLAYER_CHANGE_STAT = 55,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player entity changes its player type
      * (i.e. character) from what it was on the previous frame. For example, it will fire after using
@@ -8077,6 +8809,10 @@ export declare enum ModCallbackCustom {
      * those items cause separate player entities to be created. Use the `POST_FLIP` and
      * `POST_ESAU_JR` callbacks to handle those situations.
      *
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `PlayerVariant` provided.
+     *
      * ```ts
      * function postPlayerChangeType(
      *   player: EntityPlayer,
@@ -8085,14 +8821,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PLAYER_CHANGE_TYPE = 57,
+    POST_PLAYER_CHANGE_TYPE = 56,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is higher than
      * what it was on the previous frame, or when the active items change, or when the build is
      * rerolled.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the collectible matches the `CollectibleType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if the collectible matches the
+     * `CollectibleType` provided.
      *
      * ```ts
      * function postPlayerCollectibleAdded(
@@ -8101,14 +8838,15 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PLAYER_COLLECTIBLE_ADDED = 58,
+    POST_PLAYER_COLLECTIBLE_ADDED = 57,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is lower than
      * what it was on the previous frame, or when the active items change, or when the build is
      * rerolled.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the collectible matches the `CollectibleType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if the collectible matches the
+     * `CollectibleType` provided.
      *
      * ```ts
      * function postPlayerCollectibleRemoved(
@@ -8117,7 +8855,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_PLAYER_COLLECTIBLE_REMOVED = 59,
+    POST_PLAYER_COLLECTIBLE_REMOVED = 58,
     /**
      * Fires from the `ENTITY_TAKE_DMG` callback when a player takes fatal damage. Return false to
      * prevent the fatal damage.
@@ -8125,16 +8863,17 @@ export declare enum ModCallbackCustom {
      * Note that this function does properly take into account Guppy's Collar, Broken Ankh, Spirit
      * Shackles, and Mysterious Paper. It also takes into account using The Bible on Satan.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerFatalDamage(player: EntityPlayer): boolean | undefined {}
      * ```
      */
-    POST_PLAYER_FATAL_DAMAGE = 60,
+    POST_PLAYER_FATAL_DAMAGE = 59,
     /**
      * Fires on the first `POST_PEFFECT_UPDATE_REORDERED` frame for each player, similar to the
      * `POST_PLAYER_INIT_LATE` callback, with two changes:
@@ -8146,16 +8885,17 @@ export declare enum ModCallbackCustom {
      * character their starting items for the run. (You do not want to use the vanilla
      * `POST_PLAYER_INIT` callback for this because it fires when a run is continued.)
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerInitFirst(player: EntityPlayer): void {}
      * ```
      */
-    POST_PLAYER_INIT_FIRST = 61,
+    POST_PLAYER_INIT_FIRST = 60,
     /**
      * Fires on the first `POST_PEFFECT_UPDATE_REORDERED` frame for each player.
      *
@@ -8165,16 +8905,17 @@ export declare enum ModCallbackCustom {
      * For initializing a player with custom items and so forth, use the `POST_PLAYER_INIT_FIRST`
      * callback instead to handle the case of a Genesis room.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerInitLate(pickup: EntityPickup): void {}
      * ```
      */
-    POST_PLAYER_INIT_LATE = 62,
+    POST_PLAYER_INIT_LATE = 61,
     /**
      * Similar to the vanilla callback of the same name, but fires after the `POST_GAME_STARTED`
      * callback fires (if the player is spawning on the 0th game frame of the run).
@@ -8188,16 +8929,17 @@ export declare enum ModCallbackCustom {
      *    callback. For example, since the level is not generated yet, you will not be able to access
      *    any rooms.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerRenderReordered(player: EntityPlayer): void {}
      * ```
      */
-    POST_PLAYER_RENDER_REORDERED = 63,
+    POST_PLAYER_RENDER_REORDERED = 62,
     /**
      * Similar to the vanilla callback of the same name, but fires after the
      * `POST_GAME_STARTED_REORDERED` callback fires (if the player is being updated on the 0th game
@@ -8212,147 +8954,159 @@ export declare enum ModCallbackCustom {
      *    callback. For example, since the level is not generated yet, you will not be able to access
      *    any rooms.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postPlayerUpdateReordered(player: EntityPlayer): void {}
      * ```
      */
-    POST_PLAYER_UPDATE_REORDERED = 64,
+    POST_PLAYER_UPDATE_REORDERED = 63,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a poop exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPoopRender(poop: GridEntityPoop): void {}
      * ```
      */
-    POST_POOP_RENDER = 65,
+    POST_POOP_RENDER = 64,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a poop exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPoopUpdate(poop: GridEntityPoop): void {}
      * ```
      */
-    POST_POOP_UPDATE = 66,
+    POST_POOP_UPDATE = 65,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a pressure plate exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPressurePlateRender(pressurePlate: GridEntityPressurePlate): void {}
      * ```
      */
-    POST_PRESSURE_PLATE_RENDER = 67,
+    POST_PRESSURE_PLATE_RENDER = 66,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a pressure plate exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postPressurePlateUpdate(pressurePlate: GridEntityPressurePlate): void {}
      * ```
      */
-    POST_PRESSURE_PLATE_UPDATE = 68,
+    POST_PRESSURE_PLATE_UPDATE = 67,
     /**
      * Fires on the first `POST_PROJECTILE_UPDATE` frame for each projectile.
      *
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_PROJECTILE_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the projectile variant matches the `ProjectileVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if matches the
+     * `ProjectileVariant` provided.
      *
      * ```ts
      * function postProjectileInitLate(projectile: EntityProjectile): void {}
      * ```
      */
-    POST_PROJECTILE_INIT_LATE = 69,
+    POST_PROJECTILE_INIT_LATE = 68,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player first picks up a new item. The
      * pickup returned in the callback is assumed to be the first pickup that no longer exists.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `PickupVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if it matches the sub-type provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PickupVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the sub-type provided.
      *
      * ```ts
      * function postPurchase(player: EntityPlayer, pickup: EntityPickup): void {}
      * ```
      */
-    POST_PURCHASE = 70,
+    POST_PURCHASE = 69,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a rock exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postRockRender(rock: GridEntityRock): void {}
      * ```
      */
-    POST_ROCK_RENDER = 71,
+    POST_ROCK_RENDER = 70,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a rock exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postRockUpdate(rock: GridEntityRock): void {}
      * ```
      */
-    POST_ROCK_UPDATE = 72,
+    POST_ROCK_UPDATE = 71,
     /**
      * Fires from the `POST_UPDATE` callback when the clear state of a room changes (as according to
      * the `Room.IsClear` method).
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the room clear state matches the boolean provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if the room clear state
+     * matches the boolean provided.
      *
      * ```ts
      * function postRoomClearChanged(roomClear: boolean): void {}
      * ```
      */
-    POST_ROOM_CLEAR_CHANGED = 73,
+    POST_ROOM_CLEAR_CHANGED = 72,
     /**
      * Fires from the `ENTITY_TAKE_DMG` callback when a player takes damage from spikes in a Sacrifice
      * Room.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function postSacrifice(player: EntityPlayer, numSacrifices: int): void {}
      * ```
      */
-    POST_SACRIFICE = 74,
+    POST_SACRIFICE = 73,
     /**
      * Fires from the `POST_RENDER` callback when a slot entity's animation changes.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `SlotVariant` provided.
      *
      * ```ts
      * function postSlotAnimationChanged(slot: Entity): void {}
      * ```
      */
-    POST_SLOT_ANIMATION_CHANGED = 75,
+    POST_SLOT_ANIMATION_CHANGED = 74,
     /**
      * Fires from the `PRE_PLAYER_COLLISION` callback when when a player collides with a slot entity.
      * (It will not fire if any other type of entity collides with the slot entity.)
@@ -8361,9 +9115,10 @@ export declare enum ModCallbackCustom {
      * colliding with it on every frame. Thus, you should only perform actions in this callback under
      * certain conditions, like if the slot entity is playing the "Idle" animation, and so on.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided. (There is no need for any additional
-     * arguments, since only players will cause this callback to fire.)
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `SlotVariant` provided. (Only players will cause this callback to fire, so there is no need for
+     * an optional argument to filter by `EntityType`.)
      *
      * ```ts
      * function postSlotCollision(
@@ -8372,21 +9127,22 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_SLOT_COLLISION = 76,
+    POST_SLOT_COLLISION = 75,
     /**
      * Fires from the `POST_RENDER` callback when a slot plays the animation that indicates that it
      * has broken.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `SlotVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the destruction type matches the `SlotDestructionType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `SlotVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `SlotDestructionType` provided.
      *
      * ```ts
      * function postSlotDestroyed(slot: Entity, slotDestructionType: SlotDestructionType): void {}
      * ```
      */
-    POST_SLOT_DESTROYED = 77,
+    POST_SLOT_DESTROYED = 76,
     /**
      * Fires when a new slot entity is initialized. Specifically, this is either:
      *
@@ -8395,58 +9151,63 @@ export declare enum ModCallbackCustom {
      * - in the `POST_UPDATE` callback (if the entity appeared mid-way through the room, like when a
      *   Wheel of Fortune card is used)
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `SlotVariant` provided.
      *
      * ```ts
      * function postSlotInit(slot: Entity): void {}
      * ```
      */
-    POST_SLOT_INIT = 78,
+    POST_SLOT_INIT = 77,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a slot entity exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `SlotVariant` provided.
      *
      * ```ts
      * function postSlotRender(slot: Entity): void {}
      * ```
      */
-    POST_SLOT_RENDER = 79,
+    POST_SLOT_RENDER = 78,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a slot entity exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `SlotVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `SlotVariant` provided.
      *
      * ```ts
      * function postSlotUpdate(slot: Entity): void {}
      * ```
      */
-    POST_SLOT_UPDATE = 80,
+    POST_SLOT_UPDATE = 79,
     /**
      * Fires from the `POST_RENDER` callback on every frame that spikes exist.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postSpikesRender(spikes: GridEntitySpikes): void {}
      * ```
      */
-    POST_SPIKES_RENDER = 81,
+    POST_SPIKES_RENDER = 80,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that spikes exist.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postSpikesUpdate(spikes: GridEntitySpikes): void {}
      * ```
      */
-    POST_SPIKES_UPDATE = 82,
+    POST_SPIKES_UPDATE = 81,
     /**
      * Fires on the first `POST_TEAR_UPDATE` frame for each tear (which is when
      * `EntityTear.FrameCount` is equal to 0).
@@ -8454,58 +9215,63 @@ export declare enum ModCallbackCustom {
      * This callback is useful because many attributes cannot be set or retrieved properly in the
      * normal `POST_TEAR_INIT` callback.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the tear variant matches the `TearVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `TearVariant` provided.
      *
      * ```ts
      * function postTearInitLate(tear: EntityTear): void {}
      * ```
      */
-    POST_TEAR_INIT_LATE = 83,
+    POST_TEAR_INIT_LATE = 82,
     /**
      * Fires on the second `POST_TEAR_UPDATE` frame for each tear (which is when
      * `EntityTear.FrameCount` is equal to 1).
      *
      * This callback is useful because Incubus tears are not distinguishable until the second frame.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if the tear variant matches the `TearVariant` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `TearVariant` provided.
      *
      * ```ts
      * function postTearInitVeryLate(tear: EntityTear): void {}
      * ```
      */
-    POST_TEAR_INIT_VERY_LATE = 84,
+    POST_TEAR_INIT_VERY_LATE = 83,
     /**
      * Fires from the `POST_RENDER` callback on every frame that a TNT exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postTNTRender(tnt: GridEntityTNT): void {}
      * ```
      */
-    POST_TNT_RENDER = 85,
+    POST_TNT_RENDER = 84,
     /**
      * Fires from the `POST_UPDATE` callback on every frame that a TNT exists.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the variant provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the variant
+     * provided.
      *
      * ```ts
      * function postTNTUpdate(tnt: GridEntityTNT): void {}
      * ```
      */
-    POST_TNT_UPDATE = 86,
+    POST_TNT_UPDATE = 85,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player gains or loses a new
      * transformation.
      *
      * Note that this callback will only fire once per Forgotten/Soul pair.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `PlayerForm` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the `PlayerForm`
+     * provided.
      *
      * ```ts
      * function postTransformation(
@@ -8515,12 +9281,13 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_TRANSFORMATION = 87,
+    POST_TRANSFORMATION = 86,
     /**
      * Fires from `ENTITY_TAKE_DMG` callback when a Wishbone or a Walnut breaks.
      *
-     * When registering the callback, takes an optional second argument that will make the callback
-     * only fire if it matches the `TrinketType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method, you can provide
+     * an optional third argument that will make the callback only fire if it matches the
+     * `TrinketType` provided.
      *
      * ```ts
      * function postTrinketBreak(
@@ -8529,22 +9296,23 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    POST_TRINKET_BREAK = 88,
+    POST_TRINKET_BREAK = 87,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback on the frame before a Berserk effect ends when
      * the player is predicted to die (e.g. they currently have no health left or they took damage in
      * a "Lost" form).
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function preBerserkDeath(player: EntityPlayer): void {}
      * ```
      */
-    PRE_BERSERK_DEATH = 89,
+    PRE_BERSERK_DEATH = 88,
     /**
      * Fires from the `POST_PLAYER_FATAL_DAMAGE` callback when a player is about to die. If you want
      * to initiate a custom revival, return an integer that corresponds to the item or type of revival
@@ -8553,16 +9321,17 @@ export declare enum ModCallbackCustom {
      * This callback is useful because reviving the player after the game things that player should
      * have died will result in the save data for the run getting deleted.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function preCustomRevive(player: EntityPlayer): int | undefined {}
      * ```
      */
-    PRE_CUSTOM_REVIVE = 90,
+    PRE_CUSTOM_REVIVE = 89,
     /**
      * Fires from the `PRE_PICKUP_COLLISION` callback when a player touches a collectible pedestal and
      * meets all of the conditions to pick it up.
@@ -8572,26 +9341,28 @@ export declare enum ModCallbackCustom {
      * note that this callback will continue to fire for every frame that the player touches the
      * pedestal, so you would need to continue returning false.)
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if the player matches the `PlayerVariant` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the player matches the `PlayerType` provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `PlayerVariant` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if it
+     *   matches the `PlayerType` provided.
      *
      * ```ts
      * function preGetPedestal(player: EntityPlayer, collectible: EntityPickupCollectible): void {}
      * ```
      */
-    PRE_GET_PEDESTAL = 91,
+    PRE_GET_PEDESTAL = 90,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when an item becomes queued (i.e. when the player
      * begins to hold the item above their head).
      *
      * Note that this callback will only fire once per Forgotten/Soul pair.
      *
-     * - When registering the callback, takes an optional second argument that will make the callback
-     *   only fire if it matches the `ItemType` provided.
-     * - When registering the callback, takes an optional third argument that will make the callback
-     *   only fire if the `CollectibleType` or the `TrinketType` matches the ID provided.
+     * When registering the callback with the `ModUpgraded.AddCallbackCustom` method:
+     * - You can provide an optional third argument that will make the callback only fire if it
+     *   matches the `ItemType` provided.
+     * - You can provide an optional fourth argument that will make the callback only fire if the
+     *   sub-type matches the `CollectibleType` or the `TrinketType` provided.
      *
      * ```ts
      * function preItemPickup(
@@ -8600,7 +9371,7 @@ export declare enum ModCallbackCustom {
      * ): void {}
      * ```
      */
-    PRE_ITEM_PICKUP = 92,
+    PRE_ITEM_PICKUP = 91,
     /**
      * Fires on the `POST_RENDER` frame before the player is taken to a new floor. Only fires when a
      * player jumps into a trapdoor or enters a heaven door (beam of light). Does not fire on the
@@ -8614,7 +9385,78 @@ export declare enum ModCallbackCustom {
      * function preNewLevel(player: EntityPlayer): void {}
      * ```
      */
-    PRE_NEW_LEVEL = 93
+    PRE_NEW_LEVEL = 92
+}
+
+/** TODO */
+export declare enum ModCallbackCustom2 {
+    POST_AMBUSH_FINISHED = 0,
+    POST_AMBUSH_STARTED = 1,
+    POST_BOMB_EXPLODED = 2,
+    POST_BOMB_INIT_LATE = 3,
+    POST_BONE_SWING = 4,
+    POST_COLLECTIBLE_EMPTY = 5,
+    POST_COLLECTIBLE_INIT_FIRST = 6,
+    POST_CURSED_TELEPORT = 7,
+    POST_CUSTOM_REVIVE = 8,
+    POST_DICE_ROOM_ACTIVATED = 9,
+    POST_DOOR_RENDER = 10,
+    POST_DOOR_UPDATE = 11,
+    POST_EFFECT_INIT_LATE = 12,
+    POST_EFFECT_STATE_CHANGED = 13,
+    POST_ESAU_JR = 14,
+    POST_FAMILIAR_INIT_LATE = 15,
+    POST_FAMILIAR_STATE_CHANGED = 16,
+    POST_FIRST_ESAU_JR = 17,
+    POST_FIRST_FLIP = 18,
+    POST_FLIP = 19,
+    POST_GAME_STARTED_REORDERED = 20,
+    POST_GAME_STARTED_REORDERED_LAST = 21,
+    POST_GREED_MODE_WAVE = 22,
+    POST_GRID_ENTITY_BROKEN = 23,
+    POST_GRID_ENTITY_COLLISION = 24,
+    POST_GRID_ENTITY_CUSTOM_BROKEN = 25,
+    POST_GRID_ENTITY_CUSTOM_COLLISION = 26,
+    POST_GRID_ENTITY_CUSTOM_INIT = 27,
+    POST_GRID_ENTITY_CUSTOM_REMOVE = 28,
+    POST_GRID_ENTITY_CUSTOM_STATE_CHANGED = 29,
+    POST_GRID_ENTITY_CUSTOM_UPDATE = 30,
+    POST_GRID_ENTITY_INIT = 31,
+    POST_GRID_ENTITY_REMOVE = 32,
+    POST_GRID_ENTITY_STATE_CHANGED = 33,
+    POST_GRID_ENTITY_UPDATE = 34,
+    POST_HOLY_MANTLE_REMOVED = 35,
+    POST_KNIFE_INIT_LATE = 36,
+    POST_NEW_LEVEL_REORDERED = 37,
+    POST_NEW_ROOM_EARLY = 38,
+    POST_NEW_ROOM_REORDERED = 39,
+    POST_PEFFECT_UPDATE_REORDERED = 40,
+    POST_PIT_RENDER = 41,
+    POST_PLAYER_FATAL_DAMAGE = 42,
+    POST_PLAYER_RENDER_REORDERED = 43,
+    POST_PLAYER_UPDATE_REORDERED = 44,
+    POST_ROOM_CLEAR_CHANGED = 45,
+    POST_SPIKES_RENDER = 46,
+    PRE_BERSERK_DEATH = 47,
+    PRE_CUSTOM_REVIVE = 48
+}
+
+declare type ModCallbackCustomGridEntity = MatchingCallbackCustom<CallbackSignatureGridEntity>;
+
+declare type ModCallbackCustomGridEntityCustom = MatchingCallbackCustom<CallbackSignatureGridEntityCustom>;
+
+declare type ModCallbackCustomPlayer = MatchingCallbackCustom<CallbackSignaturePlayer>;
+
+declare type ModCallbackCustomRevive = MatchingCallbackCustom<CallbackSignatureRevive>;
+
+/**
+ * A helper class for a mod that wants to represent its individual features as classes. This is
+ * useful if you are using decorators to represent class methods that should be automatically
+ * subscribed to callbacks.
+ */
+export declare class ModFeature {
+    private mod;
+    constructor(mod: ModUpgraded);
 }
 
 /**
@@ -8626,33 +9468,76 @@ export declare enum ModCallbackCustom {
  */
 export declare class ModUpgraded implements Mod {
     /**
-     * The vanilla mod object stores the name of the mod for some reason. (It is never used or
-     * referenced.
+     * The `RegisterMod` function stores the name of the mod on the mod object for some reason. (It is
+     * never used or referenced.)
      */
     Name: string;
     /** We store a copy of the original mod object so that we can re-implement its functions. */
-    Mod: Mod;
-    Debug: boolean;
-    TimeThreshold: float | undefined;
+    private mod;
+    private debug;
+    private timeThreshold;
+    private callbacks;
     constructor(mod: Mod, debug: boolean, timeThreshold?: float);
+    /**
+     * Registers a function to be executed when an in-game event happens. For example, the
+     * `ModCallback.POST_UPDATE` event corresponds to being executed once at the end of every game
+     * logic frame.
+     */
     AddCallback<T extends ModCallback>(modCallback: T, ...args: AddCallbackParameters[T]): void;
+    /** Returns whether or not a corresponding "save#.dat" file exists for the current mod. */
     HasData(): boolean;
+    /**
+     * Returns a string containing all of the data inside of the corresponding "save#.dat" file for
+     * this mod.
+     */
     LoadData(): string;
     /**
-     * This method does not care about the tertiary argument. Regardless of the conditions of how you
-     * registered the callback, it will be removed.
+     * Unregisters a function that was previously registered with the `AddCallback` method.
+     *
+     * This method does not care about the tertiary argument. In other words, regardless of the
+     * conditions of how you registered the callback, it will be removed.
      */
     RemoveCallback<T extends ModCallback>(modCallback: T, callback: AddCallbackParameters[T][0]): void;
+    /** Deletes the corresponding "save#.dat" file for this mod, if it exists. */
     RemoveData(): void;
+    /**
+     * Creates or updates the corresponding "save#.dat" file for this mod with the provided string.
+     */
     SaveData(data: string): void;
+    /**
+     * Registers a function to be executed when an in-game event happens. This method is specifically
+     * for events that are provided by the IsaacScript standard library. For example, the
+     * `ModCallbackCustom.POST_BOMB_EXPLODE` event corresponds to when a bomb explodes.
+     */
     AddCallbackCustom<T extends ModCallbackCustom>(modCallbackCustom: T, ...args: AddCallbackParametersCustom[T]): void;
+    /** Adds a callback in the new callback system format. This method is only temporary. */
+    AddCallbackCustom2<T extends ModCallbackCustom2>(modCallbackCustom: T, ...args: AddCallbackParametersCustom2[T]): void;
+    /**
+     * Unregisters a function that was previously registered with the `AddCallbackCustom` method.
+     *
+     * This method does not care about the tertiary argument. In other words, regardless of the
+     * conditions of how you registered the callback, it will be removed.
+     */
+    RemoveCallbackCustom<T extends ModCallbackCustom2>(modCallbackCustom: T, callback: AddCallbackParametersCustom2[T][0]): void;
     /**
-     * This method does not care about the tertiary argument. Regardless of the conditions of how you
-     * registered the callback, it will be removed.
+     * This method should only be used by the `upgradeMod` function. Returns the class methods from
+     * the features that were added.
      */
-    RemoveCallbackCustom<T extends ModCallbackCustom>(modCallback: T, callback: AddCallbackParametersCustom[T][0]): void;
+    initOptionalFeature(feature: ISCFeature): FunctionTuple[];
+    /** This is used to initialize both custom callbacks and "extra features". */
+    private initFeature;
+    private uninitFeature;
 }
 
+/**
+ * By specifying one or more optional features, end-users will get a version of `ModUpgraded` that
+ * has extra methods corresponding to the features.
+ *
+ * We have to explicitly account for the empty array case, since `never` will cause mess up the
+ * union.
+ */
+declare type ModUpgradedWithFeatures<T extends ISCFeature> = [T] extends [never] ? ModUpgraded : Omit<ModUpgraded & UnionToIntersection<ISCFeatureToClass[T]>, KeysToScrubFromModClass>;
+
 /**
  * Helper function to move all of the players to where they would normally go when arriving at a new
  * floor. (In normal mode, this is the center of the room. In Greed Mode, this is below the top
@@ -8689,6 +9574,9 @@ export declare const NEW_RUN_PLAYER_STARTING_POSITION: Vector;
 /**
  * Constructor for a `ChargeBarSprites` object. For more information, see the `renderChargeBar`
  * helper function.
+ *
+ * Note that this is for the vertical charge bar that represents the number of charges that an
+ * active item has, not the circular charge bar that shows e.g. the charge rate of Brimstone.
  */
 export declare function newChargeBarSprites(maxCharges: int): ChargeBarSprites;
 
@@ -8698,6 +9586,16 @@ export declare function newChargeBarSprites(maxCharges: int): ChargeBarSprites;
  */
 export declare function newCollectibleSprite(collectibleType: CollectibleType): Sprite;
 
+/**
+ * Helper function for creating objects that represent a mapping of an enum value to some other
+ * value in a type-safe way.
+ *
+ * This function will ensure that the provided object has a key for each value in the enum.
+ *
+ * After the `satisfies` operator is released in TypeScript 4.9, this function should be deleted.
+ */
+export declare function newObjectWithEnumKeys<Enum extends number | string, T extends Record<Enum, unknown>>(theEnum: Record<string, Enum>, obj: T): T;
+
 export declare function newPickingUpItem(): PickingUpItem;
 
 /** Returns a `PlayerHealth` object with all zeros. */
@@ -8828,6 +9726,8 @@ export declare function openAllDoors(): void;
  */
 export declare function openDoorFast(door: GridEntityDoor): void;
 
+declare type OptionalArgs<T extends ModCallbackCustom2> = AllButFirst_2<AddCallbackParametersCustom2[T]>;
+
 /**
  * Helper function to parse a string that contains an entity type, a variant, and a sub-type,
  * separated by periods.
@@ -8905,7 +9805,15 @@ export declare type PickupIndex = int & {
 /** Maps pill effect names to the values of the `PillEffect` enum. */
 export declare const PILL_NAME_TO_EFFECT_MAP: ReadonlyMap<string, PillEffect>;
 
-export declare function playChargeSoundEffect(player: EntityPlayer, activeSlot: ActiveSlot): void;
+/**
+ * Helper function to play the appropriate sound effect for a player after getting one or more
+ * charges on their active item. (There is a different sound depending on whether the item is fully
+ * charged or not.)
+ *
+ * @param player The player to play the sound effect for.
+ * @param activeSlot Optional. The slot that was just charged. Default is `ActiveSlot.PRIMARY`.
+ */
+export declare function playChargeSoundEffect(player: EntityPlayer, activeSlot?: ActiveSlot): void;
 
 /**
  * Helper function to add one or more collectibles to a player.
@@ -8970,6 +9878,25 @@ export declare type PlayerIndex = int & {
     readonly __playerIndexBrand: symbol;
 };
 
+declare class PlayerReorderedCallbacks extends Feature {
+    v: {
+        run: {
+            postGameStartedFiredOnThisRun: boolean;
+            postPEffectUpdateQueue: PlayerIndex[];
+            postPlayerUpdateQueue: PlayerIndex[];
+            postPlayerRenderQueue: PlayerIndex[];
+        };
+    };
+    private postPEffectUpdateReordered;
+    private postPlayerRenderReordered;
+    private postPlayerUpdateReordered;
+    constructor(postPEffectUpdateReordered: PostPEffectUpdateReordered, postPlayerRenderReordered: PostPlayerRenderReordered, postPlayerUpdateReordered: PostPlayerUpdateReordered);
+    private postPEffectUpdate;
+    private postPlayerUpdate;
+    private postPlayerRender;
+    private postGameStartedReorderedLast;
+}
+
 /** This is used by the `getPocketItems` and related helper functions. */
 export declare interface PocketItemDescription {
     slot: PocketItemSlot;
@@ -9018,23 +9945,24 @@ callback: (boneClub: EntityKnife) => void
 ];
 
 declare type PostCollectibleEmptyRegisterParameters = [
-callback: (collectible: EntityPickup, oldCollectibleType: CollectibleType) => void,
+callback: (collectible: EntityPickupCollectible, oldCollectibleType: CollectibleType) => void,
 collectibleType?: CollectibleType
 ];
 
 declare type PostCollectibleInitFirstRegisterParameters = [
-callback: (collectible: EntityPickup) => void,
+callback: (collectible: EntityPickupCollectible) => void,
 collectibleType?: CollectibleType
 ];
 
 declare type PostCursedTeleportRegisterParameters = [
-callback: (player: EntityPlayer) => void
+callback: (player: EntityPlayer) => void,
+playerVariant?: PlayerVariant,
+character?: PlayerType
 ];
 
-declare type PostCustomDoorEnterRegisterParameters = [
-callback: (player: EntityPlayer, effectVariant: int, doorSlot: DoorSlot, direction: Direction) => void,
-effectVariant?: int
-];
+declare class PostCustomRevive extends CustomCallbackRevive<ModCallbackCustom2.POST_CUSTOM_REVIVE> {
+    constructor();
+}
 
 declare type PostCustomReviveRegisterParameters = [
 callback: (player: EntityPlayer, revivalType: int) => void,
@@ -9066,6 +9994,10 @@ callback: (effect: EntityEffect, previousState: int, currentState: int) => void,
 effectVariant?: EffectVariant
 ];
 
+declare class PostEsauJr extends CustomCallback<ModCallbackCustom2.POST_ESAU_JR> {
+    constructor();
+}
+
 declare type PostEsauJrRegisterParameters = [
 callback: (player: EntityPlayer) => void
 ];
@@ -9080,18 +10012,38 @@ callback: (familiar: EntityFamiliar, previousState: int, currentState: int) => v
 familiarVariant?: FamiliarVariant
 ];
 
+declare class PostFirstEsauJr extends CustomCallback<ModCallbackCustom2.POST_FIRST_ESAU_JR> {
+    constructor();
+}
+
 declare type PostFirstEsauJrRegisterParameters = [
 callback: (player: EntityPlayer) => void
 ];
 
+declare class PostFirstFlip extends CustomCallback<ModCallbackCustom2.POST_FIRST_FLIP> {
+    constructor();
+}
+
 declare type PostFirstFlipRegisterParameters = [
 callback: (newLazarus: EntityPlayer, oldLazarus: EntityPlayer) => void
 ];
 
+declare class PostFlip extends CustomCallback<ModCallbackCustom2.POST_FLIP> {
+    constructor();
+}
+
 declare type PostFlipRegisterParameters = [
 callback: (newLazarus: EntityPlayer, oldLazarus: EntityPlayer) => void
 ];
 
+declare class PostGameStartedReordered extends CustomCallback<ModCallbackCustom2.POST_GAME_STARTED_REORDERED> {
+    constructor();
+}
+
+declare class PostGameStartedReorderedLast extends CustomCallback<ModCallbackCustom2.POST_GAME_STARTED_REORDERED> {
+    constructor();
+}
+
 declare type PostGameStartedReorderedLastRegisterParameters = [
 callback: (isContinued: boolean) => void
 ];
@@ -9104,12 +10056,21 @@ declare type PostGreedModeWaveRegisterParameters = [
 callback: (oldWave: int, newWave: int) => void
 ];
 
+declare class PostGridEntityBroken extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_BROKEN> {
+    constructor();
+}
+
 declare type PostGridEntityBrokenRegisterParameters = [
 callback: (gridEntity: GridEntity) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
+declare class PostGridEntityCollision extends CustomCallback<T> {
+    constructor();
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+}
+
 declare type PostGridEntityCollisionRegisterParameters = [
 callback: (gridEntity: GridEntity, entity: Entity) => void,
 gridEntityType?: GridEntityType,
@@ -9118,11 +10079,20 @@ entityType?: EntityType,
 entityVariant?: int
 ];
 
+declare class PostGridEntityCustomBroken extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_BROKEN> {
+    constructor();
+}
+
 declare type PostGridEntityCustomBrokenRegisterParameters = [
 callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
 gridEntityTypeCustom?: GridEntityType
 ];
 
+declare class PostGridEntityCustomCollision extends CustomCallback<T_2> {
+    constructor();
+    protected shouldFire(fireArgs: FireArgs<T_2>, optionalArgs: OptionalArgs<T_2>): boolean;
+}
+
 declare type PostGridEntityCustomCollisionRegisterParameters = [
 callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType, entity: Entity) => void,
 gridEntityTypeCustom?: GridEntityType,
@@ -9130,11 +10100,20 @@ entityType?: EntityType,
 entityVariant?: int
 ];
 
+declare class PostGridEntityCustomInit extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_INIT> {
+    constructor();
+}
+
 declare type PostGridEntityCustomInitRegisterParameters = [
 callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
 gridEntityTypeCustom?: GridEntityType
 ];
 
+declare class PostGridEntityCustomRemove extends CustomCallback<T_4> {
+    constructor();
+    protected shouldFire(fireArgs: FireArgs<T_4>, optionalArgs: OptionalArgs<T_4>): boolean;
+}
+
 declare type PostGridEntityCustomRemoveRegisterParameters = [
 callback: (gridIndex: int, gridEntityTypeCustom: GridEntityType) => void,
 gridEntityTypeCustom?: GridEntityType
@@ -9145,44 +10124,69 @@ callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void
 gridEntityTypeCustom?: GridEntityType
 ];
 
+declare class PostGridEntityCustomStateChanged extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_STATE_CHANGED> {
+    constructor();
+}
+
 declare type PostGridEntityCustomStateChangedRegisterParameters = [
 callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType, oldState: int, newState: int) => void,
 gridEntityTypeCustom?: GridEntityType
 ];
 
+declare class PostGridEntityCustomUpdate extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_UPDATE> {
+    constructor();
+}
+
 declare type PostGridEntityCustomUpdateRegisterParameters = [
 callback: (gridEntity: GridEntity, gridEntityTypeCustom: GridEntityType) => void,
 gridEntityTypeCustom?: GridEntityType
 ];
 
+declare class PostGridEntityInit extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_INIT> {
+    constructor();
+}
+
 declare type PostGridEntityInitRegisterParameters = [
 callback: (gridEntity: GridEntity) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
+declare class PostGridEntityRemove extends CustomCallback<T_3> {
+    constructor();
+    protected shouldFire(fireArgs: FireArgs<T_3>, optionalArgs: OptionalArgs<T_3>): boolean;
+}
+
 declare type PostGridEntityRemoveRegisterParameters = [
-callback: (gridIndex: int, gridEntityType: GridEntityType) => void,
+callback: (gridIndex: int, gridEntityType: GridEntityType, variant: int) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostGridEntityRenderRegisterParameters = [
 callback: (gridEntity: GridEntity) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
+declare class PostGridEntityStateChanged extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_STATE_CHANGED> {
+    constructor();
+}
+
 declare type PostGridEntityStateChangedRegisterParameters = [
 callback: (gridEntity: GridEntity, oldState: int, newState: int) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
+declare class PostGridEntityUpdate extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_UPDATE> {
+    constructor();
+}
+
 declare type PostGridEntityUpdateRegisterParameters = [
 callback: (gridEntity: GridEntity) => void,
 gridEntityType?: GridEntityType,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostHolyMantleRemovedRegisterParameters = [
@@ -9216,10 +10220,18 @@ callback: (laser: EntityLaser) => void,
 laserVariant?: LaserVariant
 ];
 
+declare class PostNewLevelReordered extends CustomCallback<ModCallbackCustom2.POST_NEW_LEVEL_REORDERED> {
+    constructor();
+}
+
 declare type PostNewLevelReorderedRegisterParameters = [callback: () => void];
 
 declare type PostNewRoomEarlyRegisterParameters = [callback: () => void];
 
+declare class PostNewRoomReordered extends CustomCallback<ModCallbackCustom2.POST_NEW_ROOM_REORDERED> {
+    constructor();
+}
+
 declare type PostNewRoomReorderedRegisterParameters = [callback: () => void];
 
 declare type PostNPCInitLateRegisterParameters = [
@@ -9233,6 +10245,10 @@ entityType?: EntityType,
 variant?: int
 ];
 
+declare class PostPEffectUpdateReordered extends CustomCallbackPlayer<ModCallbackCustom2.POST_PEFFECT_UPDATE_REORDERED> {
+    constructor();
+}
+
 declare type PostPEffectUpdateReorderedRegisterParameters = [
 callback: (player: EntityPlayer) => void,
 playerVariant?: PlayerVariant,
@@ -9314,12 +10330,20 @@ playerVariant?: PlayerVariant,
 character?: PlayerType
 ];
 
+declare class PostPlayerRenderReordered extends CustomCallbackPlayer<ModCallbackCustom2.POST_PLAYER_RENDER_REORDERED> {
+    constructor();
+}
+
 declare type PostPlayerRenderReorderedRegisterParameters = [
 callback: (player: EntityPlayer) => void,
 playerVariant?: PlayerVariant,
 character?: PlayerType
 ];
 
+declare class PostPlayerUpdateReordered extends CustomCallbackPlayer<ModCallbackCustom2.POST_PLAYER_UPDATE_REORDERED> {
+    constructor();
+}
+
 declare type PostPlayerUpdateReorderedRegisterParameters = [
 callback: (player: EntityPlayer) => void,
 playerVariant?: PlayerVariant,
@@ -9359,12 +10383,12 @@ pickupSubType?: int
 
 declare type PostRockRenderRegisterParameters = [
 callback: (rock: GridEntityRock) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostRockUpdateRegisterParameters = [
 callback: (rock: GridEntityRock) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostRoomClearChangedRegisterParameters = [
@@ -9411,12 +10435,12 @@ slotVariant?: SlotVariant
 
 declare type PostSpikesRenderRegisterParameters = [
 callback: (spikes: GridEntitySpikes) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostSpikesUpdateRegisterParameters = [
 callback: (spikes: GridEntitySpikes) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostTearInitLateRegisterParameters = [
@@ -9431,12 +10455,12 @@ tearVariant?: TearVariant
 
 declare type PostTNTRenderRegisterParameters = [
 callback: (tnt: GridEntityTNT) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostTNTUpdateRegisterParameters = [
 callback: (tnt: GridEntityTNT) => void,
-gridEntityVariant?: int
+variant?: int
 ];
 
 declare type PostTransformationRegisterParameters = [
@@ -9455,6 +10479,10 @@ playerVariant?: PlayerVariant,
 character?: PlayerType
 ];
 
+declare class PreCustomRevive extends CustomCallbackPlayer<ModCallbackCustom2.PRE_CUSTOM_REVIVE> {
+    constructor();
+}
+
 declare type PreCustomReviveRegisterParameters = [
 callback: (player: EntityPlayer) => int | undefined,
 playerVariant?: PlayerVariant,
@@ -9534,6 +10562,9 @@ export declare function printConsole(msg: string): void;
 /** Helper function to print whether something was enabled or disabled to the in-game console. */
 export declare function printEnabled(enabled: boolean, description: string): void;
 
+/** Used for `runInNFrames` functions. */
+declare type QueuedFunctionTuple = [frameCountToFire: int, func: () => void];
+
 /**
  * Helper function to make a character that has the same health mechanic as Blue Baby (red heart
  * containers --> soul hearts) or Dark Judas (red heart containers --> black hearts).
@@ -10207,6 +11238,9 @@ export declare const RENDER_FRAMES_PER_SECOND = 60;
 /**
  * Helper function to render a charge bar on the screen. First, call the `newChargeBarSprites`
  * function to initialize the sprites, and then call this function on every render frame.
+ *
+ * Note that this is for the vertical charge bar that represents the number of charges that an
+ * active item has, not the circular charge bar that shows e.g. the charge rate of Brimstone.
  */
 export declare function renderChargeBar(sprites: ChargeBarSprites, position: Vector, normalCharges: int, batteryCharges: int): void;
 
@@ -10359,6 +11393,114 @@ export declare function round(num: float, numDecimalPlaces?: number): float;
  */
 export declare function runDeepCopyTests(): void;
 
+declare class RunInNFrames extends Feature {
+    v: {
+        run: {
+            queuedGameFunctionTuples: QueuedFunctionTuple[];
+            queuedRenderFunctionTuples: QueuedFunctionTuple[];
+            intervalGameFunctionTuples: IntervalFunctionTuple[];
+            intervalRenderFunctionTuples: IntervalFunctionTuple[];
+        };
+    };
+    constructor();
+    private postUpdate;
+    private postRender;
+    /**
+     * Supply a function to run N game frames from now in the `POST_UPDATE` callback.
+     *
+     * For a usage example, see the documentation for the `runNextGameFrame`, which is used in a
+     * similar way.
+     *
+     * Note that this function will not handle saving and quitting. If a player saving and quitting
+     * before the deferred function fires would cause a bug in your mod, then you should handle
+     * deferred functions manually using serializable data.
+     */
+    runInNGameFrames(func: () => void, gameFrames: int): void;
+    /**
+     * Supply a function to run N render frames from now in the `POST_RENDER` callback.
+     *
+     * For a usage example, see the documentation for the `runNextGameFrame`, which is used in a
+     * similar way.
+     *
+     * Note that this function will not handle saving and quitting. If a player saving and quitting
+     * before the deferred function fires would cause a bug in your mod, then you should handle
+     * deferred functions manually using serializable data.
+     */
+    runInNRenderFrames(func: () => void, renderFrames: int): void;
+    /**
+     * Supply a function to run on the next `POST_UPDATE` callback.
+     *
+     * For example:
+     *
+     * ```ts
+     * const NUM_EXPLODER_EXPLOSIONS = 5;
+     *
+     * function useItemExploder(player: EntityPlayer) {
+     *   playSound("exploderBegin");
+     *   explode(player, NUM_EXPLODER_EXPLOSIONS);
+     * }
+     *
+     * function explode(player: EntityPlayer, numFramesLeft: int) {
+     *   Isaac.Explode(player, undefined, 1);
+     *   numFramesLeft -= 1;
+     *   if (numFramesLeft === 0) {
+     *     runNextFrame(() => {
+     *       explode(player, numFramesLeft);
+     *     });
+     *   }
+     * }
+     * ```
+     *
+     * Note that this function will not handle saving and quitting. If a player saving and quitting
+     * before the deferred function fires would cause a bug in your mod, then you should handle
+     * deferred functions manually using serializable data.
+     */
+    runNextGameFrame(func: () => void): void;
+    /**
+     * Supply a function to run on the next `POST_RENDER` callback.
+     *
+     * For a usage example, see the documentation for the `runNextGameFrame`, which is used in a
+     * similar way.
+     *
+     * Note that this function will not handle saving and quitting.
+     */
+    runNextRenderFrame(func: () => void): void;
+    /**
+     * Supply a function to be repeatedly run on an interval of N game frames in the `POST_UPDATE`
+     * callback. The function will continue to be fired until `false` is returned from the function.
+     *
+     * This is similar to the `setInterval` vanilla JavaScript function, except there is no
+     * corresponding `clearInterval` function. (Instead, the return value from the supplied function
+     * is used to stop the interval.)
+     *
+     * Note that this function will not handle saving and quitting. You must manually restart any
+     * intervals if the player saves and quits in the middle of a run.
+     *
+     * @param func The function to repeatedly run on an interval.
+     * @param gameFrames The amount of game frames to wait between each run.
+     * @param runImmediately Whether or not to execute the function right now before waiting for the
+     *                       interval.
+     */
+    setIntervalGameFrames(func: () => boolean, gameFrames: int, runImmediately: boolean): void;
+    /**
+     * Supply a function to be repeatedly run on an interval of N render frames in the `POST_RENDER`
+     * callback. The function will continue to be fired until `false` is returned from the function.
+     *
+     * This is similar to the `setInterval` vanilla JavaScript function, except there is no
+     * corresponding `clearInterval` function. (Instead, the return value from the supplied function
+     * is used to stop the interval.)
+     *
+     * Note that this function will not handle saving and quitting. You must manually restart any
+     * intervals if the player saves and quits in the middle of a run.
+     *
+     * @param func The function to repeatedly run on an interval.
+     * @param renderFrames The amount of game frames to wait between each run.
+     * @param runImmediately Whether or not to execute the function right now before waiting for the
+     *                       interval.
+     */
+    setIntervalRenderFrames(func: () => boolean, renderFrames: int, runImmediately: boolean): void;
+}
+
 /**
  * Supply a function to run N game frames from now in the `POST_UPDATE` callback.
  *
@@ -10582,6 +11724,12 @@ v: SaveData, conditionalFunc: false): void;
  */
 export declare function saveDataManagerLoad(): void;
 
+/**
+ * Removes a previously registered key from the save data manager. This is the opposite of the
+ * "saveDataManager" function.
+ */
+export declare function saveDataManagerRemove(key: string): void;
+
 /**
  * The save data manager will automatically reset variables at the appropriate times (i.e. when a
  * player enters a new room). Use this function to explicitly force the save data manager to reset a
@@ -10745,12 +11893,12 @@ export declare function serializeVector(vector: Vector): SerializedVector;
  *
  * @param player The player to give the item to.
  * @param collectibleType The collectible type of the item to give.
- * @param activeSlot The slot to set.
+ * @param activeSlot Optional. The slot to set. Default is `ActiveSlot.PRIMARY`.
  * @param charge Optional. The argument of charges to set. If not specified, the item will be set
  *               with maximum charges.
  * @param keepInPools Optional. Whether or not to remove the item from pools. Default is false.
  */
-export declare function setActiveItem(player: EntityPlayer, collectibleType: CollectibleType, activeSlot: ActiveSlot, charge?: int, keepInPools?: boolean): void;
+export declare function setActiveItem(player: EntityPlayer, collectibleType: CollectibleType, activeSlot?: ActiveSlot, charge?: int, keepInPools?: boolean): void;
 
 /**
  * Helper function to add one or more elements to a set at once without having to repeatedly call
@@ -10778,7 +11926,7 @@ export declare function setAllRNGToSeed(object: unknown, seed: Seed): void;
  */
 export declare function setAllRNGToStartSeed(object: unknown): void;
 
-/** Helper function to set the backdrop of the current room. */
+/** Helper function to set the backdrop (i.e. background) of the current room. */
 export declare function setBackdrop(backdropType: BackdropType): void;
 
 /**
@@ -10892,6 +12040,8 @@ export declare function setDeletePlayer(set: Set<PlayerIndex>, player: EntityPla
  * 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 declare function setDisplayFlags(displayFlagsMap: Map<int, BitFlags<DisplayFlag>>): void;
@@ -11430,10 +12580,11 @@ export declare function spawnCoin(coinSubType: CoinSubType, position: Vector, ve
 export declare function spawnCoinWithSeed(coinSubType: CoinSubType, position: Vector, seedOrRNG: Seed | RNG, velocity?: Vector, spawner?: Entity | undefined): EntityPickupCoin;
 
 /**
- * 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.
@@ -11447,35 +12598,31 @@ export declare function spawnCoinWithSeed(coinSubType: CoinSubType, position: Ve
  */
 export declare function spawnCollectible(collectibleType: CollectibleType, position: Vector, seedOrRNG?: Seed | RNG, options?: boolean, forceFreeItem?: boolean, spawner?: Entity): EntityPickupCollectible;
 
+/**
+ * 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 declare function spawnCollectibleFromPool(itemPoolType: ItemPoolType, position: Vector, seedOrRNG?: Seed | RNG, options?: boolean, forceFreeItem?: boolean, spawner?: Entity): EntityPickupCollectible;
+
 /** Helper function to spawn a `GridEntityType.CRAWL_SPACE` (18). */
 export declare function spawnCrawlSpace(gridIndexOrPosition: int | Vector): GridEntity | undefined;
 
 /** Helper function to spawn a `GridEntityType.CRAWL_SPACE` (18) with a specific variant. */
 export declare function spawnCrawlSpaceWithVariant(crawlSpaceVariant: CrawlSpaceVariant, gridIndexOrPosition: int | Vector): GridEntity | undefined;
 
-/**
- * Helper function to spawn a custom door. This is intended to be called from the `POST_NEW_ROOM`
- * callback when the player enters a room that should have a custom door. (You could also call it
- * from another callback if you want the door to appear e.g. after clearing all enemies.)
- *
- * Like other entities, the door is not persistent, so you must spawn it every time when re-entering
- * the room.
- *
- * Handle when a player enters the door by hooking the custom `POST_CUSTOM_DOOR_ENTER` callback.
- *
- * The custom door is an `EntityEffect`. You can manually open or close the door by modifying its
- * state. (The values to use correspond to the `DoorState` enum.)
- *
- * This function will throw a run-time error if:
- * - the door slot already has a vanilla door
- * - the door slot already has a custom door
- * - the tile at the door slot does not have a wall
- *
- * Before using this function, you must first initialize the effect/door variant with the
- * `initCustomDoor` function.
- */
-export declare function spawnCustomDoor(effectVariant: EffectVariant, doorSlot: DoorSlot): EntityEffect;
-
 /**
  * Helper function to spawn a custom grid entity. Custom grid entities are persistent in that they
  * will reappear if the player leaves and re-enters the room. (It will be manually respawned in the
@@ -11881,6 +13028,10 @@ export declare function stageTypeToLetter(stageType: StageType): string;
  */
 export declare function startAmbush(): void;
 
+export declare type StartsWithLowercase<S> = S extends string ? Extract<S, Uncapitalize<S>> : never;
+
+export declare type StartsWithUppercase<S> = S extends string ? Extract<S, Capitalize<S>> : never;
+
 /** This represents the kinds of stats that a player can have. */
 export declare enum StatType {
     /** Corresponds to `CacheFlag.DAMAGE` (1 << 0) and `EntityPlayer.Damage`. */
@@ -11947,6 +13098,14 @@ export declare function sumSet(set: Set<number> | ReadonlySet<number>): number;
  */
 export declare function swapArrayElements<T>(array: T[], i: number, j: number): void;
 
+declare type T = ModCallbackCustom2.POST_GRID_ENTITY_COLLISION;
+
+declare type T_2 = ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_COLLISION;
+
+declare type T_3 = ModCallbackCustom2.POST_GRID_ENTITY_REMOVE;
+
+declare type T_4 = ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_REMOVE;
+
 /**
  * Helper function to check if a Lua table has all of the provided keys.
  *
@@ -11968,15 +13127,14 @@ export declare function tanh(x: number): number;
  * 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 declare function teleport(roomGridIndex: int, direction?: Direction, roomTransitionAnim?: RoomTransitionAnim, force?: boolean): void;
+export declare function teleport(roomGridIndex: int, direction?: Direction, roomTransitionAnim?: RoomTransitionAnim): void;
 
 /** For `GridEntityType.TELEPORTER` (23). */
 export declare const TELEPORTER_ACTIVATION_DISTANCE: number;
@@ -12217,6 +13375,15 @@ export declare type TSTLClass = LuaMap<AnyNotNil, unknown> & {
     readonly __tstlClassBrand: symbol;
 };
 
+declare interface TSTLClassMetatable {
+    ____constructor: () => void;
+    __index: unknown;
+    constructor: {
+        name: string;
+        prototype: LuaMetatable<LuaMap<AnyNotNil, unknown>>;
+    };
+}
+
 /**
  * Helper function to sort a two-dimensional array by the first element.
  *
@@ -12238,6 +13405,9 @@ export declare function twoDimensionalSort<T>(array1: T[], array2: T[]): -1 | 0
  */
 export declare const UI_HEART_WIDTH = 12;
 
+/** A helper type to convert a union to an intersection. */
+declare type UnionToIntersection<U> = (U extends U ? (u: U) => 0 : never) extends (i: infer I) => 0 ? Extract<I, U> : never;
+
 /** Helper function to put things back to normal after the `pause` function was used. */
 export declare function unpause(): void;
 
@@ -12275,6 +13445,8 @@ export declare function unsetHotkey(keyboard: Keyboard): void;
  * ```
  *
  * @param modVanilla The mod object returned by the `RegisterMod` function.
+ * @param features Optional. An array containing the optional standard library features that you
+ *                 want to enable, if any. Default is an empty array.
  * @param debug Optional. Whether to log additional output when a callback is fired. Default is
  *              false.
  * @param timeThreshold Optional. If provided, will only log callbacks that take longer than the
@@ -12282,7 +13454,9 @@ export declare function unsetHotkey(keyboard: Keyboard): void;
  *                      or milliseconds (if the "--luadebug" launch flag is turned off).
  * @returns The upgraded mod object.
  */
-export declare function upgradeMod(modVanilla: Mod, debug?: boolean, timeThreshold?: float): ModUpgraded;
+export declare function upgradeMod<T extends ISCFeature = never>(modVanilla: Mod, features?: T[], debug?: boolean, timeThreshold?: float): ModUpgradedWithFeatures<T>;
+
+export declare type UppercaseKeys<T> = StartsWithUppercase<keyof T>;
 
 /**
  * Helper function to use an active item without showing an animation, keeping the item, or adding
@@ -12314,6 +13488,35 @@ export declare function validateCustomEnum(transpiledEnumName: string, transpile
  */
 export declare function validateEnumContiguous<T>(transpiledEnumName: string, transpiledEnum: T): void;
 
+/**
+ * Helper function to validate that an interface contains all of the keys of an enum. You must
+ * specify both generic parameters in order for this to work properly (i.e. the interface and then
+ * the enum).
+ *
+ * For example:
+ *
+ * ```ts
+ * enum MyEnum {
+ *   Value1,
+ *   Value2,
+ *   Value3,
+ * }
+ *
+ * interface MyEnumToType {
+ *   [MyEnum.Value1]: boolean;
+ *   [MyEnum.Value2]: number;
+ *   [MyEnum.Value3]: string;
+ * }
+ *
+ * validateInterfaceMatchesEnum<MyEnumToType, MyEnum>();
+ * ```
+ *
+ * This function is only meant to be used with interfaces (i.e. types that will not exist at
+ * run-time). If you are generating an object that will contain all of the keys of an enum, use the
+ * `newObjectWithEnumKeys` helper function instead.
+ */
+export declare function validateInterfaceMatchesEnum<T extends Record<Enum, unknown>, Enum extends string | number>(): void;
+
 export declare function vectorEquals(vector1: Vector, vector2: Vector): boolean;
 
 /**