isaacscript-common 14.1.2 → 14.2.0

package/dist/src/classes/ModUpgraded.lua

@@ -1,6 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__Spread = ____lualib.__TS__Spread
+local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
+local __TS__ArrayUnshift = ____lualib.__TS__ArrayUnshift
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local ____exports = {}
 local getExportedMethodsFromFeature
@@ -10,11 +12,10 @@ local ____callbacks = require("src.callbacks")
 local getCallbacks = ____callbacks.getCallbacks
 local ____decorators = require("src.decorators")
 local EXPORTED_METHOD_NAMES_KEY = ____decorators.EXPORTED_METHOD_NAMES_KEY
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
 local ____features = require("src.features")
 local getFeatures = ____features.getFeatures
-local ____exports = require("src.features.saveDataManager.exports")
-local saveDataManager = ____exports.saveDataManager
-local saveDataManagerRemove = ____exports.saveDataManagerRemove
 local ____debugFunctions = require("src.functions.debugFunctions")
 local getTime = ____debugFunctions.getTime
 local ____log = require("src.functions.log")
@@ -56,7 +57,7 @@ function ModUpgraded.prototype.____constructor(self, mod, ____debug, timeThresho
     self.debug = ____debug
     self.timeThreshold = timeThreshold
     self.callbacks = getCallbacks(nil)
-    self.features = getFeatures(nil, self.callbacks)
+    self.features = getFeatures(nil, mod, self.callbacks)
 end
 function ModUpgraded.prototype.AddCallback(self, modCallback, ...)
     local args = {...}
@@ -114,26 +115,28 @@ function ModUpgraded.prototype.AddCallbackCustom(self, modCallbackCustom, ...)
 end
 function ModUpgraded.prototype.AddCallbackCustom2(self, modCallbackCustom, ...)
     local callbackClass = self.callbacks[modCallbackCustom]
-    callbackClass:add(...)
+    callbackClass:addSubscriber(...)
     self:initFeature(callbackClass)
 end
 function ModUpgraded.prototype.RemoveCallbackCustom(self, modCallbackCustom, callback)
     local callbackClass = self.callbacks[modCallbackCustom]
-    callbackClass:remove(callback)
-    if not callbackClass:hasSubscriptions() then
-        self:uninitFeature(callbackClass)
-    end
-end
-function ModUpgraded.prototype.initOptionalFeature(self, feature)
-    local featureClass = self.features[feature]
-    self:initFeature(featureClass)
-    return getExportedMethodsFromFeature(nil, featureClass)
+    callbackClass:removeSubscriber(callback)
+    self:uninitFeature(callbackClass)
 end
 function ModUpgraded.prototype.initFeature(self, feature)
+    feature.numConsumers = feature.numConsumers + 1
     if feature.initialized then
         return
     end
     feature.initialized = true
+    if feature.v ~= nil then
+        if feature.featuresUsed == nil then
+            feature.featuresUsed = {}
+        end
+        if not __TS__ArrayIncludes(feature.featuresUsed, ISCFeature.SAVE_DATA_MANAGER) then
+            __TS__ArrayUnshift(feature.featuresUsed, ISCFeature.SAVE_DATA_MANAGER)
+        end
+    end
     if feature.featuresUsed ~= nil then
         for ____, featureUsed in ipairs(feature.featuresUsed) do
             local featureClass = self.features[featureUsed]
@@ -163,11 +166,21 @@ function ModUpgraded.prototype.initFeature(self, feature)
         if className == nil then
             error("Failed to get the name of a feature.")
         end
-        saveDataManager(nil, className, feature.v)
+        local saveDataManagerClass = self.features[ISCFeature.SAVE_DATA_MANAGER]
+        saveDataManagerClass:saveDataManager(className, feature.v)
     end
 end
 function ModUpgraded.prototype.uninitFeature(self, feature)
+    if feature.numConsumers <= 0 then
+        local className = getTSTLClassName(nil, feature) or "unknown"
+        error(((("Failed to uninit feature \"" .. className) .. "\" since it has ") .. tostring(feature.numConsumers)) .. " consumers, which should never happen.")
+    end
     if not feature.initialized then
+        local className = getTSTLClassName(nil, feature) or "unknown"
+        error(("Failed to uninit feature \"" .. className) .. "\" since it was not initialized, which should never happen.")
+    end
+    feature.numConsumers = feature.numConsumers - 1
+    if feature.numConsumers > 0 then
         return
     end
     feature.initialized = false
@@ -196,7 +209,13 @@ function ModUpgraded.prototype.uninitFeature(self, feature)
         if className == nil then
             error("Failed to get the name of a feature.")
         end
-        saveDataManagerRemove(nil, className)
+        local saveDataManagerClass = self.features[ISCFeature.SAVE_DATA_MANAGER]
+        saveDataManagerClass:saveDataManagerRemove(className)
     end
 end
+function ModUpgraded.prototype.initOptionalFeature(self, feature)
+    local featureClass = self.features[feature]
+    self:initFeature(featureClass)
+    return getExportedMethodsFromFeature(nil, featureClass)
+end
 return ____exports

package/dist/src/classes/callbacks/PostCustomRevive.d.ts

@@ -1,6 +1,9 @@
 import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
-import { CustomCallbackRevive } from "./validation/CustomCallbackRevive";
-export declare class PostCustomRevive extends CustomCallbackRevive<ModCallbackCustom2.POST_CUSTOM_REVIVE> {
+import { CustomCallback, FireArgs, OptionalArgs } from "../private/CustomCallback";
+declare type T = ModCallbackCustom2.POST_CUSTOM_REVIVE;
+export declare class PostCustomRevive extends CustomCallback<ModCallbackCustom2.POST_CUSTOM_REVIVE> {
     constructor();
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
 }
+export {};
 //# sourceMappingURL=PostCustomRevive.d.ts.map

package/dist/src/classes/callbacks/PostCustomRevive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostCustomRevive.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCustomRevive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,qBAAa,gBAAiB,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;;CAMhG"}
+{"version":3,"file":"PostCustomRevive.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostCustomRevive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,aAAK,CAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC;AAE/C,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;;cAQtE,UAAU,CAC3B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,GAC5B,OAAO;CASX"}

package/dist/src/classes/callbacks/PostCustomRevive.lua

@@ -4,14 +4,22 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
-local ____CustomCallbackRevive = require("src.classes.callbacks.validation.CustomCallbackRevive")
-local CustomCallbackRevive = ____CustomCallbackRevive.CustomCallbackRevive
+local ____CustomCallback = require("src.classes.private.CustomCallback")
+local CustomCallback = ____CustomCallback.CustomCallback
 ____exports.PostCustomRevive = __TS__Class()
 local PostCustomRevive = ____exports.PostCustomRevive
 PostCustomRevive.name = "PostCustomRevive"
-__TS__ClassExtends(PostCustomRevive, CustomCallbackRevive)
+__TS__ClassExtends(PostCustomRevive, CustomCallback)
 function PostCustomRevive.prototype.____constructor(self)
-    CustomCallbackRevive.prototype.____constructor(self)
+    CustomCallback.prototype.____constructor(self)
     self.featuresUsed = {ISCFeature.CUSTOM_REVIVE}
 end
+function PostCustomRevive.prototype.shouldFire(self, fireArgs, optionalArgs)
+    local callbackRevivalType = table.unpack(optionalArgs)
+    if callbackRevivalType == nil then
+        return true
+    end
+    local _player, revivalType = table.unpack(fireArgs)
+    return revivalType == callbackRevivalType
+end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityBroken.lua

@@ -12,6 +12,6 @@ PostGridEntityBroken.name = "PostGridEntityBroken"
 __TS__ClassExtends(PostGridEntityBroken, CustomCallbackGridEntity)
 function PostGridEntityBroken.prototype.____constructor(self)
     CustomCallbackGridEntity.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityCollision.lua

@@ -12,7 +12,7 @@ PostGridEntityCollision.name = "PostGridEntityCollision"
 __TS__ClassExtends(PostGridEntityCollision, CustomCallback)
 function PostGridEntityCollision.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 function PostGridEntityCollision.prototype.shouldFire(self, fireArgs, optionalArgs)
     local gridEntity, entity = table.unpack(fireArgs)

package/dist/src/classes/callbacks/PostGridEntityCustomBroken.lua

@@ -12,6 +12,6 @@ PostGridEntityCustomBroken.name = "PostGridEntityCustomBroken"
 __TS__ClassExtends(PostGridEntityCustomBroken, CustomCallbackGridEntityCustom)
 function PostGridEntityCustomBroken.prototype.____constructor(self)
     CustomCallbackGridEntityCustom.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityCustomCollision.lua

@@ -12,7 +12,7 @@ PostGridEntityCustomCollision.name = "PostGridEntityCustomCollision"
 __TS__ClassExtends(PostGridEntityCustomCollision, CustomCallback)
 function PostGridEntityCustomCollision.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 function PostGridEntityCustomCollision.prototype.shouldFire(self, fireArgs, optionalArgs)
     local _gridEntity, gridEntityTypeCustom, entity = table.unpack(fireArgs)

package/dist/src/classes/callbacks/PostGridEntityCustomInit.lua

@@ -12,6 +12,6 @@ PostGridEntityCustomInit.name = "PostGridEntityCustomInit"
 __TS__ClassExtends(PostGridEntityCustomInit, CustomCallbackGridEntityCustom)
 function PostGridEntityCustomInit.prototype.____constructor(self)
     CustomCallbackGridEntityCustom.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityCustomRemove.lua

@@ -12,7 +12,7 @@ PostGridEntityCustomRemove.name = "PostGridEntityCustomRemove"
 __TS__ClassExtends(PostGridEntityCustomRemove, CustomCallback)
 function PostGridEntityCustomRemove.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 function PostGridEntityCustomRemove.prototype.shouldFire(self, fireArgs, optionalArgs)
     local callbackGridEntityTypeCustom = table.unpack(optionalArgs)

package/dist/src/classes/callbacks/PostGridEntityCustomRender.d.ts

@@ -0,0 +1,6 @@
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackGridEntityCustom } from "./validation/CustomCallbackGridEntityCustom";
+export declare class PostGridEntityCustomRender extends CustomCallbackGridEntityCustom<ModCallbackCustom2.POST_GRID_ENTITY_CUSTOM_RENDER> {
+    constructor();
+}
+//# sourceMappingURL=PostGridEntityCustomRender.d.ts.map

package/dist/src/classes/callbacks/PostGridEntityCustomRender.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostGridEntityCustomRender.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostGridEntityCustomRender.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAE7F,qBAAa,0BAA2B,SAAQ,8BAA8B,CAAC,kBAAkB,CAAC,8BAA8B,CAAC;;CAMhI"}

package/dist/src/classes/callbacks/PostGridEntityCustomRender.lua

@@ -0,0 +1,17 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
+local ____CustomCallbackGridEntityCustom = require("src.classes.callbacks.validation.CustomCallbackGridEntityCustom")
+local CustomCallbackGridEntityCustom = ____CustomCallbackGridEntityCustom.CustomCallbackGridEntityCustom
+____exports.PostGridEntityCustomRender = __TS__Class()
+local PostGridEntityCustomRender = ____exports.PostGridEntityCustomRender
+PostGridEntityCustomRender.name = "PostGridEntityCustomRender"
+__TS__ClassExtends(PostGridEntityCustomRender, CustomCallbackGridEntityCustom)
+function PostGridEntityCustomRender.prototype.____constructor(self)
+    CustomCallbackGridEntityCustom.prototype.____constructor(self)
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_RENDER_DETECTION}
+end
+return ____exports

