isaacscript-common 18.3.0 → 18.3.1

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 18.3.0
+isaacscript-common 18.3.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -15408,7 +15408,11 @@ local validateInterfaceMatchesEnum = ____utils.validateInterfaceMatchesEnum
 validateInterfaceMatchesEnum(nil)
 return ____exports
  end,
-["src.types.private.AllButFirst"] = function(...) 
+["src.types.AllButFirst"] = function(...) 
+local ____exports = {}
+return ____exports
+ end,
+["src.types.AnyFunction"] = function(...) 
 local ____exports = {}
 return ____exports
  end,
@@ -16631,7 +16635,10 @@ function ____exports.getRandomArrayElementAndRemove(self, array, seedOrRNG, exce
     ____exports.arrayRemoveInPlace(nil, array, randomArrayElement)
     return randomArrayElement
 end
-function ____exports.isArray(self, object)
+function ____exports.isArray(self, object, ensureContiguousValues)
+    if ensureContiguousValues == nil then
+        ensureContiguousValues = true
+    end
     if not isTable(nil, object) then
         return false
     end
@@ -16650,14 +16657,16 @@ function ____exports.isArray(self, object)
     if not hasAllNumberKeys then
         return false
     end
-    do
-        local i = 1
-        while i <= #keys do
-            local element = object[i]
-            if element == nil then
-                return false
+    if ensureContiguousValues then
+        do
+            local i = 1
+            while i <= #keys do
+                local element = object[i]
+                if element == nil then
+                    return false
+                end
+                i = i + 1
             end
-            i = i + 1
         end
     end
     return true
@@ -17276,7 +17285,6 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__Spread = ____lualib.__TS__Spread
-local __TS__ArraySlice = ____lualib.__TS__ArraySlice
 local __TS__ArrayFindIndex = ____lualib.__TS__ArrayFindIndex
 local __TS__ArraySplice = ____lualib.__TS__ArraySplice
 local ____exports = {}
@@ -17291,13 +17299,10 @@ function CustomCallback.prototype.____constructor(self, ...)
     self.subscriptions = {}
     self.fire = function(____, ...)
         local fireArgs = {...}
-        for ____, ____value in ipairs(self.subscriptions) do
-            local callback = ____value[1]
-            local optionalArgsArray = __TS__ArraySlice(____value, 1)
-            local optionalArgs = optionalArgsArray
+        for ____, subscription in ipairs(self.subscriptions) do
+            local callbackFunc, optionalArgs = table.unpack(subscription)
             if self:shouldFire(fireArgs, optionalArgs) then
-                local callbackCasted = callback
-                local value = callbackCasted(
+                local value = callbackFunc(
                     nil,
                     __TS__Spread(fireArgs)
                 )
@@ -17310,10 +17315,11 @@ function CustomCallback.prototype.____constructor(self, ...)
     end
     self.shouldFire = function() return true end
 end
-function CustomCallback.prototype.addSubscriber(self, ...)
-    local args = {...}
+function CustomCallback.prototype.addSubscriber(self, callbackFunc, ...)
+    local optionalArgs = {...}
+    local subscription = {callbackFunc, optionalArgs}
     local ____self_subscriptions_0 = self.subscriptions
-    ____self_subscriptions_0[#____self_subscriptions_0 + 1] = args
+    ____self_subscriptions_0[#____self_subscriptions_0 + 1] = subscription
 end
 function CustomCallback.prototype.removeSubscriber(self, callback)
     local subscriptionIndexMatchingCallback = __TS__ArrayFindIndex(
@@ -17354,7 +17360,7 @@ function EntityTakeDmgFilter.prototype.____constructor(self)
         source,
         countdownFrames
     ) end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmg}}}
+    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, self.entityTakeDmg}}
 end
 return ____exports
  end,
@@ -17390,7 +17396,7 @@ function EntityTakeDmgPlayer.prototype.____constructor(self)
             countdownFrames
         )
     end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
+    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, self.entityTakeDmgPlayer, {EntityType.PLAYER}}}
 end
 return ____exports
  end,
@@ -17415,7 +17421,7 @@ function InputActionFilter.prototype.____constructor(self)
         return (callbackInputHook == nil or callbackInputHook == inputHook) and (callbackButtonAction == nil or callbackButtonAction == buttonAction)
     end
     self.inputAction = function(____, entity, inputHook, buttonAction) return self:fire(entity, inputHook, buttonAction) end
-    self.callbacksUsed = {{ModCallback.INPUT_ACTION, {self.inputAction}}}
+    self.callbacksUsed = {{ModCallback.INPUT_ACTION, self.inputAction}}
 end
 return ____exports
  end,
@@ -17450,7 +17456,7 @@ function InputActionPlayer.prototype.____constructor(self)
         end
         return self:fire(player, inputHook, buttonAction)
     end
-    self.callbacksUsed = {{ModCallback.INPUT_ACTION, {self.inputAction}}}
+    self.callbacksUsed = {{ModCallback.INPUT_ACTION, self.inputAction}}
 end
 return ____exports
  end,
@@ -17526,7 +17532,7 @@ function PostAmbushFinished.prototype.____constructor(self)
             self:fire(ambushType)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -17568,7 +17574,7 @@ function PostAmbushStarted.prototype.____constructor(self)
             self:fire(ambushType)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -17597,7 +17603,7 @@ function PostBombExploded.prototype.____constructor(self)
             self:fire(bomb)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_BOMB_UPDATE, {self.postBombUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_BOMB_UPDATE, self.postBombUpdate}}
 end
 return ____exports
  end,
@@ -17629,7 +17635,7 @@ function PostBombInitLate.prototype.____constructor(self)
             self:fire(bomb)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_BOMB_UPDATE, {self.postBombUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_BOMB_UPDATE, self.postBombUpdate}}
 end
 return ____exports
  end,
@@ -17659,7 +17665,7 @@ function PostBoneSwing.prototype.____constructor(self)
             self:postKnifeRenderBoneClub(knife)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_KNIFE_RENDER, {self.postKnifeRender}}}
+    self.callbacksUsed = {{ModCallback.POST_KNIFE_RENDER, self.postKnifeRender}}
 end
 function PostBoneSwing.prototype.postKnifeRenderBoneClub(self, knife)
     local sprite = knife:GetSprite()
@@ -17715,7 +17721,7 @@ function PostCollectibleEmpty.prototype.____constructor(self)
             self:collectibleTypeChanged(collectible, oldCollectibleType)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, {self.postPickupUpdateCollectible, PickupVariant.COLLECTIBLE}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, self.postPickupUpdateCollectible, {PickupVariant.COLLECTIBLE}}}
 end
 function PostCollectibleEmpty.prototype.collectibleTypeChanged(self, collectible, oldCollectibleType)
     if collectible.SubType == CollectibleType.NULL then
@@ -21013,7 +21019,7 @@ function PostCollectibleInitFirst.prototype.____constructor(self)
         self.v.run.seenCollectibles:add(collectibleIndex)
         self:fire(collectible)
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInitCollectible, PickupVariant.COLLECTIBLE}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, self.postPickupInitCollectible, {PickupVariant.COLLECTIBLE}}}
 end
 return ____exports
  end,
@@ -22040,13 +22046,14 @@ local playerIsTeleportingFromCursedTeleport
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PlayerVariant = ____isaac_2Dtypescript_2Ddefinitions.PlayerVariant
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____flag = require("src.functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____playerDataStructures = require("src.functions.playerDataStructures")
@@ -22087,11 +22094,6 @@ function PostCursedTeleport.prototype.____constructor(self)
         level = {numSacrifices = 0}
     }
     self.shouldFire = shouldFirePlayer
-    self.entityTakeDmgPlayer = function(____, entity, _amount, damageFlags, _source, _countdownFrames)
-        self:incrementNumSacrifices(damageFlags)
-        self:setDamageFrame(entity, damageFlags)
-        return nil
-    end
     self.postPlayerRenderPlayer = function(____, player, _renderOffset)
         local trackingArray = mapGetPlayer(nil, self.v.run.playersDamageFrameMap, player)
         if trackingArray == nil then
@@ -22109,14 +22111,25 @@ function PostCursedTeleport.prototype.____constructor(self)
         mapSetPlayer(nil, self.v.run.playersDamageFrameMap, player, newTrackingArray)
         self:fire(player)
     end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}, {ModCallback.POST_PLAYER_RENDER, {self.postPlayerRenderPlayer, PlayerVariant.PLAYER}}}
