isaacscript-common 6.21.0 → 6.22.2

package/src/features/customStage/exports.ts

@@ -1,3 +1,12 @@
+// eslint-disable-next-line isaacscript/complete-sentences-jsdoc
+/**
+ * These are helper functions relating to creating custom stages with the built-in standard library.
+ * For more information about custom stages, see the [main
+ * documentation page](https://isaacscript.github.io/main/custom-stages).
+ *
+ * @module
+ */
+
 import {
   EntityType,
   LevelStage,
@@ -5,8 +14,8 @@ import {
   RoomType,
   StageType,
 } from "isaac-typescript-definitions";
-import { game } from "../../cachedClasses";
-import { reorderedCallbacksSetStage } from "../../callbacks/reorderedCallbacks";
+import { reorderedCallbacksSetStageInternal } from "../../callbacks/reorderedCallbacks";
+import { game } from "../../core/cachedClasses";
 import { getEntityIDFromConstituents } from "../../functions/entities";
 import { logError } from "../../functions/log";
 import { newRNG } from "../../functions/rng";
@@ -15,7 +24,7 @@ import {
   getRoomsInGrid,
 } from "../../functions/rooms";
 import { setStage } from "../../functions/stage";
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 import { getRandomCustomStageRoom } from "./customStageUtils";
 import v, {
   customBossPNGPaths,
@@ -23,8 +32,10 @@ import v, {
   customStagesMap,
 } from "./v";
 
-const DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2;
-const DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL;
+export const DEFAULT_BASE_STAGE = LevelStage.BASEMENT_2;
+export const DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL;
+
+export const INVALID_STAGE_VALUE = -1 as LevelStage;
 
 /**
  * Helper function to warp to a custom stage/level.
@@ -33,9 +44,11 @@ const DEFAULT_BASE_STAGE_TYPE = StageType.ORIGINAL;
  * more details: https://isaacscript.github.io/main/custom-stages/
  *
  * @param name The name of the custom stage, corresponding to what is in the "tsconfig.json" file.
- * @param firstFloor Whether to go to the first floor or the second floor. For example, if you have
- *                   a custom stage emulating Caves, then the first floor would be Caves 1, and the
- *                   second floor would be Caves 2.
+ * @param firstFloor Optional. Whether to go to the first floor or the second floor. For example, if
+ *                   you have a custom stage emulating Caves, then the first floor would be Caves 1,
+ *                   and the second floor would be Caves 2. Default is true.
+ * @param verbose Optional. Whether to log additional information about the rooms that are chosen.
+ *                Default is false.
  */
 export function setCustomStage(
   name: string,
@@ -50,6 +63,7 @@ export function setCustomStage(
   }
 
   const level = game.GetLevel();
+  const stage = level.GetStage();
   const seeds = game.GetSeeds();
   const startSeed = seeds.GetStartSeed();
   const rng = newRNG(startSeed);
@@ -57,6 +71,12 @@ export function setCustomStage(
   v.run.currentCustomStage = customStage;
   v.run.firstFloor = firstFloor;
 
+  // Before changing the stage, we have to revert the bugged stage, if necessary. This prevents the
+  // bug where the backdrop will not spawn.
+  if (stage === INVALID_STAGE_VALUE) {
+    level.SetStage(LevelStage.BASEMENT_1, StageType.ORIGINAL);
+  }
+
   let baseStage: int =
     customStage.baseStage === undefined
       ? DEFAULT_BASE_STAGE
@@ -64,22 +84,26 @@ export function setCustomStage(
   if (!firstFloor) {
     baseStage++;
   }
+
   const baseStageType =
     customStage.baseStageType === undefined
       ? DEFAULT_BASE_STAGE_TYPE
       : (customStage.baseStageType as StageType);
-  setStage(baseStage as LevelStage, baseStageType);
+
+  const reseed = (stage as int) >= baseStage;
+
+  setStage(baseStage as LevelStage, baseStageType, reseed);
 
   setStageRoomsData(customStage, rng, verbose);
 
-  // Set the stage to an invalid value, which will prevent the walls and floors from loading. We
-  // must use `StageType.WRATH_OF_THE_LAMB` instead of `StageType.ORIGINAL` or else the walls will
-  // not render properly. DeadInfinity suspects that this might be because it is trying to use the
-  // Dark Room's backdrop (instead of The Chest).
-  const stage = -1 as LevelStage;
-  const stageType = StageType.WRATH_OF_THE_LAMB;
-  level.SetStage(stage, stageType);
-  reorderedCallbacksSetStage(stage, stageType);
+  // Set the stage to an invalid value, which will prevent the walls and floors from loading.
+  // Furthermore, we must use `StageType.WRATH_OF_THE_LAMB` instead of `StageType.ORIGINAL` or else
+  // the walls will not render properly. DeadInfinity suspects that this might be because it is
+  // trying to use the Dark Room's backdrop (instead of The Chest).
+  const targetStage = INVALID_STAGE_VALUE;
+  const targetStageType = StageType.WRATH_OF_THE_LAMB;
+  level.SetStage(targetStage, targetStageType);
+  reorderedCallbacksSetStageInternal(targetStage, targetStageType);
 
   // We must reload the current room in order for the `Level.SetStage` method to take effect.
   // Furthermore, we need to cancel the queued warp to the `GridRoom.DEBUG` room. We can accomplish
@@ -197,3 +221,11 @@ export function registerCustomBoss(
   const entityID = getEntityIDFromConstituents(entityType, variant, subType);
   customBossPNGPaths.set(entityID, [namePNGPath, portraitPNGPath]);
 }
+
+/**
+ * Helper function to disable the custom stage. This is typically called before taking the player to
+ * a vanilla floor.
+ */
+export function disableCustomStage(): void {
+  v.run.currentCustomStage = null;
+}

package/src/features/customStage/init.ts

@@ -10,11 +10,11 @@ import { ModUpgraded } from "../../classes/ModUpgraded";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { isArray } from "../../functions/array";
 import { hasFlag, removeFlag } from "../../functions/flag";
-import { CustomStage, RoomTypeMap } from "../../interfaces/CustomStage";
 import {
   CustomStageLua,
   CustomStageRoomMetadata,
 } from "../../interfaces/CustomStageLua";
+import { CustomStage, RoomTypeMap } from "../../interfaces/private/CustomStage";
 import { saveDataManager } from "../saveDataManager/exports";
 import { setBackdrop } from "./backdrop";
 import {

package/src/features/customStage/shadows.ts

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

package/src/features/customStage/streakText.ts

@@ -1,12 +1,12 @@
 import { ButtonAction, ControllerIndex } from "isaac-typescript-definitions";
-import { fonts, game } from "../../cachedClasses";
-import { KColorDefault, VectorOne } from "../../constants";
+import { fonts, game } from "../../core/cachedClasses";
+import { KColorDefault, VectorOne } from "../../core/constants";
 import { getEnumValues } from "../../functions/enums";
 import {
   getScreenBottomCenterPos,
   getScreenTopCenterPos,
 } from "../../functions/ui";
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 import {
   UIStreakAnimation,
   UI_STREAK_ANIMATION_END_FRAMES,
@@ -26,7 +26,7 @@ const TEXT_STAY_FRAME = 8;
 const TEXT_OUT_FRAME = 60;
 
 /** This matches the offset that the vanilla game uses; determined via trial and error. */
-const STREAK_SPRITE_TOP_OFFSET = Vector(0, 48.25);
+const STREAK_SPRITE_TOP_OFFSET = Vector(0, 47);
 
 /** This matches the offset that the vanilla game uses; determined via trial and error. */
 const STREAK_SPRITE_BOTTOM_OFFSET = Vector(0, -48.25);

package/src/features/customStage/v.ts

@@ -1,5 +1,5 @@
 import { ControllerIndex } from "isaac-typescript-definitions";
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 import { UIStreakAnimation } from "./customStageConstants";
 
 const v = {

package/src/features/customStage/versusScreen.ts

@@ -4,13 +4,14 @@ import {
   RoomType,
   SoundEffect,
   StageID,
+  StageType,
 } from "isaac-typescript-definitions";
-import { game, sfxManager } from "../../cachedClasses";
+import { game, sfxManager } from "../../core/cachedClasses";
 import { arrayRemove } from "../../functions/array";
 import { getBosses } from "../../functions/bosses";
 import { getEntityID } from "../../functions/entities";
 import { erange } from "../../functions/utils";
-import { CustomStage } from "../../interfaces/CustomStage";
+import { CustomStage } from "../../interfaces/private/CustomStage";
 import { BOSS_NAME_PNG_FILE_NAMES } from "../../objects/bossNamePNGFileNames";
 import { BOSS_PORTRAIT_PNG_FILE_NAMES } from "../../objects/bossPortraitPNGFileNames";
 import { PLAYER_NAME_PNG_FILE_NAMES } from "../../objects/playerNamePNGFileNames";
@@ -18,7 +19,13 @@ import { PLAYER_PORTRAIT_PNG_FILE_NAMES } from "../../objects/playerPortraitPNGF
 import { VERSUS_SCREEN_BACKGROUND_COLORS } from "../../objects/versusScreenBackgroundColors";
 import { VERSUS_SCREEN_DIRT_SPOT_COLORS } from "../../objects/versusScreenDirtSpotColors";
 import { pause, unpause } from "../pause";
+import { runNextGameFrame } from "../runInNFrames";
 import { ISAACSCRIPT_CUSTOM_STAGE_GFX_PATH } from "./customStageConstants";
+import {
+  DEFAULT_BASE_STAGE,
+  DEFAULT_BASE_STAGE_TYPE,
+  INVALID_STAGE_VALUE,
+} from "./exports";
 import v, { customBossPNGPaths } from "./v";
 
 const DEFAULT_CHARACTER = PlayerType.ISAAC;
@@ -102,12 +109,29 @@ export function versusScreenInit(): void {
 export function playVersusScreenAnimation(customStage: CustomStage): void {
   const room = game.GetRoom();
   const roomType = room.GetType();
+  const roomCleared = room.IsClear();
   const hud = game.GetHUD();
 
   if (roomType !== RoomType.BOSS) {
     return;
   }
 
+  if (roomCleared) {
+    return;
+  }
+
+  if (willVanillaVersusScreenPlay()) {
+    // Since we are on an invalid stage, the versus screen will have a completely black background.
+    // Revert to using the background from the default stage.
+    const level = game.GetLevel();
+    level.SetStage(DEFAULT_BASE_STAGE, DEFAULT_BASE_STAGE_TYPE);
+    runNextGameFrame(() => {
+      const futureLevel = game.GetLevel();
+      futureLevel.SetStage(INVALID_STAGE_VALUE, StageType.ORIGINAL);
+    });
+    return;
+  }
+
   v.run.showingBossVersusScreen = true;
 
   pause();
@@ -156,6 +180,11 @@ export function playVersusScreenAnimation(customStage: CustomStage): void {
   }
 }
 
+function willVanillaVersusScreenPlay() {
+  const bosses = getBosses();
+  return bosses.some((boss) => boss.GetBossID() !== 0);
+}
+
 /** Use the character of the 0th player. */
 function getPlayerPNGPaths(): [
   playerNamePNGPath: string,

package/src/features/customTrapdoor/blackSprite.ts

@@ -1,4 +1,4 @@
-import { VectorZero } from "../../constants";
+import { VectorZero } from "../../core/constants";
 import { StageTravelState } from "../../enums/private/StageTravelState";
 import v from "./v";
 
@@ -9,7 +9,11 @@ import v from "./v";
 const blackSprite = Sprite();
 
 export function drawBlackSprite(): void {
-  if (v.run.state !== StageTravelState.PAUSING_ON_BLACK) {
+  if (
+    v.run.state !== StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END &&
+    v.run.state !==
+      StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY
+  ) {
     return;
   }
 

package/src/features/customTrapdoor/customTrapdoorConstants.ts

@@ -3,6 +3,10 @@ import { GridEntityType } from "isaac-typescript-definitions";
 export const CUSTOM_TRAPDOOR_FEATURE_NAME = "customTrapdoor";
 
 export const GridEntityTypeCustom = {
+  /**
+   * We arbitrarily choose 1000 as to not conflict with end-user mods. (The expectation is that
+   * end-user mods will begin their enums with values of 1 and increment upwards.)
+   */
   TRAPDOOR_CUSTOM: 1000 as GridEntityType,
 } as const;
 

package/src/features/customTrapdoor/exports.ts

@@ -3,13 +3,14 @@ import {
   LevelStage,
   StageType,
 } from "isaac-typescript-definitions";
-import { game } from "../../cachedClasses";
+import { game } from "../../core/cachedClasses";
 import { TrapdoorAnimation } from "../../enums/private/TrapdoorAnimation";
 import { errorIfFeaturesNotInitialized } from "../../featuresInitialized";
 import { getNextStage, getNextStageType } from "../../functions/nextStage";
 import { getRoomListIndex } from "../../functions/roomData";
 import { isVector } from "../../functions/vector";
 import { CustomTrapdoorDescription } from "../../interfaces/private/CustomTrapdoorDescription";
+import { TrapdoorDestination } from "../../types/TrapdoorDestination";
 import { spawnCustomGridEntity } from "../customGridEntity";
 import {
   CUSTOM_TRAPDOOR_FEATURE_NAME,
@@ -33,12 +34,12 @@ import v from "./v";
  *
  * @param gridIndexOrPosition The location in the room to spawn the trapdoor.
  * @param destination Optional. Used to specify where the player will go after jumping into the
- *                    trapdoor. Can either be a tuple or undefined. For example, a destination of
- *                    `[LevelStage.CAVES_1, StageType.ORIGINAL]` corresponds to Caves 1, and a
- *                    destination of `["Slaughterhouse", 1]` corresponds to a custom stage of
- *                    Slaughterhouse 1. If the destination is set to undefined, then the "normal"
- *                    destination corresponding to the current stage and room will be used (e.g. the
- *                    next floor).
+ *                    trapdoor. Can either be a vanilla stage tuple, a custom stage tuple, or
+ *                    undefined. For example, a destination of `[LevelStage.CAVES_1,
+ *                    StageType.ORIGINAL]` corresponds to Caves 1, and a destination of
+ *                    `["Slaughterhouse", 1]` corresponds to a custom stage of Slaughterhouse 1. If
+ *                    the destination is undefined, then the "normal" destination corresponding to
+ *                    the current stage and room will be used (e.g. the next floor, in most cases).
  * @param anm2Path Optional. The path to the anm2 file to use. By default, the vanilla trapdoor anm2
  *                 of "gfx/grid/door_11_trapdoor.anm2" will be used. The specified anm2 file must
  *                 have animations called "Opened", "Closed", and "Open Animation".
@@ -47,9 +48,7 @@ import v from "./v";
  */
 export function spawnCustomTrapdoor(
   gridIndexOrPosition: int | Vector,
-  destination?:
-    | [stage: LevelStage, stageType: StageType]
-    | [customStageName: string, floorNum: int],
+  destination?: TrapdoorDestination,
   anm2Path = "gfx/grid/door_11_trapdoor.anm2",
   spawnOpen?: boolean,
 ): GridEntity {

package/src/features/customTrapdoor/init.ts

@@ -6,8 +6,8 @@ import {
   RoomTransitionAnim,
   StageType,
 } from "isaac-typescript-definitions";
-import { game } from "../../cachedClasses";
 import { ModUpgraded } from "../../classes/ModUpgraded";
+import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { StageTravelState } from "../../enums/private/StageTravelState";
 import { movePlayersToCenter } from "../../functions/playerCenter";
@@ -16,7 +16,7 @@ import { getRoomGridIndex, getRoomListIndex } from "../../functions/roomData";
 import { teleport } from "../../functions/roomTransition";
 import { setStage } from "../../functions/stage";
 import { isString } from "../../functions/types";
-import { setCustomStage } from "../customStage/exports";
+import { disableCustomStage, setCustomStage } from "../customStage/exports";
 import { topStreakTextStart } from "../customStage/streakText";
 import { enableAllInputs } from "../disableInputs";
 import { runNextGameFrame } from "../runInNFrames";
@@ -48,7 +48,7 @@ export function customTrapdoorInit(mod: ModUpgraded): void {
 function postRender() {
   checkAllPlayersJumpComplete();
   checkPixelationToBlackComplete();
-  checkPausingOnBlackComplete();
+  checkSecondPixelationHalfWay();
   checkAllPlayersLayingDownComplete();
   drawBlackSprite();
 }
@@ -77,6 +77,8 @@ function checkAllPlayersJumpComplete() {
     Direction.NO_DIRECTION,
     RoomTransitionAnim.PIXELATION,
   );
+
+  // Next, we wait a certain amount of render frames for the pixelation to fade the screen to black.
 }
 
 function checkPixelationToBlackComplete() {
@@ -89,7 +91,6 @@ function checkPixelationToBlackComplete() {
 
   const hud = game.GetHUD();
   const renderFrameCount = Isaac.GetFrameCount();
-  const roomGridIndex = getRoomGridIndex();
 
   const renderFrameScreenBlack =
     v.run.stateRenderFrame + PIXELATION_TO_BLACK_FRAMES;
@@ -97,25 +98,44 @@ function checkPixelationToBlackComplete() {
     return;
   }
 
-  v.run.state = StageTravelState.PAUSING_ON_BLACK;
-  v.run.stateRenderFrame = renderFrameCount;
+  v.run.state = StageTravelState.WAITING_FOR_FIRST_PIXELATION_TO_END;
 
+  // Now, we display a black sprite on top of the pixelation effect, to prevent showing the rest of
+  // the animation.
   hud.SetVisible(false);
-  goToCustomDestination();
 
-  // Start another pixelation effect. This time, we will keep the screen black with the sprite, and
-  // then remove the black sprite once the pixelation effect is halfway complete.
-  teleport(
-    roomGridIndex,
-    Direction.NO_DIRECTION,
-    RoomTransitionAnim.PIXELATION,
-    true,
-  );
+  // If the pixelation effect is not fully allowed to complete, the game's internal buffer will not
+  // be flushed. The consequence of this is that after 11 custom stage transitions, the "log.txt"
+  // starts to become become spammed with: [ASSERT] - PushRenderTarget: stack overflow!
+
+  // In order to work around this, we fully let the animation complete by only continuing the stage
+  // transition on the next game frame.
+  runNextGameFrame(() => {
+    const level = game.GetLevel();
+    const startingRoomIndex = level.GetStartingRoomIndex();
+    const futureRenderFrameCount = Isaac.GetFrameCount();
+
+    v.run.state =
+      StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY;
+    v.run.stateRenderFrame = futureRenderFrameCount;
+
+    goToCustomDestination();
+
+    // Start another pixelation effect. This time, we will keep the screen black with the sprite,
+    // and then remove the black sprite once the pixelation effect is halfway complete.
+    teleport(
+      startingRoomIndex,
+      Direction.NO_DIRECTION,
+      RoomTransitionAnim.PIXELATION,
+      true,
+    );
+  });
 }
 
-function checkPausingOnBlackComplete() {
+function checkSecondPixelationHalfWay() {
   if (
-    v.run.state !== StageTravelState.PAUSING_ON_BLACK ||
+    v.run.state !==
+      StageTravelState.WAITING_FOR_SECOND_PIXELATION_TO_GET_HALF_WAY ||
     v.run.stateRenderFrame === null
   ) {
     return;
@@ -135,12 +155,12 @@ function checkPausingOnBlackComplete() {
   hud.SetVisible(true);
 
   runNextRoom(() => {
+    v.run.state = StageTravelState.PLAYERS_LAYING_DOWN;
+
     // After the room transition, the players will be placed next to a door, but they should be in
     // the center of the room to emulate what happens on a vanilla stage.
     movePlayersToCenter();
 
-    v.run.state = StageTravelState.PLAYERS_LAYING_DOWN;
-
     for (const player of getAllPlayers()) {
       player.AnimateAppear();
 
@@ -186,6 +206,7 @@ function goToCustomDestination() {
     setCustomStage("Slaughterhouse", firstFloor);
   } else {
     // A number represents a vanilla `LevelStage`.
+    disableCustomStage();
     setStage(arg1, arg2 as StageType);
   }
 }

package/src/features/customTrapdoor/openClose.ts

@@ -1,5 +1,5 @@
 import { RoomType } from "isaac-typescript-definitions";
-import { game } from "../../cachedClasses";
+import { game } from "../../core/cachedClasses";
 import { TrapdoorAnimation } from "../../enums/private/TrapdoorAnimation";
 import { anyPlayerCloserThan } from "../../functions/positionVelocity";
 import { CustomTrapdoorDescription } from "../../interfaces/private/CustomTrapdoorDescription";

package/src/features/customTrapdoor/touched.ts

@@ -5,7 +5,7 @@ import {
   EntityPartition,
   PlayerType,
 } from "isaac-typescript-definitions";
-import { VectorZero } from "../../constants";
+import { VectorZero } from "../../core/constants";
 import { StageTravelState } from "../../enums/private/StageTravelState";
 import { easeOutSine } from "../../functions/easing";
 import {
@@ -81,6 +81,9 @@ function playerTouchedCustomTrapdoor(
   v.run.state = StageTravelState.PLAYERS_JUMPING_DOWN;
   v.run.destination = trapdoorDescription.destination;
 
+  // We don't want to allow pausing, since that will allow render frames to pass without advancing
+  // the stage traveling logic. (We track how many render frames have passed to know when to move to
+  // the next step.)
   const whitelist = new Set([ButtonAction.CONSOLE]);
   disableAllInputsExceptFor(CUSTOM_TRAPDOOR_FEATURE_NAME, whitelist);
   setPlayerAttributes(player, gridEntity.Position);
@@ -114,6 +117,8 @@ function setPlayerAttributes(trapdoorPlayer: EntityPlayer, position: Vector) {
     // We don't want enemy attacks to move the players.
     player.EntityCollisionClass = EntityCollisionClass.NONE;
     player.GridCollisionClass = EntityGridCollisionClass.NONE;
+
+    player.StopExtraAnimation();
   }
 }
 

package/src/features/customTrapdoor/v.ts

@@ -1,7 +1,7 @@
-import { LevelStage, StageType } from "isaac-typescript-definitions";
 import { DefaultMap } from "../../classes/DefaultMap";
 import { StageTravelState } from "../../enums/private/StageTravelState";
 import { CustomTrapdoorDescription } from "../../interfaces/private/CustomTrapdoorDescription";
+import { TrapdoorDestination } from "../../types/TrapdoorDestination";
 
 const v = {
   run: {
@@ -10,10 +10,7 @@ const v = {
     /** The render frame that this state was reached. */
     stateRenderFrame: null as int | null,
 
-    destination: null as
-      | [stage: LevelStage, stageType: StageType]
-      | [customStageName: string, floorNum: int]
-      | null,
+    destination: null as TrapdoorDestination | null,
   },
 
   level: {

package/src/features/deployJSONRoom.ts

@@ -19,9 +19,9 @@ import {
   RoomType,
   UseFlag,
 } from "isaac-typescript-definitions";
-import { game } from "../cachedClasses";
 import { DefaultMap } from "../classes/DefaultMap";
 import { ModUpgraded } from "../classes/ModUpgraded";
+import { game } from "../core/cachedClasses";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { emptyArray } from "../functions/array";
@@ -93,7 +93,6 @@ const v = {
   },
 };
 
-/** @internal */
 export function deployJSONRoomInit(mod: ModUpgraded): void {
   saveDataManager(FEATURE_NAME, v);
 

package/src/features/disableAllSound.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { musicManager } from "../cachedClasses";
+import { musicManager } from "../core/cachedClasses";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { stopAllSoundEffects } from "../functions/sound";
 import { saveDataManager } from "./saveDataManager/exports";
@@ -14,7 +14,6 @@ const v = {
   },
 };
 
-/** @internal */
 export function disableAllSoundInit(mod: Mod): void {
   saveDataManager(FEATURE_NAME, v);
 

package/src/features/disableInputs.ts

@@ -25,7 +25,6 @@ const v = {
   },
 };
 
-/** @internal */
 export function disableInputsInit(mod: Mod): void {
   saveDataManager(FEATURE_NAME, v);
 

package/src/features/extraConsoleCommands/commandsSubroutines.ts

@@ -5,7 +5,7 @@ import {
   GridRoom,
   RoomType,
 } from "isaac-typescript-definitions";
-import { game } from "../../cachedClasses";
+import { game } from "../../core/cachedClasses";
 import { HealthType } from "../../enums/HealthType";
 import { directionToVector } from "../../functions/direction";
 import { spawnGridEntityWithVariant } from "../../functions/gridEntities";

package/src/features/extraConsoleCommands/init.ts

@@ -7,7 +7,7 @@ import {
   TearVariant,
 } from "isaac-typescript-definitions";
 import { ModUpgraded } from "../../classes/ModUpgraded";
-import { MAX_SPEED_STAT } from "../../constants";
+import { MAX_SPEED_STAT } from "../../core/constants";
 import { bitFlags } from "../../functions/flag";
 import { getMapPartialMatch } from "../../functions/map";
 import { printConsole } from "../../functions/utils";

package/src/features/extraConsoleCommands/listCommands.ts

@@ -39,8 +39,8 @@ import {
   SoundEffect,
   TrinketType,
 } from "isaac-typescript-definitions";
-import { game, sfxManager } from "../../cachedClasses";
-import { MAX_LEVEL_GRID_INDEX } from "../../constants";
+import { game, sfxManager } from "../../core/cachedClasses";
+import { MAX_LEVEL_GRID_INDEX } from "../../core/constants";
 import {
   FIRST_CARD,
   FIRST_CHARACTER,
@@ -52,7 +52,7 @@ import {
   LAST_ROOM_TYPE,
   LAST_STAGE,
   LAST_VANILLA_CHARACTER,
-} from "../../constantsFirstLast";
+} from "../../core/constantsFirstLast";
 import { HealthType } from "../../enums/HealthType";
 import { getCardName } from "../../functions/cards";
 import { getCharacterName } from "../../functions/characters";

package/src/features/fadeInRemover.ts

@@ -1,5 +1,5 @@
 import { ModCallback } from "isaac-typescript-definitions";
-import { game } from "../cachedClasses";
+import { game } from "../core/cachedClasses";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { saveDataManager } from "./saveDataManager/exports";
 
@@ -14,7 +14,6 @@ const v = {
   },
 };
 
-/** @internal */
 export function fadeInRemoverInit(mod: Mod): void {
   saveDataManager(FEATURE_NAME, v, () => false);
 

package/src/features/fastReset.ts

@@ -1,5 +1,5 @@
 import { ButtonAction, ModCallback } from "isaac-typescript-definitions";
-import { game } from "../cachedClasses";
+import { game } from "../core/cachedClasses";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import {
   isActionTriggeredOnAnyInput,
@@ -11,7 +11,6 @@ const FEATURE_NAME = "fastReset";
 
 let enabled = false;
 
-/** @internal */
 export function fastResetInit(mod: Mod): void {
   mod.AddCallback(ModCallback.POST_RENDER, postRender); // 2
 }

package/src/features/forgottenSwitch.ts

@@ -14,7 +14,6 @@ const v = {
   },
 };
 
-/** @internal */
 export function forgottenSwitchInit(mod: Mod): void {
   saveDataManager(FEATURE_NAME, v);