package/dist/src/classes/callbacks/PostGridEntityCustomStateChanged.lua

@@ -12,6 +12,6 @@ PostGridEntityCustomStateChanged.name = "PostGridEntityCustomStateChanged"
 __TS__ClassExtends(PostGridEntityCustomStateChanged, CustomCallbackGridEntityCustom)
 function PostGridEntityCustomStateChanged.prototype.____constructor(self)
     CustomCallbackGridEntityCustom.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityCustomUpdate.lua

@@ -12,6 +12,6 @@ PostGridEntityCustomUpdate.name = "PostGridEntityCustomUpdate"
 __TS__ClassExtends(PostGridEntityCustomUpdate, CustomCallbackGridEntityCustom)
 function PostGridEntityCustomUpdate.prototype.____constructor(self)
     CustomCallbackGridEntityCustom.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityInit.lua

@@ -12,6 +12,6 @@ PostGridEntityInit.name = "PostGridEntityInit"
 __TS__ClassExtends(PostGridEntityInit, CustomCallbackGridEntity)
 function PostGridEntityInit.prototype.____constructor(self)
     CustomCallbackGridEntity.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityRemove.lua

@@ -12,7 +12,7 @@ PostGridEntityRemove.name = "PostGridEntityRemove"
 __TS__ClassExtends(PostGridEntityRemove, CustomCallback)
 function PostGridEntityRemove.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 function PostGridEntityRemove.prototype.shouldFire(self, fireArgs, optionalArgs)
     local _gridIndex, gridEntityType, variant = table.unpack(fireArgs)

