isaacscript-common 14.1.2 → 14.2.0

package/src/callbacks.ts

@@ -27,26 +27,67 @@ import { PostGridEntityCustomBroken } from "./classes/callbacks/PostGridEntityCu
 import { PostGridEntityCustomCollision } from "./classes/callbacks/PostGridEntityCustomCollision";
 import { PostGridEntityCustomInit } from "./classes/callbacks/PostGridEntityCustomInit";
 import { PostGridEntityCustomRemove } from "./classes/callbacks/PostGridEntityCustomRemove";
+import { PostGridEntityCustomRender } from "./classes/callbacks/PostGridEntityCustomRender";
 import { PostGridEntityCustomStateChanged } from "./classes/callbacks/PostGridEntityCustomStateChanged";
 import { PostGridEntityCustomUpdate } from "./classes/callbacks/PostGridEntityCustomUpdate";
 import { PostGridEntityInit } from "./classes/callbacks/PostGridEntityInit";
 import { PostGridEntityRemove } from "./classes/callbacks/PostGridEntityRemove";
+import { PostGridEntityRender } from "./classes/callbacks/PostGridEntityRender";
 import { PostGridEntityStateChanged } from "./classes/callbacks/PostGridEntityStateChanged";
 import { PostGridEntityUpdate } from "./classes/callbacks/PostGridEntityUpdate";
 import { PostHolyMantleRemoved } from "./classes/callbacks/PostHolyMantleRemoved";
+import { PostItemDischarge } from "./classes/callbacks/PostItemDischarge";
+import { PostItemPickup } from "./classes/callbacks/PostItemPickup";
 import { PostKnifeInitLate } from "./classes/callbacks/PostKnifeInitLate";
+import { PostLaserInitLate } from "./classes/callbacks/PostLaserInitLate";
 import { PostNewLevelReordered } from "./classes/callbacks/PostNewLevelReordered";
 import { PostNewRoomEarly } from "./classes/callbacks/PostNewRoomEarly";
 import { PostNewRoomReordered } from "./classes/callbacks/PostNewRoomReordered";
+import { PostNPCInitLate } from "./classes/callbacks/PostNPCInitLate";
+import { PostNPCStateChanged } from "./classes/callbacks/PostNPCStateChanged";
 import { PostPEffectUpdateReordered } from "./classes/callbacks/PostPEffectUpdateReordered";
+import { PostPickupCollect } from "./classes/callbacks/PostPickupCollect";
+import { PostPickupInitFirst } from "./classes/callbacks/PostPickupInitFirst";
+import { PostPickupInitLate } from "./classes/callbacks/PostPickupInitLate";
+import { PostPickupStateChanged } from "./classes/callbacks/PostPickupStateChanged";
 import { PostPitRender } from "./classes/callbacks/PostPitRender";
+import { PostPitUpdate } from "./classes/callbacks/PostPitUpdate";
+import { PostPlayerChangeHealth } from "./classes/callbacks/PostPlayerChangeHealth";
+import { PostPlayerChangeStat } from "./classes/callbacks/PostPlayerChangeStat";
+import { PostPlayerChangeType } from "./classes/callbacks/PostPlayerChangeType";
+import { PostPlayerCollectibleAdded } from "./classes/callbacks/PostPlayerCollectibleAdded";
+import { PostPlayerCollectibleRemoved } from "./classes/callbacks/PostPlayerCollectibleRemoved";
 import { PostPlayerFatalDamage } from "./classes/callbacks/PostPlayerFatalDamage";
+import { PostPlayerInitFirst } from "./classes/callbacks/PostPlayerInitFirst";
+import { PostPlayerInitLate } from "./classes/callbacks/PostPlayerInitLate";
 import { PostPlayerRenderReordered } from "./classes/callbacks/PostPlayerRenderReordered";
 import { PostPlayerUpdateReordered } from "./classes/callbacks/PostPlayerUpdateReordered";