+    self.entityTakeDmgPlayer = function(____, player, _amount, damageFlags, _source, _countdownFrames)
+        self:incrementNumSacrifices(damageFlags)
+        self:setDamageFrame(player, damageFlags)
+        return nil
+    end
+    self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, self.postPlayerRenderPlayer, {PlayerVariant.PLAYER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
 end
-function PostCursedTeleport.prototype.setDamageFrame(self, entity, damageFlags)
-    local gameFrameCount = game:GetFrameCount()
-    local player = entity:ToPlayer()
-    if player == nil then
-        return
+function PostCursedTeleport.prototype.incrementNumSacrifices(self, damageFlags)
+    local room = game:GetRoom()
+    local roomType = room:GetType()
+    local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
+    if roomType == RoomType.SACRIFICE and isSpikeDamage then
+        local ____self_v_level_0, ____numSacrifices_1 = self.v.level, "numSacrifices"
+        ____self_v_level_0[____numSacrifices_1] = ____self_v_level_0[____numSacrifices_1] + 1
     end
+end
+function PostCursedTeleport.prototype.setDamageFrame(self, player, damageFlags)
+    local gameFrameCount = game:GetFrameCount()
     local trackingArray = mapGetPlayer(nil, self.v.run.playersDamageFrameMap, player)
     if trackingArray ~= nil then
         local lastDamageFrame, callbackFiredOnThisFrame = table.unpack(trackingArray)
@@ -22136,15 +22149,6 @@ function PostCursedTeleport.prototype.isPotentialNaturalTeleportFromSacrificeRoo
     local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
     return roomType == RoomType.SACRIFICE and isSpikeDamage and (self.v.level.numSacrifices == 6 or self.v.level.numSacrifices >= 12)
 end
-function PostCursedTeleport.prototype.incrementNumSacrifices(self, damageFlags)
-    local room = game:GetRoom()
-    local roomType = room:GetType()
-    local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
-    if roomType == RoomType.SACRIFICE and isSpikeDamage then
-        local ____self_v_level_0, ____numSacrifices_1 = self.v.level, "numSacrifices"
-        ____self_v_level_0[____numSacrifices_1] = ____self_v_level_0[____numSacrifices_1] + 1
-    end
-end
 return ____exports
  end,
 ["src.classes.callbacks.PostCustomRevive"] = function(...) 
@@ -22316,7 +22320,7 @@ function PostDiceRoomActivated.prototype.____constructor(self)
             self:fire(closestPlayer, effect.SubType)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, {self.postEffectUpdateDiceFloor, EffectVariant.DICE_FLOOR}}}
+    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, self.postEffectUpdateDiceFloor, {EffectVariant.DICE_FLOOR}}}
 end
 return ____exports
  end,
@@ -22345,7 +22349,7 @@ function PostDoorRender.prototype.____constructor(self)
             self:fire(door)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -22374,7 +22378,7 @@ function PostDoorUpdate.prototype.____constructor(self)
             self:fire(door)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -22406,7 +22410,7 @@ function PostEffectInitLate.prototype.____constructor(self)
             self:fire(effect)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, {self.postEffectUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, self.postEffectUpdate}}
 end
 return ____exports
  end,
@@ -22444,7 +22448,7 @@ function PostEffectStateChanged.prototype.____constructor(self)
             self:fire(effect, previousState, currentState)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, {self.postEffectUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_EFFECT_UPDATE, self.postEffectUpdate}}
 end
 return ____exports
  end,
@@ -22495,7 +22499,7 @@ function PostFamiliarInitLate.prototype.____constructor(self)
             self:fire(familiar)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_UPDATE, {self.postFamiliarUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_UPDATE, self.postFamiliarUpdate}}
 end
 return ____exports
  end,
@@ -22533,7 +22537,7 @@ function PostFamiliarStateChanged.prototype.____constructor(self)
             self:fire(familiar, previousState, currentState)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_UPDATE, {self.postFamiliarUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_UPDATE, self.postFamiliarUpdate}}
 end
 return ____exports
  end,
@@ -23460,7 +23464,7 @@ function PostGreedModeWave.prototype.____constructor(self)
             self:fire(oldWave, newWave)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -23818,7 +23822,7 @@ function PostHolyMantleRemoved.prototype.____constructor(self)
             self:fire(player, oldNumHolyMantles, newNumHolyMantles)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 return ____exports
  end,
@@ -24728,8 +24732,8 @@ function PostItemDischarge.prototype.____constructor(self)
             ::__continue9::
         end
     end
-    self.callbacksUsed = {{ModCallback.PRE_NPC_COLLISION, {self.preNPCCollisionSucker, EntityType.SUCKER}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.callbacksUsed = {{ModCallback.PRE_NPC_COLLISION, self.preNPCCollisionSucker, {EntityType.SUCKER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 function PostItemDischarge.prototype.preNPCCollisionBulb(self, _npc, collider)
     self:checkPlayerCollidedWithBulb(collider)
@@ -24802,7 +24806,7 @@ function PostKnifeInitLate.prototype.____constructor(self)
             self:fire(knife)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_KNIFE_UPDATE, {self.postKnifeUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_KNIFE_UPDATE, self.postKnifeUpdate}}
 end
 return ____exports
  end,
@@ -24834,7 +24838,7 @@ function PostLaserInitLate.prototype.____constructor(self)
             self:fire(laser)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_LASER_UPDATE, {self.postLaserUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_LASER_UPDATE, self.postLaserUpdate}}
 end
 return ____exports
  end,
@@ -27487,7 +27491,7 @@ function ____exports.logFlags(self, flags, flagEnum, description)
     end
 end
 function ____exports.logArray(self, array)
-    if not isArray(nil, array) then
+    if not isArray(nil, array, false) then
         log(nil, "Tried to log an array, but the given object was not an array.")
         return
     end
@@ -27938,7 +27942,7 @@ function PostNewRoomEarly.prototype.____constructor(self)
         self:checkRoomChanged()
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_NEW_ROOM, {self.postNewRoom}}, {ModCallback.PRE_ENTITY_SPAWN, {self.preEntitySpawn}}}
+    self.callbacksUsed = {{ModCallback.POST_NEW_ROOM, self.postNewRoom}, {ModCallback.PRE_ENTITY_SPAWN, self.preEntitySpawn}}
 end
 function PostNewRoomEarly.prototype.checkRoomChanged(self)
     if self:isNewRoom() then
@@ -28013,7 +28017,7 @@ function PostNPCDeathFilter.prototype.____constructor(self)
     self.postNPCDeath = function(____, npc)
         self:fire(npc)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_DEATH, {self.postNPCDeath}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_DEATH, self.postNPCDeath}}
 end
 return ____exports
  end,
@@ -28038,7 +28042,7 @@ function PostNPCInitFilter.prototype.____constructor(self)
     self.postNPCInit = function(____, npc)
         self:fire(npc)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, {self.postNPCInit}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, self.postNPCInit}}
 end
 return ____exports
  end,
@@ -28070,7 +28074,7 @@ function PostNPCInitLate.prototype.____constructor(self)
             self:fire(npc)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, {self.postNPCUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, self.postNPCUpdate}}
 end
 return ____exports
  end,
@@ -28095,7 +28099,7 @@ function PostNPCRenderFilter.prototype.____constructor(self)
     self.postNPCRender = function(____, npc, renderOffset)
         self:fire(npc, renderOffset)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_RENDER, {self.postNPCRender}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_RENDER, self.postNPCRender}}
 end
 return ____exports
  end,
@@ -28133,7 +28137,7 @@ function PostNPCStateChanged.prototype.____constructor(self)
             self:fire(npc, previousState, currentState)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, {self.postNPCUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, self.postNPCUpdate}}
 end
 return ____exports
  end,
@@ -28158,7 +28162,7 @@ function PostNPCUpdateFilter.prototype.____constructor(self)
     self.postNPCUpdate = function(____, npc)
         self:fire(npc)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, {self.postNPCUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_UPDATE, self.postNPCUpdate}}
 end
 return ____exports
  end,
@@ -28220,7 +28224,7 @@ function PostPickupCollect.prototype.____constructor(self)
             self:fire(pickup, player)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_RENDER, {self.postPickupRender}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_RENDER, self.postPickupRender}}
 end
 return ____exports
  end,
@@ -28257,7 +28261,7 @@ function PostPickupInitFirst.prototype.____constructor(self)
             self:fire(pickup)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInit}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, self.postPickupInit}}
 end
 return ____exports
  end,
@@ -28289,7 +28293,7 @@ function PostPickupInitLate.prototype.____constructor(self)
             self:fire(pickup)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, {self.postPickupUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, self.postPickupUpdate}}
 end
 return ____exports
  end,
@@ -28327,7 +28331,7 @@ function PostPickupStateChanged.prototype.____constructor(self)
             self:fire(pickup, previousState, currentState)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, {self.postPickupUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_UPDATE, self.postPickupUpdate}}
 end
 return ____exports
  end,
@@ -28704,7 +28708,7 @@ function PostPitRender.prototype.____constructor(self)
             self:fire(pit)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -28733,7 +28737,7 @@ function PostPitUpdate.prototype.____constructor(self)
             self:fire(pit)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -28790,7 +28794,7 @@ function PostPlayerChangeHealth.prototype.____constructor(self)
             end
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectReordered}}
 end
 return ____exports
  end,
@@ -28912,7 +28916,7 @@ function PostPlayerChangeStat.prototype.____constructor(self)
             ::__continue5::
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectReordered}}
 end
 return ____exports
  end,
@@ -28952,7 +28956,7 @@ function PostPlayerChangeType.prototype.____constructor(self)
             self:fire(player, storedCharacter, character)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectReordered}}
 end
 return ____exports
  end,
@@ -29218,10 +29222,11 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlagZero = ____isaac_2Dtypescript_2Ddefinitions.DamageFlagZero
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____playerDataStructures = require("src.functions.playerDataStructures")
 local mapGetPlayer = ____playerDataStructures.mapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
@@ -29244,11 +29249,23 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.v = {run = {playersLastDamageGameFrame = __TS__New(Map)}}
     self.shouldFire = shouldFirePlayer
-    self.entityTakeDmgPlayer = function(____, entity, amount, damageFlags, source, countdownFrames)
-        local player = entity:ToPlayer()
-        if player == nil then
+    self.preUseItemBible = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+        if not inBossRoomOf(nil, BossID.SATAN) then
             return nil
         end
