isaacscript-common 8.4.3 → 8.4.6

package/dist/functions/trinketSet.lua

@@ -1,55 +1,50 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
-local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
 local ____cachedClasses = require("core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____constantsFirstLast = require("core.constantsFirstLast")
-local FIRST_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
-local LAST_VANILLA_TRINKET_TYPE = ____constantsFirstLast.LAST_VANILLA_TRINKET_TYPE
 local ____firstLast = require("features.firstLast")
-local getLastTrinketType = ____firstLast.getLastTrinketType
-local ____utils = require("functions.utils")
-local irange = ____utils.irange
+local getModdedTrinketTypes = ____firstLast.getModdedTrinketTypes
+local ____trinkets = require("functions.trinkets")
+local getVanillaTrinketTypes = ____trinkets.getVanillaTrinketTypes
 local ALL_TRINKETS_ARRAY = {}
-local VANILLA_TRINKETS_ARRAY = {}
-local MODDED_TRINKETS_ARRAY = {}
 local ALL_TRINKETS_SET = __TS__New(Set)
+local VANILLA_TRINKETS_ARRAY = {}
 local VANILLA_TRINKETS_SET = __TS__New(Set)
+local MODDED_TRINKETS_ARRAY = {}
 local MODDED_TRINKETS_SET = __TS__New(Set)
-local function lazyInitTrinketArraysAndSets(self)
-    if #ALL_TRINKETS_ARRAY ~= 0 then
+local function lazyInitVanillaTrinkets(self)
+    if #VANILLA_TRINKETS_ARRAY > 0 then
         return
     end
-    local lastTrinketType = getLastTrinketType(nil)
-    local trinketTypeRange = irange(nil, FIRST_TRINKET_TYPE, lastTrinketType)
-    for ____, trinketType in ipairs(trinketTypeRange) do
-        do
-            local itemConfigItem = itemConfig:GetTrinket(trinketType)
-            if itemConfigItem == nil then
-                goto __continue4
-            end
-            ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
-            if trinketType <= LAST_VANILLA_TRINKET_TYPE then
-                VANILLA_TRINKETS_ARRAY[#VANILLA_TRINKETS_ARRAY + 1] = trinketType
-            else
-                MODDED_TRINKETS_ARRAY[#MODDED_TRINKETS_ARRAY + 1] = trinketType
-            end
+    local vanillaTrinketTypes = getVanillaTrinketTypes(nil)
+    for ____, trinketType in ipairs(vanillaTrinketTypes) do
+        local itemConfigItem = itemConfig:GetTrinket(trinketType)
+        if itemConfigItem ~= nil then
+            VANILLA_TRINKETS_ARRAY[#VANILLA_TRINKETS_ARRAY + 1] = trinketType
+            VANILLA_TRINKETS_SET:add(trinketType)
         end
-        ::__continue4::
     end
-    __TS__ArraySort(ALL_TRINKETS_ARRAY)
-    for ____, trinketType in ipairs(ALL_TRINKETS_ARRAY) do
-        ALL_TRINKETS_SET:add(trinketType)
+end
+local function lazyInitModdedTrinkets(self)
+    if #MODDED_TRINKETS_ARRAY > 0 then
+        return
     end
-    __TS__ArraySort(VANILLA_TRINKETS_ARRAY)
+    lazyInitVanillaTrinkets(nil)
     for ____, trinketType in ipairs(VANILLA_TRINKETS_ARRAY) do
-        VANILLA_TRINKETS_SET:add(trinketType)
+        ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
+        ALL_TRINKETS_SET:add(trinketType)
     end
-    __TS__ArraySort(MODDED_TRINKETS_ARRAY)
-    for ____, trinketType in ipairs(MODDED_TRINKETS_ARRAY) do
-        MODDED_TRINKETS_SET:add(trinketType)
+    local moddedTrinketTypes = getModdedTrinketTypes(nil)
+    for ____, trinketType in ipairs(moddedTrinketTypes) do
+        local itemConfigItem = itemConfig:GetTrinket(trinketType)
+        if itemConfigItem ~= nil then
+            MODDED_TRINKETS_ARRAY[#MODDED_TRINKETS_ARRAY + 1] = trinketType
+            MODDED_TRINKETS_SET:add(trinketType)
+            ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
+            ALL_TRINKETS_SET:add(trinketType)
+        end
     end
 end
 --- Returns an array containing every valid trinket type in the game, including modded trinkets.
@@ -60,7 +55,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return MODDED_TRINKETS_ARRAY
 end
 --- Returns a set containing every valid trinket type in the game, including modded trinkets.
@@ -71,7 +66,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return MODDED_TRINKETS_SET
 end
 --- Returns an array containing every modded trinket type in the game.
@@ -82,7 +77,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return ALL_TRINKETS_ARRAY
 end
 --- Returns a set containing every modded trinket type in the game.
@@ -93,29 +88,23 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return ALL_TRINKETS_SET
 end
 --- Returns an array containing every valid vanilla trinket type in the game.
 -- 
 -- Use this if you need to iterate over the trinkets in order. If you need to do O(1) lookups, then
 -- use the `getVanillaTrinketSet` helper function instead.
--- 
--- This function can only be called if at least one callback has been executed. This is because not
--- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getVanillaTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitVanillaTrinkets(nil)
     return VANILLA_TRINKETS_ARRAY
 end
 --- Returns a set containing every valid vanilla trinket type in the game.
 -- 
 -- Use this if you need to do O(1) lookups. If you need to iterate over the trinkets in order, then
 -- use the `getVanillaTrinketArray` helper function instead.
--- 
--- This function can only be called if at least one callback has been executed. This is because not
--- all trinkets will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getVanillaTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitVanillaTrinkets(nil)
     return VANILLA_TRINKETS_SET
 end
 return ____exports

package/dist/index.d.ts

@@ -5098,9 +5098,6 @@ export declare function getVanillaCards(): Card[];
  *
  * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
  * then use the `getVanillaCollectibleSet` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaCollectibleArray(): readonly CollectibleType[];
 
@@ -5109,9 +5106,6 @@ export declare function getVanillaCollectibleArray(): readonly CollectibleType[]
  *
  * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
  * then use the `getVanillaCollectibleArray` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>;
 
@@ -5121,7 +5115,8 @@ export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>
  * collectible types.
  *
  * This function is only useful when building collectible type objects. For most purposes, you
- * should use the `getVanillaCollectibleSet` helper function instead.
+ * should use the `getVanillaCollectibleArray` or `getVanillaCollectibleSet` helper functions
+ * instead.
  */
 export declare function getVanillaCollectibleTypeRange(): CollectibleType[];
 
@@ -5133,9 +5128,6 @@ export declare function getVanillaPillEffects(): PillEffect[];
  *
  * Use this if you need to iterate over the trinkets in order. If you need to do O(1) lookups, then
  * use the `getVanillaTrinketSet` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaTrinketArray(): readonly TrinketType[];
 
@@ -5144,9 +5136,6 @@ export declare function getVanillaTrinketArray(): readonly TrinketType[];
  *
  * Use this if you need to do O(1) lookups. If you need to iterate over the trinkets in order, then
  * use the `getVanillaTrinketArray` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaTrinketSet(): ReadonlySet<TrinketType>;
 
@@ -5673,7 +5662,7 @@ export declare function isDamageFromPlayer(damageSource: Entity): boolean;
  * Uses the player's current health and other miscellaneous things to determine if incoming damage
  * will be fatal.
  */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int | undefined): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, amount: int, source: EntityRef, lastDamageGameFrame: int | undefined): boolean;
 
 /**
  * Helper function to check if the given room grid index is a dead end. Specifically, this is
@@ -6080,7 +6069,7 @@ export declare function isSack(pickup: EntityPickup): pickup is EntityPickupSack
 export declare function isSecretRoomDoor(door: GridEntityDoor): boolean;
 
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */
@@ -8716,7 +8705,7 @@ collectibleType?: CollectibleType
 ];
 
 declare type PostPlayerFatalDamageRegisterParameters = [
-callback: (player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int) => boolean | undefined,
+callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
 playerVariant?: PlayerVariant,
 character?: PlayerType
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.4.3",
+  "version": "8.4.6",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.5.0"
+    "isaac-typescript-definitions": "^3.5.2"
   }
 }

package/src/callbacks/postCursedTeleport.ts

@@ -54,26 +54,26 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
   incrementNumSacrifices(damageFlags); // Has to be before setting the damage frame
-  setDamageFrame(tookDamage, damageFlags);
+  setDamageFrame(entity, damageFlags);
 
   return undefined;
 }
 