+import { PostPoopRender } from "./classes/callbacks/PostPoopRender";
+import { PostPoopUpdate } from "./classes/callbacks/PostPoopUpdate";
+import { PostPressurePlateRender } from "./classes/callbacks/PostPressurePlateRender";
+import { PostPressurePlateUpdate } from "./classes/callbacks/PostPressurePlateUpdate";
+import { PostProjectileInitLate } from "./classes/callbacks/PostProjectileInitLate";
+import { PostPurchase } from "./classes/callbacks/PostPurchase";
+import { PostRockRender } from "./classes/callbacks/PostRockRender";
+import { PostRockUpdate } from "./classes/callbacks/PostRockUpdate";
 import { PostRoomClearChanged } from "./classes/callbacks/PostRoomClearChanged";
+import { PostSacrifice } from "./classes/callbacks/PostSacrifice";
+import { PostSlotAnimationChanged } from "./classes/callbacks/PostSlotAnimationChanged";
+import { PostSlotCollision } from "./classes/callbacks/PostSlotCollision";
+import { PostSlotDestroyed } from "./classes/callbacks/PostSlotDestroyed";
+import { PostSlotInit } from "./classes/callbacks/PostSlotInit";
+import { PostSlotRender } from "./classes/callbacks/PostSlotRender";
+import { PostSlotUpdate } from "./classes/callbacks/PostSlotUpdate";
 import { PostSpikesRender } from "./classes/callbacks/PostSpikesRender";
+import { PostSpikesUpdate } from "./classes/callbacks/PostSpikesUpdate";
+import { PostTearInitLate } from "./classes/callbacks/PostTearInitLate";
+import { PostTearInitVeryLate } from "./classes/callbacks/PostTearInitVeryLate";
+import { PostTNTRender } from "./classes/callbacks/PostTNTRender";
+import { PostTNTUpdate } from "./classes/callbacks/PostTNTUpdate";
+import { PostTransformation } from "./classes/callbacks/PostTransformation";
 import { PreBerserkDeath } from "./classes/callbacks/PreBerserkDeath";
 import { PreCustomRevive } from "./classes/callbacks/PreCustomRevive";
+import { PreItemPickup } from "./classes/callbacks/PreItemPickup";
 import { ModCallbackCustom2 } from "./enums/ModCallbackCustom2";
 import { getEnumValues } from "./functions/enums";
 import { newObjectWithEnumKeys } from "./functions/utils";