+        local shouldSustainDeath = self:fire(
+            player,
+            0,
+            DamageFlagZero,
+            EntityRef(player),
+            0
+        )
+        if shouldSustainDeath ~= nil then
+            return not shouldSustainDeath
+        end
+        return nil
+    end
+    self.entityTakeDmgPlayer = function(____, player, amount, damageFlags, source, countdownFrames)
         if isChildPlayer(nil, player) then
             return nil
         end
@@ -29279,23 +29296,8 @@ function PostPlayerFatalDamage.prototype.____constructor(self)
         end
         return nil
     end
-    self.preUseItemBible = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
-        if not inBossRoomOf(nil, BossID.SATAN) then
-            return nil
-        end
-        local shouldSustainDeath = self:fire(
-            player,
-            0,
-            DamageFlagZero,
-            EntityRef(player),
-            0
-        )
-        if shouldSustainDeath ~= nil then
-            return not shouldSustainDeath
-        end
-        return nil
-    end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}, {ModCallback.PRE_USE_ITEM, {self.preUseItemBible, CollectibleType.BIBLE}}}
+    self.callbacksUsed = {{ModCallback.PRE_USE_ITEM, self.preUseItemBible, {CollectibleType.BIBLE}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
 end
 return ____exports
  end,
@@ -29336,7 +29338,7 @@ function PostPlayerInitFirst.prototype.____constructor(self)
         end
         self:fire(player)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}, {ModCallbackCustom.POST_PLAYER_INIT_LATE, {self.postPlayerInitLate}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}, {ModCallbackCustom.POST_PLAYER_INIT_LATE, self.postPlayerInitLate}}
 end
 return ____exports
  end,
@@ -29370,7 +29372,7 @@ function PostPlayerInitLate.prototype.____constructor(self)
             self:fire(player)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 return ____exports
  end,
@@ -29443,7 +29445,7 @@ function PostPoopRender.prototype.____constructor(self)
             self:fire(poop)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -29472,7 +29474,7 @@ function PostPoopUpdate.prototype.____constructor(self)
             self:fire(poop)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -29501,7 +29503,7 @@ function PostPressurePlateRender.prototype.____constructor(self)
             self:fire(pressurePlate)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -29530,7 +29532,7 @@ function PostPressurePlateUpdate.prototype.____constructor(self)
             self:fire(pressurePlate)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -29562,7 +29564,7 @@ function PostProjectileInitLate.prototype.____constructor(self)
             self:fire(projectile)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PROJECTILE_UPDATE, {self.postProjectileUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_PROJECTILE_UPDATE, self.postProjectileUpdate}}
 end
 return ____exports
  end,
@@ -29604,7 +29606,7 @@ function PostPurchase.prototype.____constructor(self)
             self:playerPickedUpNewItem(player)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 function PostPurchase.prototype.playerPickedUpNewItem(self, player)
     local pickups = getPickups(nil)
@@ -29643,7 +29645,7 @@ function PostRockRender.prototype.____constructor(self)
             self:fire(rock)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -29672,7 +29674,7 @@ function PostRockUpdate.prototype.____constructor(self)
             self:fire(rock)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -29714,8 +29716,8 @@ function PostRoomClearChanged.prototype.____constructor(self)
         local roomClear = room:IsClear()
         self.v.room.cleared = roomClear
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
 end
 return ____exports
  end,
@@ -29726,11 +29728,11 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
-local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____flag = require("src.functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____shouldFire = require("src.shouldFire")
@@ -29745,11 +29747,7 @@ function PostSacrifice.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.v = {level = {numSacrifices = 0}}
     self.shouldFire = shouldFirePlayer
-    self.entityTakeDmgPlayer = function(____, entity, _amount, damageFlags, _source, _countdownFrames)
-        local player = entity:ToPlayer()
-        if player == nil then
-            return nil
-        end
+    self.entityTakeDmgPlayer = function(____, player, _amount, damageFlags, _source, _countdownFrames)
         local room = game:GetRoom()
         local roomType = room:GetType()
         local isSpikeDamage = hasFlag(nil, damageFlags, DamageFlag.SPIKES)
@@ -29760,7 +29758,7 @@ function PostSacrifice.prototype.____constructor(self)
         end
         return nil
     end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
 end
 return ____exports
  end,
@@ -29821,7 +29819,7 @@ function PostSlotCollision.prototype.____constructor(self)
         end
         return nil
     end
-    self.callbacksUsed = {{ModCallback.PRE_PLAYER_COLLISION, {self.prePlayerCollision}}}
+    self.callbacksUsed = {{ModCallback.PRE_PLAYER_COLLISION, self.prePlayerCollision}}
 end
 return ____exports
  end,
@@ -29890,8 +29888,8 @@ function PostSlotDestroyed.prototype.____constructor(self)
             self.v.room.slotPrizeAnimationGameFrame:delete(ptrHash)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_ENTITY_REMOVE, {self.postEntityRemoveSlot, EntityType.SLOT}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED, {self.postSlotAnimationChanged}}}
+    self.callbacksUsed = {{ModCallback.POST_ENTITY_REMOVE, self.postEntityRemoveSlot, {EntityType.SLOT}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_SLOT_ANIMATION_CHANGED, self.postSlotAnimationChanged}}
 end
 return ____exports
  end,
@@ -29986,7 +29984,7 @@ function PostSpikesRender.prototype.____constructor(self)
             self:fire(spikes)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -30015,7 +30013,7 @@ function PostSpikesUpdate.prototype.____constructor(self)
             self:fire(spikes)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -30047,7 +30045,7 @@ function PostTearInitLate.prototype.____constructor(self)
             self:fire(tear)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_TEAR_UPDATE, {self.postTearUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_TEAR_UPDATE, self.postTearUpdate}}
 end
 return ____exports
  end,
@@ -30082,7 +30080,7 @@ function PostTearInitVeryLate.prototype.____constructor(self)
             self:fire(tear)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_TEAR_UPDATE, {self.postTearUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_TEAR_UPDATE, self.postTearUpdate}}
 end
 return ____exports
  end,
@@ -30111,7 +30109,7 @@ function PostTNTRender.prototype.____constructor(self)
             self:fire(tnt)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 return ____exports
  end,
@@ -30140,7 +30138,7 @@ function PostTNTUpdate.prototype.____constructor(self)
             self:fire(tnt)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
 end
 return ____exports
  end,
@@ -30192,7 +30190,7 @@ function PostTransformation.prototype.____constructor(self)
             end
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 return ____exports
  end,
@@ -30205,7 +30203,6 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
-local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
@@ -30230,11 +30227,7 @@ function PostTrinketBreak.prototype.____constructor(self)
         function() return __TS__New(Map) end
     )}}
     self.shouldFire = shouldFireTrinketType
-    self.entityTakeDmgPlayer = function(____, entity, _amount, _damageFlags, _source, _countdownFrames)
-        local player = entity:ToPlayer()
-        if player == nil then
-            return nil
-        end
+    self.entityTakeDmgPlayer = function(____, player, _amount, _damageFlags, _source, _countdownFrames)
         local trinketMap = defaultMapGetPlayer(nil, self.v.run.playersTrinketMap, player)
         for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
             do
@@ -30244,16 +30237,16 @@ function PostTrinketBreak.prototype.____constructor(self)
                     oldNumTrinketsHeld = 0
                 end
                 if numTrinketsHeld >= oldNumTrinketsHeld then
-                    goto __continue6
+                    goto __continue5
                 end
                 trinketMap:set(trinketType, numTrinketsHeld)
                 local numTrinketsOnGround = Isaac.CountEntities(nil, EntityType.PICKUP, PickupVariant.TRINKET, trinketType)
                 if numTrinketsOnGround > 0 then
-                    goto __continue6
+                    goto __continue5
                 end
                 self:fire(player, trinketType)
             end
-            ::__continue6::
+            ::__continue5::
         end
         return nil
     end
@@ -30264,8 +30257,7 @@ function PostTrinketBreak.prototype.____constructor(self)
             trinketMap:set(trinketType, numTrinkets)
         end
     end
-    self.callbacksUsed = {{ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 return ____exports
  end,
@@ -30306,7 +30298,7 @@ function PreBerserkDeath.prototype.____constructor(self)
             self:fire(player)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 return ____exports
  end,
@@ -30373,7 +30365,7 @@ function PreGetPedestal.prototype.____constructor(self)
         end
         return self:fire(player, collectible)
     end
-    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, {self.prePickupCollision, PickupVariant.COLLECTIBLE}}}
+    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, self.prePickupCollision, {PickupVariant.COLLECTIBLE}}}
 end
 return ____exports
  end,
@@ -30439,7 +30431,7 @@ function PreNewLevel.prototype.____constructor(self)
             self:fire(player)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, {self.postPlayerRender}}}
+    self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, self.postPlayerRender}}
 end
 return ____exports
  end,
@@ -30462,7 +30454,7 @@ function PreNPCCollisionFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.shouldFire = shouldFireNPC
     self.preNPCCollision = function(____, npc, collider, low) return self:fire(npc, collider, low) end
-    self.callbacksUsed = {{ModCallback.PRE_NPC_COLLISION, {self.preNPCCollision}}}
+    self.callbacksUsed = {{ModCallback.PRE_NPC_COLLISION, self.preNPCCollision}}
 end
 return ____exports
  end,
@@ -30485,7 +30477,7 @@ function PreNPCUpdateFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.shouldFire = shouldFireNPC
     self.preNPCUpdate = function(____, npc) return self:fire(npc) end
