isaacscript-common 6.6.4 → 6.7.1

package/src/callbacks/postPickupCollect.ts

@@ -3,7 +3,7 @@
 
 import { ModCallback } from "isaac-typescript-definitions";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getClosestPlayer } from "../functions/player";
+import { getClosestPlayer } from "../functions/players";
 import {
   postPickupCollectFire,
   postPickupCollectHasSubscriptions,

package/src/callbacks/postPitRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPits } from "../functions/gridEntitySpecific";
+import { getPits } from "../functions/gridEntitiesSpecific";
 import {
   postPitRenderFire,
   postPitRenderHasSubscriptions,

package/src/callbacks/postPitUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPits } from "../functions/gridEntitySpecific";
+import { getPits } from "../functions/gridEntitiesSpecific";
 import {
   postPitUpdateFire,
   postPitUpdateHasSubscriptions,

package/src/callbacks/postPlayerCollectible.ts

@@ -5,12 +5,12 @@
 import { CollectibleType, ModCallback } from "isaac-typescript-definitions";
 import { DefaultMap } from "../classes/DefaultMap";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getPlayerCollectibleMap } from "../functions/player";
 import {
   defaultMapGetPlayer,
   mapGetPlayer,
   mapSetPlayer,
 } from "../functions/playerDataStructures";
+import { getPlayerCollectibleMap } from "../functions/players";
 import { repeat } from "../functions/utils";
 import { PlayerIndex } from "../types/PlayerIndex";
 import {
@@ -102,7 +102,7 @@ function collectibleCountChanged(
       } else {
         postPlayerCollectibleRemovedFire(player, collectibleType);
       }
-      numFired += 1;
+      numFired++;
     });
 
     if (numFired === numCollectiblesChanged) {

package/src/callbacks/postPoopRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPoops } from "../functions/gridEntitySpecific";
+import { getPoops } from "../functions/gridEntitiesSpecific";
 import {
   postPoopRenderFire,
   postPoopRenderHasSubscriptions,

package/src/callbacks/postPoopUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPoops } from "../functions/gridEntitySpecific";
+import { getPoops } from "../functions/gridEntitiesSpecific";
 import {
   postPoopUpdateFire,
   postPoopUpdateHasSubscriptions,

package/src/callbacks/postPressurePlateRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPressurePlates } from "../functions/gridEntitySpecific";
+import { getPressurePlates } from "../functions/gridEntitiesSpecific";
 import {
   postPressurePlateRenderFire,
   postPressurePlateRenderHasSubscriptions,

package/src/callbacks/postPressurePlateUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getPressurePlates } from "../functions/gridEntitySpecific";
+import { getPressurePlates } from "../functions/gridEntitiesSpecific";
 import {
   postPressurePlateUpdateFire,
   postPressurePlateUpdateHasSubscriptions,

package/src/callbacks/postPurchase.ts

@@ -2,7 +2,7 @@ import { DefaultMap } from "../classes/DefaultMap";
 import { ModUpgraded } from "../classes/ModUpgraded";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getPickups } from "../functions/entitySpecific";
