isaacscript-common 75.2.1 → 76.0.0

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 75.2.0
+isaacscript-common 75.2.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -18854,33 +18854,29 @@ ____exports.ISCFeature.PRESS_INPUT = 42
 ____exports.ISCFeature[____exports.ISCFeature.PRESS_INPUT] = "PRESS_INPUT"
 ____exports.ISCFeature.PREVENT_CHILD_ENTITIES = 43
 ____exports.ISCFeature[____exports.ISCFeature.PREVENT_CHILD_ENTITIES] = "PREVENT_CHILD_ENTITIES"
-____exports.ISCFeature.PREVENT_COLLECTIBLE_ROTATION = 44
-____exports.ISCFeature[____exports.ISCFeature.PREVENT_COLLECTIBLE_ROTATION] = "PREVENT_COLLECTIBLE_ROTATION"
-____exports.ISCFeature.PREVENT_GRID_ENTITY_RESPAWN = 45
+____exports.ISCFeature.PREVENT_GRID_ENTITY_RESPAWN = 44
 ____exports.ISCFeature[____exports.ISCFeature.PREVENT_GRID_ENTITY_RESPAWN] = "PREVENT_GRID_ENTITY_RESPAWN"
-____exports.ISCFeature.ROOM_CLEAR_FRAME = 46
+____exports.ISCFeature.ROOM_CLEAR_FRAME = 45
 ____exports.ISCFeature[____exports.ISCFeature.ROOM_CLEAR_FRAME] = "ROOM_CLEAR_FRAME"
-____exports.ISCFeature.ROOM_HISTORY = 47
+____exports.ISCFeature.ROOM_HISTORY = 46
 ____exports.ISCFeature[____exports.ISCFeature.ROOM_HISTORY] = "ROOM_HISTORY"
-____exports.ISCFeature.RUN_IN_N_FRAMES = 48
+____exports.ISCFeature.RUN_IN_N_FRAMES = 47
 ____exports.ISCFeature[____exports.ISCFeature.RUN_IN_N_FRAMES] = "RUN_IN_N_FRAMES"
-____exports.ISCFeature.RUN_NEXT_ROOM = 49
+____exports.ISCFeature.RUN_NEXT_ROOM = 48
 ____exports.ISCFeature[____exports.ISCFeature.RUN_NEXT_ROOM] = "RUN_NEXT_ROOM"
-____exports.ISCFeature.RUN_NEXT_RUN = 50
+____exports.ISCFeature.RUN_NEXT_RUN = 49
 ____exports.ISCFeature[____exports.ISCFeature.RUN_NEXT_RUN] = "RUN_NEXT_RUN"
-____exports.ISCFeature.SAVE_DATA_MANAGER = 51
+____exports.ISCFeature.SAVE_DATA_MANAGER = 50
 ____exports.ISCFeature[____exports.ISCFeature.SAVE_DATA_MANAGER] = "SAVE_DATA_MANAGER"
-____exports.ISCFeature.SPAWN_ALT_ROCK_REWARDS = 52
+____exports.ISCFeature.SPAWN_ALT_ROCK_REWARDS = 51
 ____exports.ISCFeature[____exports.ISCFeature.SPAWN_ALT_ROCK_REWARDS] = "SPAWN_ALT_ROCK_REWARDS"
-____exports.ISCFeature.SPAWN_COLLECTIBLE = 53
-____exports.ISCFeature[____exports.ISCFeature.SPAWN_COLLECTIBLE] = "SPAWN_COLLECTIBLE"
-____exports.ISCFeature.STAGE_HISTORY = 54
+____exports.ISCFeature.STAGE_HISTORY = 52
 ____exports.ISCFeature[____exports.ISCFeature.STAGE_HISTORY] = "STAGE_HISTORY"
-____exports.ISCFeature.START_AMBUSH = 55
+____exports.ISCFeature.START_AMBUSH = 53
 ____exports.ISCFeature[____exports.ISCFeature.START_AMBUSH] = "START_AMBUSH"
-____exports.ISCFeature.TAINTED_LAZARUS_PLAYERS = 56
+____exports.ISCFeature.TAINTED_LAZARUS_PLAYERS = 54
 ____exports.ISCFeature[____exports.ISCFeature.TAINTED_LAZARUS_PLAYERS] = "TAINTED_LAZARUS_PLAYERS"
-____exports.ISCFeature.UNLOCK_ACHIEVEMENTS_DETECTION = 57
+____exports.ISCFeature.UNLOCK_ACHIEVEMENTS_DETECTION = 55
 ____exports.ISCFeature[____exports.ISCFeature.UNLOCK_ACHIEVEMENTS_DETECTION] = "UNLOCK_ACHIEVEMENTS_DETECTION"
 return ____exports
  end,
@@ -26915,6 +26911,25 @@ function ____exports.newCollectibleSprite(self, collectibleType)
     sprite:Play(defaultAnimation, true)
     return sprite
 end