-    self.callbacksUsed = {{ModCallback.PRE_NPC_UPDATE, {self.preNPCUpdate}}}
+    self.callbacksUsed = {{ModCallback.PRE_NPC_UPDATE, self.preNPCUpdate}}
 end
 return ____exports
  end,
@@ -31226,7 +31218,7 @@ function RunInNFrames.prototype.____constructor(self)
         checkExecuteQueuedFunctions(nil, renderFrameCount, self.v.run.queuedRenderFunctionTuples)
         checkExecuteIntervalFunctions(nil, renderFrameCount, self.v.run.intervalRenderFunctionTuples)
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}, {ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_RENDER, self.postRender}}
 end
 function RunInNFrames.prototype.restartNextRenderFrame(self, character)
     self:runNextRenderFrame(function()
@@ -31391,8 +31383,8 @@ function CustomGridEntities.prototype.____constructor(self, runInNFrames)
         end
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.PRE_USE_ITEM, {self.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.PRE_USE_ITEM, self.preUseItemWeNeedToGoDeeper, {CollectibleType.WE_NEED_TO_GO_DEEPER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.runInNFrames = runInNFrames
 end
 function CustomGridEntities.prototype.spawnCustomGridEntity(self, gridEntityTypeCustom, gridIndexOrPosition, gridCollisionClass, anm2Path, defaultAnimation, baseGridEntityType, baseGridEntityVariant)
@@ -31565,9 +31557,6 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         end
         sfxManager:Stop(SoundEffect.ONE_UP)
     end
-    self.postPEffectUpdate = function(____, player)
-        self:checkWaitingForItemAnimation(player)
-    end
     self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
@@ -31575,6 +31564,9 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         self.v.run.state = CustomReviveState.WAITING_FOR_ITEM_ANIMATION
         self:logStateChanged()
     end
+    self.postPEffectUpdateReordered = function(____, player)
+        self:checkWaitingForItemAnimation(player)
+    end
     self.postPlayerFatalDamage = function(____, player)
         self:playerIsAboutToDie(player)
         return nil
@@ -31583,8 +31575,8 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
         self:playerIsAboutToDie(player)
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}, {ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}, {ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, {self.postPlayerFatalDamage}}, {ModCallbackCustom.PRE_BERSERK_DEATH, {self.preBerserkDeath}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}, {ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, self.postPlayerFatalDamage}, {ModCallbackCustom.PRE_BERSERK_DEATH, self.preBerserkDeath}}
     self.preCustomRevive = preCustomRevive
     self.postCustomRevive = postCustomRevive
     self.runInNFrames = runInNFrames
@@ -31701,7 +31693,7 @@ function EsauJrDetection.prototype.____constructor(self, postEsauJr, postFirstEs
         self.v.run.usedEsauJrControllerIndex = player.ControllerIndex
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}, {ModCallback.POST_USE_ITEM, {self.useItemEsauJr, CollectibleType.ESAU_JR}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_USE_ITEM, self.useItemEsauJr, {CollectibleType.ESAU_JR}}}
     self.postEsauJr = postEsauJr
     self.postFirstEsauJr = postFirstEsauJr
 end
@@ -31761,7 +31753,7 @@ function FlipDetection.prototype.____constructor(self, postFlip, postFirstFlip)
         self.postFlip:fire(newLazarus, player)
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.useItemFlip, CollectibleType.FLIP}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemFlip, {CollectibleType.FLIP}}}
     self.postFlip = postFlip
     self.postFirstFlip = postFirstFlip
 end
@@ -31834,7 +31826,7 @@ function GameReorderedCallbacks.prototype.____constructor(self, postGameStartedR
         self.forceNewRoom = false
         self.postNewRoomReordered:fire()
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.useItemGlowingHourGlass, CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, {self.postGameStarted}}, {ModCallback.POST_NEW_LEVEL, {self.postNewLevel}}, {ModCallback.POST_NEW_ROOM, {self.postNewRoom}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, self.postGameStarted}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}, {ModCallback.POST_NEW_ROOM, self.postNewRoom}}
     self.postGameStartedReordered = postGameStartedReordered
     self.postNewLevelReordered = postNewLevelReordered
     self.postNewRoomReordered = postNewRoomReordered
@@ -31926,7 +31918,7 @@ function GridEntityCollisionDetection.prototype.____constructor(self, postGridEn
             end
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
     self.postGridEntityCollision = postGridEntityCollision
     self.postGridEntityCustomCollision = postGridEntityCustomCollision
     self.customGridEntities = customGridEntities
@@ -31961,7 +31953,7 @@ function GridEntityRenderDetection.prototype.____constructor(self, postGridEntit
             end
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
     self.postGridEntityRender = postGridEntityRender
     self.postGridEntityCustomRender = postGridEntityCustomRender
     self.customGridEntities = customGridEntities
@@ -32019,8 +32011,8 @@ function GridEntityUpdateDetection.prototype.____constructor(self, postGridEntit
         end
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.postGridEntityInit = postGridEntityInit
     self.postGridEntityCustomInit = postGridEntityCustomInit
     self.postGridEntityUpdate = postGridEntityUpdate
@@ -32104,7 +32096,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
-local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____playerDataStructures = require("src.functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local ____types = require("src.functions.types")
@@ -32126,7 +32119,7 @@ function ItemPickupDetection.prototype.____constructor(self, postItemPickup, pre
         DefaultMap,
         function() return newPickingUpItem(nil) end
     )}}
-    self.postPEffectUpdate = function(____, player)
+    self.postPEffectUpdateReordered = function(____, player)
         local pickingUpItem = defaultMapGetPlayer(nil, self.v.run.playersPickingUpItemMap, player)
         if player:IsItemQueueEmpty() then
             self:queueEmpty(player, pickingUpItem)
@@ -32134,7 +32127,7 @@ function ItemPickupDetection.prototype.____constructor(self, postItemPickup, pre
             self:queueNotEmpty(player, pickingUpItem)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
     self.postItemPickup = postItemPickup
     self.preItemPickup = preItemPickup
 end
@@ -32523,7 +32516,7 @@ function ModdedElementDetection.prototype.____constructor(self)
     self.postPlayerInit = function(____, _player)
         self.atLeastOneCallbackFired = true
     end
-    self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, {self.postPlayerInit}}}
+    self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, self.postPlayerInit}}
 end
 function ModdedElementDetection.prototype.errorIfNoCallbacksFired(self, constantType)
     if not self.atLeastOneCallbackFired then
@@ -33398,7 +33391,6 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
@@ -33444,27 +33436,10 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         self:updateCollectibleMapAndFire(player, nil)
         return nil
     end
-    self.postPEffectUpdate = function(____, player)
-        local oldCollectibleCount = defaultMapGetPlayer(nil, self.v.run.playersCollectibleCount, player)
-        local newCollectibleCount = player:GetCollectibleCount()
-        mapSetPlayer(nil, self.v.run.playersCollectibleCount, player, newCollectibleCount)
-        local difference = newCollectibleCount - oldCollectibleCount
-        if difference > 0 then
-            self:updateCollectibleMapAndFire(player, difference)
-        elseif difference < 0 then
-            self:updateCollectibleMapAndFire(player, difference * -1)
-        elseif difference == 0 then
-            self:checkActiveItemsChanged(player)
-        end
-    end
-    self.entityTakeDmgPlayer = function(____, entity, _amount, damageFlags, _source, _countdownFrames)
+    self.entityTakeDmgPlayer = function(____, player, _amount, damageFlags, _source, _countdownFrames)
         if hasFlag(nil, damageFlags, DamageFlag.FAKE) then
             return nil
         end
-        local player = entity:ToPlayer()
-        if player == nil then
-            return nil
-        end
         local character = player:GetPlayerType()
         if character ~= PlayerType.EDEN_B then
             return nil
@@ -33486,9 +33461,22 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         mapSetPlayer(nil, self.v.run.playersCollectibleCount, player, newCollectibleCount)
         self:updateCollectibleMapAndFire(player, 1)
     end
+    self.postPEffectUpdateReordered = function(____, player)
+        local oldCollectibleCount = defaultMapGetPlayer(nil, self.v.run.playersCollectibleCount, player)
+        local newCollectibleCount = player:GetCollectibleCount()
+        mapSetPlayer(nil, self.v.run.playersCollectibleCount, player, newCollectibleCount)
+        local difference = newCollectibleCount - oldCollectibleCount
+        if difference > 0 then
+            self:updateCollectibleMapAndFire(player, difference)
+        elseif difference < 0 then
+            self:updateCollectibleMapAndFire(player, difference * -1)
+        elseif difference == 0 then
+            self:checkActiveItemsChanged(player)
+        end
+    end
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_SETS, ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.useItemD4, CollectibleType.D4}}, {ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}, {ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_ITEM_PICKUP, {self.postItemPickup}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemD4, {CollectibleType.D4}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_ITEM_PICKUP, self.postItemPickup}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
     self.postPlayerCollectibleAdded = postPlayerCollectibleAdded
     self.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved
     self.moddedElementSets = moddedElementSets
