isaacscript-common 15.6.1 → 16.0.0

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.6.1
+isaacscript-common 16.0.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -25,7 +25,15 @@ information about using TypeScript, see the website: https://isaacscript.github.
 
 --]]
 
+---@diagnostic disable: assign-type-mismatch
 ---@diagnostic disable: deprecated
+---@diagnostic disable: lowercase-global
+---@diagnostic disable: need-check-nil
+---@diagnostic disable: redefined-local
+---@diagnostic disable: redundant-parameter
+---@diagnostic disable: unused-function
+---@diagnostic disable: unused-local
+---@diagnostic disable: unused-vararg
 
 
 local ____modules = {}
@@ -1023,8 +1031,7 @@ do
         if not rawget(metatable, "_descriptors") then
             metatable._descriptors = {}
         end
-        local descriptor = __TS__CloneDescriptor(desc)
-        metatable._descriptors[key] = descriptor
+        metatable._descriptors[key] = __TS__CloneDescriptor(desc)
         metatable.__index = descriptorIndex
         metatable.__newindex = descriptorNewIndex
     end
@@ -1660,22 +1667,6 @@ local function __TS__ParseFloat(numberString)
     return ____number_1
 end
 
-local function __TS__StringSubstr(self, from, length)
-    if from ~= from then
-        from = 0
-    end
-    if length ~= nil then
-        if length ~= length or length <= 0 then
-            return ""
-        end
-        length = length + from
-    end
-    if from >= 0 then
-        from = from + 1
-    end
-    return string.sub(self, from, length)
-end
-
 local function __TS__StringSubstring(self, start, ____end)
     if ____end ~= ____end then
         ____end = 0
@@ -1705,9 +1696,9 @@ do
                 base = 16
                 local ____TS__Match_result__0_0
                 if __TS__Match(hexMatch, "-") then