-function setDamageFrame(tookDamage: Entity, damageFlags: BitFlags<DamageFlag>) {
+function setDamageFrame(entity: Entity, damageFlags: BitFlags<DamageFlag>) {
   const gameFrameCount = game.GetFrameCount();
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return;
   }

package/src/callbacks/postPlayerFatalDamage.ts

@@ -50,17 +50,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  damageAmount: float,
+  entity: Entity,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }
@@ -83,23 +83,16 @@ function entityTakeDmgPlayer(
     return undefined;
   }
 
-  if (
-    !isDamageToPlayerFatal(
-      player,
-      damageAmount,
-      damageSource,
-      lastDamageGameFrame,
-    )
-  ) {
+  if (!isDamageToPlayerFatal(player, amount, source, lastDamageGameFrame)) {
     return undefined;
   }
 
   const shouldSustainDeath = postPlayerFatalDamageFire(
     player,
-    damageAmount,
+    amount,
     damageFlags,
-    damageSource,
-    damageCountdownFrames,
+    source,
+    countdownFrames,
   );
   if (shouldSustainDeath !== undefined) {
     return shouldSustainDeath;

package/src/callbacks/postSacrifice.ts

@@ -35,17 +35,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/postTrinketBreak.ts

@@ -52,17 +52,17 @@ function hasSubscriptions() {
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
 function entityTakeDmgPlayer(
-  tookDamage: Entity,
-  _damageAmount: float,
+  entity: Entity,
+  _amount: float,
   _damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
+  _source: EntityRef,
+  _countdownFrames: int,
 ): boolean | undefined {
   if (!hasSubscriptions()) {
     return undefined;
   }
 
-  const player = tookDamage.ToPlayer();
+  const player = entity.ToPlayer();
   if (player === undefined) {
     return undefined;
   }

package/src/callbacks/subscriptions/postPlayerFatalDamage.ts

@@ -7,10 +7,10 @@ import {
 export type PostPlayerFatalDamageRegisterParameters = [
   callback: (
     player: EntityPlayer,
-    damageAmount: float,
+    amount: float,
     damageFlags: BitFlags<DamageFlag>,
-    damageSource: EntityRef,
-    damageCountdownFrames: int,
+    source: EntityRef,
+    countdownFrames: int,
   ) => boolean | undefined,
   playerVariant?: PlayerVariant,
   character?: PlayerType,
@@ -30,10 +30,10 @@ export function postPlayerFatalDamageRegister(
 
 export function postPlayerFatalDamageFire(
   player: EntityPlayer,
-  damageAmount: float,
+  amount: float,
   damageFlags: BitFlags<DamageFlag>,
-  damageSource: EntityRef,
-  damageCountdownFrames: int,
+  source: EntityRef,
+  countdownFrames: int,
 ): boolean | undefined {
   const character = player.GetPlayerType();
 
@@ -50,10 +50,10 @@ export function postPlayerFatalDamageFire(
 
     const shouldSustainDeath = callback(
       player,
-      damageAmount,
+      amount,
       damageFlags,
-      damageSource,
-      damageCountdownFrames,
+      source,
+      countdownFrames,
     );
 
     if (shouldSustainDeath !== undefined) {

package/src/features/customGridEntity.ts

@@ -1,14 +1,11 @@
 import {
   ActiveSlot,
   CollectibleType,
-  DamageFlag,
-  EntityType,
   GridCollisionClass,
   GridEntityType,
   ModCallback,
   UseFlag,
 } from "isaac-typescript-definitions";
-import { postGridEntityCustomBrokenFire } from "../callbacks/subscriptions/postGridEntityCustomBroken";
 import { DefaultMap } from "../classes/DefaultMap";
 import { ModUpgraded } from "../classes/ModUpgraded";
 import { game } from "../core/cachedClasses";
@@ -17,7 +14,6 @@ import {
   areFeaturesInitialized,
   errorIfFeaturesNotInitialized,
 } from "../featuresInitialized";
-import { hasFlag } from "../functions/flag";
 import {
   removeGridEntity,
   spawnGridEntityWithVariant,
@@ -49,12 +45,6 @@ const v = {
 export function customGridEntityInit(mod: ModUpgraded): void {
   saveDataManager(FEATURE_NAME, v);
 
-  mod.AddCallback(
-    ModCallback.ENTITY_TAKE_DMG,
-    entityTakeDmgGenericProp,
-    EntityType.GENERIC_PROP,
-  ); // 11
-
   mod.AddCallback(
     ModCallback.PRE_USE_ITEM,
     preUseItemWeNeedToGoDeeper,
@@ -67,51 +57,6 @@ export function customGridEntityInit(mod: ModUpgraded): void {
   );
 }
 
-// ModCallback.ENTITY_TAKE_DMG (11)
-// EntityType.GENERIC_PROP (960)
-function entityTakeDmgGenericProp(
-  tookDamage: Entity,
-  _damageAmount: float,
-  damageFlags: BitFlags<DamageFlag>,
-  _damageSource: EntityRef,
-  _damageCountdownFrames: int,
-): boolean | undefined {
-  const ptrHash = GetPtrHash(tookDamage);
-  if (!v.room.genericPropPtrHashes.has(ptrHash)) {
-    return undefined;
-  }
-
-  if (!hasFlag(damageFlags, DamageFlag.EXPLOSION)) {
-    return false;
-  }
-
-  const room = game.GetRoom();
-  const roomListIndex = getRoomListIndex();
-  const roomCustomGridEntities = v.level.customGridEntities.get(roomListIndex);
-  if (roomCustomGridEntities === undefined) {
-    return false;
-  }
-
-  const gridIndex = room.GetGridIndex(tookDamage.Position);
-  const data = roomCustomGridEntities.get(gridIndex);
-  if (data === undefined) {
-    return false;
-  }
-
-  const gridEntity = room.GetGridEntity(gridIndex);
-  if (gridEntity === undefined) {
-    error(
-      `Failed to get the grid entity for a custom grid entity that broke at grid index: ${gridIndex}`,
-    );
-  }
-
-  postGridEntityCustomBrokenFire(gridEntity, data.gridEntityTypeCustom);
-
-  // Even though the custom grid entity is now broken, we do not want to remove it, as the end-user
-  // could intend for it to persist with different graphics (or take multiple hits to be destroyed).
-  return false;
-}
-
 // ModCallback.PRE_USE_ITEM (23)
 // CollectibleType.WE_NEED_TO_GO_DEEPER (84)
 function preUseItemWeNeedToGoDeeper(

package/src/features/extraConsoleCommands/init.ts

@@ -1,6 +1,7 @@
 import {
   CacheFlag,
   CollectibleType,
+  DamageFlag,
   EntityType,
   LevelCurse,
   ModCallback,
@@ -348,7 +349,13 @@ function evaluateCacheFlying(player: EntityPlayer) {
 
 // ModCallback.ENTITY_TAKE_DMG (11)
 // EntityType.PLAYER (1)
-function entityTakeDmgPlayer() {
+function entityTakeDmgPlayer(
+  _entity: Entity,
+  _damageAmount: float,
+  _damageFlags: BitFlags<DamageFlag>,
+  _damageSource: EntityRef,
+  _damageCountdownFrames: int,
+) {
   if (v.run.spamBloodRights) {
     return false;
   }

package/src/functions/collectibleSet.ts

@@ -1,57 +1,56 @@
 import { CollectibleType } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
-import {
-  FIRST_COLLECTIBLE_TYPE,
-  LAST_VANILLA_COLLECTIBLE_TYPE,
-} from "../core/constantsFirstLast";
-import { getLastCollectibleType } from "../features/firstLast";
-import { irange } from "./utils";
+import { getModdedCollectibleTypes } from "../features/firstLast";
+import { getVanillaCollectibleTypeRange } from "./collectibles";
 
 const ALL_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-const VANILLA_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-const MODDED_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-
 const ALL_COLLECTIBLES_SET = new Set<CollectibleType>();
+
+const VANILLA_COLLECTIBLES_ARRAY: CollectibleType[] = [];
 const VANILLA_COLLECTIBLES_SET = new Set<CollectibleType>();
+
+const MODDED_COLLECTIBLES_ARRAY: CollectibleType[] = [];
 const MODDED_COLLECTIBLES_SET = new Set<CollectibleType>();
 
-function lazyInitCollectibleArraysAndSets() {
-  if (ALL_COLLECTIBLES_ARRAY.length !== 0) {
+function lazyInitVanillaCollectibles() {
+  if (VANILLA_COLLECTIBLES_ARRAY.length > 0) {
     return;
   }
 
-  const lastCollectibleType = getLastCollectibleType();
-  const collectibleTypeRange = irange(
-    FIRST_COLLECTIBLE_TYPE,
-    lastCollectibleType,
-  ) as CollectibleType[];
-  for (const collectibleType of collectibleTypeRange) {
+  const vanillaCollectibleTypeRange = getVanillaCollectibleTypeRange();
+  for (const collectibleType of vanillaCollectibleTypeRange) {
+    // Vanilla collectible types are not contiguous, so we must check every value.
     const itemConfigItem = itemConfig.GetCollectible(collectibleType);
-    if (itemConfigItem === undefined) {
-      continue;
-    }
-
-    ALL_COLLECTIBLES_ARRAY.push(collectibleType);
-    if (collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE) {
+    if (itemConfigItem !== undefined) {
       VANILLA_COLLECTIBLES_ARRAY.push(collectibleType);
-    } else {
-      MODDED_COLLECTIBLES_ARRAY.push(collectibleType);
+      VANILLA_COLLECTIBLES_SET.add(collectibleType);
     }
   }
+}
 
-  ALL_COLLECTIBLES_ARRAY.sort();
-  for (const collectibleType of ALL_COLLECTIBLES_ARRAY) {
-    ALL_COLLECTIBLES_SET.add(collectibleType);
+function lazyInitModdedCollectibles() {
+  if (MODDED_COLLECTIBLES_ARRAY.length > 0) {
+    return;
   }
 
-  VANILLA_COLLECTIBLES_ARRAY.sort();
+  lazyInitVanillaCollectibles();
+
   for (const collectibleType of VANILLA_COLLECTIBLES_ARRAY) {
-    VANILLA_COLLECTIBLES_SET.add(collectibleType);
+    ALL_COLLECTIBLES_ARRAY.push(collectibleType);
+    ALL_COLLECTIBLES_SET.add(collectibleType);
   }
 
-  MODDED_COLLECTIBLES_ARRAY.sort();
-  for (const collectibleType of MODDED_COLLECTIBLES_ARRAY) {
-    MODDED_COLLECTIBLES_SET.add(collectibleType);
+  const moddedCollectibleTypes = getModdedCollectibleTypes();
+  for (const collectibleType of moddedCollectibleTypes) {
+    // Modded collectible types are contiguous, but we check every value just in case.
+    const itemConfigItem = itemConfig.GetCollectible(collectibleType);
+    if (itemConfigItem !== undefined) {
+      MODDED_COLLECTIBLES_ARRAY.push(collectibleType);
+      MODDED_COLLECTIBLES_SET.add(collectibleType);
+
+      ALL_COLLECTIBLES_ARRAY.push(collectibleType);
+      ALL_COLLECTIBLES_SET.add(collectibleType);
+    }
   }
 }
 
@@ -66,7 +65,7 @@ function lazyInitCollectibleArraysAndSets() {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return ALL_COLLECTIBLES_ARRAY;
 }
 
@@ -80,7 +79,7 @@ export function getCollectibleArray(): readonly CollectibleType[] {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return ALL_COLLECTIBLES_SET;
 }
 
@@ -94,7 +93,7 @@ export function getCollectibleSet(): ReadonlySet<CollectibleType> {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return MODDED_COLLECTIBLES_ARRAY;
 }
 
@@ -108,7 +107,7 @@ export function getModdedCollectibleArray(): readonly CollectibleType[] {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return MODDED_COLLECTIBLES_SET;
 }
 
@@ -117,12 +116,9 @@ export function getModdedCollectibleSet(): ReadonlySet<CollectibleType> {
  *
  * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
  * then use the `getVanillaCollectibleSet` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getVanillaCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitVanillaCollectibles();
   return VANILLA_COLLECTIBLES_ARRAY;
 }
 
@@ -131,11 +127,8 @@ export function getVanillaCollectibleArray(): readonly CollectibleType[] {
  *
  * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
  * then use the `getVanillaCollectibleArray` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getVanillaCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitVanillaCollectibles();
   return VANILLA_COLLECTIBLES_SET;
 }