@@ -33617,8 +33605,8 @@ function PlayerReorderedCallbacks.prototype.____constructor(self, postPEffectUpd
         dequeue(nil, self.v.run.postPlayerUpdateQueue, self.postPlayerUpdateReordered.fire)
         dequeue(nil, self.v.run.postPlayerRenderQueue, self.postPlayerRenderReordered.fire)
     end
-    self.callbacksUsed = {{ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}, {ModCallback.POST_PLAYER_UPDATE, {self.postPlayerUpdate}}, {ModCallback.POST_PLAYER_RENDER, {self.postPlayerRender}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED_LAST, {self.postGameStartedReorderedLast}}}
+    self.callbacksUsed = {{ModCallback.POST_PEFFECT_UPDATE, self.postPEffectUpdate}, {ModCallback.POST_PLAYER_UPDATE, self.postPlayerUpdate}, {ModCallback.POST_PLAYER_RENDER, self.postPlayerRender}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED_LAST, self.postGameStartedReorderedLast}}
     self.postPEffectUpdateReordered = postPEffectUpdateReordered
     self.postPlayerRenderReordered = postPlayerRenderReordered
     self.postPlayerUpdateReordered = postPlayerUpdateReordered
@@ -33662,7 +33650,7 @@ function SlotRenderDetection.prototype.____constructor(self, postSlotRender, pos
             self:checkSlotAnimationChanged(slot)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
     self.postSlotRender = postSlotRender
     self.postSlotAnimationChanged = postSlotAnimationChanged
 end
@@ -33711,8 +33699,8 @@ function SlotUpdateDetection.prototype.____constructor(self, postSlotInit, postS
             self:checkNewEntity(slot)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.postSlotInit = postSlotInit
     self.postSlotUpdate = postSlotUpdate
 end
@@ -34336,8 +34324,8 @@ function CharacterHealthConversion.prototype.____constructor(self)
         convertRedHeartContainers(nil, player, conversionHeartSubType)
         removeRedHearts(nil, player)
     end
-    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, {self.prePickupCollisionHeart, PickupVariant.HEART}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, self.prePickupCollisionHeart, {PickupVariant.HEART}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 function CharacterHealthConversion.prototype.registerCharacterHealthConversion(self, playerType, conversionHeartSubType)
     if self.characterHealthReplacementMap:has(playerType) then
@@ -34522,7 +34510,7 @@ function CharacterStats.prototype.____constructor(self)
         local delta = stat - defaultStat
         addStat(nil, player, cacheFlag, delta)
     end
-    self.callbacksUsed = {{ModCallback.EVALUATE_CACHE, {self.evaluateCache}}}
+    self.callbacksUsed = {{ModCallback.EVALUATE_CACHE, self.evaluateCache}}
 end
 function CharacterStats.prototype.registerCharacterStats(self, playerType, statMap)
     self.charactersStatMap:set(playerType, statMap)
@@ -34601,7 +34589,7 @@ function RoomHistory.prototype.____constructor(self)
         local ____self_v_run_roomHistory_0 = self.v.run.roomHistory
         ____self_v_run_roomHistory_0[#____self_v_run_roomHistory_0 + 1] = roomDescription
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_EARLY, {self.postNewRoomEarly}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_EARLY, self.postNewRoomEarly}}
 end
 function RoomHistory.prototype.getRoomHistory(self)
     return self.v.run.roomHistory
@@ -36354,8 +36342,8 @@ function SaveDataManager.prototype.____constructor(self, mod)
             makeGlowingHourGlassBackup(nil, self.saveDataMap, self.saveDataConditionalFuncMap, self.saveDataGlowingHourGlassMap)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.postUseItemGlowingHourGlass, CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_PLAYER_INIT, {self.postPlayerInit}}, {ModCallback.PRE_GAME_EXIT, {self.preGameExit}}, {ModCallback.POST_NEW_LEVEL, {self.postNewLevel}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_EARLY, {self.postNewRoomEarly}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_PLAYER_INIT, self.postPlayerInit}, {ModCallback.PRE_GAME_EXIT, self.preGameExit}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_EARLY, self.postNewRoomEarly}}
     self.mod = mod
 end
 function SaveDataManager.prototype.saveDataManager(self, key, v, conditionalFunc)
@@ -36518,7 +36506,7 @@ function PickupIndexCreation.prototype.____constructor(self, roomHistory, saveDa
         self:checkDespawningFromPlayerLeavingRoom(entity)
     end
     self.featuresUsed = {ISCFeature.ROOM_HISTORY, ISCFeature.SAVE_DATA_MANAGER}
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInit}}, {ModCallback.POST_ENTITY_REMOVE, {self.postEntityRemovePickup, EntityType.PICKUP}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, self.postPickupInit}, {ModCallback.POST_ENTITY_REMOVE, self.postEntityRemovePickup, {EntityType.PICKUP}}}
     self.roomHistory = roomHistory
     self.saveDataManager = saveDataManager
 end
@@ -36686,7 +36674,7 @@ function CollectibleItemPoolType.prototype.____constructor(self, pickupIndexCrea
         self.v.run.collectibleItemPoolTypeMap:set(pickupIndex, lastItemPoolType)
     end
     self.featuresUsed = {ISCFeature.PICKUP_INDEX_CREATION}
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInitCollectible, PickupVariant.COLLECTIBLE}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, self.postPickupInitCollectible, {PickupVariant.COLLECTIBLE}}}
     self.pickupIndexCreation = pickupIndexCreation
 end
 function CollectibleItemPoolType.prototype.getCollectibleItemPoolType(self, collectible)
@@ -36954,7 +36942,7 @@ function CustomHotkeys.prototype.____constructor(self)
             end
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 function CustomHotkeys.prototype.checkIfTriggered(self, keyboard, triggerFunc)
     local isPressed = isKeyboardPressed(nil, keyboard)
@@ -37133,7 +37121,7 @@ function CustomItemPools.prototype.____constructor(self)
         end
         self.v.run.customItemPools = copyMap(nil, self.customItemPoolMap)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED, {self.postGameStartedReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_GAME_STARTED_REORDERED, self.postGameStartedReordered}}
 end
 function CustomItemPools.prototype.registerCustomItemPool(self, itemPoolTypeCustom, collectibles)
     if self.customItemPoolMap:has(itemPoolTypeCustom) then
@@ -37249,7 +37237,7 @@ function CustomPickups.prototype.____constructor(self)
             effect:Remove()
         end
     end
-    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, {self.prePickupCollision}}, {ModCallback.POST_EFFECT_RENDER, {self.postEffectRenderPickupEffect, PICKUP_EFFECT_VARIANT}}}
+    self.callbacksUsed = {{ModCallback.PRE_PICKUP_COLLISION, self.prePickupCollision}, {ModCallback.POST_EFFECT_RENDER, self.postEffectRenderPickupEffect, {PICKUP_EFFECT_VARIANT}}}
 end
 function CustomPickups.prototype.registerCustomPickup(self, pickupVariantCustom, subType, collectFunc, collisionFunc)
     if collisionFunc == nil then
@@ -37962,7 +37950,7 @@ function DisableInputs.prototype.____constructor(self)
     self.isActionPressed = function(____, _entity, _inputHook, buttonAction) return self:getReturnValue(buttonAction, true) end
     self.isActionTriggered = function(____, _entity, _inputHook, buttonAction) return self:getReturnValue(buttonAction, true) end
     self.getActionValue = function(____, _entity, _inputHook, buttonAction) return self:getReturnValue(buttonAction, false) end
-    self.callbacksUsed = {{ModCallback.INPUT_ACTION, {self.isActionPressed, InputHook.IS_ACTION_PRESSED}}, {ModCallback.INPUT_ACTION, {self.isActionTriggered, InputHook.IS_ACTION_TRIGGERED}}, {ModCallback.INPUT_ACTION, {self.getActionValue, InputHook.GET_ACTION_VALUE}}}
+    self.callbacksUsed = {{ModCallback.INPUT_ACTION, self.isActionPressed, {InputHook.IS_ACTION_PRESSED}}, {ModCallback.INPUT_ACTION, self.isActionTriggered, {InputHook.IS_ACTION_TRIGGERED}}, {ModCallback.INPUT_ACTION, self.getActionValue, {InputHook.GET_ACTION_VALUE}}}
 end
 function DisableInputs.prototype.getReturnValue(self, buttonAction, booleanCallback)
     local ____booleanCallback_0
@@ -38081,7 +38069,7 @@ function PonyDetection.prototype.____constructor(self)
             setDeletePlayer(nil, self.v.run.playersIsPonyActive, player)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
 end
 function PonyDetection.prototype.isPlayerUsingPony(self, player)
     return setHasPlayer(nil, self.v.run.playersIsPonyActive, player)
@@ -38125,7 +38113,7 @@ function RoomClearFrame.prototype.____constructor(self)
         self.v.room.roomClearGameFrame = gameFrameCount
         self.v.room.roomClearRoomFrame = roomFrameCount
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_ROOM_CLEAR_CHANGED, {self.postRoomClearChangedTrue}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_ROOM_CLEAR_CHANGED, self.postRoomClearChangedTrue}}
 end
 function RoomClearFrame.prototype.getRoomClearGameFrame(self)
     return self.v.room.roomClearGameFrame
@@ -38164,7 +38152,7 @@ function RunNextRoom.prototype.____constructor(self)
         end
         emptyArray(nil, self.v.run.queuedFunctions)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
 end
 function RunNextRoom.prototype.runNextRoom(self, func)
     local ____self_v_run_queuedFunctions_0 = self.v.run.queuedFunctions
@@ -38340,7 +38328,7 @@ function StageHistory.prototype.____constructor(self)
         local ____self_v_run_stageHistory_0 = self.v.run.stageHistory
         ____self_v_run_stageHistory_0[#____self_v_run_stageHistory_0 + 1] = {stage, stageType}
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_LEVEL_REORDERED, {self.postNewLevelReordered}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_LEVEL_REORDERED, self.postNewLevelReordered}}
 end
 function StageHistory.prototype.getNextStageTypeWithHistory(self, upwards)
     if upwards == nil then