-                    ____TS__Match_result__0_0 = "-" .. __TS__StringSubstr(numberString, #hexMatch)
+                    ____TS__Match_result__0_0 = "-" .. __TS__StringSubstring(numberString, #hexMatch)
                 else
-                    ____TS__Match_result__0_0 = __TS__StringSubstr(numberString, #hexMatch)
+                    ____TS__Match_result__0_0 = __TS__StringSubstring(numberString, #hexMatch)
                 end
                 numberString = ____TS__Match_result__0_0
             end
@@ -1719,7 +1710,7 @@ do
         if base <= 10 then
             ____temp_1 = __TS__StringSubstring(parseIntBasePattern, 0, base)
         else
-            ____temp_1 = __TS__StringSubstr(parseIntBasePattern, 0, 10 + 2 * (base - 10))
+            ____temp_1 = __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
         end
         local allowedDigits = ____temp_1
         local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
@@ -2429,6 +2420,22 @@ local function __TS__StringStartsWith(self, searchString, position)
     return string.sub(self, position + 1, #searchString + position) == searchString
 end
 
+local function __TS__StringSubstr(self, from, length)
+    if from ~= from then
+        from = 0
+    end
+    if length ~= nil then
+        if length ~= length or length <= 0 then
+            return ""
+        end
+        length = length + from
+    end
+    if from >= 0 then
+        from = from + 1
+    end
+    return string.sub(self, from, length)
+end
+
 local function __TS__StringTrim(self)
     local result = string.gsub(self, "^[%s ]*(.-)[%s ]*$", "%1")
     return result
@@ -16788,6 +16795,8 @@ end
 return ____exports
  end,
 ["src.functions.flag"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectEntries = ____lualib.__TS__ObjectEntries
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
@@ -16803,7 +16812,9 @@ function ____exports.bitFlags(self, flag)
     return flag
 end
 function ____exports.getFlagName(self, flag, flagEnum)
-    for key, value in pairs(flagEnum) do
+    for ____, ____value in ipairs(__TS__ObjectEntries(flagEnum)) do
+        local key = ____value[1]
+        local value = ____value[2]
         if value == flag then
             return key
         end
@@ -23256,7 +23267,7 @@ function ____exports.restart(self, character)
     local command = "restart " .. tostring(character)
     log(
         nil,
-        (((("Restarting the run as PlayerType." .. tostring(PlayerType[character])) .. " (") .. tostring(character)) .. ") with a console command of: ") .. command
+        (((("Restarting the run as PlayerType." .. PlayerType[character]) .. " (") .. tostring(character)) .. ") with a console command of: ") .. command
     )
     Isaac.ExecuteCommand(command)
 end
@@ -27382,10 +27393,7 @@ function ____exports.logPlayerHealth(self, player)
     )
     log(nil, "  Soul heart types: [")
     for ____, soulHeartType in ipairs(playerHealth.soulHeartTypes) do
-        log(
-            nil,
-            "    HeartSubType." .. tostring(HeartSubType[soulHeartType])
-        )
+        log(nil, "    HeartSubType." .. HeartSubType[soulHeartType])
     end
     log(nil, "  ]")
 end
@@ -30999,6 +31007,8 @@ local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____gridEntities = require("src.functions.gridEntities")
 local removeGridEntity = ____gridEntities.removeGridEntity
 local spawnGridEntityWithVariant = ____gridEntities.spawnGridEntityWithVariant
@@ -31030,32 +31040,6 @@ function CustomGridEntities.prototype.____constructor(self, runInNFrames)
             manuallyUsingShovel = false
         }
     }
-    self.postNewRoom = function()
-        local roomListIndex = getRoomListIndex(nil)
-        local roomCustomGridEntities = self.v.level.customGridEntities:get(roomListIndex)
-        if roomCustomGridEntities == nil then
-            return
-        end
-        local room = game:GetRoom()
-        for ____, ____value in __TS__Iterator(roomCustomGridEntities:entries()) do
-            local gridIndex = ____value[1]
-            local data = ____value[2]
-            do
-                local decoration = room:GetGridEntity(gridIndex)
-                if decoration == nil then
-                    roomCustomGridEntities:delete(gridIndex)
-                    goto __continue6
-                end
-                if data.anm2Path ~= nil then
-                    local sprite = decoration:GetSprite()
-                    sprite:Load(data.anm2Path, true)
-                    local animationToPlay = data.defaultAnimation == nil and sprite:GetDefaultAnimation() or data.defaultAnimation
-                    sprite:Play(animationToPlay, true)
-                end
-            end
-            ::__continue6::
-        end
-    end
     self.preUseItemWeNeedToGoDeeper = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
         local room = game:GetRoom()
         local roomListIndex = getRoomListIndex(nil)
@@ -31084,8 +31068,35 @@ function CustomGridEntities.prototype.____constructor(self, runInNFrames)
         end)
         return true
     end
+    self.postNewRoomReordered = function()
+        local roomListIndex = getRoomListIndex(nil)
+        local roomCustomGridEntities = self.v.level.customGridEntities:get(roomListIndex)
+        if roomCustomGridEntities == nil then
+            return
+        end
+        local room = game:GetRoom()
+        for ____, ____value in __TS__Iterator(roomCustomGridEntities:entries()) do
+            local gridIndex = ____value[1]
+            local data = ____value[2]
+            do
+                local decoration = room:GetGridEntity(gridIndex)
+                if decoration == nil then
+                    roomCustomGridEntities:delete(gridIndex)
+                    goto __continue12
+                end
+                if data.anm2Path ~= nil then
+                    local sprite = decoration:GetSprite()
+                    sprite:Load(data.anm2Path, true)
+                    local animationToPlay = data.defaultAnimation == nil and sprite:GetDefaultAnimation() or data.defaultAnimation
+                    sprite:Play(animationToPlay, true)
+                end
+            end
+            ::__continue12::
+        end
+    end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_NEW_ROOM, {self.postNewRoom}}, {ModCallback.PRE_USE_ITEM, {self.preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER}}}
+    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)
@@ -31261,7 +31272,7 @@ function CustomRevive.prototype.____constructor(self, preCustomRevive, postCusto
     self.postPEffectUpdate = function(____, player)
         self:checkWaitingForItemAnimation(player)
     end
-    self.postNewRoom = function()
+    self.postNewRoomReordered = function()
         if self.v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
             return
         end
@@ -31276,8 +31287,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}}, {ModCallback.POST_NEW_ROOM, {self.postNewRoom}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, {self.postPlayerFatalDamage}}, {ModCallbackCustom.PRE_BERSERK_DEATH, {self.preBerserkDeath}}}
+    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.preCustomRevive = preCustomRevive
     self.postCustomRevive = postCustomRevive
     self.runInNFrames = runInNFrames
