isaacscript-common 15.3.3 → 15.3.4

package/dist/index.d.ts

@@ -1244,17 +1244,14 @@ export declare type CollectibleIndex = string & {
     readonly __collectibleIndexBrand: symbol;
 };
 
-/**
- * The item pool type of a collectible is not stored on the collectible. Thus, we scan for incoming
- * item pool types in the `PRE_GET_COLLECTIBLE` callback, and then assume that the next spawned
- * collectible has this item pool type.
- */
 declare class CollectibleItemPoolType extends Feature {
+    private pickupIndexCreation;
     private postPickupInitCollectible;
     /**
      * Helper function to get the item pool type that a given collectible came from. Since there is no
-     * native method in the API to get this, we listen in the `PRE_GET_COLLECTIBLE` callback for item
-     * pool types, and then assume that the next spawned collectible will match.
+     * native method in the API to get this, we listen in the `POST_PICKUP_INIT` callback for
+     * collectibles, use the `ItemPool.GetLastPool` method, and then assume that the collectible
+     * matches.
      *
      * In order to use this function, you must upgrade your mod with
      * `ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE`.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.3.3
+isaacscript-common 15.3.4
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -33205,6 +33205,310 @@ function CharacterStats.prototype.registerCharacterStats(self, playerType, statM
     self.charactersStatMap:set(playerType, statMap)
 end
 __TS__Decorate({Exported}, CharacterStats.prototype, "registerCharacterStats", true)
+return ____exports
+ end,
+["src.types.PickupIndex"] = function(...) 
+local ____exports = {}
+return ____exports
+ end,
+["src.interfaces.RoomDescription"] = function(...) 
+local ____exports = {}
+return ____exports
+ end,
+["src.classes.features.other.RoomHistory"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__Decorate = ____lualib.__TS__Decorate
+local ____exports = {}
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
+local ____decorators = require("src.decorators")
+local Exported = ____decorators.Exported
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
+local ____array = require("src.functions.array")
+local getLastElement = ____array.getLastElement
+local ____dimensions = require("src.functions.dimensions")
+local getDimension = ____dimensions.getDimension
+local ____roomData = require("src.functions.roomData")
+local getRoomGridIndex = ____roomData.getRoomGridIndex
+local getRoomListIndex = ____roomData.getRoomListIndex
+local getRoomName = ____roomData.getRoomName
+local getRoomStageID = ____roomData.getRoomStageID
+local getRoomSubType = ____roomData.getRoomSubType
+local getRoomVariant = ____roomData.getRoomVariant
+local getRoomVisitedCount = ____roomData.getRoomVisitedCount
+local ____Feature = require("src.classes.private.Feature")
+local Feature = ____Feature.Feature
+____exports.RoomHistory = __TS__Class()
+local RoomHistory = ____exports.RoomHistory
+RoomHistory.name = "RoomHistory"
+__TS__ClassExtends(RoomHistory, Feature)
+function RoomHistory.prototype.____constructor(self)
+    Feature.prototype.____constructor(self)
+    self.v = {run = {roomHistory = {}}}
+    self.postNewRoomEarly = function()
+        local level = game:GetLevel()
+        local stage = level:GetStage()
+        local stageType = level:GetStageType()
+        local room = game:GetRoom()
+        local roomType = room:GetType()
+        local stageID = getRoomStageID(nil)
+        local dimension = getDimension(nil)
+        local roomVariant = getRoomVariant(nil)
+        local roomSubType = getRoomSubType(nil)
+        local roomName = getRoomName(nil)
+        local roomGridIndex = getRoomGridIndex(nil)
+        local roomListIndex = getRoomListIndex(nil)
+        local roomVisitedCount = getRoomVisitedCount(nil)
+        local roomDescription = {
+            stage = stage,
+            stageType = stageType,
+            stageID = stageID,
+            dimension = dimension,
+            roomType = roomType,
+            roomVariant = roomVariant,
+            roomSubType = roomSubType,
+            roomName = roomName,
+            roomGridIndex = roomGridIndex,
+            roomListIndex = roomListIndex,
+            roomVisitedCount = roomVisitedCount
+        }
+        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}}}
+end
+function RoomHistory.prototype.getRoomHistory(self)
+    return self.v.run.roomHistory
+end
+function RoomHistory.prototype.getPreviousRoomDescription(self)
+    local previousRoomDescription = self.v.run.roomHistory[#self.v.run.roomHistory - 2 + 1]
+    if previousRoomDescription ~= nil then
+        return previousRoomDescription
+    end
+    local startingRoomDescription = self.v.run.roomHistory[1]
+    if startingRoomDescription ~= nil then
+        return startingRoomDescription
+    end
+    error("Failed to find a room description for any rooms thus far on this run.")
+end
+function RoomHistory.prototype.getLatestRoomDescription(self)
+    return getLastElement(nil, self.v.run.roomHistory)
+end
+function RoomHistory.prototype.isLeavingRoom(self)
+    local level = game:GetLevel()
+    local stage = level:GetStage()
+    local stageType = level:GetStageType()
+    local roomListIndex = getRoomListIndex(nil)
+    local roomVisitedCount = getRoomVisitedCount(nil)
+    local latestRoomDescription = self:getLatestRoomDescription()
+    if latestRoomDescription == nil then
+        return false
+    end
+    return stage ~= latestRoomDescription.stage or stageType ~= latestRoomDescription.stageType or roomListIndex ~= latestRoomDescription.roomListIndex or roomVisitedCount ~= latestRoomDescription.roomVisitedCount
+end
+__TS__Decorate({Exported}, RoomHistory.prototype, "getRoomHistory", true)
+__TS__Decorate({Exported}, RoomHistory.prototype, "getPreviousRoomDescription", true)
+__TS__Decorate({Exported}, RoomHistory.prototype, "getLatestRoomDescription", true)
+__TS__Decorate({Exported}, RoomHistory.prototype, "isLeavingRoom", true)
+return ____exports
+ end,
+["src.classes.features.other.PickupIndexCreation"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local __TS__Decorate = ____lualib.__TS__Decorate
+local __TS__Iterator = ____lualib.__TS__Iterator
+local ____exports = {}
+local getStoredPickupIndex
+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 RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
+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")
+local onAscent = ____stage.onAscent
+local ____vector = require("src.functions.vector")
+local vectorEquals = ____vector.vectorEquals
+local ____DefaultMap = require("src.classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
+local ____Feature = require("src.classes.private.Feature")
+local Feature = ____Feature.Feature
+function getStoredPickupIndex(self, pickup, pickupDescriptions)
+    for ____, ____value in __TS__Iterator(pickupDescriptions:entries()) do
+        local pickupIndex = ____value[1]
+        local pickupDescription = ____value[2]
+        if vectorEquals(nil, pickupDescription.position, pickup.Position) and pickupDescription.initSeed == pickup.InitSeed then
+            return pickupIndex
+        end
+    end
+    return nil
+end
+____exports.PickupIndexCreation = __TS__Class()
+local PickupIndexCreation = ____exports.PickupIndexCreation
+PickupIndexCreation.name = "PickupIndexCreation"
+__TS__ClassExtends(PickupIndexCreation, Feature)
+function PickupIndexCreation.prototype.____constructor(self, roomHistory)
+    Feature.prototype.____constructor(self)
+    self.v = {
+        run = {
+            pickupCounter = 0,
+            pickupDataTreasureRooms = __TS__New(Map),
+            pickupDataBossRooms = __TS__New(Map)
+        },
+        level = {pickupData = __TS__New(
+            DefaultMap,
+            function() return __TS__New(Map) end
+        )},
+        room = {pickupIndexes = __TS__New(Map)}
+    }
+    self.postPickupInit = function(____, pickup)
+        local ptrHash = GetPtrHash(pickup)
+        if self.v.room.pickupIndexes:has(ptrHash) then
+            return
+        end
+        local room = game:GetRoom()
+        local isFirstVisit = room:IsFirstVisit()
+        local roomFrameCount = room:GetFrameCount()
+        if not isFirstVisit and roomFrameCount <= 0 then
+            return
+        end
+        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
+    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_2, ____pickupCounter_3 = self.v.run, "pickupCounter"
+                ____self_v_run_2[____pickupCounter_3] = ____self_v_run_2[____pickupCounter_3] + 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.checkDespawningFromPlayerLeavingRoom(self, entity)
+    local ptrHash = GetPtrHash(entity)
+    local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
+    if pickupIndex == nil then
+        return
+    end
+    if not self.roomHistory:isLeavingRoom() then
+        return
+    end
+    self:trackDespawningPickupMetadata(entity, pickupIndex)
+end
+function PickupIndexCreation.prototype.trackDespawningPickupMetadata(self, entity, pickupIndex)
+    local previousRoomDescription = self.roomHistory:getLatestRoomDescription()
+    if previousRoomDescription == nil then
+        return
+    end
+    local previousRoomListIndex = previousRoomDescription.roomListIndex
+    local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(previousRoomListIndex)
+    local pickupDescription = {position = entity.Position, initSeed = entity.InitSeed}
+    pickupDescriptions:set(pickupIndex, pickupDescription)
+    if onAscent(nil) then
+        return
+    end
+    local room = game:GetRoom()
+    local roomType = room:GetType()
+    repeat
+        local ____switch20 = roomType
+        local ____cond20 = ____switch20 == RoomType.TREASURE
+        if ____cond20 then
+            do
+                self.v.run.pickupDataTreasureRooms:set(pickupIndex, pickupDescription)
+                break
+            end
+        end
+        ____cond20 = ____cond20 or ____switch20 == RoomType.BOSS
+        if ____cond20 then
+            do
+                self.v.run.pickupDataBossRooms:set(pickupIndex, pickupDescription)
+                break
+            end
+        end
+        do
+            do
+                break
+            end
+        end
+    until true
+end
+function PickupIndexCreation.prototype.getPostAscentPickupIndex(self, pickup)
+    if not onAscent(nil) then
+        return nil
+    end
+    local room = game:GetRoom()
+    local roomType = room:GetType()
+    repeat
+        local ____switch26 = roomType
+        local ____cond26 = ____switch26 == RoomType.TREASURE
+        if ____cond26 then
+            do
+                return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataTreasureRooms)
+            end
+        end
+        ____cond26 = ____cond26 or ____switch26 == RoomType.BOSS
+        if ____cond26 then
+            do
+                return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataBossRooms)
+            end
+        end
+        do
+            do
+                return nil
+            end
+        end
+    until true
+end
+function PickupIndexCreation.prototype.getPickupIndex(self, pickup)
+    local ptrHash = GetPtrHash(pickup)
+    local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
+    if pickupIndex == nil then
+        local entityID = getEntityID(nil, pickup)
+        error((("Failed to get a pickup index for entity " .. entityID) .. " with hash: ") .. tostring(ptrHash))
+    end
+    return pickupIndex
+end
+__TS__Decorate({Exported}, PickupIndexCreation.prototype, "getPickupIndex", true)
 return ____exports
  end,
 ["src.classes.features.other.CollectibleItemPoolType"] = function(...) 
@@ -33222,6 +33526,8 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
 local ____entities = require("src.functions.entities")
 local getEntityID = ____entities.getEntityID
 local ____pickupVariants = require("src.functions.pickupVariants")
@@ -33234,24 +33540,26 @@ ____exports.CollectibleItemPoolType = __TS__Class()
 local CollectibleItemPoolType = ____exports.CollectibleItemPoolType
 CollectibleItemPoolType.name = "CollectibleItemPoolType"
 __TS__ClassExtends(CollectibleItemPoolType, Feature)
-function CollectibleItemPoolType.prototype.____constructor(self)
+function CollectibleItemPoolType.prototype.____constructor(self, pickupIndexCreation)
     Feature.prototype.____constructor(self)
     self.v = {run = {collectibleItemPoolTypeMap = __TS__New(Map)}}
-    self.postPickupInitCollectible = function(____, pickup)
+    self.postPickupInitCollectible = function(____, collectible)
         local itemPool = game:GetItemPool()
-        local ptrHash = GetPtrHash(pickup)
+        local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
         local lastItemPoolType = itemPool:GetLastPool()
-        self.v.run.collectibleItemPoolTypeMap:set(ptrHash, lastItemPoolType)
+        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.pickupIndexCreation = pickupIndexCreation
 end
 function CollectibleItemPoolType.prototype.getCollectibleItemPoolType(self, collectible)
     if not isCollectible(nil, collectible) then
         local entityID = getEntityID(nil, collectible)
         error("The \"getCollectibleItemPoolType\" function was given a non-collectible: " .. entityID)
     end
-    local ptrHash = GetPtrHash(collectible)
-    local itemPoolType = self.v.run.collectibleItemPoolTypeMap:get(ptrHash)
+    local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
+    local itemPoolType = self.v.run.collectibleItemPoolTypeMap:get(pickupIndex)
     return itemPoolType == nil and getRoomItemPoolType(nil) or itemPoolType
 end
 __TS__Decorate({Exported}, CollectibleItemPoolType.prototype, "getCollectibleItemPoolType", true)
@@ -45668,110 +45976,6 @@ function NoSirenSteal.prototype.setFamiliarNoSirenSteal(self, familiarVariant, f
     ____self_v_run_familiarBlacklist_0[#____self_v_run_familiarBlacklist_0 + 1] = {familiarVariant, familiarSubType}
 end
 __TS__Decorate({Exported}, NoSirenSteal.prototype, "setFamiliarNoSirenSteal", true)
-return ____exports
- end,
-["src.interfaces.RoomDescription"] = function(...) 
-local ____exports = {}
-return ____exports
- end,
-["src.classes.features.other.RoomHistory"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__Decorate = ____lualib.__TS__Decorate
-local ____exports = {}
-local ____cachedClasses = require("src.core.cachedClasses")
-local game = ____cachedClasses.game
-local ____decorators = require("src.decorators")
-local Exported = ____decorators.Exported
-local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
-local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
-local ____array = require("src.functions.array")
-local getLastElement = ____array.getLastElement
-local ____dimensions = require("src.functions.dimensions")
-local getDimension = ____dimensions.getDimension
-local ____roomData = require("src.functions.roomData")
-local getRoomGridIndex = ____roomData.getRoomGridIndex
-local getRoomListIndex = ____roomData.getRoomListIndex
-local getRoomName = ____roomData.getRoomName
-local getRoomStageID = ____roomData.getRoomStageID
-local getRoomSubType = ____roomData.getRoomSubType
-local getRoomVariant = ____roomData.getRoomVariant
-local getRoomVisitedCount = ____roomData.getRoomVisitedCount
-local ____Feature = require("src.classes.private.Feature")
-local Feature = ____Feature.Feature
-____exports.RoomHistory = __TS__Class()
-local RoomHistory = ____exports.RoomHistory
-RoomHistory.name = "RoomHistory"
-__TS__ClassExtends(RoomHistory, Feature)
-function RoomHistory.prototype.____constructor(self)
-    Feature.prototype.____constructor(self)
-    self.v = {run = {roomHistory = {}}}
-    self.postNewRoomEarly = function()
-        local level = game:GetLevel()
-        local stage = level:GetStage()
-        local stageType = level:GetStageType()
-        local room = game:GetRoom()
-        local roomType = room:GetType()
-        local stageID = getRoomStageID(nil)
-        local dimension = getDimension(nil)
-        local roomVariant = getRoomVariant(nil)
-        local roomSubType = getRoomSubType(nil)
-        local roomName = getRoomName(nil)
-        local roomGridIndex = getRoomGridIndex(nil)
-        local roomListIndex = getRoomListIndex(nil)
-        local roomVisitedCount = getRoomVisitedCount(nil)
-        local roomDescription = {
-            stage = stage,
-            stageType = stageType,
-            stageID = stageID,
-            dimension = dimension,
-            roomType = roomType,
-            roomVariant = roomVariant,
-            roomSubType = roomSubType,
-            roomName = roomName,
-            roomGridIndex = roomGridIndex,
-            roomListIndex = roomListIndex,
-            roomVisitedCount = roomVisitedCount
-        }
-        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}}}
-end
-function RoomHistory.prototype.getRoomHistory(self)
-    return self.v.run.roomHistory
-end
-function RoomHistory.prototype.getPreviousRoomDescription(self)
-    local previousRoomDescription = self.v.run.roomHistory[#self.v.run.roomHistory - 2 + 1]
-    if previousRoomDescription ~= nil then
-        return previousRoomDescription
-    end
-    local startingRoomDescription = self.v.run.roomHistory[1]
-    if startingRoomDescription ~= nil then
-        return startingRoomDescription
-    end
-    error("Failed to find a room description for any rooms thus far on this run.")
-end
-function RoomHistory.prototype.getLatestRoomDescription(self)
-    return getLastElement(nil, self.v.run.roomHistory)
-end
-function RoomHistory.prototype.isLeavingRoom(self)
-    local level = game:GetLevel()
-    local stage = level:GetStage()
-    local stageType = level:GetStageType()
-    local roomListIndex = getRoomListIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    local latestRoomDescription = self:getLatestRoomDescription()
-    if latestRoomDescription == nil then
-        return false
-    end
-    return stage ~= latestRoomDescription.stage or stageType ~= latestRoomDescription.stageType or roomListIndex ~= latestRoomDescription.roomListIndex or roomVisitedCount ~= latestRoomDescription.roomVisitedCount
-end
-__TS__Decorate({Exported}, RoomHistory.prototype, "getRoomHistory", true)
-__TS__Decorate({Exported}, RoomHistory.prototype, "getPreviousRoomDescription", true)
-__TS__Decorate({Exported}, RoomHistory.prototype, "getLatestRoomDescription", true)
-__TS__Decorate({Exported}, RoomHistory.prototype, "isLeavingRoom", true)
 return ____exports
  end,
 ["src.classes.features.other.PersistentEntities"] = function(...) 
@@ -45929,206 +46133,6 @@ function PersistentEntities.prototype.spawnPersistentEntity(self, entityType, va
 end
 __TS__Decorate({Exported}, PersistentEntities.prototype, "removePersistentEntity", true)
 __TS__Decorate({Exported}, PersistentEntities.prototype, "spawnPersistentEntity", true)
-return ____exports
- end,
-["src.types.PickupIndex"] = function(...) 
-local ____exports = {}
-return ____exports
- end,
-["src.classes.features.other.PickupIndexCreation"] = function(...) 
-local ____lualib = require("lualib_bundle")
-local __TS__Class = ____lualib.__TS__Class
-local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local Map = ____lualib.Map
-local __TS__New = ____lualib.__TS__New
-local __TS__Decorate = ____lualib.__TS__Decorate
-local __TS__Iterator = ____lualib.__TS__Iterator
-local ____exports = {}
-local getStoredPickupIndex
-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 RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
-local ____cachedClasses = require("src.core.cachedClasses")
-local game = ____cachedClasses.game
-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")
-local onAscent = ____stage.onAscent
-local ____vector = require("src.functions.vector")
-local vectorEquals = ____vector.vectorEquals
-local ____DefaultMap = require("src.classes.DefaultMap")
-local DefaultMap = ____DefaultMap.DefaultMap
-local ____Feature = require("src.classes.private.Feature")
-local Feature = ____Feature.Feature
-function getStoredPickupIndex(self, pickup, pickupDescriptions)
-    for ____, ____value in __TS__Iterator(pickupDescriptions:entries()) do
-        local pickupIndex = ____value[1]
-        local pickupDescription = ____value[2]
-        if vectorEquals(nil, pickupDescription.position, pickup.Position) and pickupDescription.initSeed == pickup.InitSeed then
-            return pickupIndex
-        end
-    end
-    return nil
-end
-____exports.PickupIndexCreation = __TS__Class()
-local PickupIndexCreation = ____exports.PickupIndexCreation
-PickupIndexCreation.name = "PickupIndexCreation"
-__TS__ClassExtends(PickupIndexCreation, Feature)
-function PickupIndexCreation.prototype.____constructor(self, roomHistory)
-    Feature.prototype.____constructor(self)
-    self.v = {
-        run = {
-            pickupCounter = 0,
-            pickupDataTreasureRooms = __TS__New(Map),
-            pickupDataBossRooms = __TS__New(Map)
-        },
-        level = {pickupData = __TS__New(
-            DefaultMap,
-            function() return __TS__New(Map) end
-        )},
-        room = {pickupIndexes = __TS__New(Map)}
-    }
-    self.postPickupInit = function(____, pickup)
-        local ptrHash = GetPtrHash(pickup)
-        if self.v.room.pickupIndexes:has(ptrHash) then
-            return
-        end
-        local room = game:GetRoom()
-        local isFirstVisit = room:IsFirstVisit()
-        local roomFrameCount = room:GetFrameCount()
-        if not isFirstVisit and roomFrameCount <= 0 then
-            return
-        end
-        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
-    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_2, ____pickupCounter_3 = self.v.run, "pickupCounter"
-                ____self_v_run_2[____pickupCounter_3] = ____self_v_run_2[____pickupCounter_3] + 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.checkDespawningFromPlayerLeavingRoom(self, entity)
-    local ptrHash = GetPtrHash(entity)
-    local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndex == nil then
-        return
-    end
-    if not self.roomHistory:isLeavingRoom() then
-        return
-    end
-    self:trackDespawningPickupMetadata(entity, pickupIndex)
-end
-function PickupIndexCreation.prototype.trackDespawningPickupMetadata(self, entity, pickupIndex)
-    local previousRoomDescription = self.roomHistory:getLatestRoomDescription()
-    if previousRoomDescription == nil then
-        return
-    end
-    local previousRoomListIndex = previousRoomDescription.roomListIndex
-    local pickupDescriptions = self.v.level.pickupData:getAndSetDefault(previousRoomListIndex)
-    local pickupDescription = {position = entity.Position, initSeed = entity.InitSeed}
-    pickupDescriptions:set(pickupIndex, pickupDescription)
-    if onAscent(nil) then
-        return
-    end
-    local room = game:GetRoom()
-    local roomType = room:GetType()
-    repeat
-        local ____switch20 = roomType
-        local ____cond20 = ____switch20 == RoomType.TREASURE
-        if ____cond20 then
-            do
-                self.v.run.pickupDataTreasureRooms:set(pickupIndex, pickupDescription)
-                break
-            end
-        end
-        ____cond20 = ____cond20 or ____switch20 == RoomType.BOSS
-        if ____cond20 then
-            do
-                self.v.run.pickupDataBossRooms:set(pickupIndex, pickupDescription)
-                break
-            end
-        end
-        do
-            do
-                break
-            end
-        end
-    until true
-end
-function PickupIndexCreation.prototype.getPostAscentPickupIndex(self, pickup)
-    if not onAscent(nil) then
-        return nil
-    end
-    local room = game:GetRoom()
-    local roomType = room:GetType()
-    repeat
-        local ____switch26 = roomType
-        local ____cond26 = ____switch26 == RoomType.TREASURE
-        if ____cond26 then
-            do
-                return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataTreasureRooms)
-            end
-        end
-        ____cond26 = ____cond26 or ____switch26 == RoomType.BOSS
-        if ____cond26 then
-            do
-                return getStoredPickupIndex(nil, pickup, self.v.run.pickupDataBossRooms)
-            end
-        end
-        do
-            do
-                return nil
-            end
-        end
-    until true
-end
-function PickupIndexCreation.prototype.getPickupIndex(self, pickup)
-    local ptrHash = GetPtrHash(pickup)
-    local pickupIndex = self.v.room.pickupIndexes:get(ptrHash)
-    if pickupIndex == nil then
-        local entityID = getEntityID(nil, pickup)
-        error((("Failed to get a pickup index for entity " .. entityID) .. " with hash: ") .. tostring(ptrHash))
-    end
-    return pickupIndex
-end
-__TS__Decorate({Exported}, PickupIndexCreation.prototype, "getPickupIndex", true)
 return ____exports
  end,
 ["src.classes.features.other.PlayerInventory"] = function(...) 
@@ -47934,6 +47938,7 @@ function ____exports.getFeatures(self, mod, callbacks)
     local moddedElementSets = __TS__New(ModdedElementSets, moddedElementDetection)
     local itemPoolDetection = __TS__New(ItemPoolDetection, moddedElementSets)
     local pause = __TS__New(Pause, disableInputs)
+    local pickupIndexCreation = __TS__New(PickupIndexCreation, roomHistory)
     local preventGridEntityRespawn = __TS__New(PreventGridEntityRespawn, runInNFrames)
     local spawnCollectible = __TS__New(SpawnCollectible, preventCollectibleRotation)
     local customTrapdoors = __TS__New(
@@ -47983,7 +47988,7 @@ function ____exports.getFeatures(self, mod, callbacks)
             [ISCFeature.SLOT_UPDATE_DETECTION] = __TS__New(SlotUpdateDetection, callbacks[ModCallbackCustom.POST_SLOT_INIT], callbacks[ModCallbackCustom.POST_SLOT_UPDATE]),
             [ISCFeature.CHARACTER_HEALTH_CONVERSION] = __TS__New(CharacterHealthConversion),
             [ISCFeature.CHARACTER_STATS] = __TS__New(CharacterStats),
-            [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE] = __TS__New(CollectibleItemPoolType),
+            [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE] = __TS__New(CollectibleItemPoolType, pickupIndexCreation),
             [ISCFeature.CUSTOM_GRID_ENTITIES] = customGridEntities,
             [ISCFeature.CUSTOM_ITEM_POOLS] = __TS__New(CustomItemPools),
             [ISCFeature.CUSTOM_HOTKEYS] = __TS__New(CustomHotkeys),
@@ -48013,7 +48018,7 @@ function ____exports.getFeatures(self, mod, callbacks)
             [ISCFeature.NO_SIREN_STEAL] = __TS__New(NoSirenSteal),
             [ISCFeature.PAUSE] = pause,
             [ISCFeature.PERSISTENT_ENTITIES] = __TS__New(PersistentEntities, roomHistory),
-            [ISCFeature.PICKUP_INDEX_CREATION] = __TS__New(PickupIndexCreation, roomHistory),
+            [ISCFeature.PICKUP_INDEX_CREATION] = pickupIndexCreation,
             [ISCFeature.PLAYER_INVENTORY] = __TS__New(PlayerInventory),
             [ISCFeature.PONY_DETECTION] = ponyDetection,
             [ISCFeature.PREVENT_CHILD_ENTITIES] = __TS__New(PreventChildEntities),
@@ -48404,7 +48409,8 @@ function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, va
 end
 function addCallback(self, modFeature, modFeatureConstructor, mod, modCallback, callback, parameters, vanilla)
     local function wrappedCallback(____, ...)
-        callback(nil, modFeature, ...)
+        local castedCallback = callback
+        castedCallback(modFeature, ...)
     end
     if vanilla then
         local modCallbackVanilla = modCallback

package/dist/src/classes/ModFeature.lua

@@ -63,7 +63,8 @@ function initDecoratedCallbacks(self, modFeature, constructor, tstlClassName, va
 end
 function addCallback(self, modFeature, modFeatureConstructor, mod, modCallback, callback, parameters, vanilla)
     local function wrappedCallback(____, ...)
-        callback(nil, modFeature, ...)
+        local castedCallback = callback
+        castedCallback(modFeature, ...)
     end
     if vanilla then
         local modCallbackVanilla = modCallback

package/dist/src/classes/features/other/CollectibleItemPoolType.d.ts

@@ -1,16 +1,13 @@
 import { ItemPoolType } from "isaac-typescript-definitions";
 import { Feature } from "../../private/Feature";
-/**
- * The item pool type of a collectible is not stored on the collectible. Thus, we scan for incoming
- * item pool types in the `PRE_GET_COLLECTIBLE` callback, and then assume that the next spawned
- * collectible has this item pool type.
- */
 export declare class CollectibleItemPoolType extends Feature {
+    private pickupIndexCreation;
     private postPickupInitCollectible;
     /**
      * Helper function to get the item pool type that a given collectible came from. Since there is no
-     * native method in the API to get this, we listen in the `PRE_GET_COLLECTIBLE` callback for item
-     * pool types, and then assume that the next spawned collectible will match.
+     * native method in the API to get this, we listen in the `POST_PICKUP_INIT` callback for
+     * collectibles, use the `ItemPool.GetLastPool` method, and then assume that the collectible
+     * matches.
      *
      * In order to use this function, you must upgrade your mod with
      * `ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE`.

package/dist/src/classes/features/other/CollectibleItemPoolType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollectibleItemPoolType.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CollectibleItemPoolType.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,OAAO;IAsBlD,OAAO,CAAC,yBAAyB,CAM/B;IAEF;;;;;;;OAOG;IAEI,0BAA0B,CAAC,WAAW,EAAE,YAAY,GAAG,YAAY;CAY3E"}
+{"version":3,"file":"CollectibleItemPoolType.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/CollectibleItemPoolType.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AAQtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,qBAAa,uBAAwB,SAAQ,OAAO;IAQlD,OAAO,CAAC,mBAAmB,CAAsB;IAoBjD,OAAO,CAAC,yBAAyB,CAM/B;IAEF;;;;;;;;OAQG;IAEI,0BAA0B,CAAC,WAAW,EAAE,YAAY,GAAG,YAAY;CAY3E"}

package/dist/src/classes/features/other/CollectibleItemPoolType.lua

@@ -12,6 +12,8 @@ local ____cachedClasses = require("src.core.cachedClasses")
 local game = ____cachedClasses.game
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
 local ____entities = require("src.functions.entities")
 local getEntityID = ____entities.getEntityID
 local ____pickupVariants = require("src.functions.pickupVariants")
@@ -20,31 +22,30 @@ local ____rooms = require("src.functions.rooms")
 local getRoomItemPoolType = ____rooms.getRoomItemPoolType
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
---- The item pool type of a collectible is not stored on the collectible. Thus, we scan for incoming
--- item pool types in the `PRE_GET_COLLECTIBLE` callback, and then assume that the next spawned
--- collectible has this item pool type.
 ____exports.CollectibleItemPoolType = __TS__Class()
 local CollectibleItemPoolType = ____exports.CollectibleItemPoolType
 CollectibleItemPoolType.name = "CollectibleItemPoolType"
 __TS__ClassExtends(CollectibleItemPoolType, Feature)
-function CollectibleItemPoolType.prototype.____constructor(self)
+function CollectibleItemPoolType.prototype.____constructor(self, pickupIndexCreation)
     Feature.prototype.____constructor(self)
     self.v = {run = {collectibleItemPoolTypeMap = __TS__New(Map)}}
-    self.postPickupInitCollectible = function(____, pickup)
+    self.postPickupInitCollectible = function(____, collectible)
         local itemPool = game:GetItemPool()
-        local ptrHash = GetPtrHash(pickup)
+        local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
         local lastItemPoolType = itemPool:GetLastPool()
-        self.v.run.collectibleItemPoolTypeMap:set(ptrHash, lastItemPoolType)
+        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.pickupIndexCreation = pickupIndexCreation
 end
 function CollectibleItemPoolType.prototype.getCollectibleItemPoolType(self, collectible)
     if not isCollectible(nil, collectible) then
         local entityID = getEntityID(nil, collectible)
         error("The \"getCollectibleItemPoolType\" function was given a non-collectible: " .. entityID)
     end
-    local ptrHash = GetPtrHash(collectible)
-    local itemPoolType = self.v.run.collectibleItemPoolTypeMap:get(ptrHash)
+    local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
+    local itemPoolType = self.v.run.collectibleItemPoolTypeMap:get(pickupIndex)
     return itemPoolType == nil and getRoomItemPoolType(nil) or itemPoolType
 end
 __TS__Decorate({Exported}, CollectibleItemPoolType.prototype, "getCollectibleItemPoolType", true)

package/dist/src/features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../src/features.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../../src/features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qDAAqD,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yDAAyD,CAAC;AACjG,OAAO,EAAE,4BAA4B,EAAE,MAAM,+DAA+D,CAAC;AAC7G,OAAO,EAAE,yBAAyB,EAAE,MAAM,4DAA4D,CAAC;AACvG,OAAO,EAAE,yBAAyB,EAAE,MAAM,4DAA4D,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6DAA6D,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEjF,MAAM,WAAW,iBAAiB;IAEhC,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACzC,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,eAAe,CAAC;IAChD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC3C,CAAC,UAAU,CAAC,+BAA+B,CAAC,EAAE,4BAA4B,CAAC;IAC3E,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE,yBAAyB,CAAC;IACrE,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE,yBAAyB,CAAC;IACrE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE,sBAAsB,CAAC;IAC9D,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;IACxD,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE,0BAA0B,CAAC;IACtE,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,wBAAwB,CAAC;IAClE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;IACxD,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;IAGxD,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAAE,yBAAyB,CAAC;IACpE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,cAAc,CAAC;IAC7C,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,uBAAuB,CAAC;IACjE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IACtD,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,eAAe,CAAC;IAChD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC3C,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC3C,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACzC,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;IAC/C,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACzC,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IAC9C,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,eAAe,CAAC;IAChD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC3C,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;IAC5C,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IACnC,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;IAC/C,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;IAC/C,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,oBAAoB,CAAC;IAC1D,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,iBAAiB,CAAC;IACpD,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE,sBAAsB,CAAC;IAC9D,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,iBAAiB,CAAC;IACpD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC;IAC1C,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAC1B,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACrD,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,mBAAmB,CAAC;IACxD,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;IAC/C,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC3C,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,oBAAoB,CAAC;IAC1D,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE,0BAA0B,CAAC;IACtE,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAAE,wBAAwB,CAAC;IACnE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IAC9C,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC;IACvC,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC;IAC3C,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC;IACxC,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,eAAe,CAAC;IAChD,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,mBAAmB,CAAC;IACzD,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACjD,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;IACzC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC;IACvC,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,qBAAqB,CAAC;CAC7D;AAKD,wBAAgB,WAAW,CACzB,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+JpC"}

package/dist/src/features.lua

@@ -135,6 +135,7 @@ function ____exports.getFeatures(self, mod, callbacks)
     local moddedElementSets = __TS__New(ModdedElementSets, moddedElementDetection)
     local itemPoolDetection = __TS__New(ItemPoolDetection, moddedElementSets)
     local pause = __TS__New(Pause, disableInputs)
+    local pickupIndexCreation = __TS__New(PickupIndexCreation, roomHistory)
     local preventGridEntityRespawn = __TS__New(PreventGridEntityRespawn, runInNFrames)
     local spawnCollectible = __TS__New(SpawnCollectible, preventCollectibleRotation)
     local customTrapdoors = __TS__New(
@@ -184,7 +185,7 @@ function ____exports.getFeatures(self, mod, callbacks)
             [ISCFeature.SLOT_UPDATE_DETECTION] = __TS__New(SlotUpdateDetection, callbacks[ModCallbackCustom.POST_SLOT_INIT], callbacks[ModCallbackCustom.POST_SLOT_UPDATE]),
             [ISCFeature.CHARACTER_HEALTH_CONVERSION] = __TS__New(CharacterHealthConversion),
             [ISCFeature.CHARACTER_STATS] = __TS__New(CharacterStats),
-            [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE] = __TS__New(CollectibleItemPoolType),
+            [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE] = __TS__New(CollectibleItemPoolType, pickupIndexCreation),
             [ISCFeature.CUSTOM_GRID_ENTITIES] = customGridEntities,
             [ISCFeature.CUSTOM_ITEM_POOLS] = __TS__New(CustomItemPools),
             [ISCFeature.CUSTOM_HOTKEYS] = __TS__New(CustomHotkeys),
@@ -214,7 +215,7 @@ function ____exports.getFeatures(self, mod, callbacks)
             [ISCFeature.NO_SIREN_STEAL] = __TS__New(NoSirenSteal),
             [ISCFeature.PAUSE] = pause,
             [ISCFeature.PERSISTENT_ENTITIES] = __TS__New(PersistentEntities, roomHistory),
-            [ISCFeature.PICKUP_INDEX_CREATION] = __TS__New(PickupIndexCreation, roomHistory),
+            [ISCFeature.PICKUP_INDEX_CREATION] = pickupIndexCreation,
             [ISCFeature.PLAYER_INVENTORY] = __TS__New(PlayerInventory),
             [ISCFeature.PONY_DETECTION] = ponyDetection,
             [ISCFeature.PREVENT_CHILD_ENTITIES] = __TS__New(PreventChildEntities),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "15.3.3",
+  "version": "15.3.4",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/ModFeature.ts

@@ -195,7 +195,11 @@ function addCallback(
   // We need to wrap the callback in a new function so that we can explicitly pass the class as the
   // first argument. (Otherwise, the method will not be able to properly access `this`.
   const wrappedCallback = (...callbackArgs: unknown[]) => {
-    callback(modFeature, ...callbackArgs);
+    const castedCallback = callback as (
+      this: void,
+      ...args: unknown[]
+    ) => unknown;
+    castedCallback(modFeature, ...callbackArgs);
   };
 
   // We need to save the wrapped function for later (so we can unregister them).

package/src/classes/features/other/CollectibleItemPoolType.ts

@@ -5,50 +5,55 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../../../core/cachedClasses";
 import { Exported } from "../../../decorators";
+import { ISCFeature } from "../../../enums/ISCFeature";
 import { getEntityID } from "../../../functions/entities";
 import { isCollectible } from "../../../functions/pickupVariants";
 import { getRoomItemPoolType } from "../../../functions/rooms";
+import { PickupIndex } from "../../../types/PickupIndex";
 import { Feature } from "../../private/Feature";
+import { PickupIndexCreation } from "./PickupIndexCreation";
 
-/**
- * The item pool type of a collectible is not stored on the collectible. Thus, we scan for incoming
- * item pool types in the `PRE_GET_COLLECTIBLE` callback, and then assume that the next spawned
- * collectible has this item pool type.
- */
 export class CollectibleItemPoolType extends Feature {
   /** @internal */
   public override v = {
     run: {
-      collectibleItemPoolTypeMap: new Map<PtrHash, ItemPoolType>(),
+      collectibleItemPoolTypeMap: new Map<PickupIndex, ItemPoolType>(),
     },
   };
 
+  private pickupIndexCreation: PickupIndexCreation;
+
   /** @internal */
-  constructor() {
+  constructor(pickupIndexCreation: PickupIndexCreation) {
     super();
 
+    this.featuresUsed = [ISCFeature.PICKUP_INDEX_CREATION];
+
     this.callbacksUsed = [
       [
         ModCallback.POST_PICKUP_INIT,
         [this.postPickupInitCollectible, PickupVariant.COLLECTIBLE],
       ], // 34
     ];
+
+    this.pickupIndexCreation = pickupIndexCreation;
   }
 
   // ModCallback.POST_PICKUP_INIT (34)
   // PickupVariant.COLLECTIBLE (100)
-  private postPickupInitCollectible = (pickup: EntityPickup) => {
+  private postPickupInitCollectible = (collectible: EntityPickup) => {
     const itemPool = game.GetItemPool();
-    const ptrHash = GetPtrHash(pickup);
+    const pickupIndex = this.pickupIndexCreation.getPickupIndex(collectible);
     const lastItemPoolType = itemPool.GetLastPool();
 
-    this.v.run.collectibleItemPoolTypeMap.set(ptrHash, lastItemPoolType);
+    this.v.run.collectibleItemPoolTypeMap.set(pickupIndex, lastItemPoolType);
   };
 
   /**
    * Helper function to get the item pool type that a given collectible came from. Since there is no
-   * native method in the API to get this, we listen in the `PRE_GET_COLLECTIBLE` callback for item
-   * pool types, and then assume that the next spawned collectible will match.
+   * native method in the API to get this, we listen in the `POST_PICKUP_INIT` callback for
+   * collectibles, use the `ItemPool.GetLastPool` method, and then assume that the collectible
+   * matches.
    *
    * In order to use this function, you must upgrade your mod with
    * `ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE`.
@@ -62,8 +67,8 @@ export class CollectibleItemPoolType extends Feature {
       );
     }
 
-    const ptrHash = GetPtrHash(collectible);
-    const itemPoolType = this.v.run.collectibleItemPoolTypeMap.get(ptrHash);
+    const pickupIndex = this.pickupIndexCreation.getPickupIndex(collectible);
+    const itemPoolType = this.v.run.collectibleItemPoolTypeMap.get(pickupIndex);
     return itemPoolType === undefined ? getRoomItemPoolType() : itemPoolType;
   }
 }

package/src/features.ts

@@ -147,6 +147,7 @@ export function getFeatures(
   const moddedElementSets = new ModdedElementSets(moddedElementDetection);
   const itemPoolDetection = new ItemPoolDetection(moddedElementSets);
   const pause = new Pause(disableInputs);
+  const pickupIndexCreation = new PickupIndexCreation(roomHistory);
   const preventGridEntityRespawn = new PreventGridEntityRespawn(runInNFrames);
   const spawnCollectible = new SpawnCollectible(preventCollectibleRotation);
 
@@ -227,7 +228,9 @@ export function getFeatures(
     // Extra features
     [ISCFeature.CHARACTER_HEALTH_CONVERSION]: new CharacterHealthConversion(),
     [ISCFeature.CHARACTER_STATS]: new CharacterStats(),
-    [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE]: new CollectibleItemPoolType(),
+    [ISCFeature.COLLECTIBLE_ITEM_POOL_TYPE]: new CollectibleItemPoolType(
+      pickupIndexCreation,
+    ),
     [ISCFeature.CUSTOM_GRID_ENTITIES]: customGridEntities,
     [ISCFeature.CUSTOM_ITEM_POOLS]: new CustomItemPools(),
     [ISCFeature.CUSTOM_HOTKEYS]: new CustomHotkeys(),
@@ -259,7 +262,7 @@ export function getFeatures(
     [ISCFeature.NO_SIREN_STEAL]: new NoSirenSteal(),
     [ISCFeature.PAUSE]: pause,
     [ISCFeature.PERSISTENT_ENTITIES]: new PersistentEntities(roomHistory),
-    [ISCFeature.PICKUP_INDEX_CREATION]: new PickupIndexCreation(roomHistory),
+    [ISCFeature.PICKUP_INDEX_CREATION]: pickupIndexCreation,
     [ISCFeature.PLAYER_INVENTORY]: new PlayerInventory(),
     [ISCFeature.PONY_DETECTION]: ponyDetection,
     [ISCFeature.PREVENT_CHILD_ENTITIES]: new PreventChildEntities(),