@@ -38663,8 +38651,8 @@ function CustomTrapdoors.prototype.____constructor(self, customGridEntities, dis
         ISCFeature.RUN_NEXT_ROOM,
         ISCFeature.STAGE_HISTORY
     }
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_GRID_ENTITY_CUSTOM_UPDATE, {self.postGridEntityCustomUpdateTrapdoor, GridEntityTypeCustom.TRAPDOOR_CUSTOM}}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_GRID_ENTITY_CUSTOM_UPDATE, self.postGridEntityCustomUpdateTrapdoor, {GridEntityTypeCustom.TRAPDOOR_CUSTOM}}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
     self.customGridEntities = customGridEntities
     self.disableInputs = disableInputs
     self.ponyDetection = ponyDetection
@@ -41035,7 +41023,7 @@ function DisableAllSound.prototype.____constructor(self)
         end
         stopAllSoundEffects(nil)
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 function DisableAllSound.prototype.enableAllSound(self, key)
     if not self.v.run.disableSoundSet:has(key) then
@@ -41125,7 +41113,7 @@ function Pause.prototype.____constructor(self, disableInputs)
         self.v.run.shouldUnpause = false
         return 1
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}, {ModCallback.INPUT_ACTION, {self.inputActionGetActionValue, InputHook.GET_ACTION_VALUE}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.INPUT_ACTION, self.inputActionGetActionValue, {InputHook.GET_ACTION_VALUE}}}
     self.disableInputs = disableInputs
 end
 function Pause.prototype.stopTearsAndProjectilesFromMoving(self)
@@ -41686,8 +41674,8 @@ function CustomStages.prototype.____constructor(self, customGridEntities, custom
         ISCFeature.PAUSE,
         ISCFeature.RUN_IN_N_FRAMES
     }
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}, {ModCallback.POST_CURSE_EVAL, {self.postCurseEval}}, {ModCallback.GET_SHADER_PARAMS, {self.getShaderParams}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_GRID_ENTITY_BROKEN, {self.postGridEntityBrokenRockAlt, GridEntityType.ROCK_ALT}}, {ModCallbackCustom.POST_GRID_ENTITY_INIT, {self.postGridEntityInit}}, {ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}, {ModCallback.POST_CURSE_EVAL, self.postCurseEval}, {ModCallback.GET_SHADER_PARAMS, self.getShaderParams}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_GRID_ENTITY_BROKEN, self.postGridEntityBrokenRockAlt, {GridEntityType.ROCK_ALT}}, {ModCallbackCustom.POST_GRID_ENTITY_INIT, self.postGridEntityInit}, {ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.customGridEntities = customGridEntities
     self.customTrapdoors = customTrapdoors
     self.disableAllSound = disableAllSound
@@ -41901,7 +41889,7 @@ function DebugDisplayBomb.prototype.____constructor(self)
         local text = self:textCallback(bomb)
         renderTextOnEntity(nil, bomb, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_BOMB_RENDER, {self.postBombRender}}}
+    self.callbacksUsed = {{ModCallback.POST_BOMB_RENDER, self.postBombRender}}
 end
 return ____exports
  end,
@@ -41928,7 +41916,7 @@ function DebugDisplayDoor.prototype.____constructor(self)
         local text = self:textCallback(door)
         renderTextOnEntity(nil, door, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_DOOR_RENDER, {self.postDoorRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_DOOR_RENDER, self.postDoorRender}}
 end
 return ____exports
  end,
@@ -41955,7 +41943,7 @@ function DebugDisplayEffect.prototype.____constructor(self)
         local text = self:textCallback(effect)
         renderTextOnEntity(nil, effect, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_EFFECT_RENDER, {self.postEffectRender}}}
+    self.callbacksUsed = {{ModCallback.POST_EFFECT_RENDER, self.postEffectRender}}
 end
 return ____exports
  end,
@@ -41982,7 +41970,7 @@ function DebugDisplayFamiliar.prototype.____constructor(self)
         local text = self:textCallback(familiar)
         renderTextOnEntity(nil, familiar, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_RENDER, {self.postFamiliarRender}}}
+    self.callbacksUsed = {{ModCallback.POST_FAMILIAR_RENDER, self.postFamiliarRender}}
 end
 return ____exports
  end,
@@ -42009,7 +41997,7 @@ function DebugDisplayKnife.prototype.____constructor(self)
         local text = self:textCallback(knife)
         renderTextOnEntity(nil, knife, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_KNIFE_RENDER, {self.postKnifeRender}}}
+    self.callbacksUsed = {{ModCallback.POST_KNIFE_RENDER, self.postKnifeRender}}
 end
 return ____exports
  end,
@@ -42036,7 +42024,7 @@ function DebugDisplayLaser.prototype.____constructor(self)
         local text = self:textCallback(laser)
         renderTextOnEntity(nil, laser, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_LASER_RENDER, {self.postLaserRender}}}
+    self.callbacksUsed = {{ModCallback.POST_LASER_RENDER, self.postLaserRender}}
 end
 return ____exports
  end,
@@ -42063,7 +42051,7 @@ function DebugDisplayNPC.prototype.____constructor(self)
         local text = self:textCallback(npc)
         renderTextOnEntity(nil, npc, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_RENDER, {self.postNPCRender}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_RENDER, self.postNPCRender}}
 end
 return ____exports
  end,
@@ -42090,7 +42078,7 @@ function DebugDisplayPickup.prototype.____constructor(self)
         local text = self:textCallback(pickup)
         renderTextOnEntity(nil, pickup, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_PICKUP_RENDER, {self.postPickupRender}}}
+    self.callbacksUsed = {{ModCallback.POST_PICKUP_RENDER, self.postPickupRender}}
 end
 return ____exports
  end,
@@ -42117,7 +42105,7 @@ function DebugDisplayPit.prototype.____constructor(self)
         local text = self:textCallback(pit)
         renderTextOnEntity(nil, pit, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PIT_RENDER, {self.postPitRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PIT_RENDER, self.postPitRender}}
 end
 return ____exports
  end,
@@ -42144,7 +42132,7 @@ function DebugDisplayPlayer.prototype.____constructor(self)
         local text = self:textCallback(player)
         renderTextOnEntity(nil, player, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, {self.postPlayerRender}}}
+    self.callbacksUsed = {{ModCallback.POST_PLAYER_RENDER, self.postPlayerRender}}
 end
 return ____exports
  end,
@@ -42171,7 +42159,7 @@ function DebugDisplayPoop.prototype.____constructor(self)
         local text = self:textCallback(poop)
         renderTextOnEntity(nil, poop, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_POOP_RENDER, {self.postPoopRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_POOP_RENDER, self.postPoopRender}}
 end
 return ____exports
  end,
@@ -42198,7 +42186,7 @@ function DebugDisplayPressurePlate.prototype.____constructor(self)
         local text = self:textCallback(pressurePlate)
         renderTextOnEntity(nil, pressurePlate, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PRESSURE_PLATE_RENDER, {self.postPressurePlateRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PRESSURE_PLATE_RENDER, self.postPressurePlateRender}}
 end
 return ____exports
  end,
@@ -42225,7 +42213,7 @@ function DebugDisplayProjectile.prototype.____constructor(self)
         local text = self:textCallback(projectile)
         renderTextOnEntity(nil, projectile, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_PROJECTILE_RENDER, {self.postProjectileRender}}}
+    self.callbacksUsed = {{ModCallback.POST_PROJECTILE_RENDER, self.postProjectileRender}}
 end
 return ____exports
  end,
@@ -42252,7 +42240,7 @@ function DebugDisplayRock.prototype.____constructor(self)
         local text = self:textCallback(rock)
         renderTextOnEntity(nil, rock, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_ROCK_RENDER, {self.postRockRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_ROCK_RENDER, self.postRockRender}}
 end
 return ____exports
  end,
@@ -42279,7 +42267,7 @@ function DebugDisplaySlot.prototype.____constructor(self)
         local text = self:textCallback(slot)
         renderTextOnEntity(nil, slot, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_SLOT_RENDER, {self.postSlotRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_SLOT_RENDER, self.postSlotRender}}
 end
 return ____exports
  end,
@@ -42306,7 +42294,7 @@ function DebugDisplaySpikes.prototype.____constructor(self)
         local text = self:textCallback(spikes)
         renderTextOnEntity(nil, spikes, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_SPIKES_RENDER, {self.postSpikesRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_SPIKES_RENDER, self.postSpikesRender}}
 end
 return ____exports
  end,
@@ -42333,7 +42321,7 @@ function DebugDisplayTear.prototype.____constructor(self)
         local text = self:textCallback(tear)
         renderTextOnEntity(nil, tear, text)
     end
-    self.callbacksUsed = {{ModCallback.POST_TEAR_RENDER, {self.postTearRender}}}
+    self.callbacksUsed = {{ModCallback.POST_TEAR_RENDER, self.postTearRender}}
 end
 return ____exports
  end,
@@ -42360,7 +42348,7 @@ function DebugDisplayTNT.prototype.____constructor(self)
         local text = self:textCallback(tnt)
         renderTextOnEntity(nil, tnt, text)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_TNT_RENDER, {self.postTNTRender}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_TNT_RENDER, self.postTNTRender}}
 end
 return ____exports
  end,
