From 989050a47796ace70106f390a98f88956f67aa6f Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Sat, 6 Sep 2025 23:40:55 +0200 Subject: [PATCH] Moved some ui files to separate folders --- src/@types/api/pokerogue-daily-api.ts | 2 +- src/battle-scene.ts | 14 +-- src/data/daily-run.ts | 2 +- .../encounters/bug-type-superfan-encounter.ts | 4 +- .../encounters/clowning-around-encounter.ts | 2 +- .../encounters/dancing-lessons-encounter.ts | 2 +- .../encounters/delibirdy-encounter.ts | 2 +- .../encounters/field-trip-encounter.ts | 2 +- .../global-trade-system-encounter.ts | 2 +- .../encounters/training-session-encounter.ts | 2 +- .../utils/encounter-phase-utils.ts | 6 +- .../utils/encounter-pokemon-utils.ts | 6 +- src/field/pokemon.ts | 4 +- src/init/init.ts | 2 +- src/modifier/modifier-type.ts | 4 +- src/phases/attempt-capture-phase.ts | 6 +- src/phases/egg-hatch-phase.ts | 6 +- src/phases/evolution-phase.ts | 2 +- src/phases/form-change-phase.ts | 2 +- src/phases/learn-move-phase.ts | 4 +- src/phases/revival-blessing-phase.ts | 4 +- src/phases/select-biome-phase.ts | 2 +- src/phases/select-modifier-phase.ts | 6 +- src/phases/select-starter-phase.ts | 4 +- src/phases/switch-phase.ts | 2 +- src/phases/title-phase.ts | 4 +- src/plugins/api/pokerogue-daily-api.ts | 2 +- src/system/game-data.ts | 2 +- src/tutorial.ts | 4 +- src/ui-inputs.ts | 10 +-- src/ui/battle-info/enemy-battle-info.ts | 2 +- src/ui/{ => containers}/ability-bar.ts | 0 src/ui/{ => containers}/achv-bar.ts | 0 src/ui/{ => containers}/arena-flyout.ts | 2 +- src/ui/{ => containers}/base-stats-overlay.ts | 0 src/ui/{ => containers}/battle-flyout.ts | 0 src/ui/{ => containers}/bgm-bar.ts | 0 src/ui/{ => containers}/candy-bar.ts | 0 src/ui/{ => containers}/char-sprite.ts | 0 .../{ => containers}/daily-run-scoreboard.ts | 0 src/ui/{ => containers}/dropdown.ts | 2 +- .../{ => containers}/egg-counter-container.ts | 2 +- src/ui/{ => containers}/filter-bar.ts | 6 +- src/ui/{ => containers}/filter-text.ts | 4 +- .../hatched-pokemon-container.ts | 4 +- src/ui/{ => containers}/move-info-overlay.ts | 0 src/ui/{ => containers}/party-exp-bar.ts | 0 src/ui/{ => containers}/pokeball-tray.ts | 0 .../{ => containers}/pokedex-info-overlay.ts | 0 .../{ => containers}/pokedex-mon-container.ts | 0 .../pokedex-page-ui-handler.ts | 12 +-- .../pokemon-hatch-info-container.ts | 2 +- .../pokemon-info-container.ts | 4 +- .../{ => containers}/saving-icon-handler.ts | 0 src/ui/{ => containers}/scroll-bar.ts | 0 src/ui/{ => containers}/starter-container.ts | 0 src/ui/{ => containers}/stats-container.ts | 0 src/ui/{ => containers}/time-of-day-widget.ts | 0 .../abstract-binding-ui-handler.ts | 2 +- .../abstract-option-select-ui-handler.ts | 2 +- src/ui/{ => handlers}/achvs-ui-handler.ts | 4 +- src/ui/{ => handlers}/admin-ui-handler.ts | 8 +- .../{ => handlers}/autocomplete-ui-handler.ts | 2 +- src/ui/{ => handlers}/awaitable-ui-handler.ts | 2 +- src/ui/{ => handlers}/ball-ui-handler.ts | 2 +- .../battle-message-ui-handler.ts | 2 +- .../challenges-select-ui-handler.ts | 2 +- .../change-password-form-ui-handler.ts | 6 +- src/ui/{ => handlers}/command-ui-handler.ts | 4 +- src/ui/{ => handlers}/confirm-ui-handler.ts | 4 +- src/ui/{ => handlers}/egg-gacha-ui-handler.ts | 2 +- .../{ => handlers}/egg-hatch-scene-handler.ts | 2 +- src/ui/{ => handlers}/egg-list-ui-handler.ts | 8 +- .../{ => handlers}/egg-summary-ui-handler.ts | 12 +-- .../{ => handlers}/evolution-scene-handler.ts | 2 +- src/ui/{ => handlers}/fight-ui-handler.ts | 4 +- .../{ => handlers}/form-modal-ui-handler.ts | 4 +- .../{ => handlers}/game-stats-ui-handler.ts | 2 +- .../loading-modal-ui-handler.ts | 2 +- .../{ => handlers}/login-form-ui-handler.ts | 8 +- src/ui/{ => handlers}/menu-ui-handler.ts | 10 +-- src/ui/{ => handlers}/message-ui-handler.ts | 2 +- src/ui/{ => handlers}/modal-ui-handler.ts | 2 +- .../modifier-select-ui-handler.ts | 4 +- .../mystery-encounter-ui-handler.ts | 4 +- src/ui/{ => handlers}/party-ui-handler.ts | 6 +- .../{ => handlers}/pokedex-scan-ui-handler.ts | 10 +-- src/ui/{ => handlers}/pokedex-ui-handler.ts | 23 +++-- .../pokemon-icon-anim-handler.ts | 0 .../registration-form-ui-handler.ts | 6 +- .../{ => handlers}/rename-form-ui-handler.ts | 6 +- .../{ => handlers}/rename-run-ui-handler.ts | 3 +- .../{ => handlers}/run-history-ui-handler.ts | 4 +- src/ui/{ => handlers}/run-info-ui-handler.ts | 2 +- .../save-slot-select-ui-handler.ts | 6 +- .../{ => handlers}/scrollable-grid-handler.ts | 4 +- .../session-reload-modal-ui-handler.ts | 4 +- .../starter-select-ui-handler.ts | 25 ++++-- src/ui/{ => handlers}/summary-ui-handler.ts | 2 +- .../target-select-ui-handler.ts | 2 +- .../test-dialogue-ui-handler.ts | 8 +- src/ui/{ => handlers}/title-ui-handler.ts | 0 src/ui/{ => handlers}/ui-handler.ts | 0 .../unavailable-modal-ui-handler.ts | 4 +- .../abstract-control-settings-ui-handler.ts | 4 +- .../settings/abstract-settings-ui-handler.ts | 4 +- src/ui/settings/gamepad-binding-ui-handler.ts | 2 +- .../settings/keyboard-binding-ui-handler.ts | 2 +- src/ui/settings/option-select-ui-handler.ts | 2 +- src/ui/ui.ts | 88 +++++++++---------- test/abilities/arena-trap.test.ts | 2 +- test/challenges/hardcore.test.ts | 2 +- test/challenges/limited-support.test.ts | 2 +- test/daily-mode.test.ts | 2 +- test/imports.test.ts | 2 +- test/items/dire-hit.test.ts | 2 +- .../double-battle-chance-booster.test.ts | 2 +- test/items/temp-stat-stage-booster.test.ts | 2 +- .../mystery-encounter/encounter-test-utils.ts | 6 +- .../berries-abound-encounter.test.ts | 2 +- .../bug-type-superfan-encounter.test.ts | 2 +- .../clowning-around-encounter.test.ts | 2 +- .../dancing-lessons-encounter.test.ts | 2 +- .../department-store-sale-encounter.test.ts | 2 +- .../encounters/field-trip-encounter.test.ts | 2 +- .../fight-or-flight-encounter.test.ts | 2 +- .../fun-and-games-encounter.test.ts | 2 +- .../global-trade-system-encounter.test.ts | 2 +- .../mysterious-challengers-encounter.test.ts | 2 +- .../teleporting-hijinks-encounter.test.ts | 2 +- .../the-strong-stuff-encounter.test.ts | 2 +- .../the-winstrate-challenge-encounter.test.ts | 2 +- .../trash-to-treasure-encounter.test.ts | 2 +- .../encounters/weird-dream-encounter.test.ts | 2 +- test/phases/mystery-encounter-phase.test.ts | 4 +- test/phases/select-modifier-phase.test.ts | 2 +- test/plugins/api/pokerogue-daily-api.test.ts | 2 +- test/test-utils/game-manager-utils.ts | 2 +- test/test-utils/game-manager.ts | 14 +-- test/test-utils/game-wrapper.ts | 2 +- test/test-utils/helpers/daily-mode-helper.ts | 2 +- test/test-utils/phase-interceptor.ts | 2 +- test/ui/item-manage-button.test.ts | 4 +- test/ui/pokedex.test.ts | 6 +- test/ui/starter-select.test.ts | 6 +- test/ui/transfer-item-options.test.ts | 4 +- test/ui/transfer-item.test.ts | 4 +- test/ui/type-hints.test.ts | 2 +- 148 files changed, 301 insertions(+), 288 deletions(-) rename src/ui/{ => containers}/ability-bar.ts (100%) rename src/ui/{ => containers}/achv-bar.ts (100%) rename src/ui/{ => containers}/arena-flyout.ts (99%) rename src/ui/{ => containers}/base-stats-overlay.ts (100%) rename src/ui/{ => containers}/battle-flyout.ts (100%) rename src/ui/{ => containers}/bgm-bar.ts (100%) rename src/ui/{ => containers}/candy-bar.ts (100%) rename src/ui/{ => containers}/char-sprite.ts (100%) rename src/ui/{ => containers}/daily-run-scoreboard.ts (100%) rename src/ui/{ => containers}/dropdown.ts (99%) rename src/ui/{ => containers}/egg-counter-container.ts (96%) rename src/ui/{ => containers}/filter-bar.ts (97%) rename src/ui/{ => containers}/filter-text.ts (97%) rename src/ui/{ => containers}/hatched-pokemon-container.ts (97%) rename src/ui/{ => containers}/move-info-overlay.ts (100%) rename src/ui/{ => containers}/party-exp-bar.ts (100%) rename src/ui/{ => containers}/pokeball-tray.ts (100%) rename src/ui/{ => containers}/pokedex-info-overlay.ts (100%) rename src/ui/{ => containers}/pokedex-mon-container.ts (100%) rename src/ui/{ => containers}/pokedex-page-ui-handler.ts (99%) rename src/ui/{ => containers}/pokemon-hatch-info-container.ts (99%) rename src/ui/{ => containers}/pokemon-info-container.ts (99%) rename src/ui/{ => containers}/saving-icon-handler.ts (100%) rename src/ui/{ => containers}/scroll-bar.ts (100%) rename src/ui/{ => containers}/starter-container.ts (100%) rename src/ui/{ => containers}/stats-container.ts (100%) rename src/ui/{ => containers}/time-of-day-widget.ts (100%) rename src/ui/{settings => handlers}/abstract-binding-ui-handler.ts (99%) rename src/ui/{ => handlers}/abstract-option-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/achvs-ui-handler.ts (99%) rename src/ui/{ => handlers}/admin-ui-handler.ts (98%) rename src/ui/{ => handlers}/autocomplete-ui-handler.ts (94%) rename src/ui/{ => handlers}/awaitable-ui-handler.ts (96%) rename src/ui/{ => handlers}/ball-ui-handler.ts (98%) rename src/ui/{ => handlers}/battle-message-ui-handler.ts (99%) rename src/ui/{ => handlers}/challenges-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/change-password-form-ui-handler.ts (94%) rename src/ui/{ => handlers}/command-ui-handler.ts (98%) rename src/ui/{ => handlers}/confirm-ui-handler.ts (95%) rename src/ui/{ => handlers}/egg-gacha-ui-handler.ts (99%) rename src/ui/{ => handlers}/egg-hatch-scene-handler.ts (96%) rename src/ui/{ => handlers}/egg-list-ui-handler.ts (96%) rename src/ui/{ => handlers}/egg-summary-ui-handler.ts (95%) rename src/ui/{ => handlers}/evolution-scene-handler.ts (97%) rename src/ui/{ => handlers}/fight-ui-handler.ts (99%) rename src/ui/{ => handlers}/form-modal-ui-handler.ts (98%) rename src/ui/{ => handlers}/game-stats-ui-handler.ts (99%) rename src/ui/{ => handlers}/loading-modal-ui-handler.ts (92%) rename src/ui/{ => handlers}/login-form-ui-handler.ts (97%) rename src/ui/{ => handlers}/menu-ui-handler.ts (98%) rename src/ui/{ => handlers}/message-ui-handler.ts (99%) rename src/ui/{ => handlers}/modal-ui-handler.ts (99%) rename src/ui/{ => handlers}/modifier-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/mystery-encounter-ui-handler.ts (99%) rename src/ui/{ => handlers}/party-ui-handler.ts (99%) rename src/ui/{ => handlers}/pokedex-scan-ui-handler.ts (93%) rename src/ui/{ => handlers}/pokedex-ui-handler.ts (99%) rename src/ui/{ => handlers}/pokemon-icon-anim-handler.ts (100%) rename src/ui/{ => handlers}/registration-form-ui-handler.ts (94%) rename src/ui/{ => handlers}/rename-form-ui-handler.ts (87%) rename src/ui/{ => handlers}/rename-run-ui-handler.ts (91%) rename src/ui/{ => handlers}/run-history-ui-handler.ts (99%) rename src/ui/{ => handlers}/run-info-ui-handler.ts (99%) rename src/ui/{ => handlers}/save-slot-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/scrollable-grid-handler.ts (98%) rename src/ui/{ => handlers}/session-reload-modal-ui-handler.ts (88%) rename src/ui/{ => handlers}/starter-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/summary-ui-handler.ts (99%) rename src/ui/{ => handlers}/target-select-ui-handler.ts (99%) rename src/ui/{ => handlers}/test-dialogue-ui-handler.ts (94%) rename src/ui/{ => handlers}/title-ui-handler.ts (100%) rename src/ui/{ => handlers}/ui-handler.ts (100%) rename src/ui/{ => handlers}/unavailable-modal-ui-handler.ts (95%) diff --git a/src/@types/api/pokerogue-daily-api.ts b/src/@types/api/pokerogue-daily-api.ts index 838af2a2a34..862ff2f51a3 100644 --- a/src/@types/api/pokerogue-daily-api.ts +++ b/src/@types/api/pokerogue-daily-api.ts @@ -1,4 +1,4 @@ -import type { ScoreboardCategory } from "#ui/daily-run-scoreboard"; +import type { ScoreboardCategory } from "#ui/containers/daily-run-scoreboard"; export interface GetDailyRankingsRequest { category: ScoreboardCategory; diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 9bb76b6fd23..6762f032173 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -121,13 +121,13 @@ import { vouchers } from "#system/voucher"; import { trainerConfigs } from "#trainers/trainer-config"; import type { HeldModifierConfig } from "#types/held-modifier-config"; import type { Localizable } from "#types/locales"; -import { AbilityBar } from "#ui/ability-bar"; -import { ArenaFlyout } from "#ui/arena-flyout"; -import { CandyBar } from "#ui/candy-bar"; -import { CharSprite } from "#ui/char-sprite"; -import { PartyExpBar } from "#ui/party-exp-bar"; -import { PokeballTray } from "#ui/pokeball-tray"; -import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { AbilityBar } from "#ui/containers/ability-bar"; +import { ArenaFlyout } from "#ui/containers/arena-flyout"; +import { CandyBar } from "#ui/containers/candy-bar"; +import { CharSprite } from "#ui/containers/char-sprite"; +import { PartyExpBar } from "#ui/containers/party-exp-bar"; +import { PokeballTray } from "#ui/containers/pokeball-tray"; +import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container"; import { addTextObject, getTextColor } from "#ui/text"; import { UI } from "#ui/ui"; import { addUiThemeOverrides } from "#ui/ui-theme"; diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts index f0a20a0b02b..47936e16828 100644 --- a/src/data/daily-run.ts +++ b/src/data/daily-run.ts @@ -6,7 +6,7 @@ import { PokemonSpecies } from "#data/pokemon-species"; import { BiomeId } from "#enums/biome-id"; import { PartyMemberStrength } from "#enums/party-member-strength"; import { SpeciesId } from "#enums/species-id"; -import type { Starter } from "#ui/starter-select-ui-handler"; +import type { Starter } from "#ui/handlers/starter-select-ui-handler"; import { isNullOrUndefined, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common"; import { getEnumValues } from "#utils/enums"; import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils"; diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index 6750051c3c4..1c2bfdd105b 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -46,8 +46,8 @@ import { } from "#mystery-encounters/mystery-encounter-requirements"; import { getRandomPartyMemberFunc, trainerConfigs } from "#trainers/trainer-config"; import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#utils/common"; import i18next from "i18next"; diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 09e59c7e391..016af698104 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -45,7 +45,7 @@ import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; import { trainerConfigs } from "#trainers/trainer-config"; import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template"; -import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler"; import { randSeedInt, randSeedShuffle } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts index e2c330a1106..1baed27cfde 100644 --- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts +++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts @@ -37,7 +37,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements"; import { DANCING_MOVES } from "#mystery-encounters/requirement-groups"; import { PokemonData } from "#system/pokemon-data"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index 8cd4c8bee66..79cccd91b26 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -33,7 +33,7 @@ import { MoneyRequirement, } from "#mystery-encounters/mystery-encounter-requirements"; import i18next from "#plugins/i18n"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { randSeedItem } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index 67a7cad3466..7d885deaa41 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -18,7 +18,7 @@ import { import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import i18next from "i18next"; /** i18n namespace for the encounter */ diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts index a8dafdaa848..baa32bb4c70 100644 --- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts +++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts @@ -42,7 +42,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou import { PartySizeRequirement } from "#mystery-encounters/mystery-encounter-requirements"; import { PokemonData } from "#system/pokemon-data"; import { MusicPreference } from "#system/settings"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { isNullOrUndefined, NumberHolder, randInt, randSeedInt, randSeedItem, randSeedShuffle } from "#utils/common"; import { getEnumKeys } from "#utils/enums"; import { getRandomLocaleEntry } from "#utils/i18n"; diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts index 02e7a5c5575..3f44e286ca1 100644 --- a/src/data/mystery-encounters/encounters/training-session-encounter.ts +++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts @@ -27,7 +27,7 @@ import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; import { PokemonData } from "#system/pokemon-data"; import type { HeldModifierConfig } from "#types/held-modifier-config"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { isNullOrUndefined, randSeedShuffle } from "#utils/common"; import { getEnumValues } from "#utils/enums"; import i18next from "i18next"; diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 5c976cbc8cd..a0606b53834 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -46,9 +46,9 @@ import type { PokemonData } from "#system/pokemon-data"; import type { TrainerConfig } from "#trainers/trainer-config"; import { trainerConfigs } from "#trainers/trainer-config"; import type { HeldModifierConfig } from "#types/held-modifier-config"; -import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import type { PartyOption, PokemonSelectFilter } from "#ui/party-ui-handler"; -import { PartyUiMode } from "#ui/party-ui-handler"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { PartyOption, PokemonSelectFilter } from "#ui/handlers/party-ui-handler"; +import { PartyUiMode } from "#ui/handlers/party-ui-handler"; import { coerceArray, isNullOrUndefined, randomString, randSeedInt, randSeedItem } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index 93ef59d6ee7..06a43b1ff64 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -31,9 +31,9 @@ import { showEncounterText, } from "#mystery-encounters/encounter-dialogue-utils"; import { achvs } from "#system/achv"; -import type { PartyOption } from "#ui/party-ui-handler"; -import { PartyUiMode } from "#ui/party-ui-handler"; -import { SummaryUiMode } from "#ui/summary-ui-handler"; +import type { PartyOption } from "#ui/handlers/party-ui-handler"; +import { PartyUiMode } from "#ui/handlers/party-ui-handler"; +import { SummaryUiMode } from "#ui/handlers/summary-ui-handler"; import { applyChallenges } from "#utils/challenge-utils"; import { BooleanHolder, isNullOrUndefined, randSeedInt } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 7cd0b9fecf8..536de79cb53 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -147,8 +147,8 @@ import type { IllusionData } from "#types/illusion-data"; import type { TurnMove } from "#types/turn-move"; import { BattleInfo } from "#ui/battle-info"; import { EnemyBattleInfo } from "#ui/enemy-battle-info"; -import type { PartyOption } from "#ui/party-ui-handler"; -import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import type { PartyOption } from "#ui/handlers/party-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; import { PlayerBattleInfo } from "#ui/player-battle-info"; import { applyChallenges } from "#utils/challenge-utils"; import { diff --git a/src/init/init.ts b/src/init/init.ts index ba9738e2be8..9e6e24e5648 100644 --- a/src/init/init.ts +++ b/src/init/init.ts @@ -12,7 +12,7 @@ import { initMoves } from "#moves/move"; import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters"; import { initAchievements } from "#system/achv"; import { initVouchers } from "#system/voucher"; -import { initStatsKeys } from "#ui/game-stats-ui-handler"; +import { initStatsKeys } from "#ui/handlers/game-stats-ui-handler"; /** Initialize the game. */ export function initializeGame() { diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 8b77900cb62..20a18a3de38 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -115,8 +115,8 @@ import { import type { PokemonMove } from "#moves/pokemon-move"; import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#system/voucher"; import type { ModifierTypeFunc, WeightedModifierTypeWeightFunc } from "#types/modifier-types"; -import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#ui/party-ui-handler"; -import { PartyUiHandler } from "#ui/party-ui-handler"; +import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#ui/handlers/party-ui-handler"; +import { PartyUiHandler } from "#ui/handlers/party-ui-handler"; import { getModifierTierTextTint } from "#ui/text"; import { applyChallenges } from "#utils/challenge-utils"; import { diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 699caa2af21..25122e91033 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -21,9 +21,9 @@ import type { EnemyPokemon } from "#field/pokemon"; import { PokemonHeldItemModifier } from "#modifiers/modifier"; import { PokemonPhase } from "#phases/pokemon-phase"; import { achvs } from "#system/achv"; -import type { PartyOption } from "#ui/party-ui-handler"; -import { PartyUiMode } from "#ui/party-ui-handler"; -import { SummaryUiMode } from "#ui/summary-ui-handler"; +import type { PartyOption } from "#ui/handlers/party-ui-handler"; +import { PartyUiMode } from "#ui/handlers/party-ui-handler"; +import { SummaryUiMode } from "#ui/handlers/summary-ui-handler"; import { applyChallenges } from "#utils/challenge-utils"; import { BooleanHolder } from "#utils/common"; import i18next from "i18next"; diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts index 547ca778c6b..b64de9bc6d4 100644 --- a/src/phases/egg-hatch-phase.ts +++ b/src/phases/egg-hatch-phase.ts @@ -9,9 +9,9 @@ import { doShinySparkleAnim } from "#field/anims"; import type { PlayerPokemon } from "#field/pokemon"; import type { EggLapsePhase } from "#phases/egg-lapse-phase"; import { achvs } from "#system/achv"; -import { EggCounterContainer } from "#ui/egg-counter-container"; -import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; -import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { EggCounterContainer } from "#ui/containers/egg-counter-container"; +import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container"; +import type { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler"; import { fixedInt, getFrameMs, randInt } from "#utils/common"; import i18next from "i18next"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts index 6095dfafa21..7d7301bbeca 100644 --- a/src/phases/evolution-phase.ts +++ b/src/phases/evolution-phase.ts @@ -10,7 +10,7 @@ import { LearnMoveSituation } from "#enums/learn-move-situation"; import { UiMode } from "#enums/ui-mode"; import { cos, sin } from "#field/anims"; import type { PlayerPokemon, Pokemon } from "#field/pokemon"; -import type { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; +import type { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler"; import { fixedInt, getFrameMs, randInt } from "#utils/common"; import i18next from "i18next"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts index 7b7f5a6dac6..298e6f32a10 100644 --- a/src/phases/form-change-phase.ts +++ b/src/phases/form-change-phase.ts @@ -8,7 +8,7 @@ import { UiMode } from "#enums/ui-mode"; import type { PlayerPokemon, Pokemon } from "#field/pokemon"; import { EvolutionPhase } from "#phases/evolution-phase"; import { achvs } from "#system/achv"; -import type { PartyUiHandler } from "#ui/party-ui-handler"; +import type { PartyUiHandler } from "#ui/handlers/party-ui-handler"; import { fixedInt } from "#utils/common"; export class FormChangePhase extends EvolutionPhase { diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index a714d247730..a16e12ba058 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -10,8 +10,8 @@ import { UiMode } from "#enums/ui-mode"; import type { Pokemon } from "#field/pokemon"; import type { Move } from "#moves/move"; import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase"; -import { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; -import { SummaryUiMode } from "#ui/summary-ui-handler"; +import { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler"; +import { SummaryUiMode } from "#ui/handlers/summary-ui-handler"; import i18next from "i18next"; export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts index 0235fb51da3..3add1bcbe34 100644 --- a/src/phases/revival-blessing-phase.ts +++ b/src/phases/revival-blessing-phase.ts @@ -3,8 +3,8 @@ import { SwitchType } from "#enums/switch-type"; import { UiMode } from "#enums/ui-mode"; import type { PlayerPokemon } from "#field/pokemon"; import { BattlePhase } from "#phases/battle-phase"; -import type { PartyOption } from "#ui/party-ui-handler"; -import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import type { PartyOption } from "#ui/handlers/party-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; import { isNullOrUndefined, toDmgValue } from "#utils/common"; import i18next from "i18next"; diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts index d02d69fc934..640b6de6db0 100644 --- a/src/phases/select-biome-phase.ts +++ b/src/phases/select-biome-phase.ts @@ -5,7 +5,7 @@ import { ChallengeType } from "#enums/challenge-type"; import { UiMode } from "#enums/ui-mode"; import { MapModifier, MoneyInterestModifier } from "#modifiers/modifier"; import { BattlePhase } from "#phases/battle-phase"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; import { applyChallenges } from "#utils/challenge-utils"; import { BooleanHolder, randSeedInt } from "#utils/common"; diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 06a02af38b0..e2d2e107e4a 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -24,9 +24,9 @@ import { TmModifierType, } from "#modifiers/modifier-type"; import { BattlePhase } from "#phases/battle-phase"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import { SHOP_OPTIONS_ROW_LIMIT } from "#ui/modifier-select-ui-handler"; -import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; +import { SHOP_OPTIONS_ROW_LIMIT } from "#ui/handlers/modifier-select-ui-handler"; +import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; import { isNullOrUndefined, NumberHolder } from "#utils/common"; import i18next from "i18next"; diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index ef3fa74bd44..e099fdd7a3a 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -7,8 +7,8 @@ import { ChallengeType } from "#enums/challenge-type"; import type { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { overrideHeldItems, overrideModifiers } from "#modifiers/modifier"; -import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler"; -import type { Starter } from "#ui/starter-select-ui-handler"; +import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler"; +import type { Starter } from "#ui/handlers/starter-select-ui-handler"; import { applyChallenges } from "#utils/challenge-utils"; import { isNullOrUndefined } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts index eaa8a723745..58d0338e8de 100644 --- a/src/phases/switch-phase.ts +++ b/src/phases/switch-phase.ts @@ -3,7 +3,7 @@ import { DynamicPhaseType } from "#enums/dynamic-phase-type"; import { SwitchType } from "#enums/switch-type"; import { UiMode } from "#enums/ui-mode"; import { BattlePhase } from "#phases/battle-phase"; -import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; /** * Opens the party selector UI and transitions into a {@linkcode SwitchSummonPhase} diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 15d92ba2812..b9973a7944c 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -16,8 +16,8 @@ import type { Modifier } from "#modifiers/modifier"; import { getDailyRunStarterModifiers, regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; import type { SessionSaveData } from "#system/game-data"; import { vouchers } from "#system/voucher"; -import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler"; import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; diff --git a/src/plugins/api/pokerogue-daily-api.ts b/src/plugins/api/pokerogue-daily-api.ts index 5ea3846e60e..dfde4720730 100644 --- a/src/plugins/api/pokerogue-daily-api.ts +++ b/src/plugins/api/pokerogue-daily-api.ts @@ -1,6 +1,6 @@ import { ApiBase } from "#api/api-base"; import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/api/pokerogue-daily-api"; -import type { RankingEntry } from "#ui/daily-run-scoreboard"; +import type { RankingEntry } from "#ui/containers/daily-run-scoreboard"; /** * A wrapper for daily-run PokéRogue API requests. diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 47d3c2df2f5..df9c0b2f2cf 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -62,7 +62,7 @@ import { import { VoucherType, vouchers } from "#system/voucher"; import { trainerConfigs } from "#trainers/trainer-config"; import type { DexData, DexEntry } from "#types/dex-data"; -import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler"; +import { RUN_HISTORY_LIMIT } from "#ui/handlers/run-history-ui-handler"; import { applyChallenges } from "#utils/challenge-utils"; import { executeIf, fixedInt, isLocal, NumberHolder, randInt, randSeedItem } from "#utils/common"; import { decrypt, encrypt } from "#utils/data"; diff --git a/src/tutorial.ts b/src/tutorial.ts index 018d0927da0..5ab0be116f8 100644 --- a/src/tutorial.ts +++ b/src/tutorial.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; import Overrides from "#app/overrides"; import { UiMode } from "#enums/ui-mode"; -import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; -import type { UiHandler } from "#ui/ui-handler"; +import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; +import type { UiHandler } from "#ui/handlers/ui-handler"; import i18next from "i18next"; export enum Tutorial { diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts index 72ae59faaec..9c45bdb394d 100644 --- a/src/ui-inputs.ts +++ b/src/ui-inputs.ts @@ -3,16 +3,16 @@ import type { InputsController } from "#app/inputs-controller"; import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; import { Setting, SettingKeys, settingIndex } from "#system/settings"; -import type { MessageUiHandler } from "#ui/message-ui-handler"; -import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; -import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; -import { RunInfoUiHandler } from "#ui/run-info-ui-handler"; +import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler"; +import type { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler"; +import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler"; +import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler"; import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler"; import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler"; import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; import { SettingsUiHandler } from "#ui/settings-ui-handler"; -import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; import Phaser from "phaser"; type ActionKeys = Record void>; diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts index a48948e9617..1d648b93774 100644 --- a/src/ui/battle-info/enemy-battle-info.ts +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -3,9 +3,9 @@ import { Stat } from "#enums/stat"; import { TextStyle } from "#enums/text-style"; import { UiTheme } from "#enums/ui-theme"; import type { EnemyPokemon } from "#field/pokemon"; -import { BattleFlyout } from "#ui/battle-flyout"; import type { BattleInfoParamList } from "#ui/battle-info"; import { BattleInfo } from "#ui/battle-info"; +import { BattleFlyout } from "#ui/containers/battle-flyout"; import { addTextObject } from "#ui/text"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import { getLocalizedSpriteKey } from "#utils/common"; diff --git a/src/ui/ability-bar.ts b/src/ui/containers/ability-bar.ts similarity index 100% rename from src/ui/ability-bar.ts rename to src/ui/containers/ability-bar.ts diff --git a/src/ui/achv-bar.ts b/src/ui/containers/achv-bar.ts similarity index 100% rename from src/ui/achv-bar.ts rename to src/ui/containers/achv-bar.ts diff --git a/src/ui/arena-flyout.ts b/src/ui/containers/arena-flyout.ts similarity index 99% rename from src/ui/arena-flyout.ts rename to src/ui/containers/arena-flyout.ts index da062f5c96f..cdecabee8e3 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/containers/arena-flyout.ts @@ -15,8 +15,8 @@ import { } from "#events/arena"; import type { TurnEndEvent } from "#events/battle-scene"; import { BattleSceneEventType } from "#events/battle-scene"; +import { TimeOfDayWidget } from "#ui/containers/time-of-day-widget"; import { addTextObject } from "#ui/text"; -import { TimeOfDayWidget } from "#ui/time-of-day-widget"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import { fixedInt } from "#utils/common"; import { toCamelCase, toTitleCase } from "#utils/strings"; diff --git a/src/ui/base-stats-overlay.ts b/src/ui/containers/base-stats-overlay.ts similarity index 100% rename from src/ui/base-stats-overlay.ts rename to src/ui/containers/base-stats-overlay.ts diff --git a/src/ui/battle-flyout.ts b/src/ui/containers/battle-flyout.ts similarity index 100% rename from src/ui/battle-flyout.ts rename to src/ui/containers/battle-flyout.ts diff --git a/src/ui/bgm-bar.ts b/src/ui/containers/bgm-bar.ts similarity index 100% rename from src/ui/bgm-bar.ts rename to src/ui/containers/bgm-bar.ts diff --git a/src/ui/candy-bar.ts b/src/ui/containers/candy-bar.ts similarity index 100% rename from src/ui/candy-bar.ts rename to src/ui/containers/candy-bar.ts diff --git a/src/ui/char-sprite.ts b/src/ui/containers/char-sprite.ts similarity index 100% rename from src/ui/char-sprite.ts rename to src/ui/containers/char-sprite.ts diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/containers/daily-run-scoreboard.ts similarity index 100% rename from src/ui/daily-run-scoreboard.ts rename to src/ui/containers/daily-run-scoreboard.ts diff --git a/src/ui/dropdown.ts b/src/ui/containers/dropdown.ts similarity index 99% rename from src/ui/dropdown.ts rename to src/ui/containers/dropdown.ts index c13d1ab6482..4076387caf1 100644 --- a/src/ui/dropdown.ts +++ b/src/ui/containers/dropdown.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; -import { ScrollBar } from "#ui/scroll-bar"; +import { ScrollBar } from "#ui/containers/scroll-bar"; import { addTextObject } from "#ui/text"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/egg-counter-container.ts b/src/ui/containers/egg-counter-container.ts similarity index 96% rename from src/ui/egg-counter-container.ts rename to src/ui/containers/egg-counter-container.ts index da394e73b28..811b6b3bc3a 100644 --- a/src/ui/egg-counter-container.ts +++ b/src/ui/containers/egg-counter-container.ts @@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; import type { EggCountChangedEvent } from "#events/egg"; import { EggEventType } from "#events/egg"; -import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; +import type { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; diff --git a/src/ui/filter-bar.ts b/src/ui/containers/filter-bar.ts similarity index 97% rename from src/ui/filter-bar.ts rename to src/ui/containers/filter-bar.ts index f33c2902295..3c1cf0ed699 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/containers/filter-bar.ts @@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene"; import type { DropDownColumn } from "#enums/drop-down-column"; import { TextStyle } from "#enums/text-style"; import type { UiTheme } from "#enums/ui-theme"; -import type { DropDown } from "#ui/dropdown"; -import { DropDownType } from "#ui/dropdown"; -import type { StarterContainer } from "#ui/starter-container"; +import type { DropDown } from "#ui/containers/dropdown"; +import { DropDownType } from "#ui/containers/dropdown"; +import type { StarterContainer } from "#ui/containers/starter-container"; import { addTextObject, getTextColor } from "#ui/text"; import { addWindow, WindowVariant } from "#ui/ui-theme"; diff --git a/src/ui/filter-text.ts b/src/ui/containers/filter-text.ts similarity index 97% rename from src/ui/filter-text.ts rename to src/ui/containers/filter-text.ts index c9849469d5d..202761152eb 100644 --- a/src/ui/filter-text.ts +++ b/src/ui/containers/filter-text.ts @@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import type { UiTheme } from "#enums/ui-theme"; -import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; -import type { StarterContainer } from "#ui/starter-container"; +import type { StarterContainer } from "#ui/containers/starter-container"; +import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; import { addTextObject, getTextColor } from "#ui/text"; import type { UI } from "#ui/ui"; import { addWindow, WindowVariant } from "#ui/ui-theme"; diff --git a/src/ui/hatched-pokemon-container.ts b/src/ui/containers/hatched-pokemon-container.ts similarity index 97% rename from src/ui/hatched-pokemon-container.ts rename to src/ui/containers/hatched-pokemon-container.ts index a5919348a94..4ed67477a3f 100644 --- a/src/ui/hatched-pokemon-container.ts +++ b/src/ui/containers/hatched-pokemon-container.ts @@ -4,8 +4,8 @@ import { Gender } from "#data/gender"; import type { PokemonSpecies } from "#data/pokemon-species"; import { DexAttr } from "#enums/dex-attr"; import { getVariantTint } from "#sprites/variant"; -import type { PokemonIconAnimHandler } from "#ui/pokemon-icon-anim-handler"; -import { PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import type { PokemonIconAnimHandler } from "#ui/handlers/pokemon-icon-anim-handler"; +import { PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; /** * A container for a Pokemon's sprite and icons to get displayed in the egg summary screen diff --git a/src/ui/move-info-overlay.ts b/src/ui/containers/move-info-overlay.ts similarity index 100% rename from src/ui/move-info-overlay.ts rename to src/ui/containers/move-info-overlay.ts diff --git a/src/ui/party-exp-bar.ts b/src/ui/containers/party-exp-bar.ts similarity index 100% rename from src/ui/party-exp-bar.ts rename to src/ui/containers/party-exp-bar.ts diff --git a/src/ui/pokeball-tray.ts b/src/ui/containers/pokeball-tray.ts similarity index 100% rename from src/ui/pokeball-tray.ts rename to src/ui/containers/pokeball-tray.ts diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/containers/pokedex-info-overlay.ts similarity index 100% rename from src/ui/pokedex-info-overlay.ts rename to src/ui/containers/pokedex-info-overlay.ts diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/containers/pokedex-mon-container.ts similarity index 100% rename from src/ui/pokedex-mon-container.ts rename to src/ui/containers/pokedex-mon-container.ts diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/containers/pokedex-page-ui-handler.ts similarity index 99% rename from src/ui/pokedex-page-ui-handler.ts rename to src/ui/containers/pokedex-page-ui-handler.ts index 672968bd953..1280b3bc30f 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/containers/pokedex-page-ui-handler.ts @@ -46,12 +46,12 @@ import { getVariantIcon, getVariantTint } from "#sprites/variant"; import type { StarterAttributes } from "#system/game-data"; import { SettingKeyboard } from "#system/settings-keyboard"; import type { DexEntry } from "#types/dex-data"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { BaseStatsOverlay } from "#ui/base-stats-overlay"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; -import { PokedexInfoOverlay } from "#ui/pokedex-info-overlay"; -import { StatsContainer } from "#ui/stats-container"; +import { BaseStatsOverlay } from "#ui/containers/base-stats-overlay"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import { PokedexInfoOverlay } from "#ui/containers/pokedex-info-overlay"; +import { StatsContainer } from "#ui/containers/stats-container"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common"; diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/containers/pokemon-hatch-info-container.ts similarity index 99% rename from src/ui/pokemon-hatch-info-container.ts rename to src/ui/containers/pokemon-hatch-info-container.ts index bb1cc22e9fd..8ddd9df9836 100644 --- a/src/ui/pokemon-hatch-info-container.ts +++ b/src/ui/containers/pokemon-hatch-info-container.ts @@ -9,7 +9,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { TextStyle } from "#enums/text-style"; import type { PlayerPokemon } from "#field/pokemon"; -import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container"; import { addTextObject } from "#ui/text"; import { padInt, rgbHexToRgba } from "#utils/common"; import { getPokemonSpeciesForm } from "#utils/pokemon-utils"; diff --git a/src/ui/pokemon-info-container.ts b/src/ui/containers/pokemon-info-container.ts similarity index 99% rename from src/ui/pokemon-info-container.ts rename to src/ui/containers/pokemon-info-container.ts index d232100ffaa..2b214229992 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/containers/pokemon-info-container.ts @@ -8,8 +8,8 @@ import type { Pokemon } from "#field/pokemon"; import { getVariantTint } from "#sprites/variant"; import type { StarterDataEntry } from "#system/game-data"; import type { DexEntry } from "#types/dex-data"; -import { ConfirmUiHandler } from "#ui/confirm-ui-handler"; -import { StatsContainer } from "#ui/stats-container"; +import { StatsContainer } from "#ui/containers/stats-container"; +import { ConfirmUiHandler } from "#ui/handlers/confirm-ui-handler"; import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { fixedInt, getShinyDescriptor } from "#utils/common"; diff --git a/src/ui/saving-icon-handler.ts b/src/ui/containers/saving-icon-handler.ts similarity index 100% rename from src/ui/saving-icon-handler.ts rename to src/ui/containers/saving-icon-handler.ts diff --git a/src/ui/scroll-bar.ts b/src/ui/containers/scroll-bar.ts similarity index 100% rename from src/ui/scroll-bar.ts rename to src/ui/containers/scroll-bar.ts diff --git a/src/ui/starter-container.ts b/src/ui/containers/starter-container.ts similarity index 100% rename from src/ui/starter-container.ts rename to src/ui/containers/starter-container.ts diff --git a/src/ui/stats-container.ts b/src/ui/containers/stats-container.ts similarity index 100% rename from src/ui/stats-container.ts rename to src/ui/containers/stats-container.ts diff --git a/src/ui/time-of-day-widget.ts b/src/ui/containers/time-of-day-widget.ts similarity index 100% rename from src/ui/time-of-day-widget.ts rename to src/ui/containers/time-of-day-widget.ts diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/handlers/abstract-binding-ui-handler.ts similarity index 99% rename from src/ui/settings/abstract-binding-ui-handler.ts rename to src/ui/handlers/abstract-binding-ui-handler.ts index 6b747a10d2b..d106ff6f914 100644 --- a/src/ui/settings/abstract-binding-ui-handler.ts +++ b/src/ui/handlers/abstract-binding-ui-handler.ts @@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { NavigationManager } from "#ui/navigation-menu"; import { addTextObject, getTextColor } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/abstract-option-select-ui-handler.ts b/src/ui/handlers/abstract-option-select-ui-handler.ts similarity index 99% rename from src/ui/abstract-option-select-ui-handler.ts rename to src/ui/handlers/abstract-option-select-ui-handler.ts index 914dfca6ef3..d6e9b583237 100644 --- a/src/ui/abstract-option-select-ui-handler.ts +++ b/src/ui/handlers/abstract-option-select-ui-handler.ts @@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addBBCodeTextObject, getTextColor, getTextStyleOptions } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import { fixedInt, rgbHexToRgba } from "#utils/common"; import { argbFromRgba } from "@material/material-color-utilities"; diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/handlers/achvs-ui-handler.ts similarity index 99% rename from src/ui/achvs-ui-handler.ts rename to src/ui/handlers/achvs-ui-handler.ts index b0f49d13c86..f8f73dd2078 100644 --- a/src/ui/achvs-ui-handler.ts +++ b/src/ui/handlers/achvs-ui-handler.ts @@ -8,8 +8,8 @@ import { achvs, getAchievementDescription } from "#system/achv"; import type { AchvUnlocks, VoucherUnlocks } from "#system/game-data"; import type { Voucher } from "#system/voucher"; import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#system/voucher"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { ScrollBar } from "#ui/scroll-bar"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/admin-ui-handler.ts b/src/ui/handlers/admin-ui-handler.ts similarity index 98% rename from src/ui/admin-ui-handler.ts rename to src/ui/handlers/admin-ui-handler.ts index 3af34f14e2d..bddf730208f 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/handlers/admin-ui-handler.ts @@ -3,11 +3,11 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; +import { getTextColor } from "#ui/text"; import { toTitleCase } from "#utils/strings"; -import { getTextColor } from "./text"; type AdminUiHandlerService = "discord" | "google"; type AdminUiHandlerServiceMode = "Link" | "Unlink"; diff --git a/src/ui/autocomplete-ui-handler.ts b/src/ui/handlers/autocomplete-ui-handler.ts similarity index 94% rename from src/ui/autocomplete-ui-handler.ts rename to src/ui/handlers/autocomplete-ui-handler.ts index 337b17048dc..914fe23a123 100644 --- a/src/ui/autocomplete-ui-handler.ts +++ b/src/ui/handlers/autocomplete-ui-handler.ts @@ -1,6 +1,6 @@ import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler"; +import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler"; export class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler { modalContainer: Phaser.GameObjects.Container; diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/handlers/awaitable-ui-handler.ts similarity index 96% rename from src/ui/awaitable-ui-handler.ts rename to src/ui/handlers/awaitable-ui-handler.ts index e8513b4acc1..9dcd3377da2 100644 --- a/src/ui/awaitable-ui-handler.ts +++ b/src/ui/handlers/awaitable-ui-handler.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import type { UiMode } from "#enums/ui-mode"; -import { UiHandler } from "#ui/ui-handler"; +import { UiHandler } from "#ui/handlers/ui-handler"; export abstract class AwaitableUiHandler extends UiHandler { protected awaitingActionInput: boolean; diff --git a/src/ui/ball-ui-handler.ts b/src/ui/handlers/ball-ui-handler.ts similarity index 98% rename from src/ui/ball-ui-handler.ts rename to src/ui/handlers/ball-ui-handler.ts index 3d8efca96b8..3d1868c207e 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/handlers/ball-ui-handler.ts @@ -5,8 +5,8 @@ import { Command } from "#enums/command"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import type { CommandPhase } from "#phases/command-phase"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject, getTextStyleOptions } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/handlers/battle-message-ui-handler.ts similarity index 99% rename from src/ui/battle-message-ui-handler.ts rename to src/ui/handlers/battle-message-ui-handler.ts index bf4360b37bf..72ccec735aa 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/handlers/battle-message-ui-handler.ts @@ -3,7 +3,7 @@ import { Button } from "#enums/buttons"; import { getStatKey, PERMANENT_STATS } from "#enums/stat"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/handlers/challenges-select-ui-handler.ts similarity index 99% rename from src/ui/challenges-select-ui-handler.ts rename to src/ui/handlers/challenges-select-ui-handler.ts index 68559b92439..b7cdd16efe0 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/handlers/challenges-select-ui-handler.ts @@ -5,8 +5,8 @@ import { Challenges } from "#enums/challenges"; import { Color, ShadowColor } from "#enums/color"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import { getLocalizedSpriteKey } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/change-password-form-ui-handler.ts b/src/ui/handlers/change-password-form-ui-handler.ts similarity index 94% rename from src/ui/change-password-form-ui-handler.ts rename to src/ui/handlers/change-password-form-ui-handler.ts index eccc67ffb04..f4fdf349978 100644 --- a/src/ui/change-password-form-ui-handler.ts +++ b/src/ui/handlers/change-password-form-ui-handler.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { UiMode } from "#enums/ui-mode"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import i18next from "i18next"; export class ChangePasswordFormUiHandler extends FormModalUiHandler { diff --git a/src/ui/command-ui-handler.ts b/src/ui/handlers/command-ui-handler.ts similarity index 98% rename from src/ui/command-ui-handler.ts rename to src/ui/handlers/command-ui-handler.ts index b702bcd0803..a1219a8fb31 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/handlers/command-ui-handler.ts @@ -9,9 +9,9 @@ import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { TerastallizeAccessModifier } from "#modifiers/modifier"; import type { CommandPhase } from "#phases/command-phase"; -import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import i18next from "i18next"; export class CommandUiHandler extends UiHandler { diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/handlers/confirm-ui-handler.ts similarity index 95% rename from src/ui/confirm-ui-handler.ts rename to src/ui/handlers/confirm-ui-handler.ts index 529d1bd8bbb..f1bd70e272a 100644 --- a/src/ui/confirm-ui-handler.ts +++ b/src/ui/handlers/confirm-ui-handler.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler"; -import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler"; +import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler"; import i18next from "i18next"; export class ConfirmUiHandler extends AbstractOptionSelectUiHandler { diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/handlers/egg-gacha-ui-handler.ts similarity index 99% rename from src/ui/egg-gacha-ui-handler.ts rename to src/ui/handlers/egg-gacha-ui-handler.ts index d94ddcd6ee5..b7884d8653a 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/handlers/egg-gacha-ui-handler.ts @@ -9,7 +9,7 @@ import { GachaType } from "#enums/gacha-types"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { getVoucherTypeIcon, VoucherType } from "#system/voucher"; -import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addTextObject, getEggTierTextTint, getTextStyleOptions } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { fixedInt, randSeedShuffle } from "#utils/common"; diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/handlers/egg-hatch-scene-handler.ts similarity index 96% rename from src/ui/egg-hatch-scene-handler.ts rename to src/ui/handlers/egg-hatch-scene-handler.ts index 1733b64144b..b7b5b78641f 100644 --- a/src/ui/egg-hatch-scene-handler.ts +++ b/src/ui/handlers/egg-hatch-scene-handler.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import { UiHandler } from "#ui/ui-handler"; +import { UiHandler } from "#ui/handlers/ui-handler"; export class EggHatchSceneHandler extends UiHandler { public eggHatchContainer: Phaser.GameObjects.Container; diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/handlers/egg-list-ui-handler.ts similarity index 96% rename from src/ui/egg-list-ui-handler.ts rename to src/ui/handlers/egg-list-ui-handler.ts index 2516903f631..2161073e6b1 100644 --- a/src/ui/egg-list-ui-handler.ts +++ b/src/ui/handlers/egg-list-ui-handler.ts @@ -2,10 +2,10 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; -import { ScrollBar } from "#ui/scroll-bar"; -import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; +import { ScrollableGridUiHandler } from "#ui/handlers/scrollable-grid-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/handlers/egg-summary-ui-handler.ts similarity index 95% rename from src/ui/egg-summary-ui-handler.ts rename to src/ui/handlers/egg-summary-ui-handler.ts index db357b849c3..ebf1a01b2c2 100644 --- a/src/ui/egg-summary-ui-handler.ts +++ b/src/ui/handlers/egg-summary-ui-handler.ts @@ -3,12 +3,12 @@ import { getEggTierForSpecies } from "#data/egg"; import type { EggHatchData } from "#data/egg-hatch-data"; import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import { HatchedPokemonContainer } from "#ui/hatched-pokemon-container"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { PokemonHatchInfoContainer } from "#ui/pokemon-hatch-info-container"; -import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; -import { ScrollBar } from "#ui/scroll-bar"; -import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler"; +import { HatchedPokemonContainer } from "#ui/containers/hatched-pokemon-container"; +import { PokemonHatchInfoContainer } from "#ui/containers/pokemon-hatch-info-container"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; +import { ScrollableGridUiHandler } from "#ui/handlers/scrollable-grid-handler"; const iconContainerX = 112; const iconContainerY = 9; diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/handlers/evolution-scene-handler.ts similarity index 97% rename from src/ui/evolution-scene-handler.ts rename to src/ui/handlers/evolution-scene-handler.ts index 0333594dc36..987a64b5333 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/handlers/evolution-scene-handler.ts @@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addTextObject } from "#ui/text"; export class EvolutionSceneHandler extends MessageUiHandler { diff --git a/src/ui/fight-ui-handler.ts b/src/ui/handlers/fight-ui-handler.ts similarity index 99% rename from src/ui/fight-ui-handler.ts rename to src/ui/handlers/fight-ui-handler.ts index d1b85a29b14..74e5888fa68 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/handlers/fight-ui-handler.ts @@ -12,9 +12,9 @@ import { UiMode } from "#enums/ui-mode"; import type { EnemyPokemon, Pokemon } from "#field/pokemon"; import type { PokemonMove } from "#moves/pokemon-move"; import type { CommandPhase } from "#phases/command-phase"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject, getTextColor } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { fixedInt, getLocalizedSpriteKey, padInt } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/handlers/form-modal-ui-handler.ts similarity index 98% rename from src/ui/form-modal-ui-handler.ts rename to src/ui/handlers/form-modal-ui-handler.ts index 092a0c85bb2..b9f79eb1abc 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/handlers/form-modal-ui-handler.ts @@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; -import type { ModalConfig } from "#ui/modal-ui-handler"; -import { ModalUiHandler } from "#ui/modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; +import { ModalUiHandler } from "#ui/handlers/modal-ui-handler"; import { addTextInputObject, addTextObject, getTextColor } from "#ui/text"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import { fixedInt } from "#utils/common"; diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/handlers/game-stats-ui-handler.ts similarity index 99% rename from src/ui/game-stats-ui-handler.ts rename to src/ui/handlers/game-stats-ui-handler.ts index be41e4d21b9..f961d5c18f1 100644 --- a/src/ui/game-stats-ui-handler.ts +++ b/src/ui/handlers/game-stats-ui-handler.ts @@ -7,8 +7,8 @@ import { PlayerGender } from "#enums/player-gender"; import { TextStyle } from "#enums/text-style"; import { UiTheme } from "#enums/ui-theme"; import type { GameData } from "#system/game-data"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import { formatFancyLargeNumber, getPlayTimeString } from "#utils/common"; import { toTitleCase } from "#utils/strings"; diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/handlers/loading-modal-ui-handler.ts similarity index 92% rename from src/ui/loading-modal-ui-handler.ts rename to src/ui/handlers/loading-modal-ui-handler.ts index de00d911c47..9b401e17f91 100644 --- a/src/ui/loading-modal-ui-handler.ts +++ b/src/ui/handlers/loading-modal-ui-handler.ts @@ -1,6 +1,6 @@ import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; -import { ModalUiHandler } from "#ui/modal-ui-handler"; +import { ModalUiHandler } from "#ui/handlers/modal-ui-handler"; import { addTextObject } from "#ui/text"; import i18next from "i18next"; diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/handlers/login-form-ui-handler.ts similarity index 97% rename from src/ui/login-form-ui-handler.ts rename to src/ui/handlers/login-form-ui-handler.ts index 0f55faba5c4..eaab2742897 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/handlers/login-form-ui-handler.ts @@ -2,10 +2,10 @@ import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { fixedInt } from "#utils/common"; diff --git a/src/ui/menu-ui-handler.ts b/src/ui/handlers/menu-ui-handler.ts similarity index 98% rename from src/ui/menu-ui-handler.ts rename to src/ui/handlers/menu-ui-handler.ts index 66465f76445..db74d127056 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/handlers/menu-ui-handler.ts @@ -7,11 +7,10 @@ import { Button } from "#enums/buttons"; import { GameDataType } from "#enums/game-data-type"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { AdminMode, getAdminModeName } from "#ui/admin-ui-handler"; -import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; -import { BgmBar } from "#ui/bgm-bar"; -import { MessageUiHandler } from "#ui/message-ui-handler"; +import { BgmBar } from "#ui/containers/bgm-bar"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { addTextObject, getTextStyleOptions } from "#ui/text"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import { fixedInt, isLocal, sessionIdKey } from "#utils/common"; @@ -20,6 +19,7 @@ import { getEnumValues } from "#utils/enums"; import { toCamelCase } from "#utils/strings"; import { isBeta } from "#utils/utility-vars"; import i18next from "i18next"; +import { AdminMode, getAdminModeName } from "./admin-ui-handler"; enum MenuOptions { GAME_SETTINGS, diff --git a/src/ui/message-ui-handler.ts b/src/ui/handlers/message-ui-handler.ts similarity index 99% rename from src/ui/message-ui-handler.ts rename to src/ui/handlers/message-ui-handler.ts index 57f054c9bf9..262e716512c 100644 --- a/src/ui/message-ui-handler.ts +++ b/src/ui/handlers/message-ui-handler.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import type { UiMode } from "#enums/ui-mode"; -import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; import { getFrameMs } from "#utils/common"; export abstract class MessageUiHandler extends AwaitableUiHandler { diff --git a/src/ui/modal-ui-handler.ts b/src/ui/handlers/modal-ui-handler.ts similarity index 99% rename from src/ui/modal-ui-handler.ts rename to src/ui/handlers/modal-ui-handler.ts index 51a6a21a29c..c11a694c1c9 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/handlers/modal-ui-handler.ts @@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene"; import type { Button } from "#enums/buttons"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addTextObject } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow, WindowVariant } from "#ui/ui-theme"; export interface ModalConfig { diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/handlers/modifier-select-ui-handler.ts similarity index 99% rename from src/ui/modifier-select-ui-handler.ts rename to src/ui/handlers/modifier-select-ui-handler.ts index 9ddc892add6..09c849e7c04 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/handlers/modifier-select-ui-handler.ts @@ -11,8 +11,8 @@ import { UiMode } from "#enums/ui-mode"; import { HealShopCostModifier, LockModifierTiersModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; import type { ModifierTypeOption } from "#modifiers/modifier-type"; import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "#modifiers/modifier-type"; -import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; import { addTextObject, getModifierTierTextTint, getTextColor, getTextStyleOptions } from "#ui/text"; import { formatMoney, NumberHolder } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/handlers/mystery-encounter-ui-handler.ts similarity index 99% rename from src/ui/mystery-encounter-ui-handler.ts rename to src/ui/handlers/mystery-encounter-ui-handler.ts index 37f77cf43b9..26d70088d77 100644 --- a/src/ui/mystery-encounter-ui-handler.ts +++ b/src/ui/handlers/mystery-encounter-ui-handler.ts @@ -9,9 +9,9 @@ import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; import type { OptionSelectSettings } from "#mystery-encounters/encounter-phase-utils"; import type { MysteryEncounterOption } from "#mystery-encounters/mystery-encounter-option"; import type { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; -import { PartyUiMode } from "#ui/party-ui-handler"; +import { PartyUiMode } from "#ui/handlers/party-ui-handler"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addBBCodeTextObject, getBBCodeFrag } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow, WindowVariant } from "#ui/ui-theme"; import { fixedInt, isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/party-ui-handler.ts b/src/ui/handlers/party-ui-handler.ts similarity index 99% rename from src/ui/party-ui-handler.ts rename to src/ui/handlers/party-ui-handler.ts index 9fc777809bf..60a6fd1104f 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/handlers/party-ui-handler.ts @@ -21,9 +21,9 @@ import type { PokemonMove } from "#moves/pokemon-move"; import type { CommandPhase } from "#phases/command-phase"; import { getVariantTint } from "#sprites/variant"; import type { TurnMove } from "#types/turn-move"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; -import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { applyChallenges } from "#utils/challenge-utils"; diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/handlers/pokedex-scan-ui-handler.ts similarity index 93% rename from src/ui/pokedex-scan-ui-handler.ts rename to src/ui/handlers/pokedex-scan-ui-handler.ts index 4f606cbcbb0..9a027be35f9 100644 --- a/src/ui/pokedex-scan-ui-handler.ts +++ b/src/ui/handlers/pokedex-scan-ui-handler.ts @@ -1,11 +1,11 @@ import { allAbilities, allMoves, allSpecies } from "#data/data-lists"; import { UiMode } from "#enums/ui-mode"; import type { PlayerPokemon } from "#field/pokemon"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { FilterTextRow } from "#ui/filter-text"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import { FilterTextRow } from "#ui/containers/filter-text"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import { isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/handlers/pokedex-ui-handler.ts similarity index 99% rename from src/ui/pokedex-ui-handler.ts rename to src/ui/handlers/pokedex-ui-handler.ts index 046ca564709..0550353233c 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/handlers/pokedex-ui-handler.ts @@ -34,14 +34,21 @@ import { getVariantIcon, getVariantTint } from "#sprites/variant"; import type { DexAttrProps, StarterAttributes } from "#system/game-data"; import { SettingKeyboard } from "#system/settings-keyboard"; import type { DexEntry } from "#types/dex-data"; -import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler"; -import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown"; -import { FilterBar } from "#ui/filter-bar"; -import { FilterText, FilterTextRow } from "#ui/filter-text"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { PokedexMonContainer } from "#ui/pokedex-mon-container"; -import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; -import { ScrollBar } from "#ui/scroll-bar"; +import { + DropDown, + DropDownLabel, + DropDownOption, + DropDownState, + DropDownType, + SortCriteria, +} from "#ui/containers/dropdown"; +import { FilterBar } from "#ui/containers/filter-bar"; +import { FilterText, FilterTextRow } from "#ui/containers/filter-text"; +import { PokedexMonContainer } from "#ui/containers/pokedex-mon-container"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; import { addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#utils/common"; diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/handlers/pokemon-icon-anim-handler.ts similarity index 100% rename from src/ui/pokemon-icon-anim-handler.ts rename to src/ui/handlers/pokemon-icon-anim-handler.ts diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/handlers/registration-form-ui-handler.ts similarity index 94% rename from src/ui/registration-form-ui-handler.ts rename to src/ui/handlers/registration-form-ui-handler.ts index 2c8080d534d..d424e44b455 100644 --- a/src/ui/registration-form-ui-handler.ts +++ b/src/ui/handlers/registration-form-ui-handler.ts @@ -2,9 +2,9 @@ import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import { addTextObject } from "#ui/text"; import i18next from "i18next"; diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/handlers/rename-form-ui-handler.ts similarity index 87% rename from src/ui/rename-form-ui-handler.ts rename to src/ui/handlers/rename-form-ui-handler.ts index 9da5b0e8554..f1d9ae3c981 100644 --- a/src/ui/rename-form-ui-handler.ts +++ b/src/ui/handlers/rename-form-ui-handler.ts @@ -1,7 +1,7 @@ import type { PlayerPokemon } from "#field/pokemon"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import i18next from "i18next"; export class RenameFormUiHandler extends FormModalUiHandler { diff --git a/src/ui/rename-run-ui-handler.ts b/src/ui/handlers/rename-run-ui-handler.ts similarity index 91% rename from src/ui/rename-run-ui-handler.ts rename to src/ui/handlers/rename-run-ui-handler.ts index a94b7b08fb9..08c52cfed5b 100644 --- a/src/ui/rename-run-ui-handler.ts +++ b/src/ui/handlers/rename-run-ui-handler.ts @@ -1,6 +1,5 @@ import i18next from "i18next"; -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; +import { FormModalUiHandler, type InputFieldConfig } from "./form-modal-ui-handler"; import type { ModalConfig } from "./modal-ui-handler"; export class RenameRunFormUiHandler extends FormModalUiHandler { diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/handlers/run-history-ui-handler.ts similarity index 99% rename from src/ui/run-history-ui-handler.ts rename to src/ui/handlers/run-history-ui-handler.ts index 6f4d9024832..db5a8eac7bd 100644 --- a/src/ui/run-history-ui-handler.ts +++ b/src/ui/handlers/run-history-ui-handler.ts @@ -8,8 +8,8 @@ import { TrainerVariant } from "#enums/trainer-variant"; import { UiMode } from "#enums/ui-mode"; import type { RunEntry } from "#system/game-data"; import type { PokemonData } from "#system/pokemon-data"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { RunDisplayMode } from "#ui/run-info-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { fixedInt, formatLargeNumber } from "#utils/common"; diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/handlers/run-info-ui-handler.ts similarity index 99% rename from src/ui/run-info-ui-handler.ts rename to src/ui/handlers/run-info-ui-handler.ts index 8b2190c3b4a..42fef26ec6d 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/handlers/run-info-ui-handler.ts @@ -22,8 +22,8 @@ import { getVariantTint } from "#sprites/variant"; import type { SessionSaveData } from "#system/game-data"; import type { PokemonData } from "#system/pokemon-data"; import { SettingKeyboard } from "#system/settings-keyboard"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import { formatFancyLargeNumber, formatLargeNumber, formatMoney, getPlayTimeString } from "#utils/common"; import { toCamelCase } from "#utils/strings"; diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/handlers/save-slot-select-ui-handler.ts similarity index 99% rename from src/ui/save-slot-select-ui-handler.ts rename to src/ui/handlers/save-slot-select-ui-handler.ts index 97cd3016479..7c86a3e8d5b 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/handlers/save-slot-select-ui-handler.ts @@ -8,9 +8,9 @@ import { UiMode } from "#enums/ui-mode"; import * as Modifier from "#modifiers/modifier"; import type { SessionSaveData } from "#system/game-data"; import type { PokemonData } from "#system/pokemon-data"; -import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { RunDisplayMode } from "#ui/run-info-ui-handler"; +import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler"; import { addTextObject } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { fixedInt, formatLargeNumber, getPlayTimeString, isNullOrUndefined } from "#utils/common"; diff --git a/src/ui/scrollable-grid-handler.ts b/src/ui/handlers/scrollable-grid-handler.ts similarity index 98% rename from src/ui/scrollable-grid-handler.ts rename to src/ui/handlers/scrollable-grid-handler.ts index 3c6458f5083..12bbaa32e98 100644 --- a/src/ui/scrollable-grid-handler.ts +++ b/src/ui/handlers/scrollable-grid-handler.ts @@ -1,6 +1,6 @@ import { Button } from "#enums/buttons"; -import type { ScrollBar } from "#ui/scroll-bar"; -import type { UiHandler } from "#ui/ui-handler"; +import type { ScrollBar } from "#ui/containers/scroll-bar"; +import type { UiHandler } from "#ui/handlers/ui-handler"; type UpdateGridCallbackFunction = () => void; type UpdateDetailsCallbackFunction = (index: number) => void; diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/handlers/session-reload-modal-ui-handler.ts similarity index 88% rename from src/ui/session-reload-modal-ui-handler.ts rename to src/ui/handlers/session-reload-modal-ui-handler.ts index 1f5a205f990..33c18b1974a 100644 --- a/src/ui/session-reload-modal-ui-handler.ts +++ b/src/ui/handlers/session-reload-modal-ui-handler.ts @@ -1,7 +1,7 @@ import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; -import type { ModalConfig } from "#ui/modal-ui-handler"; -import { ModalUiHandler } from "#ui/modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; +import { ModalUiHandler } from "#ui/handlers/modal-ui-handler"; import { addTextObject } from "#ui/text"; export class SessionReloadModalUiHandler extends ModalUiHandler { diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts similarity index 99% rename from src/ui/starter-select-ui-handler.ts rename to src/ui/handlers/starter-select-ui-handler.ts index 3b4b2716369..41697d9d79d 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/handlers/starter-select-ui-handler.ts @@ -50,15 +50,22 @@ import type { DexAttrProps, StarterAttributes, StarterDataEntry, StarterMoveset import { RibbonData } from "#system/ribbons/ribbon-data"; import { SettingKeyboard } from "#system/settings-keyboard"; import type { DexEntry } from "#types/dex-data"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown"; -import { FilterBar } from "#ui/filter-bar"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { MoveInfoOverlay } from "#ui/move-info-overlay"; -import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; -import { ScrollBar } from "#ui/scroll-bar"; -import { StarterContainer } from "#ui/starter-container"; -import { StatsContainer } from "#ui/stats-container"; +import { + DropDown, + DropDownLabel, + DropDownOption, + DropDownState, + DropDownType, + SortCriteria, +} from "#ui/containers/dropdown"; +import { FilterBar } from "#ui/containers/filter-bar"; +import { MoveInfoOverlay } from "#ui/containers/move-info-overlay"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { StarterContainer } from "#ui/containers/starter-container"; +import { StatsContainer } from "#ui/containers/stats-container"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler"; import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import { applyChallenges, checkStarterValidForChallenge } from "#utils/challenge-utils"; diff --git a/src/ui/summary-ui-handler.ts b/src/ui/handlers/summary-ui-handler.ts similarity index 99% rename from src/ui/summary-ui-handler.ts rename to src/ui/handlers/summary-ui-handler.ts index f737411896e..a1ae01b895b 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/handlers/summary-ui-handler.ts @@ -25,8 +25,8 @@ import type { PokemonMove } from "#moves/pokemon-move"; import type { Variant } from "#sprites/variant"; import { getVariantTint } from "#sprites/variant"; import { achvs } from "#system/achv"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { addBBCodeTextObject, addTextObject, getBBCodeFrag, getTextColor } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { fixedInt, formatStat, diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/handlers/target-select-ui-handler.ts similarity index 99% rename from src/ui/target-select-ui-handler.ts rename to src/ui/handlers/target-select-ui-handler.ts index 5ea89929cda..91f40d4a476 100644 --- a/src/ui/target-select-ui-handler.ts +++ b/src/ui/handlers/target-select-ui-handler.ts @@ -7,7 +7,7 @@ import { UiMode } from "#enums/ui-mode"; import type { Pokemon } from "#field/pokemon"; import type { ModifierBar } from "#modifiers/modifier"; import { getMoveTargets } from "#moves/move-utils"; -import { UiHandler } from "#ui/ui-handler"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { fixedInt, isNullOrUndefined } from "#utils/common"; export type TargetSelectCallback = (targets: BattlerIndex[]) => void; diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/handlers/test-dialogue-ui-handler.ts similarity index 94% rename from src/ui/test-dialogue-ui-handler.ts rename to src/ui/handlers/test-dialogue-ui-handler.ts index 6f7c79a151b..e925e523bc5 100644 --- a/src/ui/test-dialogue-ui-handler.ts +++ b/src/ui/handlers/test-dialogue-ui-handler.ts @@ -1,9 +1,9 @@ import { UiMode } from "#enums/ui-mode"; import type { PlayerPokemon } from "#field/pokemon"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; -import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; -import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; -import type { ModalConfig } from "#ui/modal-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; import { isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; diff --git a/src/ui/title-ui-handler.ts b/src/ui/handlers/title-ui-handler.ts similarity index 100% rename from src/ui/title-ui-handler.ts rename to src/ui/handlers/title-ui-handler.ts diff --git a/src/ui/ui-handler.ts b/src/ui/handlers/ui-handler.ts similarity index 100% rename from src/ui/ui-handler.ts rename to src/ui/handlers/ui-handler.ts diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/handlers/unavailable-modal-ui-handler.ts similarity index 95% rename from src/ui/unavailable-modal-ui-handler.ts rename to src/ui/handlers/unavailable-modal-ui-handler.ts index 5c3dc513473..a69f423376b 100644 --- a/src/ui/unavailable-modal-ui-handler.ts +++ b/src/ui/handlers/unavailable-modal-ui-handler.ts @@ -2,8 +2,8 @@ import { updateUserInfo } from "#app/account"; import { globalScene } from "#app/global-scene"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; -import type { ModalConfig } from "#ui/modal-ui-handler"; -import { ModalUiHandler } from "#ui/modal-ui-handler"; +import type { ModalConfig } from "#ui/handlers/modal-ui-handler"; +import { ModalUiHandler } from "#ui/handlers/modal-ui-handler"; import { addTextObject } from "#ui/text"; import { sessionIdKey } from "#utils/common"; import { removeCookie } from "#utils/cookies"; diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts index c08f1570b75..4c76f7b991f 100644 --- a/src/ui/settings/abstract-control-settings-ui-handler.ts +++ b/src/ui/settings/abstract-control-settings-ui-handler.ts @@ -5,10 +5,10 @@ import type { Device } from "#enums/devices"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { getIconWithSettingName } from "#inputs/config-handler"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { UiHandler } from "#ui/handlers/ui-handler"; import { NavigationManager, NavigationMenu } from "#ui/navigation-menu"; -import { ScrollBar } from "#ui/scroll-bar"; import { addTextObject, getTextColor } from "#ui/text"; -import { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; import { toCamelCase } from "#utils/strings"; import i18next from "i18next"; diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index ae1bb40dbeb..fda18d8ba66 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -5,9 +5,9 @@ import { UiMode } from "#enums/ui-mode"; import type { SettingType } from "#system/settings"; import { Setting, SettingKeys } from "#system/settings"; import type { InputsIcons } from "#ui/abstract-control-settings-ui-handler"; -import { MessageUiHandler } from "#ui/message-ui-handler"; +import { ScrollBar } from "#ui/containers/scroll-bar"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; import { NavigationManager, NavigationMenu } from "#ui/navigation-menu"; -import { ScrollBar } from "#ui/scroll-bar"; import { addTextObject, getTextColor } from "#ui/text"; import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index 53d606b6f84..397d9c88531 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -3,7 +3,7 @@ import { Device } from "#enums/devices"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { getIconWithSettingName, getKeyWithKeycode } from "#inputs/config-handler"; -import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler"; +import { AbstractBindingUiHandler } from "#ui/handlers/abstract-binding-ui-handler"; import { addTextObject } from "#ui/text"; import i18next from "i18next"; diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index b339ac16188..b1fd153461f 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -3,7 +3,7 @@ import { Device } from "#enums/devices"; import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { getKeyWithKeycode } from "#inputs/config-handler"; -import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler"; +import { AbstractBindingUiHandler } from "#ui/handlers/abstract-binding-ui-handler"; import { addTextObject } from "#ui/text"; import i18next from "i18next"; diff --git a/src/ui/settings/option-select-ui-handler.ts b/src/ui/settings/option-select-ui-handler.ts index c989c768244..235f16e7f09 100644 --- a/src/ui/settings/option-select-ui-handler.ts +++ b/src/ui/settings/option-select-ui-handler.ts @@ -1,5 +1,5 @@ import { UiMode } from "#enums/ui-mode"; -import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler"; +import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler"; export class OptionSelectUiHandler extends AbstractOptionSelectUiHandler { constructor(mode: UiMode = UiMode.OPTION_SELECT) { diff --git a/src/ui/ui.ts b/src/ui/ui.ts index e381d205b78..5c270eacdc0 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -4,63 +4,63 @@ import { Device } from "#enums/devices"; import { PlayerGender } from "#enums/player-gender"; import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; -import { AchvBar } from "#ui/achv-bar"; -import { AchvsUiHandler } from "#ui/achvs-ui-handler"; -import { AdminUiHandler } from "#ui/admin-ui-handler"; -import { AutoCompleteUiHandler } from "#ui/autocomplete-ui-handler"; -import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; -import { BallUiHandler } from "#ui/ball-ui-handler"; -import { BattleMessageUiHandler } from "#ui/battle-message-ui-handler"; -import type { BgmBar } from "#ui/bgm-bar"; -import { GameChallengesUiHandler } from "#ui/challenges-select-ui-handler"; -import { ChangePasswordFormUiHandler } from "#ui/change-password-form-ui-handler"; -import { CommandUiHandler } from "#ui/command-ui-handler"; -import { ConfirmUiHandler } from "#ui/confirm-ui-handler"; -import { EggGachaUiHandler } from "#ui/egg-gacha-ui-handler"; -import { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; -import { EggListUiHandler } from "#ui/egg-list-ui-handler"; -import { EggSummaryUiHandler } from "#ui/egg-summary-ui-handler"; -import { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; -import { FightUiHandler } from "#ui/fight-ui-handler"; -import { GameStatsUiHandler } from "#ui/game-stats-ui-handler"; +import { AchvBar } from "#ui/containers/achv-bar"; +import type { BgmBar } from "#ui/containers/bgm-bar"; +import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler"; +import { SavingIconHandler } from "#ui/containers/saving-icon-handler"; import { GamepadBindingUiHandler } from "#ui/gamepad-binding-ui-handler"; +import { AchvsUiHandler } from "#ui/handlers/achvs-ui-handler"; +import { AutoCompleteUiHandler } from "#ui/handlers/autocomplete-ui-handler"; +import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; +import { BallUiHandler } from "#ui/handlers/ball-ui-handler"; +import { BattleMessageUiHandler } from "#ui/handlers/battle-message-ui-handler"; +import { GameChallengesUiHandler } from "#ui/handlers/challenges-select-ui-handler"; +import { ChangePasswordFormUiHandler } from "#ui/handlers/change-password-form-ui-handler"; +import { CommandUiHandler } from "#ui/handlers/command-ui-handler"; +import { ConfirmUiHandler } from "#ui/handlers/confirm-ui-handler"; +import { EggGachaUiHandler } from "#ui/handlers/egg-gacha-ui-handler"; +import { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler"; +import { EggListUiHandler } from "#ui/handlers/egg-list-ui-handler"; +import { EggSummaryUiHandler } from "#ui/handlers/egg-summary-ui-handler"; +import { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler"; +import { FightUiHandler } from "#ui/handlers/fight-ui-handler"; +import { GameStatsUiHandler } from "#ui/handlers/game-stats-ui-handler"; +import { LoadingModalUiHandler } from "#ui/handlers/loading-modal-ui-handler"; +import { LoginFormUiHandler } from "#ui/handlers/login-form-ui-handler"; +import { MenuUiHandler } from "#ui/handlers/menu-ui-handler"; +import { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; +import { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler"; +import { PartyUiHandler } from "#ui/handlers/party-ui-handler"; +import { PokedexScanUiHandler } from "#ui/handlers/pokedex-scan-ui-handler"; +import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler"; +import { RegistrationFormUiHandler } from "#ui/handlers/registration-form-ui-handler"; +import { RenameFormUiHandler } from "#ui/handlers/rename-form-ui-handler"; +import { RunHistoryUiHandler } from "#ui/handlers/run-history-ui-handler"; +import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler"; +import { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler"; +import { SessionReloadModalUiHandler } from "#ui/handlers/session-reload-modal-ui-handler"; +import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler"; +import { SummaryUiHandler } from "#ui/handlers/summary-ui-handler"; +import { TargetSelectUiHandler } from "#ui/handlers/target-select-ui-handler"; +import { TestDialogueUiHandler } from "#ui/handlers/test-dialogue-ui-handler"; +import { TitleUiHandler } from "#ui/handlers/title-ui-handler"; +import type { UiHandler } from "#ui/handlers/ui-handler"; +import { UnavailableModalUiHandler } from "#ui/handlers/unavailable-modal-ui-handler"; import { KeyboardBindingUiHandler } from "#ui/keyboard-binding-ui-handler"; -import { LoadingModalUiHandler } from "#ui/loading-modal-ui-handler"; -import { LoginFormUiHandler } from "#ui/login-form-ui-handler"; -import { MenuUiHandler } from "#ui/menu-ui-handler"; -import { MessageUiHandler } from "#ui/message-ui-handler"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; import { NavigationManager } from "#ui/navigation-menu"; import { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; -import { PartyUiHandler } from "#ui/party-ui-handler"; -import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; -import { PokedexScanUiHandler } from "#ui/pokedex-scan-ui-handler"; -import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; -import { RegistrationFormUiHandler } from "#ui/registration-form-ui-handler"; -import { RenameFormUiHandler } from "#ui/rename-form-ui-handler"; -import { RunHistoryUiHandler } from "#ui/run-history-ui-handler"; -import { RunInfoUiHandler } from "#ui/run-info-ui-handler"; -import { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; -import { SavingIconHandler } from "#ui/saving-icon-handler"; -import { SessionReloadModalUiHandler } from "#ui/session-reload-modal-ui-handler"; import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler"; import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler"; import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; import { SettingsUiHandler } from "#ui/settings-ui-handler"; -import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; -import { SummaryUiHandler } from "#ui/summary-ui-handler"; -import { TargetSelectUiHandler } from "#ui/target-select-ui-handler"; -import { TestDialogueUiHandler } from "#ui/test-dialogue-ui-handler"; import { addTextObject } from "#ui/text"; -import { TitleUiHandler } from "#ui/title-ui-handler"; -import type { UiHandler } from "#ui/ui-handler"; import { addWindow } from "#ui/ui-theme"; -import { UnavailableModalUiHandler } from "#ui/unavailable-modal-ui-handler"; import { executeIf } from "#utils/common"; import i18next from "i18next"; -import { RenameRunFormUiHandler } from "./rename-run-ui-handler"; +import { AdminUiHandler } from "./handlers/admin-ui-handler"; +import { RenameRunFormUiHandler } from "./handlers/rename-run-ui-handler"; const transitionModes = [ UiMode.SAVE_SLOT, diff --git a/test/abilities/arena-trap.test.ts b/test/abilities/arena-trap.test.ts index 0090487f49c..d43148dce7b 100644 --- a/test/abilities/arena-trap.test.ts +++ b/test/abilities/arena-trap.test.ts @@ -6,7 +6,7 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { GameManager } from "#test/test-utils/game-manager"; -import type { PartyUiHandler } from "#ui/party-ui-handler"; +import type { PartyUiHandler } from "#ui/handlers/party-ui-handler"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/challenges/hardcore.test.ts b/test/challenges/hardcore.test.ts index 0f4ab1b9f02..a52d7102868 100644 --- a/test/challenges/hardcore.test.ts +++ b/test/challenges/hardcore.test.ts @@ -8,7 +8,7 @@ import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; import { UiMode } from "#enums/ui-mode"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/challenges/limited-support.test.ts b/test/challenges/limited-support.test.ts index 35413220550..ba8930943dd 100644 --- a/test/challenges/limited-support.test.ts +++ b/test/challenges/limited-support.test.ts @@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { ExpBoosterModifier } from "#modifiers/modifier"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/daily-mode.test.ts b/test/daily-mode.test.ts index 34a8da80478..fae12a0b5d7 100644 --- a/test/daily-mode.test.ts +++ b/test/daily-mode.test.ts @@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { MapModifier } from "#modifiers/modifier"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Daily Mode", () => { diff --git a/test/imports.test.ts b/test/imports.test.ts index 04e9462d8d0..aeaa763c05e 100644 --- a/test/imports.test.ts +++ b/test/imports.test.ts @@ -1,4 +1,4 @@ -import { initStatsKeys } from "#ui/game-stats-ui-handler"; +import { initStatsKeys } from "#ui/handlers/game-stats-ui-handler"; import { describe, expect, it } from "vitest"; async function importModule() { diff --git a/test/items/dire-hit.test.ts b/test/items/dire-hit.test.ts index 6d4bc7524eb..d704a94f3a8 100644 --- a/test/items/dire-hit.test.ts +++ b/test/items/dire-hit.test.ts @@ -10,7 +10,7 @@ import { NewBattlePhase } from "#phases/new-battle-phase"; import { TurnEndPhase } from "#phases/turn-end-phase"; import { TurnInitPhase } from "#phases/turn-init-phase"; import { GameManager } from "#test/test-utils/game-manager"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/items/double-battle-chance-booster.test.ts b/test/items/double-battle-chance-booster.test.ts index 2c12b34eba3..9985d4b3a55 100644 --- a/test/items/double-battle-chance-booster.test.ts +++ b/test/items/double-battle-chance-booster.test.ts @@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { DoubleBattleChanceBoosterModifier } from "#modifiers/modifier"; import { GameManager } from "#test/test-utils/game-manager"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/items/temp-stat-stage-booster.test.ts b/test/items/temp-stat-stage-booster.test.ts index 05ea5a03eae..499f1d630b0 100644 --- a/test/items/temp-stat-stage-booster.test.ts +++ b/test/items/temp-stat-stage-booster.test.ts @@ -7,7 +7,7 @@ import { BATTLE_STATS, Stat } from "#enums/stat"; import { UiMode } from "#enums/ui-mode"; import { TempStatStageBoosterModifier } from "#modifiers/modifier"; import { GameManager } from "#test/test-utils/game-manager"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts index 7b2dbfc9aeb..fcf27b2c6fb 100644 --- a/test/mystery-encounter/encounter-test-utils.ts +++ b/test/mystery-encounter/encounter-test-utils.ts @@ -13,10 +13,10 @@ import { } from "#phases/mystery-encounter-phases"; import { VictoryPhase } from "#phases/victory-phase"; import type { GameManager } from "#test/test-utils/game-manager"; -import type { MessageUiHandler } from "#ui/message-ui-handler"; -import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; +import type { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import type { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler"; +import type { PartyUiHandler } from "#ui/handlers/party-ui-handler"; import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; -import type { PartyUiHandler } from "#ui/party-ui-handler"; import { isNullOrUndefined } from "#utils/common"; import { expect, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts index 5e9dffa1332..44585d4d795 100644 --- a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts +++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts @@ -17,7 +17,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/berriesAbound"; diff --git a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts index 723516174fb..a3357b00b89 100644 --- a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts +++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts @@ -20,7 +20,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/bugTypeSuperfan"; diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index e7ec6e43392..d199a331943 100644 --- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -29,8 +29,8 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; +import type { PartyUiHandler } from "#ui/handlers/party-ui-handler"; import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; -import type { PartyUiHandler } from "#ui/party-ui-handler"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts index 81a2fc7463c..bf42e6d4df3 100644 --- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts +++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts @@ -18,7 +18,7 @@ import { skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/dancingLessons"; diff --git a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts index 812d6d661ef..2ee83945159 100644 --- a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts +++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts @@ -11,7 +11,7 @@ import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/departmentStoreSale"; diff --git a/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts index fd3e20012b1..b8e6e36cf17 100644 --- a/test/mystery-encounter/encounters/field-trip-encounter.test.ts +++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts @@ -12,7 +12,7 @@ import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import i18next from "i18next"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts index 81dbad16e01..34c0f635000 100644 --- a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts +++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts @@ -17,7 +17,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/fightOrFlight"; diff --git a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts index bc1a2893627..8a058bad5fe 100644 --- a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts +++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts @@ -22,7 +22,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/funAndGames"; diff --git a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts index c8e934168bc..90bc41fde2b 100644 --- a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts +++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts @@ -15,7 +15,7 @@ import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import * as Utils from "#utils/common"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts index b937fdcfcf5..0d87533ea37 100644 --- a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts +++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts @@ -20,7 +20,7 @@ import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; import { TrainerConfig } from "#trainers/trainer-config"; import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/mysteriousChallengers"; diff --git a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts index c88d77a8cf5..a096ea5ff6e 100644 --- a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts +++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts @@ -16,7 +16,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import i18next from "i18next"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts index 06c4c3c1cee..5df2d2ab358 100644 --- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -24,7 +24,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts index 814e2ee07fb..9b009879522 100644 --- a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts @@ -20,7 +20,7 @@ import { VictoryPhase } from "#phases/victory-phase"; import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts index fe0139be3a7..a370c3ecc98 100644 --- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts +++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts @@ -27,7 +27,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import * as Utils from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts index 9f03b113d27..44ae5a45d51 100644 --- a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts +++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts @@ -16,7 +16,7 @@ import { } from "#test/mystery-encounter/encounter-test-utils"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/weirdDream"; diff --git a/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts index 30ab977dbc6..8dfbd509a05 100644 --- a/test/phases/mystery-encounter-phase.test.ts +++ b/test/phases/mystery-encounter-phase.test.ts @@ -5,8 +5,8 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { MysteryEncounterOptionSelectedPhase } from "#phases/mystery-encounter-phases"; import { GameManager } from "#test/test-utils/game-manager"; -import type { MessageUiHandler } from "#ui/message-ui-handler"; -import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; +import type { MessageUiHandler } from "#ui/handlers/message-ui-handler"; +import type { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts index b77e31e931f..a23ed99b049 100644 --- a/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -12,7 +12,7 @@ import { ModifierTypeOption } from "#modifiers/modifier-type"; import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { GameManager } from "#test/test-utils/game-manager"; import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; import { shiftCharCodes } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import Phaser from "phaser"; diff --git a/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts index ef5dfddada5..b45896e6a2c 100644 --- a/test/plugins/api/pokerogue-daily-api.test.ts +++ b/test/plugins/api/pokerogue-daily-api.test.ts @@ -2,7 +2,7 @@ import { PokerogueDailyApi } from "#api/pokerogue-daily-api"; import { initServerForApiTests } from "#test/test-utils/test-file-initialization"; import { getApiBaseUrl } from "#test/test-utils/test-utils"; import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/api/pokerogue-daily-api"; -import { type RankingEntry, ScoreboardCategory } from "#ui/daily-run-scoreboard"; +import { type RankingEntry, ScoreboardCategory } from "#ui/containers/daily-run-scoreboard"; import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/test-utils/game-manager-utils.ts b/test/test-utils/game-manager-utils.ts index 89e352cdbdc..e9c3e9809cc 100644 --- a/test/test-utils/game-manager-utils.ts +++ b/test/test-utils/game-manager-utils.ts @@ -9,7 +9,7 @@ import type { MoveId } from "#enums/move-id"; import type { SpeciesId } from "#enums/species-id"; import { PlayerPokemon } from "#field/pokemon"; import type { StarterMoveset } from "#system/game-data"; -import type { Starter } from "#ui/starter-select-ui-handler"; +import type { Starter } from "#ui/handlers/starter-select-ui-handler"; import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils"; /** Function to convert Blob to string */ diff --git a/test/test-utils/game-manager.ts b/test/test-utils/game-manager.ts index 5f56832a6d2..b8144db9d76 100644 --- a/test/test-utils/game-manager.ts +++ b/test/test-utils/game-manager.ts @@ -45,13 +45,13 @@ import { MockFetch } from "#test/test-utils/mocks/mock-fetch"; import { PhaseInterceptor } from "#test/test-utils/phase-interceptor"; import { TextInterceptor } from "#test/test-utils/text-interceptor"; import type { PhaseClass, PhaseString } from "#types/phase-types"; -import type { BallUiHandler } from "#ui/ball-ui-handler"; -import type { BattleMessageUiHandler } from "#ui/battle-message-ui-handler"; -import type { CommandUiHandler } from "#ui/command-ui-handler"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import type { PartyUiHandler } from "#ui/party-ui-handler"; -import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; -import type { TargetSelectUiHandler } from "#ui/target-select-ui-handler"; +import type { BallUiHandler } from "#ui/handlers/ball-ui-handler"; +import type { BattleMessageUiHandler } from "#ui/handlers/battle-message-ui-handler"; +import type { CommandUiHandler } from "#ui/handlers/command-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; +import type { PartyUiHandler } from "#ui/handlers/party-ui-handler"; +import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler"; +import type { TargetSelectUiHandler } from "#ui/handlers/target-select-ui-handler"; import { isNullOrUndefined } from "#utils/common"; import fs from "node:fs"; import { AES, enc } from "crypto-js"; diff --git a/test/test-utils/game-wrapper.ts b/test/test-utils/game-wrapper.ts index 1a906bf8492..a47d6ed73cf 100644 --- a/test/test-utils/game-wrapper.ts +++ b/test/test-utils/game-wrapper.ts @@ -14,7 +14,7 @@ import { MockLoader } from "#test/test-utils/mocks/mock-loader"; import { MockTextureManager } from "#test/test-utils/mocks/mock-texture-manager"; import { MockTimedEventManager } from "#test/test-utils/mocks/mock-timed-event-manager"; import { MockContainer } from "#test/test-utils/mocks/mocks-container/mock-container"; -import { PokedexMonContainer } from "#ui/pokedex-mon-container"; +import { PokedexMonContainer } from "#ui/containers/pokedex-mon-container"; import { sessionIdKey } from "#utils/common"; import { setCookie } from "#utils/cookies"; import fs from "node:fs"; diff --git a/test/test-utils/helpers/daily-mode-helper.ts b/test/test-utils/helpers/daily-mode-helper.ts index ca882eaf548..365c5df3627 100644 --- a/test/test-utils/helpers/daily-mode-helper.ts +++ b/test/test-utils/helpers/daily-mode-helper.ts @@ -7,7 +7,7 @@ import { EncounterPhase } from "#phases/encounter-phase"; import { TitlePhase } from "#phases/title-phase"; import { TurnInitPhase } from "#phases/turn-init-phase"; import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper"; -import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; +import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler"; /** * Helper to handle daily mode specifics diff --git a/test/test-utils/phase-interceptor.ts b/test/test-utils/phase-interceptor.ts index cc8d9b8e32a..66a64fc63af 100644 --- a/test/test-utils/phase-interceptor.ts +++ b/test/test-utils/phase-interceptor.ts @@ -66,7 +66,7 @@ import { UnlockPhase } from "#phases/unlock-phase"; import { VictoryPhase } from "#phases/victory-phase"; import { ErrorInterceptor } from "#test/test-utils/error-interceptor"; import type { PhaseClass, PhaseString } from "#types/phase-types"; -import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler"; import { UI } from "#ui/ui"; export interface PromptHandler { diff --git a/test/ui/item-manage-button.test.ts b/test/ui/item-manage-button.test.ts index c28cd9e802e..b5c24776e7b 100644 --- a/test/ui/item-manage-button.test.ts +++ b/test/ui/item-manage-button.test.ts @@ -5,8 +5,8 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import type { Pokemon } from "#field/pokemon"; import { GameManager } from "#test/test-utils/game-manager"; -import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import { type PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; +import { type PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts index edd9fa879d0..5c6ae51ffaa 100644 --- a/test/ui/pokedex.test.ts +++ b/test/ui/pokedex.test.ts @@ -8,9 +8,9 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import type { StarterAttributes } from "#system/game-data"; import { GameManager } from "#test/test-utils/game-manager"; -import { FilterTextRow } from "#ui/filter-text"; -import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; -import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; +import { FilterTextRow } from "#ui/containers/filter-text"; +import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler"; +import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts index 397f3d6086f..2f575b72a5c 100644 --- a/test/ui/starter-select.test.ts +++ b/test/ui/starter-select.test.ts @@ -8,10 +8,10 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import type { TitlePhase } from "#phases/title-phase"; import { GameManager } from "#test/test-utils/game-manager"; -import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler"; +import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler"; +import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler"; +import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler"; import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; -import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; -import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/transfer-item-options.test.ts b/test/ui/transfer-item-options.test.ts index 901aa261f50..7e9c1b5e36b 100644 --- a/test/ui/transfer-item-options.test.ts +++ b/test/ui/transfer-item-options.test.ts @@ -4,8 +4,8 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { GameManager } from "#test/test-utils/game-manager"; -import { type PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; -import type { RenameFormUiHandler } from "#ui/rename-form-ui-handler"; +import { type PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; +import type { RenameFormUiHandler } from "#ui/handlers/rename-form-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts index 8e42149acc3..78679b296cd 100644 --- a/test/ui/transfer-item.test.ts +++ b/test/ui/transfer-item.test.ts @@ -4,8 +4,8 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { GameManager } from "#test/test-utils/game-manager"; -import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler"; import Phaser from "phaser"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts index b5fe0d9585a..56891e22c2a 100644 --- a/test/ui/type-hints.test.ts +++ b/test/ui/type-hints.test.ts @@ -4,7 +4,7 @@ import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; import { GameManager } from "#test/test-utils/game-manager"; import type { MockText } from "#test/test-utils/mocks/mocks-container/mock-text"; -import { FightUiHandler } from "#ui/fight-ui-handler"; +import { FightUiHandler } from "#ui/handlers/fight-ui-handler"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";