+--- Helper function to remove the rotation behavior from a collectible. This will happen by default
+-- when collectibles are spawned when playing as Tainted Isaac or when having Binge Eater.
+-- 
+-- Under the hood, this is accomplished by morphing the collectible with the `ignoreModifiers`
+-- argument set to true.
+function ____exports.preventCollectibleRotation(self, collectible)
+    if not isCollectible(nil, collectible) then
+        local entityID = getEntityID(nil, collectible)
+        error("The \"preventCollectibleRotation\" function was given a non-collectible: " .. entityID)
+    end
+    collectible:Morph(
+        collectible.Type,
+        collectible.Variant,
+        collectible.SubType,
+        true,
+        true,
+        true
+    )
+end
 --- Helper function to remove all pickup delay on a collectible. By default, collectibles have a 20
 -- frame delay before they can be picked up by a player.
 function ____exports.removeCollectiblePickupDelay(self, collectible)
@@ -53249,133 +53264,6 @@ function ____exports.worldPositionToGridPositionFast(self, worldPos)
     local y = worldPos.Y / 40 - 4
     return Vector(x, y)
 end
-return ____exports
- end,
-["classes.features.other.PreventGridEntityRespawn"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__New = ____lualib.__TS__New
-local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__DecorateLegacy = ____lualib.__TS__DecorateLegacy
-local ____exports = {}
-local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
-local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
-local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____cachedClasses = require("core.cachedClasses")
-local game = ____cachedClasses.game
-local ____decorators = require("decorators")
-local Exported = ____decorators.Exported
-local ____ISCFeature = require("enums.ISCFeature")
-local ISCFeature = ____ISCFeature.ISCFeature
-local ____ModCallbackCustom = require("enums.ModCallbackCustom")
-local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
-local ____array = require("functions.array")
-local emptyArray = ____array.emptyArray
-local ____gridEntities = require("functions.gridEntities")
-local getAllGridIndexes = ____gridEntities.getAllGridIndexes
-local getGridEntities = ____gridEntities.getGridEntities
-local removeGridEntity = ____gridEntities.removeGridEntity
-local setGridEntityInvisible = ____gridEntities.setGridEntityInvisible
-local spawnGridEntity = ____gridEntities.spawnGridEntity
-local ____players = require("functions.players")
-local getPlayerFromPtr = ____players.getPlayerFromPtr
-local ____roomData = require("functions.roomData")
-local getRoomListIndex = ____roomData.getRoomListIndex
-local ____DefaultMap = require("classes.DefaultMap")
-local DefaultMap = ____DefaultMap.DefaultMap
-local ____Feature = require("classes.private.Feature")
-local Feature = ____Feature.Feature
-local v = {
-    level = {roomListIndexToDecorationGridIndexes = __TS__New(
-        DefaultMap,
-        function() return {} end
-    )},
-    room = {manuallyUsingShovel = false}
-}
-____exports.PreventGridEntityRespawn = __TS__Class()
-local PreventGridEntityRespawn = ____exports.PreventGridEntityRespawn
-PreventGridEntityRespawn.name = "PreventGridEntityRespawn"
-__TS__ClassExtends(PreventGridEntityRespawn, Feature)
-function PreventGridEntityRespawn.prototype.____constructor(self, runInNFrames)
-    Feature.prototype.____constructor(self)
-    self.v = v
-    self.preUseItemWeNeedToGoDeeper = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
-        if v.room.manuallyUsingShovel then
-            return nil
-        end
-        local roomListIndex = getRoomListIndex(nil)
-        if not v.level.roomListIndexToDecorationGridIndexes:has(roomListIndex) then
-            return
-        end
-        local decorations = getGridEntities(nil, GridEntityType.DECORATION)
-        for ____, decoration in ipairs(decorations) do
-            removeGridEntity(nil, decoration, false)
-        end
-        local entityPtr = EntityPtr(player)
-        self.runInNFrames:runNextGameFrame(function()
-            local futurePlayer = getPlayerFromPtr(nil, entityPtr)
-            if futurePlayer == nil then
-                return
-            end
-            local futureRoomListIndex = getRoomListIndex(nil)
-            if futureRoomListIndex ~= roomListIndex then
-                return
-            end
-            v.room.manuallyUsingShovel = true
-            futurePlayer:UseActiveItem(CollectibleType.WE_NEED_TO_GO_DEEPER)
-            v.room.manuallyUsingShovel = false
-            local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:getAndSetDefault(roomListIndex)
-            emptyArray(nil, decorationGridIndexes)
-            self:preventGridEntityRespawn()
-        end)
-        return true
-    end
-    self.postNewRoomReordered = function()
-        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.runInNFrames = runInNFrames
-end
-function PreventGridEntityRespawn.prototype.setDecorationsInvisible(self)
-    local room = game:GetRoom()
-    local roomListIndex = getRoomListIndex(nil)
-    local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:get(roomListIndex)
-    if decorationGridIndexes == nil then
-        return
-    end
-    for ____, gridIndex in ipairs(decorationGridIndexes) do
-        local gridEntity = room:GetGridEntity(gridIndex)
-        if gridEntity ~= nil then
-            local gridEntityType = gridEntity:GetType()
-            if gridEntityType == GridEntityType.DECORATION then
-                setGridEntityInvisible(nil, gridEntity)
-            end
-        end
-    end
-end
-function PreventGridEntityRespawn.prototype.preventGridEntityRespawn(self)
-    local room = game:GetRoom()
-    local roomListIndex = getRoomListIndex(nil)
-    local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:getAndSetDefault(roomListIndex)
-    for ____, gridIndex in ipairs(getAllGridIndexes(nil)) do
-        do
-            local existingGridEntity = room:GetGridEntity(gridIndex)
-            if existingGridEntity ~= nil then
-                goto __continue20
-            end
-            local decoration = spawnGridEntity(nil, GridEntityType.DECORATION, gridIndex)
-            if decoration ~= nil then
-                setGridEntityInvisible(nil, decoration)
-            end
-            decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
-        end
-        ::__continue20::
-    end
-end
-__TS__DecorateLegacy({Exported}, PreventGridEntityRespawn.prototype, "preventGridEntityRespawn", true)
 return ____exports
  end,
 ["functions.spawnCollectible"] = function(...) 
@@ -53384,11 +53272,14 @@ local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescri
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
+local ____cachedClasses = require("core.cachedClasses")
+local game = ____cachedClasses.game
 local ____constants = require("core.constants")
 local VectorZero = ____constants.VectorZero
 local ____collectibleTag = require("functions.collectibleTag")
 local isQuestCollectible = ____collectibleTag.isQuestCollectible
 local ____collectibles = require("functions.collectibles")
+local preventCollectibleRotation = ____collectibles.preventCollectibleRotation
 local setCollectibleEmpty = ____collectibles.setCollectibleEmpty
 local ____entitiesSpecific = require("functions.entitiesSpecific")
 local spawnPickupWithSeed = ____entitiesSpecific.spawnPickupWithSeed
@@ -53400,11 +53291,8 @@ local isRNG = ____rng.isRNG
 --- Helper function to spawn a collectible.
 -- 
 -- Use this instead of the `Game.Spawn` method because it handles the cases of Tainted Keeper
--- collectibles costing coins.
--- 
--- This function is unsafe because it will not correctly handle quest items being rotated by Tainted
--- Isaac's rotation mechanic. To handle that, use the `spawnCollectible` helper function instead
--- (which is provided by `ISCFeature.SPAWN_COLLECTIBLE`).
+-- collectibles costing coins and prevents quest items from being rotated by Tainted Isaac's
+-- rotation mechanic.
 -- 
 -- If you want to spawn an unseeded collectible, you must explicitly pass `undefined` to the
 -- `seedOrRNG` parameter.
@@ -53419,7 +53307,7 @@ local isRNG = ____rng.isRNG
 -- @param forceFreeItem Optional. Set to true to disable the logic that gives the item a price for
 -- Tainted Keeper. Default is false.
 -- @param spawner Optional.
-function ____exports.spawnCollectibleUnsafe(self, collectibleType, positionOrGridIndex, seedOrRNG, options, forceFreeItem, spawner)
+function ____exports.spawnCollectible(self, collectibleType, positionOrGridIndex, seedOrRNG, options, forceFreeItem, spawner)
     if options == nil then
         options = false
     end
@@ -53439,6 +53327,9 @@ function ____exports.spawnCollectibleUnsafe(self, collectibleType, positionOrGri
         VectorZero,
         spawner
     )
+    if isQuestCollectible(nil, collectible) then
+        preventCollectibleRotation(nil, collectible)
+    end
     if options then
         collectible.OptionsPickupIndex = 1
     end
@@ -53448,6 +53339,46 @@ function ____exports.spawnCollectibleUnsafe(self, collectibleType, positionOrGri
     end
     return collectible
 end
+--- Helper function to spawn a collectible from a specific item pool.
+-- 
+-- Use this instead of the `Game.Spawn` method because it handles the cases of Tainted Keeper
+-- collectibles costing coins and prevents quest items from being rotated by Tainted Isaac's
+-- rotation mechanic.
+-- 
+-- If you want to spawn an unseeded collectible, you must explicitly pass `undefined` to the
+-- `seedOrRNG` parameter.
+-- 
+-- In order to use this function, you must upgrade your mod with `ISCFeature.SPAWN_COLLECTIBLE`.
+-- 
+-- @param itemPoolType The item pool to draw the collectible type from.
+-- @param positionOrGridIndex The position or grid index to spawn the collectible at.
+-- @param seedOrRNG The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+-- `RNG.Next` method will be called. If `undefined` is provided, it will default to
+-- a random seed.
+-- @param options Optional. Set to true to make the collectible a "There's Options" style
+-- collectible. Default is false.
+-- @param forceFreeItem Optional. Set to true to disable the logic that gives the item a price for
+-- Tainted Keeper. Default is false.
+-- @param spawner Optional.
+function ____exports.spawnCollectibleFromPool(self, itemPoolType, positionOrGridIndex, seedOrRNG, options, forceFreeItem, spawner)
+    if options == nil then
+        options = false
+    end
+    if forceFreeItem == nil then
+        forceFreeItem = false
+    end
+    local itemPool = game:GetItemPool()
+    local collectibleType = itemPool:GetCollectible(itemPoolType)
+    return ____exports.spawnCollectible(
+        nil,
+        collectibleType,
+        positionOrGridIndex,
+        seedOrRNG,
+        options,
+        forceFreeItem,
+        spawner
+    )
+end
 --- Helper function to spawn an empty collectible. Doing this is tricky since spawning a collectible
 -- with `CollectibleType.NULL` will result in spawning a collectible with a random type from the
 -- current room's item pool.
@@ -53465,7 +53396,7 @@ end
 -- `RNG.Next` method will be called. If `undefined` is provided, it will default to
 -- a random seed.
 function ____exports.spawnEmptyCollectible(self, positionOrGridIndex, seedOrRNG)
-    local collectible = ____exports.spawnCollectibleUnsafe(
+    local collectible = ____exports.spawnCollectible(
         nil,
         CollectibleType.BROKEN_SHOVEL_1,
         positionOrGridIndex,
@@ -53478,20 +53409,17 @@ function ____exports.spawnEmptyCollectible(self, positionOrGridIndex, seedOrRNG)
 end
 return ____exports
  end,
-["classes.features.other.PreventCollectibleRotation"] = function(...) 
+["classes.features.other.PreventGridEntityRespawn"] = function(...) 
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
-local Map = ____lualib.Map
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__DecorateLegacy = ____lualib.__TS__DecorateLegacy
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
-local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local DiceFloorSubType = ____isaac_2Dtypescript_2Ddefinitions.DiceFloorSubType
+local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____decorators = require("decorators")
@@ -53500,166 +53428,112 @@ local ____ISCFeature = require("enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
 local ____ModCallbackCustom = require("enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
-local ____collectibles = require("functions.collectibles")
-local setCollectibleSubType = ____collectibles.setCollectibleSubType
-local ____entities = require("functions.entities")
-local getEntityID = ____entities.getEntityID
-local ____frames = require("functions.frames")
-local onGameFrame = ____frames.onGameFrame
-local ____pickupVariants = require("functions.pickupVariants")
-local isCollectible = ____pickupVariants.isCollectible
-local ____pickupsSpecific = require("functions.pickupsSpecific")
-local getCollectibles = ____pickupsSpecific.getCollectibles
-local ____types = require("functions.types")
-local asCollectibleType = ____types.asCollectibleType
-local ____ReadonlySet = require("types.ReadonlySet")
-local ReadonlySet = ____ReadonlySet.ReadonlySet
+local ____array = require("functions.array")
+local emptyArray = ____array.emptyArray
+local ____gridEntities = require("functions.gridEntities")
+local getAllGridIndexes = ____gridEntities.getAllGridIndexes
+local getGridEntities = ____gridEntities.getGridEntities
+local removeGridEntity = ____gridEntities.removeGridEntity
+local setGridEntityInvisible = ____gridEntities.setGridEntityInvisible
+local spawnGridEntity = ____gridEntities.spawnGridEntity
+local ____players = require("functions.players")
+local getPlayerFromPtr = ____players.getPlayerFromPtr
+local ____roomData = require("functions.roomData")
+local getRoomListIndex = ____roomData.getRoomListIndex
+local ____DefaultMap = require("classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
 local ____Feature = require("classes.private.Feature")
 local Feature = ____Feature.Feature
-local ROLL_COLLECTIBLE_TYPES = __TS__New(ReadonlySet, {CollectibleType.D6, CollectibleType.ETERNAL_D6, CollectibleType.SPINDOWN_DICE})
-local ROLL_FLOOR_DICE_FLOOR_SUB_TYPES = __TS__New(ReadonlySet, {DiceFloorSubType.FOUR_PIP, DiceFloorSubType.SIX_PIP})
-local v = {run = {
-    trackedCollectibles = __TS__New(Map),
-    rollGameFrame = nil
-}}
-____exports.PreventCollectibleRotation = __TS__Class()
-local PreventCollectibleRotation = ____exports.PreventCollectibleRotation
-PreventCollectibleRotation.name = "PreventCollectibleRotation"
-__TS__ClassExtends(PreventCollectibleRotation, Feature)
-function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexCreation, runInNFrames)
+local v = {
+    level = {roomListIndexToDecorationGridIndexes = __TS__New(
+        DefaultMap,
+        function() return {} end
+    )},
+    room = {manuallyUsingShovel = false}
+}
+____exports.PreventGridEntityRespawn = __TS__Class()
+local PreventGridEntityRespawn = ____exports.PreventGridEntityRespawn
+PreventGridEntityRespawn.name = "PreventGridEntityRespawn"
+__TS__ClassExtends(PreventGridEntityRespawn, Feature)
+function PreventGridEntityRespawn.prototype.____constructor(self, runInNFrames)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.preUseItem = function(____, collectibleType)
-        if ROLL_COLLECTIBLE_TYPES:has(collectibleType) then
-            v.run.rollGameFrame = game:GetFrameCount()
-        end
-        return nil
-    end
-    self.postUseCardSoulOfIsaac = function()
-        local collectibles = getCollectibles(nil)
-        for ____, collectible in ipairs(collectibles) do
-            local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
-            v.run.trackedCollectibles:delete(pickupIndex)
-        end
-    end
-    self.postDiceRoomActivated = function(____, _player, diceFloorSubType)
-        if ROLL_FLOOR_DICE_FLOOR_SUB_TYPES:has(diceFloorSubType) then
-            v.run.trackedCollectibles:clear()
-        end
-    end
-    self.postPickupChanged = function(____, pickup, oldVariant, _oldSubType, newVariant, newSubType)
-        if oldVariant ~= PickupVariant.COLLECTIBLE or newVariant ~= PickupVariant.COLLECTIBLE then
-            return
-        end
-        if asCollectibleType(nil, newSubType) == CollectibleType.NULL then
-            return
-        end
-        local pickupIndex = self.pickupIndexCreation:getPickupIndex(pickup)
-        local trackedCollectibleType = v.run.trackedCollectibles:get(pickupIndex)
-        if trackedCollectibleType == nil then
-            return
+    self.preUseItemWeNeedToGoDeeper = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+        if v.room.manuallyUsingShovel then
+            return nil
         end
-        if v.run.rollGameFrame ~= nil and (onGameFrame(nil, v.run.rollGameFrame) or onGameFrame(nil, v.run.rollGameFrame + 1)) then
-            v.run.trackedCollectibles:delete(pickupIndex)
+        local roomListIndex = getRoomListIndex(nil)
+        if not v.level.roomListIndexToDecorationGridIndexes:has(roomListIndex) then
             return
         end
-        if trackedCollectibleType ~= asCollectibleType(nil, newSubType) then
-            setCollectibleSubType(nil, pickup, trackedCollectibleType)
+        local decorations = getGridEntities(nil, GridEntityType.DECORATION)
+        for ____, decoration in ipairs(decorations) do
+            removeGridEntity(nil, decoration, false)
         end
+        local entityPtr = EntityPtr(player)
+        self.runInNFrames:runNextGameFrame(function()
+            local futurePlayer = getPlayerFromPtr(nil, entityPtr)
+            if futurePlayer == nil then
+                return
+            end
+            local futureRoomListIndex = getRoomListIndex(nil)
+            if futureRoomListIndex ~= roomListIndex then
+                return
+            end
+            v.room.manuallyUsingShovel = true
+            futurePlayer:UseActiveItem(CollectibleType.WE_NEED_TO_GO_DEEPER)
+            v.room.manuallyUsingShovel = false
+            local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:getAndSetDefault(roomListIndex)
+            emptyArray(nil, decorationGridIndexes)
+            self:preventGridEntityRespawn()
+        end)
+        return true
     end
-    self.featuresUsed = {ISCFeature.PICKUP_INDEX_CREATION, ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.postUseCardSoulOfIsaac, {CardType.SOUL_OF_ISAAC}}, {ModCallback.PRE_USE_ITEM, self.preUseItem}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_DICE_ROOM_ACTIVATED, self.postDiceRoomActivated}, {ModCallbackCustom.POST_PICKUP_CHANGED, self.postPickupChanged}}
-    self.pickupIndexCreation = pickupIndexCreation
+    self.postNewRoomReordered = function()
+        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.runInNFrames = runInNFrames
 end
-function PreventCollectibleRotation.prototype.preventCollectibleRotation(self, collectible, collectibleType)
-    if not isCollectible(nil, collectible) then
-        local entityID = getEntityID(nil, collectible)
-        error("The \"preventCollectibleRotation\" function was given a non-collectible: " .. entityID)
-    end
-    local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
-    v.run.trackedCollectibles:set(pickupIndex, collectibleType)
-    if collectible.SubType ~= collectibleType then
-        setCollectibleSubType(nil, collectible, collectibleType)
+function PreventGridEntityRespawn.prototype.setDecorationsInvisible(self)
+    local room = game:GetRoom()
+    local roomListIndex = getRoomListIndex(nil)
+    local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:get(roomListIndex)
+    if decorationGridIndexes == nil then
+        return
     end
-    self.runInNFrames:runNextGameFrame(function()
-        if collectible:Exists() and collectible.SubType ~= collectibleType then
-            setCollectibleSubType(nil, collectible, collectibleType)
+    for ____, gridIndex in ipairs(decorationGridIndexes) do
+        local gridEntity = room:GetGridEntity(gridIndex)
+        if gridEntity ~= nil then
+            local gridEntityType = gridEntity:GetType()
+            if gridEntityType == GridEntityType.DECORATION then
+                setGridEntityInvisible(nil, gridEntity)
+            end
         end
-    end)
-end
-__TS__DecorateLegacy({Exported}, PreventCollectibleRotation.prototype, "preventCollectibleRotation", true)
-return ____exports
- end,
-["classes.features.other.SpawnCollectible"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__DecorateLegacy = ____lualib.__TS__DecorateLegacy
-local ____exports = {}
-local ____cachedClasses = require("core.cachedClasses")
-local game = ____cachedClasses.game
-local ____decorators = require("decorators")
-local Exported = ____decorators.Exported
-local ____ISCFeature = require("enums.ISCFeature")
-local ISCFeature = ____ISCFeature.ISCFeature
-local ____collectibleTag = require("functions.collectibleTag")
-local isQuestCollectible = ____collectibleTag.isQuestCollectible
-local ____spawnCollectible = require("functions.spawnCollectible")
-local spawnCollectibleUnsafe = ____spawnCollectible.spawnCollectibleUnsafe
-local ____Feature = require("classes.private.Feature")
-local Feature = ____Feature.Feature
-____exports.SpawnCollectible = __TS__Class()
-local SpawnCollectible = ____exports.SpawnCollectible
-SpawnCollectible.name = "SpawnCollectible"
-__TS__ClassExtends(SpawnCollectible, Feature)
-function SpawnCollectible.prototype.____constructor(self, preventCollectibleRotation)
-    Feature.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.PREVENT_COLLECTIBLE_ROTATION}
-    self.preventCollectibleRotation = preventCollectibleRotation
-end
-function SpawnCollectible.prototype.spawnCollectible(self, collectibleType, positionOrGridIndex, seedOrRNG, options, forceFreeItem, spawner)
-    if options == nil then
-        options = false
-    end
-    if forceFreeItem == nil then
-        forceFreeItem = false
     end
-    local collectible = spawnCollectibleUnsafe(
-        nil,
-        collectibleType,
-        positionOrGridIndex,
-        seedOrRNG,
-        options,
-        forceFreeItem,
-        spawner
-    )
-    if isQuestCollectible(nil, collectibleType) then
-        self.preventCollectibleRotation:preventCollectibleRotation(collectible, collectibleType)
-    end
-    return collectible
 end
-__TS__DecorateLegacy({Exported}, SpawnCollectible.prototype, "spawnCollectible", true)
-function SpawnCollectible.prototype.spawnCollectibleFromPool(self, itemPoolType, positionOrGridIndex, seedOrRNG, options, forceFreeItem, spawner)
-    if options == nil then
-        options = false
-    end
-    if forceFreeItem == nil then
-        forceFreeItem = false
+function PreventGridEntityRespawn.prototype.preventGridEntityRespawn(self)
+    local room = game:GetRoom()
+    local roomListIndex = getRoomListIndex(nil)
+    local decorationGridIndexes = v.level.roomListIndexToDecorationGridIndexes:getAndSetDefault(roomListIndex)
+    for ____, gridIndex in ipairs(getAllGridIndexes(nil)) do
+        do
+            local existingGridEntity = room:GetGridEntity(gridIndex)
+            if existingGridEntity ~= nil then
+                goto __continue20
+            end
+            local decoration = spawnGridEntity(nil, GridEntityType.DECORATION, gridIndex)
+            if decoration ~= nil then
+                setGridEntityInvisible(nil, decoration)
+            end
+            decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
+        end
+        ::__continue20::
     end
-    local itemPool = game:GetItemPool()
-    local collectibleType = itemPool:GetCollectible(itemPoolType)
-    return self:spawnCollectible(
-        collectibleType,
-        positionOrGridIndex,
-        seedOrRNG,
-        options,
-        forceFreeItem,
-        spawner
-    )
 end
-__TS__DecorateLegacy({Exported}, SpawnCollectible.prototype, "spawnCollectibleFromPool", true)
+__TS__DecorateLegacy({Exported}, PreventGridEntityRespawn.prototype, "preventGridEntityRespawn", true)
 return ____exports
  end,
 ["classes.features.other.DeployJSONRoom"] = function(...) 
@@ -53709,6 +53583,8 @@ local gridCoordinatesToWorldPosition = ____roomGrid.gridCoordinatesToWorldPositi
 local ____rooms = require("functions.rooms")
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared
+local ____spawnCollectible = require("functions.spawnCollectible")
+local spawnCollectible = ____spawnCollectible.spawnCollectible
 local ____types = require("functions.types")
 local asCollectibleType = ____types.asCollectibleType
 local asNumber = ____types.asNumber
@@ -53853,11 +53729,10 @@ ____exports.DeployJSONRoom = __TS__Class()
 local DeployJSONRoom = ____exports.DeployJSONRoom
 DeployJSONRoom.name = "DeployJSONRoom"
 __TS__ClassExtends(DeployJSONRoom, Feature)
-function DeployJSONRoom.prototype.____constructor(self, preventGridEntityRespawn, spawnCollectible)
+function DeployJSONRoom.prototype.____constructor(self, preventGridEntityRespawn)
     Feature.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.PREVENT_GRID_ENTITY_RESPAWN, ISCFeature.SPAWN_COLLECTIBLE}
+    self.featuresUsed = {ISCFeature.PREVENT_GRID_ENTITY_RESPAWN}
     self.preventGridEntityRespawn = preventGridEntityRespawn
-    self.spawnCollectible = spawnCollectible
 end
 function DeployJSONRoom.prototype.spawnAllEntities(self, jsonRoom, rng, verbose)
     if verbose == nil then
@@ -53939,7 +53814,8 @@ function DeployJSONRoom.prototype.spawnNormalEntityForJSONRoom(self, entityType,
     local entity
     if entityType == EntityType.PICKUP and variant == asNumber(nil, PickupVariant.COLLECTIBLE) then
         local options = roomType == RoomType.ANGEL
-        entity = self.spawnCollectible:spawnCollectible(
+        entity = spawnCollectible(
+            nil,
             asCollectibleType(nil, subType),
             position,
             seed,
@@ -59202,7 +59078,7 @@ local onSetSeed = ____run.onSetSeed
 local restart = ____run.restart
 local setUnseeded = ____run.setUnseeded
 local ____spawnCollectible = require("functions.spawnCollectible")
-local spawnCollectibleUnsafe = ____spawnCollectible.spawnCollectibleUnsafe
+local spawnCollectibleFunc = ____spawnCollectible.spawnCollectible
 local ____stage = require("functions.stage")
 local onStage = ____stage.onStage
 local setStage = ____stage.setStage
@@ -59361,7 +59237,7 @@ function ____exports.spawnCollectible(self, params)
     end
     local roomClass = game:GetRoom()
     local centerPos = roomClass:GetCenterPos()
-    spawnCollectibleUnsafe(nil, collectibleType, centerPos, nil)
+    spawnCollectibleFunc(nil, collectibleType, centerPos, nil)
 end
 --- The same thing as the `spawnTrinket` command but spawns a golden version of the specified
 -- trinket.
@@ -60412,7 +60288,7 @@ function ____exports.spawnCollectibleAt(self, params)
         return
     end
     local collectibleType = asCollectibleType(nil, collectibleTypeNumber)
-    spawnCollectibleUnsafe(nil, collectibleType, gridIndex, nil)
+    spawnCollectibleFunc(nil, collectibleType, gridIndex, nil)
 end
 --- Alias for the `spawnGoldenTrinket` command.
 function ____exports.spawnGoldTrinket(self, params)
@@ -61605,7 +61481,7 @@ local ____rng = require("functions.rng")
 local isRNG = ____rng.isRNG
 local newRNG = ____rng.newRNG
 local ____spawnCollectible = require("functions.spawnCollectible")
-local spawnCollectibleUnsafe = ____spawnCollectible.spawnCollectibleUnsafe
+local spawnCollectible = ____spawnCollectible.spawnCollectible
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
 local ____vector = require("functions.vector")
@@ -61713,7 +61589,7 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardUrn(self, position, rng
     if chance < totalChance then
         local stillInPools = self.itemPoolDetection:isCollectibleInItemPool(CollectibleType.QUARTER, ItemPoolType.DEVIL)
         if stillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.QUARTER, position, rng)
+            spawnCollectible(nil, CollectibleType.QUARTER, position, rng)
             return true
         end
         return false
@@ -61763,7 +61639,7 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardMushroom(self, position
             if wavyCapChance < 0.0272 then
                 local stillInPools = self.itemPoolDetection:isCollectibleInItemPool(CollectibleType.WAVY_CAP, ItemPoolType.SECRET)
                 if stillInPools then
-                    spawnCollectibleUnsafe(nil, CollectibleType.WAVY_CAP, position, rng)
+                    spawnCollectible(nil, CollectibleType.WAVY_CAP, position, rng)
                     return true
                 end
             end
@@ -61773,15 +61649,15 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardMushroom(self, position
         if magicMushroomStillInPools and miniMushStillInPools then
             local collectibleChance = getRandom(nil, rng)
             local collectibleType = collectibleChance < 0.5 and CollectibleType.MAGIC_MUSHROOM or CollectibleType.MINI_MUSH
-            spawnCollectibleUnsafe(nil, collectibleType, position, rng)
+            spawnCollectible(nil, collectibleType, position, rng)
             return true
         end
         if magicMushroomStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.MINI_MUSH, position, rng)
+            spawnCollectible(nil, CollectibleType.MINI_MUSH, position, rng)
             return true
         end
         if miniMushStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.MAGIC_MUSHROOM, position, rng)
+            spawnCollectible(nil, CollectibleType.MAGIC_MUSHROOM, position, rng)
             return true
         end
         return false
@@ -61815,15 +61691,15 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardSkull(self, position, r
         if ghostBabyStillInPools and dryBabyStillInPools then
             local collectibleChance = getRandom(nil, rng)
             local collectibleType = collectibleChance < 0.5 and CollectibleType.GHOST_BABY or CollectibleType.DRY_BABY
-            spawnCollectibleUnsafe(nil, collectibleType, position, rng)
+            spawnCollectible(nil, collectibleType, position, rng)
             return true
         end
         if ghostBabyStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.DRY_BABY, position, rng)
+            spawnCollectible(nil, CollectibleType.DRY_BABY, position, rng)
             return true
         end
         if dryBabyStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.GHOST_BABY, position, rng)
+            spawnCollectible(nil, CollectibleType.GHOST_BABY, position, rng)
             return true
         end
         return false
@@ -61863,15 +61739,15 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardPolyp(self, position, r
         if placentaStillInPools and bloodClotStillInPools then
             local collectibleChance = getRandom(nil, rng)
             local collectibleType = collectibleChance < 0.5 and CollectibleType.PLACENTA or CollectibleType.BLOOD_CLOT
-            spawnCollectibleUnsafe(nil, collectibleType, position, rng)
+            spawnCollectible(nil, collectibleType, position, rng)
             return true
         end
         if placentaStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.PLACENTA, position, rng)
+            spawnCollectible(nil, CollectibleType.PLACENTA, position, rng)
             return true
         end
         if bloodClotStillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.BLOOD_CLOT, position, rng)
+            spawnCollectible(nil, CollectibleType.BLOOD_CLOT, position, rng)
             return true
         end
         return false
@@ -61931,7 +61807,7 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardBucketDownpour(self, po
     if chance < totalChance then
         local stillInPools = self.itemPoolDetection:isCollectibleInItemPool(CollectibleType.LEECH, ItemPoolType.TREASURE)
         if stillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.LEECH, position, rng)
+            spawnCollectible(nil, CollectibleType.LEECH, position, rng)
             return true
         end
         return false
@@ -61998,7 +61874,7 @@ function SpawnRockAltRewards.prototype.spawnRockAltRewardBucketDross(self, posit
     if chance < totalChance then
         local stillInPools = self.itemPoolDetection:isCollectibleInItemPool(CollectibleType.POOP, ItemPoolType.TREASURE)
         if stillInPools then
-            spawnCollectibleUnsafe(nil, CollectibleType.POOP, position, rng)
+            spawnCollectible(nil, CollectibleType.POOP, position, rng)
             return true
         end
         return false
@@ -62285,8 +62161,6 @@ local ____PressInput = require("classes.features.other.PressInput")
 local PressInput = ____PressInput.PressInput
 local ____PreventChildEntities = require("classes.features.other.PreventChildEntities")
 local PreventChildEntities = ____PreventChildEntities.PreventChildEntities
-local ____PreventCollectibleRotation = require("classes.features.other.PreventCollectibleRotation")
-local PreventCollectibleRotation = ____PreventCollectibleRotation.PreventCollectibleRotation
 local ____PreventGridEntityRespawn = require("classes.features.other.PreventGridEntityRespawn")
 local PreventGridEntityRespawn = ____PreventGridEntityRespawn.PreventGridEntityRespawn
 local ____RoomClearFrame = require("classes.features.other.RoomClearFrame")
@@ -62301,8 +62175,6 @@ local ____RunNextRun = require("classes.features.other.RunNextRun")
 local RunNextRun = ____RunNextRun.RunNextRun
 local ____SaveDataManager = require("classes.features.other.SaveDataManager")
 local SaveDataManager = ____SaveDataManager.SaveDataManager
-local ____SpawnCollectible = require("classes.features.other.SpawnCollectible")
-local SpawnCollectible = ____SpawnCollectible.SpawnCollectible
 local ____SpawnRockAltRewards = require("classes.features.other.SpawnRockAltRewards")
 local SpawnRockAltRewards = ____SpawnRockAltRewards.SpawnRockAltRewards
 local ____StageHistory = require("classes.features.other.StageHistory")
@@ -62340,13 +62212,11 @@ function ____exports.getFeatures(self, mod, callbacks)
     local stageHistory = __TS__New(StageHistory)
     local runInNFrames = __TS__New(RunInNFrames, roomHistory)
     local pickupIndexCreation = __TS__New(PickupIndexCreation, roomHistory, saveDataManager)
-    local preventCollectibleRotation = __TS__New(PreventCollectibleRotation, pickupIndexCreation, runInNFrames)
     local customGridEntities = __TS__New(CustomGridEntities, runInNFrames)
     local moddedElementSets = __TS__New(ModdedElementSets, moddedElementDetection)
     local itemPoolDetection = __TS__New(ItemPoolDetection, moddedElementSets)
     local pause = __TS__New(Pause, disableInputs)
     local preventGridEntityRespawn = __TS__New(PreventGridEntityRespawn, runInNFrames)
-    local spawnCollectible = __TS__New(SpawnCollectible, preventCollectibleRotation)
     local customTrapdoors = __TS__New(
         CustomTrapdoors,
         customGridEntities,
@@ -62409,7 +62279,7 @@ function ____exports.getFeatures(self, mod, callbacks)
         ),
         [ISCFeature.CUSTOM_TRAPDOORS] = customTrapdoors,
         [ISCFeature.DEBUG_DISPLAY] = __TS__New(DebugDisplay, mod),
-        [ISCFeature.DEPLOY_JSON_ROOM] = __TS__New(DeployJSONRoom, preventGridEntityRespawn, spawnCollectible),
+        [ISCFeature.DEPLOY_JSON_ROOM] = __TS__New(DeployJSONRoom, preventGridEntityRespawn),
         [ISCFeature.DISABLE_ALL_SOUND] = disableAllSound,
         [ISCFeature.DISABLE_INPUTS] = disableInputs,
         [ISCFeature.EDEN_STARTING_STATS_HEALTH] = __TS__New(EdenStartingStatsHealth),
@@ -62429,7 +62299,6 @@ function ____exports.getFeatures(self, mod, callbacks)
         [ISCFeature.PONY_DETECTION] = ponyDetection,
         [ISCFeature.PRESS_INPUT] = pressInput,
         [ISCFeature.PREVENT_CHILD_ENTITIES] = __TS__New(PreventChildEntities),
-        [ISCFeature.PREVENT_COLLECTIBLE_ROTATION] = preventCollectibleRotation,
         [ISCFeature.PREVENT_GRID_ENTITY_RESPAWN] = preventGridEntityRespawn,
         [ISCFeature.ROOM_CLEAR_FRAME] = roomClearFrame,
         [ISCFeature.ROOM_HISTORY] = roomHistory,
@@ -62438,7 +62307,6 @@ function ____exports.getFeatures(self, mod, callbacks)
         [ISCFeature.RUN_NEXT_RUN] = __TS__New(RunNextRun),
         [ISCFeature.SAVE_DATA_MANAGER] = saveDataManager,
         [ISCFeature.SPAWN_ALT_ROCK_REWARDS] = __TS__New(SpawnRockAltRewards, itemPoolDetection),
-        [ISCFeature.SPAWN_COLLECTIBLE] = spawnCollectible,
         [ISCFeature.STAGE_HISTORY] = stageHistory,
         [ISCFeature.START_AMBUSH] = __TS__New(StartAmbush, runInNFrames),
         [ISCFeature.TAINTED_LAZARUS_PLAYERS] = __TS__New(TaintedLazarusPlayers),