@@ -43320,8 +43308,8 @@ function PreventGridEntityRespawn.prototype.____constructor(self, runInNFrames)
         self:setDecorationsInvisible()
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.PRE_USE_ITEM, {self.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.PRE_USE_ITEM, self.preUseItemWeNeedToGoDeeper, {CollectibleType.WE_NEED_TO_GO_DEEPER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.runInNFrames = runInNFrames
 end
 function PreventGridEntityRespawn.prototype.setDecorationsInvisible(self)
@@ -43473,7 +43461,7 @@ function PreventCollectibleRotation.prototype.____constructor(self)
         local collectible = pickup
         self:checkCollectibleRotated(collectible)
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_CARD, {self.useCardSoulOfIsaac, CardType.SOUL_ISAAC}}, {ModCallback.POST_PICKUP_UPDATE, {self.postPickupUpdateCollectible, PickupVariant.COLLECTIBLE}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.useCardSoulOfIsaac, {CardType.SOUL_ISAAC}}, {ModCallback.POST_PICKUP_UPDATE, self.postPickupUpdateCollectible, {PickupVariant.COLLECTIBLE}}}
 end
 function PreventCollectibleRotation.prototype.checkCollectibleRotated(self, collectible)
     if collectible.SubType == CollectibleType.NULL then
@@ -47228,12 +47216,13 @@ local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local LevelCurse = ____isaac_2Dtypescript_2Ddefinitions.LevelCurse
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local TearVariant = ____isaac_2Dtypescript_2Ddefinitions.TearVariant
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____flag = require("src.functions.flag")
 local addFlag = ____flag.addFlag
 local bitFlags = ____flag.bitFlags
@@ -47281,12 +47270,6 @@ function ExtraConsoleCommands.prototype.____constructor(self)
             player.CanFly = true
         end
     end
-    self.entityTakeDmgPlayer = function(____, _entity, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
-        if self.v.persistent.spamBloodRights then
-            return false
-        end
-        return nil
-    end
     self.postCurseEval = function(____, curses)
         if self.v.persistent.disableCurses then
             return bitFlags(nil, LevelCurse.NONE)
@@ -47339,17 +47322,23 @@ function ExtraConsoleCommands.prototype.____constructor(self)
             tear:ChangeVariant(TearVariant.CHAOS_CARD)
         end
     end
+    self.entityTakeDmgPlayer = function(____, _player, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
+        if self.v.persistent.spamBloodRights then
+            return false
+        end
+        return nil
+    end
     self.callbacksUsed = {
-        {ModCallback.POST_UPDATE, {self.postUpdate}},
-        {ModCallback.EVALUATE_CACHE, {self.evaluateCacheDamage, CacheFlag.DAMAGE}},
-        {ModCallback.EVALUATE_CACHE, {self.evaluateCacheFireDelay, CacheFlag.FIRE_DELAY}},
-        {ModCallback.EVALUATE_CACHE, {self.evaluateCacheSpeed, CacheFlag.SPEED}},
-        {ModCallback.EVALUATE_CACHE, {self.evaluateCacheFlying, CacheFlag.FLYING}},
-        {ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}},
-        {ModCallback.POST_CURSE_EVAL, {self.postCurseEval}},
-        {ModCallback.EXECUTE_CMD, {self.executeCmd}},
-        {ModCallback.POST_FIRE_TEAR, {self.postFireTear}}
+        {ModCallback.POST_UPDATE, self.postUpdate},
+        {ModCallback.EVALUATE_CACHE, self.evaluateCacheDamage, {CacheFlag.DAMAGE}},
+        {ModCallback.EVALUATE_CACHE, self.evaluateCacheFireDelay, {CacheFlag.FIRE_DELAY}},
+        {ModCallback.EVALUATE_CACHE, self.evaluateCacheSpeed, {CacheFlag.SPEED}},
+        {ModCallback.EVALUATE_CACHE, self.evaluateCacheFlying, {CacheFlag.FLYING}},
+        {ModCallback.POST_CURSE_EVAL, self.postCurseEval},
+        {ModCallback.EXECUTE_CMD, self.executeCmd},
+        {ModCallback.POST_FIRE_TEAR, self.postFireTear}
     }
+    self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}}
     for ____, ____value in ipairs(__TS__ObjectEntries(commands)) do
         local funcName = ____value[1]
         local func = ____value[2]
@@ -47402,7 +47391,7 @@ function FadeInRemover.prototype.____constructor(self)
             game:Fadein(FADE_IN_SPEED)
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_GAME_STARTED, {self.postGameStarted}}}
+    self.callbacksUsed = {{ModCallback.POST_GAME_STARTED, self.postGameStarted}}
 end
 function FadeInRemover.prototype.removeFadeIn(self)
     self.enabled = true
@@ -47463,7 +47452,7 @@ function FastReset.prototype.____constructor(self)
         end
         checkResetInput(nil)
     end
-    self.callbacksUsed = {{ModCallback.POST_RENDER, {self.postRender}}}
+    self.callbacksUsed = {{ModCallback.POST_RENDER, self.postRender}}
 end
 function FastReset.prototype.enableFastReset(self)
     self.enabled = true
@@ -47570,7 +47559,7 @@ function PressInput.prototype.____constructor(self)
         end
         return nil
     end
-    self.callbacksUsed = {{ModCallback.INPUT_ACTION, {self.isActionTriggered, InputHook.IS_ACTION_TRIGGERED}}}
+    self.callbacksUsed = {{ModCallback.INPUT_ACTION, self.isActionTriggered, {InputHook.IS_ACTION_TRIGGERED}}}
 end
 function PressInput.prototype.pressInput(self, player, buttonAction)
     local playerIndex = getPlayerIndex(nil, player)
@@ -47782,7 +47771,7 @@ function NoSirenSteal.prototype.____constructor(self)
     self.postNPCInitSirenHelper = function(____, npc)
         self:checkReturnFamiliarToPlayer(npc)
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, {self.postNPCInitSirenHelper, EntityType.SIREN_HELPER}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, self.postNPCInitSirenHelper, {EntityType.SIREN_HELPER}}}
 end
 function NoSirenSteal.prototype.checkReturnFamiliarToPlayer(self, npc)
     if npc.Target == nil then
@@ -47896,8 +47885,8 @@ function PersistentEntities.prototype.____constructor(self, roomHistory)
         end
     end
     self.featuresUsed = {ISCFeature.ROOM_HISTORY}
-    self.callbacksUsed = {{ModCallback.POST_ENTITY_REMOVE, {self.postEntityRemove}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_ENTITY_REMOVE, self.postEntityRemove}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, self.postNewRoomReordered}}
     self.roomHistory = roomHistory
 end
 function PersistentEntities.prototype.trackDespawningPickupPosition(self, entity, index)
@@ -48016,7 +48005,7 @@ function PlayerInventory.prototype.____constructor(self)
         local inventory = defaultMapGetPlayer(nil, self.v.run.playersInventory, player, player)
         arrayRemoveInPlace(nil, inventory, collectibleType)
     end
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, {self.postCollectibleAdded}}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, {self.postCollectibleRemoved}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_COLLECTIBLE_ADDED, self.postCollectibleAdded}, {ModCallbackCustom.POST_PLAYER_COLLECTIBLE_REMOVED, self.postCollectibleRemoved}}
 end
 function PlayerInventory.prototype.getPlayerInventory(self, player, includeActiveCollectibles)
     if includeActiveCollectibles == nil then
@@ -48067,7 +48056,7 @@ function PreventChildEntities.prototype.____constructor(self)
             npc:Remove()
         end
     end
-    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, {self.postNPCInit}}}
+    self.callbacksUsed = {{ModCallback.POST_NPC_INIT, self.postNPCInit}}
 end
 function PreventChildEntities.prototype.preventChildEntities(self, entity)
     local ptrHash = GetPtrHash(entity)
@@ -48691,7 +48680,7 @@ function TaintedLazarusPlayers.prototype.____constructor(self)
         end
         self:checkDequeue()
     end
-    self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, {self.postPlayerInit}}}
+    self.callbacksUsed = {{ModCallback.POST_PLAYER_INIT, self.postPlayerInit}}
 end
 function TaintedLazarusPlayers.prototype.checkDequeue(self)
     if #self.v.run.queuedTaintedLazarus == 0 or #self.v.run.queuedDeadTaintedLazarus == 0 then
@@ -48956,10 +48945,6 @@ function ____exports.getFeatures(self, mod, callbacks)
     }
     return features
 end
-return ____exports
- end,
-["src.types.AnyFunction"] = function(...) 
-local ____exports = {}
 return ____exports
  end,
 ["src.functions.debugFunctions"] = function(...) 
@@ -49193,19 +49178,21 @@ function ModUpgradedBase.prototype.initFeature(self, feature)
     end
     if feature.callbacksUsed ~= nil then
         for ____, callbackTuple in ipairs(feature.callbacksUsed) do
-            local modCallback, callbackArgs = table.unpack(callbackTuple)
+            local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple)
             self:AddCallback(
                 modCallback,
-                table.unpack(callbackArgs)
+                callbackFunc,
+                table.unpack(optionalArgs or ({}))
             )
         end
     end
     if feature.customCallbacksUsed ~= nil then
         for ____, callbackTuple in ipairs(feature.customCallbacksUsed) do
-            local modCallback, callbackArgs = table.unpack(callbackTuple)
+            local modCallback, callbackFunc, optionalArgs = table.unpack(callbackTuple)
             self:AddCallbackCustom(
                 modCallback,
-                table.unpack(callbackArgs)
+                callbackFunc,
+                table.unpack(optionalArgs or ({}))
             )
         end
     end