@@ -31340,7 +31351,7 @@ function CustomRevive.prototype.logStateChanged(self)
     if DEBUG then
         log(
             nil,
-            ((("Custom revive state changed: " .. tostring(CustomReviveState[self.v.run.state])) .. " (") .. tostring(self.v.run.state)) .. ")"
+            ((("Custom revive state changed: " .. CustomReviveState[self.v.run.state]) .. " (") .. tostring(self.v.run.state)) .. ")"
         )
     end
 end
@@ -31673,6 +31684,8 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____gridEntities = require("src.functions.gridEntities")
 local getGridEntitiesMap = ____gridEntities.getGridEntitiesMap
 local isGridEntityBroken = ____gridEntities.isGridEntityBroken
@@ -31701,7 +31714,7 @@ function GridEntityUpdateDetection.prototype.____constructor(self, postGridEntit
             end
         end
     end
-    self.postNewRoom = function()
+    self.postNewRoomReordered = function()
         local gridEntitiesMap = getGridEntitiesMap(nil)
         for ____, ____value in __TS__Iterator(gridEntitiesMap:entries()) do
             local gridIndex = ____value[1]
@@ -31710,7 +31723,8 @@ function GridEntityUpdateDetection.prototype.____constructor(self, postGridEntit
         end
     end
     self.featuresUsed = {ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, {self.postUpdate}}, {ModCallback.POST_NEW_ROOM, {self.postNewRoom}}}
+    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
@@ -33886,12 +33900,8 @@ local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
-local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
-local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____entities = require("src.functions.entities")
 local getEntityID = ____entities.getEntityID
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local getPickups = ____entitiesSpecific.getPickups
 local ____roomData = require("src.functions.roomData")
 local getRoomListIndex = ____roomData.getRoomListIndex
 local ____stage = require("src.functions.stage")
@@ -33931,53 +33941,41 @@ function PickupIndexCreation.prototype.____constructor(self, roomHistory)
         room = {pickupIndexes = __TS__New(Map)}
     }
     self.postPickupInit = function(____, pickup)
-        self:trySetPickupIndex(pickup)
+        self:setPickupIndex(pickup)
     end
     self.postEntityRemovePickup = function(____, entity)
         self:checkDespawningFromPlayerLeavingRoom(entity)
     end
-    self.postNewRoomReordered = function()
-        local room = game:GetRoom()
-        local isFirstVisit = room:IsFirstVisit()
-        if isFirstVisit then
-            return
-        end
-        local roomListIndex = getRoomListIndex(nil)
-        local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(roomListIndex)
-        for ____, pickup in ipairs(getPickups(nil)) do
-            local pickupIndex = getStoredPickupIndex(nil, pickup, pickupDescriptions)
-            if pickupIndex == nil then
-                pickupIndex = self:getPostAscentPickupIndex(pickup)
-            end
-            if pickupIndex == nil then
-                local ____self_v_run_0, ____pickupCounter_1 = self.v.run, "pickupCounter"
-                ____self_v_run_0[____pickupCounter_1] = ____self_v_run_0[____pickupCounter_1] + 1
-                pickupIndex = self.v.run.pickupCounter
-            end
-            local ptrHash = GetPtrHash(pickup)
-            self.v.room.pickupIndexes:set(ptrHash, pickupIndex)
-        end
-    end
     self.featuresUsed = {ISCFeature.ROOM_HISTORY}
     self.callbacksUsed = {{ModCallback.POST_PICKUP_INIT, {self.postPickupInit}}, {ModCallback.POST_ENTITY_REMOVE, {self.postEntityRemovePickup, EntityType.PICKUP}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_NEW_ROOM_REORDERED, {self.postNewRoomReordered}}}
     self.roomHistory = roomHistory
 end
-function PickupIndexCreation.prototype.trySetPickupIndex(self, pickup)
+function PickupIndexCreation.prototype.setPickupIndex(self, pickup)
     local ptrHash = GetPtrHash(pickup)
     if self.v.room.pickupIndexes:has(ptrHash) then
         return
     end