+import { getPickups } from "../functions/entitiesSpecific";
 import {
   defaultMapGetPlayer,
   mapSetPlayer,

package/src/callbacks/postRockRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getRocks } from "../functions/gridEntitySpecific";
+import { getRocks } from "../functions/gridEntitiesSpecific";
 import {
   postRockRenderFire,
   postRockRenderHasSubscriptions,

package/src/callbacks/postRockUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getRocks } from "../functions/gridEntitySpecific";
+import { getRocks } from "../functions/gridEntitiesSpecific";
 import {
   postRockUpdateFire,
   postRockUpdateHasSubscriptions,

package/src/callbacks/postSacrifice.ts

@@ -56,7 +56,7 @@ function entityTakeDmgPlayer(
   const isSpikeDamage = hasFlag(damageFlags, DamageFlag.SPIKES);
 
   if (roomType === RoomType.SACRIFICE && isSpikeDamage) {
-    v.level.numSacrifices += 1;
+    v.level.numSacrifices++;
     postSacrificeFire(player, v.level.numSacrifices);
   }
 

package/src/callbacks/postSlotInitUpdate.ts

@@ -5,7 +5,7 @@ import { ModCallback } from "isaac-typescript-definitions";
 import { ModUpgraded } from "../classes/ModUpgraded";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getSlots } from "../functions/entitySpecific";
+import { getSlots } from "../functions/entitiesSpecific";
 import {
   postSlotInitFire,
   postSlotInitHasSubscriptions,

package/src/callbacks/postSlotRender.ts

@@ -5,7 +5,7 @@
 import { ModCallback } from "isaac-typescript-definitions";
 import { DefaultMap } from "../classes/DefaultMap";
 import { saveDataManager } from "../features/saveDataManager/exports";
-import { getSlots } from "../functions/entitySpecific";
+import { getSlots } from "../functions/entitiesSpecific";
 import {
   postSlotAnimationChangedFire,
   postSlotAnimationChangedHasSubscriptions,

package/src/callbacks/postSpikesRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getSpikes } from "../functions/gridEntitySpecific";
+import { getSpikes } from "../functions/gridEntitiesSpecific";
 import {
   postSpikesRenderFire,
   postSpikesRenderHasSubscriptions,

package/src/callbacks/postSpikesUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getSpikes } from "../functions/gridEntitySpecific";
+import { getSpikes } from "../functions/gridEntitiesSpecific";
 import {
   postSpikesUpdateFire,
   postSpikesUpdateHasSubscriptions,

package/src/callbacks/postTNTRender.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getTNT } from "../functions/gridEntitySpecific";
+import { getTNT } from "../functions/gridEntitiesSpecific";
 import {
   postTNTRenderFire,
   postTNTRenderHasSubscriptions,

package/src/callbacks/postTNTUpdate.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getTNT } from "../functions/gridEntitySpecific";
+import { getTNT } from "../functions/gridEntitiesSpecific";
 import {
   postTNTUpdateFire,
   postTNTUpdateHasSubscriptions,

package/src/callbacks/preBerserkDeath.ts

@@ -1,8 +1,8 @@
 import { CollectibleType } from "isaac-typescript-definitions";
 import { ModUpgraded } from "../classes/ModUpgraded";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
-import { getPlayerNumHitsRemaining } from "../functions/player";
 import { isChildPlayer } from "../functions/playerIndex";
+import { getPlayerNumHitsRemaining } from "../functions/players";
 import { willPlayerRevive } from "../functions/revive";
 import {
   preBerserkDeathFire,

package/src/callbacks/preNewLevel.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { getLastFrameOfAnimation } from "../functions/sprite";
+import { getLastFrameOfAnimation } from "../functions/sprites";
 import { getEffectiveStage } from "../functions/stage";
 import {
   preNewLevelFire,

package/src/callbacks/subscriptions/postDoorRender.ts

@@ -1,6 +1,8 @@
+import { DoorVariant } from "isaac-typescript-definitions";
+
 export type PostDoorRenderRegisterParameters = [
   callback: (door: GridEntityDoor) => void,
-  gridEntityVariant?: int,
+  doorVariant?: DoorVariant,
 ];
 
 const subscriptions: PostDoorRenderRegisterParameters[] = [];
@@ -19,13 +21,13 @@ export function postDoorRenderRegister(
 
 /** @internal */
 export function postDoorRenderFire(door: GridEntityDoor): void {
-  const gridEntityVariant = door.GetVariant();
+  const doorVariant = door.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackDoorVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackDoorVariant !== undefined &&
+      callbackDoorVariant !== doorVariant
     ) {
       continue;
     }

package/src/callbacks/subscriptions/postDoorUpdate.ts

@@ -1,6 +1,8 @@
+import { DoorVariant } from "isaac-typescript-definitions";
+
 export type PostDoorUpdateRegisterParameters = [
   callback: (door: GridEntityDoor) => void,
-  gridEntityVariant?: int,
+  doorVariant?: DoorVariant,
 ];
 
 const subscriptions: PostDoorUpdateRegisterParameters[] = [];
@@ -19,13 +21,13 @@ export function postDoorUpdateRegister(
 
 /** @internal */
 export function postDoorUpdateFire(door: GridEntityDoor): void {
-  const gridEntityVariant = door.GetVariant();
+  const doorVariant = door.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackDoorVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackDoorVariant !== undefined &&
+      callbackDoorVariant !== doorVariant
     ) {
       continue;
     }

package/src/callbacks/subscriptions/postPitRender.ts

@@ -1,6 +1,8 @@
+import { PitVariant } from "isaac-typescript-definitions";
+
 export type PostPitRenderRegisterParameters = [
   callback: (pit: GridEntityPit) => void,
-  gridEntityVariant?: int,
+  pitVariant?: PitVariant,
 ];
 
 const subscriptions: PostPitRenderRegisterParameters[] = [];
@@ -19,14 +21,11 @@ export function postPitRenderRegister(
 
 /** @internal */
 export function postPitRenderFire(pit: GridEntityPit): void {
-  const gridEntityVariant = pit.GetVariant();
+  const pitVariant = pit.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPitVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
-    if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
-    ) {
+    if (callbackPitVariant !== undefined && callbackPitVariant !== pitVariant) {
       continue;
     }
 

package/src/callbacks/subscriptions/postPitUpdate.ts

@@ -1,6 +1,8 @@
+import { PitVariant } from "isaac-typescript-definitions";
+
 export type PostPitUpdateRegisterParameters = [
   callback: (pit: GridEntityPit) => void,
-  gridEntityVariant?: int,
+  pitVariant?: PitVariant,
 ];
 
 const subscriptions: PostPitUpdateRegisterParameters[] = [];
@@ -19,14 +21,11 @@ export function postPitUpdateRegister(
 
 /** @internal */
 export function postPitUpdateFire(pit: GridEntityPit): void {
-  const gridEntityVariant = pit.GetVariant();
+  const pitVariant = pit.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPitVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
-    if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
-    ) {
+    if (callbackPitVariant !== undefined && callbackPitVariant !== pitVariant) {
       continue;
     }
 

package/src/callbacks/subscriptions/postPoopRender.ts

@@ -1,6 +1,8 @@
+import { PoopGridEntityVariant } from "isaac-typescript-definitions";
+
 export type PostPoopRenderRegisterParameters = [
   callback: (poop: GridEntityPoop) => void,
-  gridEntityVariant?: int,
+  poopVariant?: PoopGridEntityVariant,
 ];
 
 const subscriptions: PostPoopRenderRegisterParameters[] = [];
@@ -19,13 +21,13 @@ export function postPoopRenderRegister(
 
 /** @internal */
 export function postPoopRenderFire(poop: GridEntityPoop): void {
-  const gridEntityVariant = poop.GetVariant();
+  const poopVariant = poop.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPoopVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackPoopVariant !== undefined &&
+      callbackPoopVariant !== poopVariant
     ) {
       continue;
     }

package/src/callbacks/subscriptions/postPoopUpdate.ts

@@ -1,6 +1,8 @@
+import { PoopGridEntityVariant } from "isaac-typescript-definitions";
+
 export type PostPoopUpdateRegisterParameters = [
   callback: (poop: GridEntityPoop) => void,
-  gridEntityVariant?: int,
+  poopVariant?: PoopGridEntityVariant,
 ];
 
 const subscriptions: PostPoopUpdateRegisterParameters[] = [];
@@ -19,13 +21,13 @@ export function postPoopUpdateRegister(
 
 /** @internal */
 export function postPoopUpdateFire(poop: GridEntityPoop): void {
-  const gridEntityVariant = poop.GetVariant();
+  const poopVariant = poop.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPoopVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackPoopVariant !== undefined &&
+      callbackPoopVariant !== poopVariant
     ) {
       continue;
     }

package/src/callbacks/subscriptions/postPressurePlateRender.ts

@@ -1,6 +1,8 @@
+import { PressurePlateVariant } from "isaac-typescript-definitions";
+
 export type PostPressurePlateRenderRegisterParameters = [
   callback: (pressurePlate: GridEntityPressurePlate) => void,
-  gridEntityVariant?: int,
+  pressurePlateVariant?: PressurePlateVariant,
 ];
 
 const subscriptions: PostPressurePlateRenderRegisterParameters[] = [];
@@ -21,13 +23,13 @@ export function postPressurePlateRenderRegister(
 export function postPressurePlateRenderFire(
   pressurePlate: GridEntityPressurePlate,
 ): void {
-  const gridEntityVariant = pressurePlate.GetVariant();
+  const pressurePlateVariant = pressurePlate.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPressurePlateVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackPressurePlateVariant !== undefined &&
+      callbackPressurePlateVariant !== pressurePlateVariant
     ) {
       continue;
     }

package/src/callbacks/subscriptions/postPressurePlateUpdate.ts

@@ -1,6 +1,8 @@
+import { PressurePlateVariant } from "isaac-typescript-definitions";
+
 export type PostPressurePlateUpdateRegisterParameters = [
   callback: (pressurePlate: GridEntityPressurePlate) => void,
-  gridEntityVariant?: int,
+  pressurePlateVariant?: PressurePlateVariant,
 ];
 
 const subscriptions: PostPressurePlateUpdateRegisterParameters[] = [];
@@ -21,13 +23,13 @@ export function postPressurePlateUpdateRegister(
 export function postPressurePlateUpdateFire(
   pressurePlate: GridEntityPressurePlate,
 ): void {
-  const gridEntityVariant = pressurePlate.GetVariant();
+  const pressurePlateVariant = pressurePlate.GetVariant();
 
-  for (const [callback, callbackGridEntityVariant] of subscriptions) {
+  for (const [callback, callbackPressurePlateVariant] of subscriptions) {
     // Handle the optional 2nd callback argument.
     if (
-      callbackGridEntityVariant !== undefined &&
-      callbackGridEntityVariant !== gridEntityVariant
+      callbackPressurePlateVariant !== undefined &&
+      callbackPressurePlateVariant !== pressurePlateVariant
     ) {
       continue;
     }

package/src/enums/private/SerializationBrand.ts

@@ -20,10 +20,6 @@ export enum SerializationBrand {
   /**
    * This is set to the value that represents the default value (instead of an empty string like the
    * other brands are).
-   *
-   * Default maps that use a factory function are unserializable, but do not throw runtime errors
-   * because the merge function can derive the factory function from the already-instantiated
-   * object.
    */
   DEFAULT_MAP_VALUE = "__TSTL_DEFAULT_MAP_VALUE",
 

package/src/features/characterStats.ts

@@ -11,7 +11,7 @@ import {
 } from "isaac-typescript-definitions";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { getDefaultPlayerStat } from "../functions/cacheFlag";
-import { addStat } from "../functions/player";
+import { addStat } from "../functions/players";
 
 const FEATURE_NAME = "characterStats";
 

package/src/features/collectibleItemPoolType.ts

@@ -9,7 +9,7 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../cachedClasses";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
-import { getEntityID } from "../functions/entity";
+import { getEntityID } from "../functions/entities";
 import { isCollectible } from "../functions/pickupVariants";
 import { getRoomItemPoolType } from "../functions/rooms";
 import { saveDataManager } from "./saveDataManager/exports";

package/src/features/customGridEntity.ts

@@ -8,7 +8,10 @@ import { ModUpgraded } from "../classes/ModUpgraded";
 import { DecorationVariant } from "../enums/DecorationVariant";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
-import { removeGrid, spawnGridWithVariant } from "../functions/gridEntity";
+import {
+  removeGridEntity,
+  spawnGridEntityWithVariant,
+} from "../functions/gridEntities";
 import { getRoomListIndex } from "../functions/roomData";
 import { isVector } from "../functions/vector";
 import { CustomGridEntityData } from "../interfaces/CustomGridEntityData";
@@ -105,7 +108,7 @@ export function spawnCustomGrid(
       (DecorationVariant.CUSTOM_GRID_ENTITY as int);
   const decoration = isExistingDecoration
     ? existingGridEntity
-    : spawnGridWithVariant(
+    : spawnGridEntityWithVariant(
         GridEntityType.DECORATION,
         DecorationVariant.CUSTOM_GRID_ENTITY,
         gridIndexOrPosition,
@@ -186,7 +189,7 @@ export function removeCustomGrid(
   }
 
   roomCustomGridEntities.delete(gridIndex);
-  removeGrid(decoration, updateRoom);
+  removeGridEntity(decoration, updateRoom);
 
   return decoration;
 }

package/src/features/customStage/backdrop.ts

@@ -11,7 +11,7 @@ import {
 import { game } from "../../cachedClasses";
 import { VectorZero } from "../../constants";
 import { getRandomArrayElement } from "../../functions/array";
-import { spawnEffectWithSeed } from "../../functions/entitySpecific";
+import { spawnEffectWithSeed } from "../../functions/entitiesSpecific";
 import { newRNG } from "../../functions/rng";
 import { isLRoom, isNarrowRoom } from "../../functions/roomShape";
 import { trimPrefix } from "../../functions/string";

package/src/features/customStage/{gridEntities.ts → customStageGridEntities.ts}

@@ -4,13 +4,13 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { DecorationVariant } from "../../enums/DecorationVariant";
-import { removeEntities } from "../../functions/entity";
-import { getNPCs } from "../../functions/entitySpecific";
+import { removeEntities } from "../../functions/entities";
+import { getNPCs } from "../../functions/entitiesSpecific";
 import {
   getCoins,
   getCollectibles,
   getTrinkets,
-} from "../../functions/pickups";
+} from "../../functions/pickupsSpecific";
 import { vectorEquals } from "../../functions/vector";
 import { CustomStage } from "../../interfaces/CustomStage";
 

package/src/features/customStage/exports.ts

@@ -10,7 +10,7 @@ import {
 } from "isaac-typescript-definitions";
 import { game } from "../../cachedClasses";
 import { reorderedCallbacksSetStage } from "../../callbacks/reorderedCallbacks";
-import { getEntityIDFromConstituents } from "../../functions/entity";
+import { getEntityIDFromConstituents } from "../../functions/entities";
 import { log, logError } from "../../functions/log";
 import { movePlayersToCenter } from "../../functions/playerCenter";
 import { newRNG } from "../../functions/rng";
@@ -18,7 +18,7 @@ import { getRoomData } from "../../functions/roomData";
 import { getRooms } from "../../functions/rooms";
 import { getGotoCommand, setStage } from "../../functions/stage";
 import { runNextRoom } from "../runNextRoom";
-import { getRandomCustomStageRoom } from "./util";
+import { getRandomCustomStageRoom } from "./customStageUtils";
 import v, {
   customBossPNGPaths,
   customStageCachedRoomData,

package/src/features/customStage/init.ts

@@ -21,7 +21,7 @@ import {
   setCustomDoorGraphics,
   setCustomPitGraphics,
   setCustomRockGraphics,
-} from "./gridEntities";
+} from "./customStageGridEntities";
 import * as metadataJSON from "./metadata.json"; // This will correspond to "metadata.lua" at run-time.
 import { setShadows } from "./shadows";
 import { streakTextGetShaderParams, streakTextPostRender } from "./streakText";

package/src/features/customStage/shadows.ts

@@ -1,7 +1,7 @@
 import { EffectVariant, RoomShape } from "isaac-typescript-definitions";
 import { game } from "../../cachedClasses";
 import { getRandomArrayElement } from "../../functions/array";
-import { spawnEffectWithSeed } from "../../functions/entitySpecific";
+import { spawnEffectWithSeed } from "../../functions/entitiesSpecific";
 import { CustomStage } from "../../interfaces/CustomStage";
 import { ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH } from "./customStageConstants";
 import v from "./v";

package/src/features/customStage/versusScreen.ts

@@ -7,8 +7,8 @@ import {
 } from "isaac-typescript-definitions";
 import { game, sfxManager } from "../../cachedClasses";
 import { arrayRemove } from "../../functions/array";
-import { getBosses } from "../../functions/boss";
-import { getEntityID } from "../../functions/entity";
+import { getBosses } from "../../functions/bosses";
+import { getEntityID } from "../../functions/entities";
 import { erange } from "../../functions/utils";
 import { CustomStage } from "../../interfaces/CustomStage";
 import { BOSS_NAME_PNG_FILE_NAMES } from "../../objects/bossNamePNGFileNames";

package/src/features/debugDisplay/v.ts

@@ -1,5 +1,5 @@
-import { getEntityID } from "../../functions/entity";
-import { getGridEntityID } from "../../functions/gridEntity";
+import { getEntityID } from "../../functions/entities";
+import { getGridEntityID } from "../../functions/gridEntities";
 
 let debugDisplayEnabled = false;
 

package/src/features/deployJSONRoom.ts

@@ -28,22 +28,22 @@ import {
   removeAllMatchingEntities,
   spawn,
   spawnWithSeed,
-} from "../functions/entity";
+} from "../functions/entities";
 import {
   getNPCs,
   removeAllBombs,
   removeAllPickups,
-} from "../functions/entitySpecific";
+} from "../functions/entitiesSpecific";
 import {
   convertXMLGridEntityType,
   getAllGridIndexes,
   getGridEntities,
   getGridEntityIDFromConstituents,
   removeAllGridExcept,
-  removeGrid,
+  removeGridEntity,
   setGridEntityInvisible,
-  spawnGridWithVariant,
-} from "../functions/gridEntity";
+  spawnGridEntityWithVariant,
+} from "../functions/gridEntities";
 import { getRandomJSONRoom } from "../functions/jsonRoom";
 import { log } from "../functions/log";
 import { getRandomSeed, isRNG, newRNG } from "../functions/rng";
@@ -131,7 +131,7 @@ function preUseItemWeNeedToGoDeeper(
   // of the shovel to happen.)
   const decorations = getGridEntities(GridEntityType.DECORATION);
   for (const decoration of decorations) {
-    removeGrid(decoration, false);
+    removeGridEntity(decoration, false);
   }
 
   const playerPtr = EntityPtr(player);
@@ -549,7 +549,11 @@ function spawnGridEntityForJSONRoom(
   const position = gridCoordinatesToWorldPosition(x, y);
   const gridIndex = room.GetGridIndex(position);
 
-  const gridEntity = spawnGridWithVariant(gridEntityType, variant, gridIndex);
+  const gridEntity = spawnGridEntityWithVariant(
+    gridEntityType,
+    variant,
+    gridIndex,
+  );
   if (gridEntity === undefined) {
     return gridEntity;
   }