@@ -49240,16 +49227,14 @@ function ModUpgradedBase.prototype.uninitFeature(self, feature)
     end
     if feature.callbacksUsed ~= nil then
         for ____, callbackTuple in ipairs(feature.callbacksUsed) do
-            local modCallback, callbackArgs = table.unpack(callbackTuple)
-            local callback = callbackArgs[1]
-            self:RemoveCallback(modCallback, callback)
+            local modCallback, callbackFunc = table.unpack(callbackTuple)
+            self:RemoveCallback(modCallback, callbackFunc)
         end
     end
     if feature.customCallbacksUsed ~= nil then
         for ____, callbackTuple in ipairs(feature.customCallbacksUsed) do
-            local modCallback, callbackArgs = table.unpack(callbackTuple)
-            local callback = callbackArgs[1]
-            self:RemoveCallbackCustom(modCallback, callback)
+            local modCallback, callbackFunc = table.unpack(callbackTuple)
+            self:RemoveCallbackCustom(modCallback, callbackFunc)
         end
     end
     if feature.v ~= nil then
@@ -49294,8 +49279,6 @@ local ____exports = {}
 local initDecoratedCallbacks, addCallback, removeCallback, initSaveDataManager, WRAPPED_CALLBACK_METHODS_KEY, WRAPPED_CUSTOM_CALLBACK_METHODS_KEY
 local ____array = require("src.functions.array")
 local isArray = ____array.isArray
-local ____deepCopy = require("src.functions.deepCopy")
-local deepCopy = ____deepCopy.deepCopy
 local ____tstlClass = require("src.functions.tstlClass")
 local getTSTLClassConstructor = ____tstlClass.getTSTLClassConstructor
 local getTSTLClassName = ____tstlClass.getTSTLClassName
@@ -49305,26 +49288,29 @@ local isNumber = ____types.isNumber
 local isTable = ____types.isTable
 function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, vanilla, init)
     local modFeatureConstructor = constructor
-    local argsKey = vanilla and ____exports.ADD_CALLBACK_ARGS_KEY or ____exports.ADD_CALLBACK_CUSTOM_ARGS_KEY
-    local addCallbackArgs = modFeatureConstructor[argsKey]
-    if addCallbackArgs == nil then
+    local callbackTuplesKey = vanilla and ____exports.MOD_FEATURE_CALLBACKS_KEY or ____exports.MOD_FEATURE_CUSTOM_CALLBACKS_KEY
+    local callbackTuples = modFeatureConstructor[callbackTuplesKey]
+    if callbackTuples == nil then
         return
     end
-    if not isArray(nil, addCallbackArgs) then
-        error(("Failed to initialize/uninitialize the decorated callbacks on a mod feature since the callback arguments on the key of \"" .. argsKey) .. "\" was not an array.")
+    if not isArray(nil, callbackTuples) then
+        error((("Failed to initialize/uninitialize the decorated callbacks on a mod feature since the callback arguments on the key of \"" .. callbackTuplesKey) .. "\" was not an array and was instead of type: ") .. type(callbackTuples))
     end
-    for ____, args in ipairs(addCallbackArgs) do
-        if not isArray(nil, args) then
-            error("Failed to initialize/uninitialize the decorated callbacks on a mod feature since one of the callback arguments was not an array.")
+    for ____, callbackTuple in ipairs(callbackTuples) do
+        if not isArray(nil, callbackTuple) then
+            error((("Failed to initialize/uninitialize the decorated callbacks on a mod feature since one of the callback arguments on the key of \"" .. callbackTuplesKey) .. "\" was not an array and was instead of type: ") .. type(callbackTuple))
         end
-        local parameters = deepCopy(nil, args)
-        local modCallback = table.remove(parameters, 1)
+        local modCallback = callbackTuple[1]
         if not isNumber(nil, modCallback) then
-            error("Failed to get the callback number from the parameters for class: " .. tstlClassName)
+            error("Failed to get the callback number from the callback tuple for class: " .. tstlClassName)
         end
-        local callback = table.remove(parameters, 1)
+        local callback = callbackTuple[2]
         if not isFunction(nil, callback) then
-            error("Failed to get the callback function from the parameters for class: " .. tstlClassName)
+            error("Failed to get the callback function from the callback tuple for class: " .. tstlClassName)
+        end
+        local parameters = callbackTuple[3]
+        if not isArray(nil, parameters, false) then
+            error("Failed to get the callback parameters from the callback tuple for class: " .. tstlClassName)
         end
         local mod = modFeature.mod
         if init then
@@ -49435,8 +49421,8 @@ function initSaveDataManager(self, modFeature, tstlClassName, init)
         saveDataManagerMethod(nil, tstlClassName)
     end
 end
-____exports.ADD_CALLBACK_ARGS_KEY = "__addCallbackArgs"
-____exports.ADD_CALLBACK_CUSTOM_ARGS_KEY = "__addCallbackCustomArgs"
+____exports.MOD_FEATURE_CALLBACKS_KEY = "__callbacks"
+____exports.MOD_FEATURE_CUSTOM_CALLBACKS_KEY = "__customCallbacks"
 WRAPPED_CALLBACK_METHODS_KEY = "__wrappedCallbackMethods"
 WRAPPED_CUSTOM_CALLBACK_METHODS_KEY = "__wrappedCustomCallbacksMethods"
 ____exports.ModFeature = __TS__Class()
@@ -49868,19 +49854,13 @@ function ____exports.hasCurse(self, curse)
     local curses = level:GetCurses()
     return hasFlag(nil, curses, curse)
 end
-return ____exports
- end,
-["src.types.AllButFirst"] = function(...) 
-local ____exports = {}
 return ____exports
  end,
 ["src.functions.decorators"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__Spread = ____lualib.__TS__Spread
 local ____exports = {}
 local ____ModFeature = require("src.classes.ModFeature")
-local ADD_CALLBACK_ARGS_KEY = ____ModFeature.ADD_CALLBACK_ARGS_KEY
-local ADD_CALLBACK_CUSTOM_ARGS_KEY = ____ModFeature.ADD_CALLBACK_CUSTOM_ARGS_KEY
+local MOD_FEATURE_CALLBACKS_KEY = ____ModFeature.MOD_FEATURE_CALLBACKS_KEY
+local MOD_FEATURE_CUSTOM_CALLBACKS_KEY = ____ModFeature.MOD_FEATURE_CUSTOM_CALLBACKS_KEY
 local ____tstlClass = require("src.functions.tstlClass")
 local getTSTLClassName = ____tstlClass.getTSTLClassName
 function ____exports.Callback(self, modCallback, ...)
@@ -49888,21 +49868,17 @@ function ____exports.Callback(self, modCallback, ...)
     return function(____, target, propertyKey, _descriptor)
         local methodName = propertyKey
         local method = target[methodName]
-        local addCallbackArgs = {
-            modCallback,
-            method,
-            __TS__Spread(optionalArgs)
-        }
+        local callbackTuple = {modCallback, method, optionalArgs}
         local constructor = target.constructor
         if constructor == nil then
             local tstlClassName = getTSTLClassName(nil, target) or "Unknown"
             error(("Failed to get the constructor for class \"" .. tstlClassName) .. "\". Did you decorate a static method? You can only decorate non-static class methods, because the \"Mod\" object is not present before the class is instantiated.")
         end
-        if not (constructor[ADD_CALLBACK_ARGS_KEY] ~= nil) then
-            constructor[ADD_CALLBACK_ARGS_KEY] = {}
+        if not (constructor[MOD_FEATURE_CALLBACKS_KEY] ~= nil) then
+            constructor[MOD_FEATURE_CALLBACKS_KEY] = {}
         end
-        local callbackTuples = constructor[ADD_CALLBACK_ARGS_KEY]
-        callbackTuples[#callbackTuples + 1] = addCallbackArgs
+        local callbackTuples = constructor[MOD_FEATURE_CALLBACKS_KEY]
+        callbackTuples[#callbackTuples + 1] = callbackTuple
     end
 end
 function ____exports.CallbackCustom(self, modCallbackCustom, ...)
@@ -49910,21 +49886,17 @@ function ____exports.CallbackCustom(self, modCallbackCustom, ...)
     return function(____, target, propertyKey, _descriptor)
         local methodName = propertyKey
         local method = target[methodName]
-        local addCallbackArgs = {
-            modCallbackCustom,
-            method,
-            __TS__Spread(optionalArgs)
-        }
+        local callbackTuple = {modCallbackCustom, method, optionalArgs}
         local constructor = target.constructor
         if constructor == nil then
             local tstlClassName = getTSTLClassName(nil, target) or "Unknown"
             error(("Failed to get the constructor for class \"" .. tstlClassName) .. "\". Did you decorate a static method? You can only decorate non-static class methods, because the \"Mod\" object is not present before the class is instantiated.")
         end
-        if not (constructor[ADD_CALLBACK_CUSTOM_ARGS_KEY] ~= nil) then
-            constructor[ADD_CALLBACK_CUSTOM_ARGS_KEY] = {}
+        if not (constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY] ~= nil) then
+            constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY] = {}
         end
-        local callbackTuples = constructor[ADD_CALLBACK_CUSTOM_ARGS_KEY]
-        callbackTuples[#callbackTuples + 1] = addCallbackArgs
+        local callbackTuples = constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY]
+        callbackTuples[#callbackTuples + 1] = callbackTuple
     end
 end
 return ____exports