package/dist/src/classes/callbacks/PostGridEntityRender.d.ts

@@ -0,0 +1,6 @@
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackGridEntity } from "./validation/CustomCallbackGridEntity";
+export declare class PostGridEntityRender extends CustomCallbackGridEntity<ModCallbackCustom2.POST_GRID_ENTITY_RENDER> {
+    constructor();
+}
+//# sourceMappingURL=PostGridEntityRender.d.ts.map

package/dist/src/classes/callbacks/PostGridEntityRender.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostGridEntityRender.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostGridEntityRender.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,qBAAa,oBAAqB,SAAQ,wBAAwB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC;;CAM7G"}

package/dist/src/classes/callbacks/PostGridEntityRender.lua

@@ -0,0 +1,17 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
+local ____CustomCallbackGridEntity = require("src.classes.callbacks.validation.CustomCallbackGridEntity")
+local CustomCallbackGridEntity = ____CustomCallbackGridEntity.CustomCallbackGridEntity
+____exports.PostGridEntityRender = __TS__Class()
+local PostGridEntityRender = ____exports.PostGridEntityRender
+PostGridEntityRender.name = "PostGridEntityRender"
+__TS__ClassExtends(PostGridEntityRender, CustomCallbackGridEntity)
+function PostGridEntityRender.prototype.____constructor(self)
+    CustomCallbackGridEntity.prototype.____constructor(self)
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_RENDER_DETECTION}
+end
+return ____exports