@@ -85,35 +126,77 @@ const MOD_CALLBACK_CUSTOM_TO_CLASS = newObjectWithEnumKeys(ModCallbackCustom2, {
   [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_INIT]: PostGridEntityCustomInit,
   [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_REMOVE]:
     PostGridEntityCustomRemove,
-  // [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_RENDER]: new PostGridEntityCustomRender(),
+  [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_RENDER]:
+    PostGridEntityCustomRender,
   [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_STATE_CHANGED]:
     PostGridEntityCustomStateChanged,
   [ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_UPDATE]:
     PostGridEntityCustomUpdate,
   [ModCallbackCustom2.POST_GRID_ENTITY_INIT]: PostGridEntityInit,
   [ModCallbackCustom2.POST_GRID_ENTITY_REMOVE]: PostGridEntityRemove,
-  // [ModCallbackCustom2.POST_GRID_ENTITY_RENDER]: new PostGridEntityRender(),
+  [ModCallbackCustom2.POST_GRID_ENTITY_RENDER]: PostGridEntityRender,
   [ModCallbackCustom2.POST_GRID_ENTITY_STATE_CHANGED]:
     PostGridEntityStateChanged,
   [ModCallbackCustom2.POST_GRID_ENTITY_UPDATE]: PostGridEntityUpdate,
   [ModCallbackCustom2.POST_HOLY_MANTLE_REMOVED]: PostHolyMantleRemoved,
-
-  // ----------------
-
+  [ModCallbackCustom2.POST_ITEM_DISCHARGE]: PostItemDischarge,
+  [ModCallbackCustom2.POST_ITEM_PICKUP]: PostItemPickup,
   [ModCallbackCustom2.POST_KNIFE_INIT_LATE]: PostKnifeInitLate,
+  [ModCallbackCustom2.POST_LASER_INIT_LATE]: PostLaserInitLate,
   [ModCallbackCustom2.POST_NEW_LEVEL_REORDERED]: PostNewLevelReordered,
   [ModCallbackCustom2.POST_NEW_ROOM_EARLY]: PostNewRoomEarly,
   [ModCallbackCustom2.POST_NEW_ROOM_REORDERED]: PostNewRoomReordered,
+  [ModCallbackCustom2.POST_NPC_INIT_LATE]: PostNPCInitLate,
+  [ModCallbackCustom2.POST_NPC_STATE_CHANGED]: PostNPCStateChanged,
   [ModCallbackCustom2.POST_PEFFECT_UPDATE_REORDERED]:
     PostPEffectUpdateReordered,
+  [ModCallbackCustom2.POST_PICKUP_COLLECT]: PostPickupCollect,
+  [ModCallbackCustom2.POST_PICKUP_INIT_FIRST]: PostPickupInitFirst,
+  [ModCallbackCustom2.POST_PICKUP_INIT_LATE]: PostPickupInitLate,
+  [ModCallbackCustom2.POST_PICKUP_STATE_CHANGED]: PostPickupStateChanged,
   [ModCallbackCustom2.POST_PIT_RENDER]: PostPitRender,
+  [ModCallbackCustom2.POST_PIT_UPDATE]: PostPitUpdate,
+  [ModCallbackCustom2.POST_PLAYER_CHANGE_HEALTH]: PostPlayerChangeHealth,
+  [ModCallbackCustom2.POST_PLAYER_CHANGE_STAT]: PostPlayerChangeStat,
+  [ModCallbackCustom2.POST_PLAYER_CHANGE_TYPE]: PostPlayerChangeType,
+  [ModCallbackCustom2.POST_PLAYER_COLLECTIBLE_ADDED]:
+    PostPlayerCollectibleAdded,
+  [ModCallbackCustom2.POST_PLAYER_COLLECTIBLE_REMOVED]:
+    PostPlayerCollectibleRemoved,
   [ModCallbackCustom2.POST_PLAYER_FATAL_DAMAGE]: PostPlayerFatalDamage,
+  [ModCallbackCustom2.POST_PLAYER_INIT_FIRST]: PostPlayerInitFirst,
+  [ModCallbackCustom2.POST_PLAYER_INIT_LATE]: PostPlayerInitLate,
   [ModCallbackCustom2.POST_PLAYER_RENDER_REORDERED]: PostPlayerRenderReordered,
   [ModCallbackCustom2.POST_PLAYER_UPDATE_REORDERED]: PostPlayerUpdateReordered,
+  [ModCallbackCustom2.POST_POOP_RENDER]: PostPoopRender,
+  [ModCallbackCustom2.POST_POOP_UPDATE]: PostPoopUpdate,
+  [ModCallbackCustom2.POST_PRESSURE_PLATE_RENDER]: PostPressurePlateRender,
+  [ModCallbackCustom2.POST_PRESSURE_PLATE_UPDATE]: PostPressurePlateUpdate,
+  [ModCallbackCustom2.POST_PROJECTILE_INIT_LATE]: PostProjectileInitLate,
+  [ModCallbackCustom2.POST_PURCHASE]: PostPurchase,
+  [ModCallbackCustom2.POST_ROCK_RENDER]: PostRockRender,
+  [ModCallbackCustom2.POST_ROCK_UPDATE]: PostRockUpdate,
   [ModCallbackCustom2.POST_ROOM_CLEAR_CHANGED]: PostRoomClearChanged,
+  [ModCallbackCustom2.POST_SACRIFICE]: PostSacrifice,
+  [ModCallbackCustom2.POST_SLOT_ANIMATION_CHANGED]: PostSlotAnimationChanged,
+  [ModCallbackCustom2.POST_SLOT_COLLISION]: PostSlotCollision,
+  [ModCallbackCustom2.POST_SLOT_DESTROYED]: PostSlotDestroyed,
+  [ModCallbackCustom2.POST_SLOT_INIT]: PostSlotInit,
+  [ModCallbackCustom2.POST_SLOT_RENDER]: PostSlotRender,
+  [ModCallbackCustom2.POST_SLOT_UPDATE]: PostSlotUpdate,
   [ModCallbackCustom2.POST_SPIKES_RENDER]: PostSpikesRender,
+  [ModCallbackCustom2.POST_SPIKES_UPDATE]: PostSpikesUpdate,
+  [ModCallbackCustom2.POST_TEAR_INIT_LATE]: PostTearInitLate,
+  [ModCallbackCustom2.POST_TEAR_INIT_VERY_LATE]: PostTearInitVeryLate,
+  [ModCallbackCustom2.POST_TNT_RENDER]: PostTNTRender,
+  [ModCallbackCustom2.POST_TNT_UPDATE]: PostTNTUpdate,
+  [ModCallbackCustom2.POST_TRANSFORMATION]: PostTransformation,
+
+  // ----------------
+
   [ModCallbackCustom2.PRE_BERSERK_DEATH]: PreBerserkDeath,
   [ModCallbackCustom2.PRE_CUSTOM_REVIVE]: PreCustomRevive,
+  [ModCallbackCustom2.PRE_ITEM_PICKUP]: PreItemPickup,
 } as const);
 
 export type ModCallbackCustomToClass = {

package/src/classes/ModFeature.ts

@@ -1,14 +1,104 @@
+import {
+  getTSTLClassConstructor,
+  getTSTLClassName,
+} from "../functions/tstlClass";
+import { isTable } from "../functions/types";
+import { TSTLClassMetatable } from "../interfaces/TSTLClassMetatable";
 import { ModUpgraded } from "./ModUpgraded";
 
+export const ADD_CALLBACK_ARGS_KEY = "__addCallbackArgs";
+export const ADD_CALLBACK_CUSTOM_ARGS_KEY = "__addCallbackCustomArgs";
+
+type ModFeatureConstructor = TSTLClassMetatable["constructor"] & {
+  [ADD_CALLBACK_ARGS_KEY]: unknown[] | undefined;
+  [ADD_CALLBACK_CUSTOM_ARGS_KEY]: unknown[] | undefined;
+};
+
 /**
- * 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.
+ * A helper class for mods that wants to represent their individual features as classes. Extend your
+ * mod features from this class in order to enable the `@Callback` and `@CustomCallback` decorators
+ * that automatically subscribe to callbacks.
+ *
+ * For example:
+ *
+ * ```ts
+ * export class MyFeature extends ModFeature {
+ *   @Callback(ModCallback.POST_GAME_STARTED)
+ *   postGameStarted(isContinued: boolean): void {
+ *     Isaac.DebugString(`Callback fired: POST_GAME_STARTED`);
+ *   }
+ * }
+ * ```
  */
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class ModFeature {
-  private mod: ModUpgraded;
-
   constructor(mod: ModUpgraded) {
-    this.mod = mod;
+    const constructor = getTSTLClassConstructor(this);
+    if (constructor === undefined) {
+      error("Failed to get the TSTL class constructor for a mod feature.");
+    }
+
+    const modFeatureConstructor = constructor as ModFeatureConstructor;
+    addDecoratedCallbacks(mod, modFeatureConstructor);
+    addDecoratedCallbacksCustom(mod, modFeatureConstructor);
+    registerSaveDataManager(mod, this);
+  }
+}
+
+function addDecoratedCallbacks(
+  mod: ModUpgraded,
+  modFeatureConstructor: ModFeatureConstructor,
+) {
+  const addCallbackArgs = modFeatureConstructor[ADD_CALLBACK_ARGS_KEY];
+  if (addCallbackArgs === undefined) {
+    return;
+  }
+
+  for (const args of addCallbackArgs) {
+    // @ts-expect-error The compiler does not know that the arguments match the method.
+    // eslint-disable-next-line isaacscript/strict-enums
+    mod.AddCallback(...args);
+  }
+}
+
+function addDecoratedCallbacksCustom(
+  mod: ModUpgraded,
+  modFeatureConstructor: ModFeatureConstructor,
+) {
+  const addCallbackCustomArgs =
+    modFeatureConstructor[ADD_CALLBACK_CUSTOM_ARGS_KEY];
+  if (addCallbackCustomArgs === undefined) {
+    return;
+  }
+
+  for (const args of addCallbackCustomArgs) {
+    // @ts-expect-error The compiler does not know that the arguments match the method.
+    // eslint-disable-next-line isaacscript/strict-enums
+    mod.AddCallbackCustom(...args);
+  }
+}
+
+function registerSaveDataManager(mod: ModUpgraded, modFeature: ModFeature) {
+  // Do nothing if this class does not have any variables.
+  const { v } = modFeature as unknown as Record<string, unknown>;
+  if (v === undefined) {
+    return;
   }
+
+  if (!isTable(v)) {
+    error(
+      'Failed to initialize a mod feature class due to having a "v" property that is not an object. (The "v" property is supposed to be an object that holds the variables for the class, managed by the save data manager.)',
+    );
+  }
+
+  // Do nothing if we have not enabled the save data manager.
+  const { saveDataManager } = mod as unknown as Record<string, unknown>;
+  if (saveDataManager === undefined) {
+    error(
+      'Failed to initialize a mod feature class due to having a "v" object and not having the save data manager initialized. You must pass "ISCFeature.SAVE_DATA_MANAGER" to the "upgradeMod" function.',
+    );
+  }
+
+  const tstlClassName = getTSTLClassName(modFeature);
+  (saveDataManager as (...args: unknown[]) => void)(tstlClassName, v);
 }

package/src/classes/ModUpgraded.ts

@@ -5,10 +5,6 @@ import { ISCFeature } from "../enums/ISCFeature";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { ModCallbackCustom2 } from "../enums/ModCallbackCustom2";
 import { getFeatures } from "../features";
-import {
-  saveDataManager,
-  saveDataManagerRemove,
-} from "../features/saveDataManager/exports";
 import { getTime } from "../functions/debugFunctions";
 import { getParentFunctionDescription } from "../functions/log";
 import {
@@ -18,6 +14,7 @@ import {
 import { AddCallbackParametersCustom } from "../interfaces/private/AddCallbackParametersCustom";
 import { AddCallbackParametersCustom2 } from "../interfaces/private/AddCallbackParametersCustom2";
 import { CALLBACK_REGISTER_FUNCTIONS } from "../objects/callbackRegisterFunctions";
+import { AnyFunction } from "../types/AnyFunction";
 import { FunctionTuple } from "../types/FunctionTuple";
 import { Feature } from "./private/Feature";
 
@@ -33,10 +30,6 @@ export class ModUpgraded implements Mod {
   // Vanilla variables
   // -----------------
 
-  /**
-   * The `RegisterMod` function stores the name of the mod on the mod object for some reason. (It is
-   * never used or referenced.)
-   */
   public Name: string;
 
   // ----------------
@@ -65,7 +58,7 @@ export class ModUpgraded implements Mod {
     this.debug = debug;
     this.timeThreshold = timeThreshold;
     this.callbacks = getCallbacks();
-    this.features = getFeatures(this.callbacks);
+    this.features = getFeatures(mod, this.callbacks);
   }
 
   // ---------------
@@ -194,7 +187,7 @@ export class ModUpgraded implements Mod {
   ): void {
     const callbackClass = this.callbacks[modCallbackCustom];
     // @ts-expect-error The compiler is not smart enough to figure out that the parameters match.
-    callbackClass.add(...args);
+    callbackClass.addSubscriber(...args);
     this.initFeature(callbackClass);
   }
 
@@ -210,34 +203,37 @@ export class ModUpgraded implements Mod {
   ): void {
     const callbackClass = this.callbacks[modCallbackCustom];
     // @ts-expect-error The compiler is not smart enough to figure out that the parameters match.
-    callbackClass.remove(callback);
-    if (!callbackClass.hasSubscriptions()) {
-      this.uninitFeature(callbackClass);
-    }
-  }
-
-  /**
-   * This method should only be used by the `upgradeMod` function. Returns the names of the exported
-   * class methods from the features that were added.
-   */
-  public initOptionalFeature(feature: ISCFeature): FunctionTuple[] {
-    const featureClass = this.features[feature];
-    this.initFeature(featureClass);
-
-    return getExportedMethodsFromFeature(featureClass);
+    callbackClass.removeSubscriber(callback);
+    this.uninitFeature(callbackClass);
   }
 
   // ----------------------
   // Custom private methods
   // ----------------------
 
-  /** This is used to initialize both custom callbacks and "extra features". */
+  /**
+   * This is used to initialize both custom callbacks and "extra features".
+   *
+   * This mirrors the `uninitFeature` method.
+   */
   private initFeature(feature: Feature): void {
+    feature.numConsumers++;
+
     if (feature.initialized) {
       return;
     }
+
     feature.initialized = true;
 
+    if (feature.v !== undefined) {
+      if (feature.featuresUsed === undefined) {
+        feature.featuresUsed = [];
+      }
+      if (!feature.featuresUsed.includes(ISCFeature.SAVE_DATA_MANAGER)) {
+        feature.featuresUsed.unshift(ISCFeature.SAVE_DATA_MANAGER);
+      }
+    }
+
     if (feature.featuresUsed !== undefined) {
       for (const featureUsed of feature.featuresUsed) {
         const featureClass = this.features[featureUsed];
@@ -264,14 +260,37 @@ export class ModUpgraded implements Mod {
       if (className === undefined) {
         error("Failed to get the name of a feature.");
       }
-      saveDataManager(className, feature.v);
+      const saveDataManagerClass = this.features[ISCFeature.SAVE_DATA_MANAGER];
+      saveDataManagerClass.saveDataManager(className, feature.v);
     }
   }
 
+  /**
+   * This is used to uninitialize both custom callbacks and "extra features".
+   *
+   * This mirrors the `initFeature` method.
+   */
   private uninitFeature(feature: Feature): void {
+    if (feature.numConsumers <= 0) {
+      const className = getTSTLClassName(feature) ?? "unknown";
+      error(
+        `Failed to uninit feature "${className}" since it has ${feature.numConsumers} consumers, which should never happen.`,
+      );
+    }
+
     if (!feature.initialized) {
+      const className = getTSTLClassName(feature) ?? "unknown";
+      error(
+        `Failed to uninit feature "${className}" since it was not initialized, which should never happen.`,
+      );
+    }
+
+    feature.numConsumers--;
+
+    if (feature.numConsumers > 0) {
       return;
     }
+
     feature.initialized = false;
 
     if (feature.featuresUsed !== undefined) {
@@ -302,9 +321,18 @@ export class ModUpgraded implements Mod {
       if (className === undefined) {
         error("Failed to get the name of a feature.");
       }
-      saveDataManagerRemove(className);
+      const saveDataManagerClass = this.features[ISCFeature.SAVE_DATA_MANAGER];
+      saveDataManagerClass.saveDataManagerRemove(className);
     }
   }
+
+  /** Returns the names of the exported class methods from the features that were added. */
+  private initOptionalFeature(feature: ISCFeature): FunctionTuple[] {
+    const featureClass = this.features[feature];
+    this.initFeature(featureClass);
+
+    return getExportedMethodsFromFeature(featureClass);
+  }
 }
 
 /**
@@ -324,10 +352,7 @@ function getExportedMethodsFromFeature(featureClass: unknown): FunctionTuple[] {
   ] as string[];
 
   return exportedMethodNames.map((name) => {
-    const featureClassRecord = featureClass as Record<
-      string,
-      (...args: unknown[]) => unknown
-    >;
+    const featureClassRecord = featureClass as Record<string, AnyFunction>;
     const method = featureClassRecord[name];
     if (method === undefined) {
       error(`Failed to find a decorated exported method: ${name}`);

package/src/classes/callbacks/PostCustomRevive.ts

@@ -1,11 +1,31 @@
 import { ISCFeature } from "../../enums/ISCFeature";
 import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
-import { CustomCallbackRevive } from "./validation/CustomCallbackRevive";
+import {
+  CustomCallback,
+  FireArgs,
+  OptionalArgs,
+} from "../private/CustomCallback";
 
-export class PostCustomRevive extends CustomCallbackRevive<ModCallbackCustom2.POST_CUSTOM_REVIVE> {
+type T = ModCallbackCustom2.POST_CUSTOM_REVIVE;
+
+export class PostCustomRevive extends CustomCallback<ModCallbackCustom2.POST_CUSTOM_REVIVE> {
   constructor() {
     super();
 
     this.featuresUsed = [ISCFeature.CUSTOM_REVIVE];
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  protected override shouldFire(
+    fireArgs: FireArgs<T>,
+    optionalArgs: OptionalArgs<T>,
+  ): boolean {
+    const [callbackRevivalType] = optionalArgs;
+    if (callbackRevivalType === undefined) {
+      return true;
+    }
+
+    const [_player, revivalType] = fireArgs;
+    return revivalType === callbackRevivalType;
+  }
 }

package/src/classes/callbacks/PostGridEntityBroken.ts

@@ -6,6 +6,6 @@ export class PostGridEntityBroken extends CustomCallbackGridEntity<ModCallbackCu
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityCollision.ts

@@ -12,7 +12,7 @@ export class PostGridEntityCollision extends CustomCallback<T> {
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/classes/callbacks/PostGridEntityCustomBroken.ts

@@ -6,6 +6,6 @@ export class PostGridEntityCustomBroken extends CustomCallbackGridEntityCustom<M
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityCustomCollision.ts

@@ -12,7 +12,7 @@ export class PostGridEntityCustomCollision extends CustomCallback<T> {
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/classes/callbacks/PostGridEntityCustomInit.ts

@@ -6,6 +6,6 @@ export class PostGridEntityCustomInit extends CustomCallbackGridEntityCustom<Mod
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityCustomRemove.ts

@@ -12,7 +12,7 @@ export class PostGridEntityCustomRemove extends CustomCallback<T> {
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/classes/callbacks/PostGridEntityCustomRender.ts

@@ -0,0 +1,11 @@
+import { ISCFeature } from "../../enums/ISCFeature";
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackGridEntityCustom } from "./validation/CustomCallbackGridEntityCustom";
+
+export class PostGridEntityCustomRender extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_RENDER> {
+  constructor() {
+    super();
+
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_RENDER_DETECTION];
+  }
+}

package/src/classes/callbacks/PostGridEntityCustomStateChanged.ts

@@ -6,6 +6,6 @@ export class PostGridEntityCustomStateChanged extends CustomCallbackGridEntityCu
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityCustomUpdate.ts

@@ -6,6 +6,6 @@ export class PostGridEntityCustomUpdate extends CustomCallbackGridEntityCustom<M
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityInit.ts

@@ -6,6 +6,6 @@ export class PostGridEntityInit extends CustomCallbackGridEntity<ModCallbackCust
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityRemove.ts

@@ -12,7 +12,7 @@ export class PostGridEntityRemove extends CustomCallback<T> {
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/classes/callbacks/PostGridEntityRender.ts

@@ -0,0 +1,11 @@
+import { ISCFeature } from "../../enums/ISCFeature";
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackGridEntity } from "./validation/CustomCallbackGridEntity";
+
+export class PostGridEntityRender extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_RENDER> {
+  constructor() {
+    super();
+
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_RENDER_DETECTION];
+  }
+}

package/src/classes/callbacks/PostGridEntityStateChanged.ts

@@ -6,6 +6,6 @@ export class PostGridEntityStateChanged extends CustomCallbackGridEntity<ModCall
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostGridEntityUpdate.ts

@@ -6,6 +6,6 @@ export class PostGridEntityUpdate extends CustomCallbackGridEntity<ModCallbackCu
   constructor() {
     super();
 
-    this.featuresUsed = [ISCFeature.GRID_ENTITY_DETECTION];
+    this.featuresUsed = [ISCFeature.GRID_ENTITY_UPDATE_DETECTION];
   }
 }

package/src/classes/callbacks/PostHolyMantleRemoved.ts

@@ -1,4 +1,4 @@
-import { CollectibleType } from "isaac-typescript-definitions";
+import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
 import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
 import {
   defaultMapGetPlayer,
@@ -18,16 +18,13 @@ export class PostHolyMantleRemoved extends CustomCallback<ModCallbackCustom2.POS
   constructor() {
     super();
 
-    this.customCallbacksUsed = [
-      [
-        ModCallbackCustom2.POST_PEFFECT_UPDATE_REORDERED,
-        [this.postPEffectUpdateReordered],
-      ],
+    this.callbacksUsed = [
+      [ModCallback.POST_PEFFECT_UPDATE, [this.postPEffectUpdate]], // 4
     ];
   }
 
-  // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
-  private postPEffectUpdateReordered = (player: EntityPlayer): void => {
+  // ModCallback.POST_PEFFECT_UPDATE (4)
+  private postPEffectUpdate = (player: EntityPlayer): void => {
     const effects = player.GetEffects();
     const newNumHolyMantles = effects.GetCollectibleEffectNum(
       CollectibleType.HOLY_MANTLE,