+    local pickupIndexFromLevelData = self:getPickupIndexFromPreviousData(pickup)
     local room = game:GetRoom()
     local isFirstVisit = room:IsFirstVisit()
     local roomFrameCount = room:GetFrameCount()
-    if not isFirstVisit and roomFrameCount <= 0 then
+    if pickupIndexFromLevelData ~= nil and not isFirstVisit and roomFrameCount <= 0 then
+        self.v.room.pickupIndexes:set(ptrHash, pickupIndexFromLevelData)
         return
     end
-    local ____self_v_run_2, ____pickupCounter_3 = self.v.run, "pickupCounter"
-    ____self_v_run_2[____pickupCounter_3] = ____self_v_run_2[____pickupCounter_3] + 1
+    local ____self_v_run_0, ____pickupCounter_1 = self.v.run, "pickupCounter"
+    ____self_v_run_0[____pickupCounter_1] = ____self_v_run_0[____pickupCounter_1] + 1
     self.v.room.pickupIndexes:set(ptrHash, self.v.run.pickupCounter)
 end
+function PickupIndexCreation.prototype.getPickupIndexFromPreviousData(self, pickup)
+    local roomListIndex = getRoomListIndex(nil)
+    local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(roomListIndex)
+    local pickupIndex = getStoredPickupIndex(nil, pickup, pickupDescriptions)
+    if pickupIndex == nil then
+        pickupIndex = self:getPostAscentPickupIndex(pickup)
+    end
+    return pickupIndex
+end
 function PickupIndexCreation.prototype.checkDespawningFromPlayerLeavingRoom(self, entity)
     local ptrHash = GetPtrHash(entity)
     local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
@@ -34004,16 +34002,16 @@ function PickupIndexCreation.prototype.trackDespawningPickupMetadata(self, entit
     local room = game:GetRoom()
     local roomType = room:GetType()
     repeat
-        local ____switch21 = roomType
-        local ____cond21 = ____switch21 == RoomType.TREASURE
-        if ____cond21 then
+        local ____switch17 = roomType
+        local ____cond17 = ____switch17 == RoomType.TREASURE
+        if ____cond17 then
             do
                 self.v.run.pickupDataTreasureRooms:set(pickupIndex, pickupDescription)
                 break
             end
         end
-        ____cond21 = ____cond21 or ____switch21 == RoomType.BOSS
-        if ____cond21 then
+        ____cond17 = ____cond17 or ____switch17 == RoomType.BOSS
+        if ____cond17 then
             do
                 self.v.run.pickupDataBossRooms:set(pickupIndex, pickupDescription)
                 break
@@ -34033,15 +34031,15 @@ function PickupIndexCreation.prototype.getPostAscentPickupIndex(self, pickup)
     local room = game:GetRoom()
     local roomType = room:GetType()
     repeat
-        local ____switch27 = roomType
-        local ____cond27 = ____switch27 == RoomType.TREASURE
-        if ____cond27 then
+        local ____switch23 = roomType
+        local ____cond23 = ____switch23 == RoomType.TREASURE
+        if ____cond23 then
             do
                 return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataTreasureRooms)
             end
         end
-        ____cond27 = ____cond27 or ____switch27 == RoomType.BOSS
-        if ____cond27 then
+        ____cond23 = ____cond23 or ____switch23 == RoomType.BOSS
+        if ____cond23 then
             do
                 return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataBossRooms)
             end
@@ -34056,15 +34054,16 @@ end
 function PickupIndexCreation.prototype.getPickupIndex(self, pickup)
     local ptrHash = GetPtrHash(pickup)
     local pickupIndexInitial = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndexInitial == nil then
-        self:trySetPickupIndex(pickup)
+    if pickupIndexInitial ~= nil then
+        return pickupIndexInitial
     end
+    self:setPickupIndex(pickup)
     local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndex == nil then
-        local entityID = getEntityID(nil, pickup)
-        error("Failed to generate a new pickup index for pickup: " .. entityID)
+    if pickupIndex ~= nil then
+        return pickupIndex
     end
-    return pickupIndex
+    local entityID = getEntityID(nil, pickup)
+    error("Failed to generate a new pickup index for pickup: " .. entityID)
 end
 __TS__Decorate({Exported}, PickupIndexCreation.prototype, "getPickupIndex", true)
 return ____exports