package/dist/src/classes/callbacks/PostGridEntityStateChanged.lua

@@ -12,6 +12,6 @@ PostGridEntityStateChanged.name = "PostGridEntityStateChanged"
 __TS__ClassExtends(PostGridEntityStateChanged, CustomCallbackGridEntity)
 function PostGridEntityStateChanged.prototype.____constructor(self)
     CustomCallbackGridEntity.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostGridEntityUpdate.lua

@@ -12,6 +12,6 @@ PostGridEntityUpdate.name = "PostGridEntityUpdate"
 __TS__ClassExtends(PostGridEntityUpdate, CustomCallbackGridEntity)
 function PostGridEntityUpdate.prototype.____constructor(self)
     CustomCallbackGridEntity.prototype.____constructor(self)
-    self.featuresUsed = {ISCFeature.GRID_ENTITY_DETECTION}
+    self.featuresUsed = {ISCFeature.GRID_ENTITY_UPDATE_DETECTION}
 end
 return ____exports

package/dist/src/classes/callbacks/PostHolyMantleRemoved.d.ts

@@ -9,6 +9,6 @@ export declare class PostHolyMantleRemoved extends CustomCallback<ModCallbackCus
         };
     };
     constructor();
-    private postPEffectUpdateReordered;
+    private postPEffectUpdate;
 }
 //# sourceMappingURL=PostHolyMantleRemoved.d.ts.map

package/dist/src/classes/callbacks/PostHolyMantleRemoved.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostHolyMantleRemoved.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostHolyMantleRemoved.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAKpE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,kBAAkB,CAAC,wBAAwB,CAAC;IACpF,CAAC;;;;MAIf;;IAcF,OAAO,CAAC,0BAA0B,CAchC;CACH"}
+{"version":3,"file":"PostHolyMantleRemoved.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostHolyMantleRemoved.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAKpE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,kBAAkB,CAAC,wBAAwB,CAAC;IACpF,CAAC;;;;MAIf;;IAWF,OAAO,CAAC,iBAAiB,CAcvB;CACH"}

package/dist/src/classes/callbacks/PostHolyMantleRemoved.lua