@@ -34230,9 +34229,6 @@ local SHOOTING_ACTIONS = {ButtonAction.SHOOT_LEFT, ButtonAction.SHOOT_RIGHT, But
 ____exports.SHOOTING_ACTIONS_SET = __TS__New(Set, SHOOTING_ACTIONS)
 function ____exports.controllerToString(self, controller)
     local key = Controller[controller]
-    if key == nil then
-        return nil
-    end
     return trimPrefix(nil, key, "BUTTON_")
 end
 function ____exports.getMoveActions(self)
@@ -34370,7 +34366,7 @@ function CustomHotkeys.prototype.setConditionalHotkey(self, getKeyFunc, triggerF
 end
 function CustomHotkeys.prototype.setHotkey(self, keyboard, triggerFunc)
     if self.staticHotkeyFunctionMap:has(keyboard) then
-        error(((("Failed to register a hotkey due to a hotkey already being defined for: Keyboard." .. tostring(Keyboard[keyboard])) .. " (") .. tostring(keyboard)) .. ")")
+        error(((("Failed to register a hotkey due to a hotkey already being defined for: Keyboard." .. Keyboard[keyboard]) .. " (") .. tostring(keyboard)) .. ")")
     end
     self.staticHotkeyFunctionMap:set(keyboard, triggerFunc)
 end
@@ -34382,7 +34378,7 @@ function CustomHotkeys.prototype.unsetConditionalHotkey(self, getKeyFunc)
 end
 function CustomHotkeys.prototype.unsetHotkey(self, keyboard)
     if not self.staticHotkeyFunctionMap:has(keyboard) then
-        error(((("Failed to unregister a hotkey since there is no existing hotkey defined for: Keyboard." .. tostring(Keyboard[keyboard])) .. " (") .. tostring(keyboard)) .. ")")
+        error(((("Failed to unregister a hotkey since there is no existing hotkey defined for: Keyboard." .. Keyboard[keyboard]) .. " (") .. tostring(keyboard)) .. ")")
     end
     self.staticHotkeyFunctionMap:delete(keyboard)
 end
@@ -39128,7 +39124,7 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
                 if roomType == RoomType.DEFAULT then
                     logError(
                         nil,
-                        (((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name
+                        (((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") for custom stage: ") .. customStage.name
                     )
                 end
                 goto __continue26
@@ -39138,7 +39134,7 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             if roomDoorSlotFlagMap == nil then
                 logError(
                     nil,
-                    (((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name
+                    (((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") for custom stage: ") .. customStage.name
                 )
                 goto __continue26
             end
@@ -39147,13 +39143,13 @@ function CustomStages.prototype.setStageRoomsData(self, customStage, rng, verbos
             if roomsMetadata == nil then
                 logError(
                     nil,
-                    (((((((((("Failed to find any custom rooms for RoomType." .. tostring(RoomType[roomType])) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
+                    (((((((((("Failed to find any custom rooms for RoomType." .. RoomType[roomType]) .. " (") .. tostring(roomType)) .. ") + RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") + DoorSlotFlags ") .. tostring(doorSlotFlags)) .. " for custom stage: ") .. customStage.name
                 )
                 local header = ("For reference, a DoorSlotFlags of " .. tostring(doorSlotFlags)) .. " is equal to the following doors being enabled:\n"
                 local doorSlots = doorSlotFlagsToDoorSlots(nil, doorSlotFlags)
                 local doorSlotLines = __TS__ArrayMap(
                     doorSlots,
-                    function(____, doorSlot) return ((("- DoorSlot." .. tostring(DoorSlot[doorSlot])) .. " (") .. tostring(doorSlot)) .. ")" end
+                    function(____, doorSlot) return ((("- DoorSlot." .. DoorSlot[doorSlot]) .. " (") .. tostring(doorSlot)) .. ")" end
                 )
                 local explanation = header .. table.concat(doorSlotLines, "\n")
                 logError(nil, explanation)
@@ -40015,7 +40011,7 @@ function ____exports.getGridIndexesBetween(self, gridIndex1, gridIndex2, roomSha
     if isOnVerticalLine then
         return iRange(nil, gridIndex1, gridIndex2, gridWidth)
     end
-    error(((((((("Failed to get the grid indexes between " .. tostring(gridIndex1)) .. " and ") .. tostring(gridIndex2)) .. " for RoomShape.") .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ") since they are not on the same horizontal or vertical line.")
+    error(((((((("Failed to get the grid indexes between " .. tostring(gridIndex1)) .. " and ") .. tostring(gridIndex2)) .. " for RoomShape.") .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ") since they are not on the same horizontal or vertical line.")
 end
 return ____exports
  end,
@@ -40058,7 +40054,7 @@ function getVanillaWallGridIndexSetForRoomShape(self, roomShape)
     local corners = getRoomShapeCorners(nil, roomShape)
     local lRoom = isLRoom(nil, roomShape)
     if lRoom and #corners ~= 6 then
-        error(((("Failed to get the correct amount of corners for: RoomShape." .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ")")
+        error(((("Failed to get the correct amount of corners for: RoomShape." .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ")")
     end
     repeat
         local ____switch7 = roomShape
@@ -40280,7 +40276,7 @@ function ____exports.isVanillaWallGridIndex(self, gridIndex)
         wallGridIndexSet = ROOM_SHAPE_TO_WALL_GRID_INDEX_SET:get(roomShape)
     end
     if wallGridIndexSet == nil then
-        error(((("Failed to find the wall grid index set for: RoomShape." .. tostring(RoomShape[roomShape])) .. " (") .. tostring(roomShape)) .. ")")
+        error(((("Failed to find the wall grid index set for: RoomShape." .. RoomShape[roomShape]) .. " (") .. tostring(roomShape)) .. ")")
     end
     return wallGridIndexSet:has(gridIndex)
 end
@@ -44462,23 +44458,23 @@ function getEntityLogLine(self, entity, num)
     msg = msg .. getEntityID(nil, entity)
     local bomb = entity:ToBomb()
     if bomb ~= nil then
-        msg = msg .. (" (bomb - BombVariant." .. tostring(BombVariant[bomb.Variant])) .. ")"
+        msg = msg .. (" (bomb - BombVariant." .. BombVariant[bomb.Variant]) .. ")"
     end
     local effect = entity:ToEffect()
     if effect ~= nil then
-        msg = msg .. (((" (effect - EffectVariant." .. tostring(EffectVariant[effect.Variant])) .. ") (State: ") .. tostring(effect.State)) .. ")"
+        msg = msg .. (((" (effect - EffectVariant." .. EffectVariant[effect.Variant]) .. ") (State: ") .. tostring(effect.State)) .. ")"
     end
     local familiar = entity:ToFamiliar()
     if familiar ~= nil then
-        msg = msg .. (((" (familiar - FamiliarVariant." .. tostring(FamiliarVariant[familiar.Variant])) .. ") (State: ") .. tostring(familiar.State)) .. ")"
+        msg = msg .. (((" (familiar - FamiliarVariant." .. FamiliarVariant[familiar.Variant]) .. ") (State: ") .. tostring(familiar.State)) .. ")"
     end
     local knife = entity:ToKnife()
     if knife ~= nil then
-        msg = msg .. (" (knife - KnifeVariant." .. tostring(KnifeVariant[knife.Variant])) .. ")"
+        msg = msg .. (" (knife - KnifeVariant." .. KnifeVariant[knife.Variant]) .. ")"
     end
     local laser = entity:ToLaser()
     if laser ~= nil then
-        msg = msg .. (" (laser - LaserVariant." .. tostring(LaserVariant[laser.Variant])) .. ")"
+        msg = msg .. (" (laser - LaserVariant." .. LaserVariant[laser.Variant]) .. ")"
     end
     local npc = entity:ToNPC()
     if npc ~= nil then
@@ -44486,19 +44482,19 @@ function getEntityLogLine(self, entity, num)
     end
     local pickup = entity:ToPickup()
     if pickup ~= nil then
-        msg = msg .. (((" (pickup - PickupVariant." .. tostring(PickupVariant[pickup.Variant])) .. ") (State: ") .. tostring(pickup.State)) .. ")"
+        msg = msg .. (((" (pickup - PickupVariant." .. PickupVariant[pickup.Variant]) .. ") (State: ") .. tostring(pickup.State)) .. ")"
     end
     local player = entity:ToPlayer()
     if player ~= nil then
-        msg = msg .. (" (player - PlayerVariant." .. tostring(PlayerVariant[player.Variant])) .. ")"
+        msg = msg .. (" (player - PlayerVariant." .. PlayerVariant[player.Variant]) .. ")"
     end
     local projectile = entity:ToProjectile()
     if projectile ~= nil then
-        msg = msg .. (" (projectile - ProjectileVariant." .. tostring(ProjectileVariant[projectile.Variant])) .. "))"
+        msg = msg .. (" (projectile - ProjectileVariant." .. ProjectileVariant[projectile.Variant]) .. "))"
     end
     local tear = entity:ToTear()
     if tear ~= nil then
-        msg = msg .. (" (tear - TearVariant." .. tostring(TearVariant[tear.Variant])) .. "))"
+        msg = msg .. (" (tear - TearVariant." .. TearVariant[tear.Variant]) .. "))"
     end
     msg = msg .. "\n"
     msg = msg .. ("  - Index: " .. tostring(entity.Index)) .. "\n"
@@ -45410,7 +45406,7 @@ function ____exports.getCharge(self, params)
     local totalCharge = getTotalCharge(nil, player, activeSlot)
     printConsole(
         nil,
-        (((("Total charge for ActiveSlot." .. tostring(ActiveSlot[activeSlot])) .. " (") .. tostring(activeSlot)) .. ") is: ") .. tostring(totalCharge)
+        (((("Total charge for ActiveSlot." .. ActiveSlot[activeSlot]) .. " (") .. tostring(activeSlot)) .. ") is: ") .. tostring(totalCharge)
     )
 end
 function ____exports.getPosition(self)
@@ -48766,7 +48762,7 @@ function ModUpgradedBase.prototype.AddCallback(self, modCallback, ...)
         local callback = args[1]
         local optionalArg = args[2]
         local parentFunctionDescription = getParentFunctionDescription(nil)
-        local callbackName = "ModCallback." .. tostring(ModCallback[modCallback])
+        local callbackName = "ModCallback." .. ModCallback[modCallback]
         local signature = parentFunctionDescription == nil and callbackName or (parentFunctionDescription .. " - ") .. callbackName
         local function callbackWithLogger(____, ...)
             local startTime = getTime(nil)
@@ -48951,6 +48947,10 @@ function ModUpgradedBase.prototype.initOptionalFeature(self, feature)
     self:initFeature(featureClass)
     return getExportedMethodsFromFeature(nil, featureClass)
 end
+function ModUpgradedBase.prototype.initCustomCallbackEarly(self, modCallbackCustom)
+    local callbackClass = self.callbacks[modCallbackCustom]
+    self:initFeature(callbackClass)
+end
 return ____exports
  end,
 ["src.classes.ModFeature"] = function(...) 
@@ -49241,7 +49241,7 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local initOptionalFeatures
+local initOptionalFeatures, initCallbacksEarly
 local ____ModUpgradedBase = require("src.classes.ModUpgradedBase")
 local ModUpgradedBase = ____ModUpgradedBase.ModUpgradedBase
 local ____patchErrorFunctions = require("src.patchErrorFunctions")
@@ -49259,10 +49259,18 @@ function initOptionalFeatures(self, mod, features)
         end
     end
 end
-function ____exports.upgradeMod(self, modVanilla, features, ____debug, timeThreshold)
+function initCallbacksEarly(self, mod, callbacks)
+    for ____, modCallbackCustom in ipairs(callbacks) do
+        mod.initCustomCallbackEarly(mod, modCallbackCustom)
+    end
+end
+function ____exports.upgradeMod(self, modVanilla, features, customCallbacksUsed, ____debug, timeThreshold)
     if features == nil then
         features = {}
     end
+    if customCallbacksUsed == nil then
+        customCallbacksUsed = {}
+    end
     if ____debug == nil then
         ____debug = false
     end
@@ -49270,6 +49278,7 @@ function ____exports.upgradeMod(self, modVanilla, features, ____debug, timeThres
     local mod = __TS__New(ModUpgradedBase, modVanilla, ____debug, timeThreshold)
     applyShaderCrashFix(nil, mod)
     initOptionalFeatures(nil, mod, features)
+    initCallbacksEarly(nil, mod, customCallbacksUsed)
     return mod
 end
 return ____exports