@@ -5,8 +5,7 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local ____ModCallbackCustom2 = require("src.enums.ModCallbackCustom2")
-local ModCallbackCustom2 = ____ModCallbackCustom2.ModCallbackCustom2
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____playerDataStructures = require("src.functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
@@ -21,7 +20,7 @@ __TS__ClassExtends(PostHolyMantleRemoved, CustomCallback)
 function PostHolyMantleRemoved.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.v = {run = {playersHolyMantleMap = __TS__New(DefaultMap, 0)}}
-    self.postPEffectUpdateReordered = function(____, player)
+    self.postPEffectUpdate = function(____, player)
         local effects = player:GetEffects()
         local newNumHolyMantles = effects:GetCollectibleEffectNum(CollectibleType.HOLY_MANTLE)
         local oldNumHolyMantles = defaultMapGetPlayer(nil, self.v.run.playersHolyMantleMap, player)
@@ -30,6 +29,6 @@ function PostHolyMantleRemoved.prototype.____constructor(self)
             self:fire(player, oldNumHolyMantles, newNumHolyMantles)
         end
     end
-    self.customCallbacksUsed = {{ModCallbackCustom2.POST_PEFFECT_UPDATE_REORDERED, {self.postPEffectUpdateReordered}}}
+    self.callbacksUsed = {{ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}}
 end
 return ____exports

package/dist/src/classes/callbacks/PostItemDischarge.d.ts

@@ -0,0 +1,43 @@
+import { ActiveSlot, CollectibleType } from "isaac-typescript-definitions";
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { PlayerIndex } from "../../types/PlayerIndex";
+import { DefaultMap } from "../DefaultMap";
+import { CustomCallback, FireArgs, OptionalArgs } from "../private/CustomCallback";
+declare type T = ModCallbackCustom2.POST_ITEM_DISCHARGE;
+declare type ActiveSlotToCollectibleTypeMap = Map<ActiveSlot, CollectibleType>;
+declare type ActiveSlotToChargeMap = Map<ActiveSlot, int>;
+export declare class PostItemDischarge extends CustomCallback<T> {
+    v: {
+        run: {
+            playersActiveItemMap: DefaultMap<PlayerIndex, ActiveSlotToCollectibleTypeMap, []>;
+            playersActiveChargeMap: DefaultMap<PlayerIndex, ActiveSlotToChargeMap, []>;
+        };
+        room: {
+            playersBulbLastCollisionFrame: Map<PlayerIndex, number>;
+        };
+    };
+    constructor();
+    protected shouldFire(fireArgs: FireArgs<T>, optionalArgs: OptionalArgs<T>): boolean;
+    private postPEffectUpdate;
+    /**
+     * If the player collided with a Bulb on either this frame or the last frame, then assume a zap
+     * has occurred. (We do not want to fire the discharge callback if this is the case.)
+     */
+    private playerRecentlyCollidedWithBulb;
+    private preNPCCollisionSucker;
+    private preNPCCollisionBulb;
+    /**
+     * The algorithm for detecting a discharge is checking if the current charge is less than the
+     * charge on the previous frame. Thus, when a Bulb zaps a player and drains their charge, this
+     * will be a false position, so Bulbs have to be handled.
+     *
+     * When Bulbs zap a player, they go to `NpcState.STATE_JUMP` for a frame. However, this only
+     * happens on the frame after the player is discharged, which is too late to be of any use.
+     *
+     * Instead, we track the frames that Bulbs collide with players and assume that a collision means
+     * a zap has occurred.
+     */
+    private checkPlayerCollidedWithBulb;
+}
+export {};
+//# sourceMappingURL=PostItemDischarge.d.ts.map

package/dist/src/classes/callbacks/PostItemDischarge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostItemDischarge.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostItemDischarge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAIhB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AASpE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACb,MAAM,2BAA2B,CAAC;AAEnC,aAAK,CAAC,GAAG,kBAAkB,CAAC,mBAAmB,CAAC;AAGhD,aAAK,8BAA8B,GAAG,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AACvE,aAAK,qBAAqB,GAAG,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAElD,qBAAa,iBAAkB,SAAQ,cAAc,CAAC,CAAC,CAAC;IACtC,CAAC;;;;;;;;MAef;;cAeiB,UAAU,CAC3B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,GAC5B,OAAO;IAWV,OAAO,CAAC,iBAAiB,CAwCvB;IAEF;;;OAGG;IACH,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,qBAAqB,CAS3B;IAIF,OAAO,CAAC,mBAAmB;IAQ3B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,2BAA2B;CAapC"}

package/dist/src/classes/callbacks/PostItemDischarge.lua

@@ -0,0 +1,113 @@
+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 ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
+local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local SuckerVariant = ____isaac_2Dtypescript_2Ddefinitions.SuckerVariant
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
+local ____charge = require("src.functions.charge")
+local getTotalCharge = ____charge.getTotalCharge
+local ____enums = require("src.functions.enums")
+local getEnumValues = ____enums.getEnumValues
+local ____playerDataStructures = require("src.functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____types = require("src.functions.types")
+local asNumber = ____types.asNumber
+local ____DefaultMap = require("src.classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
+local ____CustomCallback = require("src.classes.private.CustomCallback")
+local CustomCallback = ____CustomCallback.CustomCallback
+____exports.PostItemDischarge = __TS__Class()
+local PostItemDischarge = ____exports.PostItemDischarge
+PostItemDischarge.name = "PostItemDischarge"
+__TS__ClassExtends(PostItemDischarge, CustomCallback)
+function PostItemDischarge.prototype.____constructor(self)
+    CustomCallback.prototype.____constructor(self)
+    self.v = {
+        run = {
+            playersActiveItemMap = __TS__New(
+                DefaultMap,
+                function() return __TS__New(Map) end
+            ),
+            playersActiveChargeMap = __TS__New(
+                DefaultMap,
+                function() return __TS__New(Map) end
+            )
+        },
+        room = {playersBulbLastCollisionFrame = __TS__New(Map)}
+    }
+    self.postPEffectUpdate = function(____, player)
+        local activeItemMap = defaultMapGetPlayer(nil, self.v.run.playersActiveItemMap, player)
+        local chargeMap = defaultMapGetPlayer(nil, self.v.run.playersActiveChargeMap, player)
+        for ____, activeSlot in ipairs(getEnumValues(nil, ActiveSlot)) do
+            do
+                local currentActiveItem = player:GetActiveItem()
+                local previousActiveItem = activeItemMap:get(activeSlot)
+                if previousActiveItem == nil then
+                    previousActiveItem = currentActiveItem
+                end
+                activeItemMap:set(activeSlot, currentActiveItem)
+                if currentActiveItem ~= previousActiveItem then
+                    goto __continue6
+                end
+                local currentCharge = getTotalCharge(nil, player, activeSlot)
+                local previousCharge = chargeMap:get(activeSlot)
+                if previousCharge == nil then
+                    previousCharge = currentCharge
+                end
+                chargeMap:set(activeSlot, currentCharge)
+                if self:playerRecentlyCollidedWithBulb(player) then
+                    goto __continue6
+                end
+                if currentCharge < previousCharge then
+                    local collectibleType = player:GetActiveItem(activeSlot)
+                    self:fire(player, collectibleType, activeSlot)
+                end
+            end
+            ::__continue6::
+        end
+    end
+    self.preNPCCollisionSucker = function(____, npc, collider)
+        if npc.Variant == asNumber(nil, SuckerVariant.BULB) then
+            return self:preNPCCollisionBulb(npc, collider)
+        end
+        return nil
+    end
+    self.callbacksUsed = {{ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}, {ModCallback.PRE_NPC_COLLISION, {self.preNPCCollisionSucker, EntityType.SUCKER}}}
+end
+function PostItemDischarge.prototype.shouldFire(self, fireArgs, optionalArgs)
+    local callbackCollectibleType = table.unpack(optionalArgs)
+    if callbackCollectibleType == nil then
+        return true
+    end
+    local _player, collectibleType = table.unpack(fireArgs)
+    return collectibleType == callbackCollectibleType
+end
+function PostItemDischarge.prototype.playerRecentlyCollidedWithBulb(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    local bulbLastCollisionFrame = mapGetPlayer(nil, self.v.room.playersBulbLastCollisionFrame, player)
+    local collidedOnThisFrame = gameFrameCount == bulbLastCollisionFrame
+    local collidedOnLastFrame = gameFrameCount - 1 == bulbLastCollisionFrame
+    return collidedOnThisFrame or collidedOnLastFrame
+end
+function PostItemDischarge.prototype.preNPCCollisionBulb(self, _npc, collider)
+    self:checkPlayerCollidedWithBulb(collider)
+    return nil
+end
+function PostItemDischarge.prototype.checkPlayerCollidedWithBulb(self, collider)
+    local player = collider:ToPlayer()
+    if player == nil then
+        return
+    end
+    local gameFrameCount = game:GetFrameCount()
+    mapSetPlayer(nil, self.v.room.playersBulbLastCollisionFrame, player, gameFrameCount)
+end
+return ____exports

package/dist/src/classes/callbacks/PostItemPickup.d.ts

@@ -0,0 +1,6 @@
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackItemPickup } from "./validation/CustomCallbackItemPickup";
+export declare class PostItemPickup extends CustomCallbackItemPickup<ModCallbackCustom2.POST_ITEM_PICKUP> {
+    constructor();
+}
+//# sourceMappingURL=PostItemPickup.d.ts.map

package/dist/src/classes/callbacks/PostItemPickup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostItemPickup.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostItemPickup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,qBAAa,cAAe,SAAQ,wBAAwB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;;CAMhG"}

package/dist/src/classes/callbacks/PostItemPickup.lua

@@ -0,0 +1,17 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local ____ISCFeature = require("src.enums.ISCFeature")
+local ISCFeature = ____ISCFeature.ISCFeature
+local ____CustomCallbackItemPickup = require("src.classes.callbacks.validation.CustomCallbackItemPickup")
+local CustomCallbackItemPickup = ____CustomCallbackItemPickup.CustomCallbackItemPickup
+____exports.PostItemPickup = __TS__Class()
+local PostItemPickup = ____exports.PostItemPickup
+PostItemPickup.name = "PostItemPickup"
+__TS__ClassExtends(PostItemPickup, CustomCallbackItemPickup)
+function PostItemPickup.prototype.____constructor(self)
+    CustomCallbackItemPickup.prototype.____constructor(self)
+    self.featuresUsed = {ISCFeature.ITEM_PICKUP_DETECTION}
+end
+return ____exports

package/dist/src/classes/callbacks/PostLaserInitLate.d.ts

@@ -0,0 +1,12 @@
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackLaser } from "./validation/CustomCallbackLaser";
+export declare class PostLaserInitLate extends CustomCallbackLaser<ModCallbackCustom2.POST_LASER_INIT_LATE> {
+    v: {
+        room: {
+            firedSet: Set<PtrHash>;
+        };
+    };
+    constructor();
+    private postLaserUpdate;
+}
+//# sourceMappingURL=PostLaserInitLate.d.ts.map

package/dist/src/classes/callbacks/PostLaserInitLate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostLaserInitLate.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostLaserInitLate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,qBAAa,iBAAkB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;IACjF,CAAC;;;;MAIf;;IAWF,OAAO,CAAC,eAAe,CAMrB;CACH"}

package/dist/src/classes/callbacks/PostLaserInitLate.lua

@@ -0,0 +1,27 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____CustomCallbackLaser = require("src.classes.callbacks.validation.CustomCallbackLaser")
+local CustomCallbackLaser = ____CustomCallbackLaser.CustomCallbackLaser
+____exports.PostLaserInitLate = __TS__Class()
+local PostLaserInitLate = ____exports.PostLaserInitLate
+PostLaserInitLate.name = "PostLaserInitLate"
+__TS__ClassExtends(PostLaserInitLate, CustomCallbackLaser)
+function PostLaserInitLate.prototype.____constructor(self)
+    CustomCallbackLaser.prototype.____constructor(self)
+    self.v = {room = {firedSet = __TS__New(Set)}}
+    self.postLaserUpdate = function(____, laser)
+        local index = GetPtrHash(laser)
+        if not self.v.room.firedSet:has(index) then
+            self.v.room.firedSet:add(index)
+            self:fire(laser)
+        end
+    end
+    self.callbacksUsed = {{ModCallback.POST_LASER_UPDATE, {self.postLaserUpdate}}}
+end
+return ____exports

package/dist/src/classes/callbacks/PostNPCInitLate.d.ts

@@ -0,0 +1,12 @@
+import { ModCallbackCustom2 } from "../../enums/ModCallbackCustom2";
+import { CustomCallbackNPC } from "./validation/CustomCallbackNPC";
+export declare class PostNPCInitLate extends CustomCallbackNPC<ModCallbackCustom2.POST_NPC_INIT_LATE> {
+    v: {
+        room: {
+            firedSet: Set<PtrHash>;
+        };
+    };
+    constructor();
+    private postNPCUpdate;
+}
+//# sourceMappingURL=PostNPCInitLate.d.ts.map

package/dist/src/classes/callbacks/PostNPCInitLate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostNPCInitLate.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostNPCInitLate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;IAC3E,CAAC;;;;MAIf;;IAWF,OAAO,CAAC,aAAa,CAMnB;CACH"}