From b6f9ae9187940a668040f870f213be5015a82444 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sun, 30 Aug 2026 15:02:01 -0500 Subject: [PATCH] some more updates to imports --- .../src/{core/blitzkit => astro}/mixStaticPaths.ts | 0 packages/website/src/{core => }/blitzkit/api.ts | 2 +- .../website/src/components/AvatarsList/index.tsx | 2 +- .../website/src/components/Compare/CompareTable.tsx | 4 ++-- packages/website/src/components/Compare/Controls.tsx | 2 +- .../website/src/components/Compare/TankControl.tsx | 2 +- packages/website/src/components/CrewSkillManager.tsx | 4 ++-- packages/website/src/components/Embeds/breakdown.tsx | 2 +- .../website/src/components/GuessBackground/index.tsx | 2 +- packages/website/src/components/Guesser.tsx | 2 +- packages/website/src/components/HomePageHotTanks.tsx | 2 +- .../src/components/MixerScene/components/Model.tsx | 2 +- .../components/ModuleButtons/ConsumableButton.tsx | 2 +- .../src/components/ModuleButtons/EquipmentButton.tsx | 2 +- .../src/components/ModuleButtons/ProvisionButton.tsx | 2 +- .../website/src/components/Performance/Tanks.tsx | 2 +- .../website/src/components/PlaylistGenerator.tsx | 2 +- .../website/src/components/PlaylistTankEntry.tsx | 2 +- .../website/src/components/ProvisionsManager.tsx | 2 +- .../src/components/RecentlyViewedTanks/index.tsx | 2 +- packages/website/src/components/TankCard/index.tsx | 2 +- .../src/components/TankSearch/components/Card.tsx | 2 +- packages/website/src/components/TankSearch/index.tsx | 2 +- .../src/components/TankSearchFilters/index.tsx | 2 +- .../src/components/Tankopedia/CalloutsSection.tsx | 2 +- .../components/Characteristics/components/Crew.tsx | 2 +- .../components/CanvasContent.tsx | 2 +- .../components/ModelChunk.tsx | 2 +- .../components/GunFlexibilityVisualizer/index.tsx | 2 +- .../Characteristics/components/InfoWithDelta.tsx | 4 ++-- .../components/Characteristics/index.tsx | 2 +- .../components/Consumables.tsx | 2 +- .../CharacteristicsSection/components/Equipment.tsx | 2 +- .../CharacteristicsSection/components/Modules.tsx | 2 +- .../CharacteristicsSection/components/Provisions.tsx | 2 +- .../src/components/Tankopedia/GameModeSection.tsx | 2 +- .../components/TankSandbox/components/Control.tsx | 2 +- .../TankSandbox/components/InitialAligner.tsx | 2 +- .../src/components/Tankopedia/HeroSection/index.tsx | 2 +- .../Tankopedia/TechTreeSection/components/Node.tsx | 2 +- .../components/Tankopedia/TechTreeSection/index.tsx | 2 +- .../website/src/components/TierList/Row/index.tsx | 2 +- packages/website/src/components/TierList/Tiles.tsx | 2 +- .../website/src/components/TierList/URLManager.tsx | 2 +- packages/website/src/core/awaitables/tankNames.ts | 2 +- packages/website/src/core/blitzkit/curateMixer.ts | 2 +- packages/website/src/core/blitzkit/filterTank.ts | 2 +- .../website/src/core/blitzkit/generatePlaylist.ts | 2 +- packages/website/src/core/blitzkit/hasEquipment.ts | 2 +- packages/website/src/hooks/useEccentricity.ts | 2 +- packages/website/src/hooks/useEquipment.ts | 2 +- packages/website/src/hooks/useEquipmentPreset.ts | 2 +- .../[...chunk_api]/definitions/camouflage.pb.ts | 2 +- .../[...chunk_api]/definitions/consumables.pb.ts | 2 +- .../pages/[...chunk_api]/definitions/equipment.pb.ts | 2 +- .../pages/[...chunk_api]/definitions/gallery.pb.ts | 2 +- .../src/pages/[...chunk_api]/definitions/game.pb.ts | 2 +- .../src/pages/[...chunk_api]/definitions/maps.pb.ts | 2 +- .../pages/[...chunk_api]/definitions/models.pb.ts | 2 +- .../[...chunk_api]/definitions/provisions.pb.ts | 2 +- .../pages/[...chunk_api]/definitions/skills.pb.ts | 4 ++-- .../src/pages/[...chunk_api]/definitions/tanks.pb.ts | 2 +- .../pages/[...chunk_api]/flags/circle/[id].webp.ts | 2 +- .../src/pages/[...chunk_api]/flags/fade/[id].webp.ts | 2 +- .../[...chunk_api]/flags/scratched/[id].webp.ts | 2 +- .../pages/[...chunk_api]/gallery/avatars/[name].ts | 2 +- .../[...chunk_api]/gamemodes/[id]/banner.webp.ts | 2 +- .../pages/[...chunk_api]/icons/boosters/[id].webp.ts | 2 +- .../[...chunk_api]/icons/consumables/[id].webp.ts | 2 +- .../[...chunk_api]/icons/currencies/[id].webp.ts | 2 +- .../[...chunk_api]/icons/equipment/[id].webp.ts | 2 +- .../pages/[...chunk_api]/icons/modules/[id].webp.ts | 2 +- .../[...chunk_api]/icons/provisions/[id].webp.ts | 2 +- .../pages/[...chunk_api]/icons/shells/[id].webp.ts | 2 +- .../pages/[...chunk_api]/icons/skills/[id].webp.ts | 2 +- .../src/pages/[...chunk_api]/tanks/[id]/_index.ts | 4 ++-- .../[...locale]/compare/_index.tsx | 4 ++-- .../[...chunk_default]/[...locale]/guess/_index.tsx | 2 +- .../pages/[...chunk_default]/[...locale]/index.astro | 12 +++++------- .../[...chunk_default]/[...locale]/mixer/_index.tsx | 2 +- .../[...locale]/session/_index.tsx | 2 +- .../[...locale]/tanks/[slug]/_index.tsx | 2 +- .../[...locale]/tanks/[slug]/index.astro | 12 ++++++------ packages/website/src/stores/duel/index.ts | 2 +- packages/website/src/stores/tankopedia.ts | 4 ++-- 85 files changed, 100 insertions(+), 102 deletions(-) rename packages/website/src/{core/blitzkit => astro}/mixStaticPaths.ts (100%) rename packages/website/src/{core => }/blitzkit/api.ts (64%) diff --git a/packages/website/src/core/blitzkit/mixStaticPaths.ts b/packages/website/src/astro/mixStaticPaths.ts similarity index 100% rename from packages/website/src/core/blitzkit/mixStaticPaths.ts rename to packages/website/src/astro/mixStaticPaths.ts diff --git a/packages/website/src/core/blitzkit/api.ts b/packages/website/src/blitzkit/api.ts similarity index 64% rename from packages/website/src/core/blitzkit/api.ts rename to packages/website/src/blitzkit/api.ts index ffceab58e..615fab0d3 100644 --- a/packages/website/src/core/blitzkit/api.ts +++ b/packages/website/src/blitzkit/api.ts @@ -1,5 +1,5 @@ import { createDynamicAPI } from "@blitzkit/core"; export const api = await createDynamicAPI(() => - import("./vfs").then(({ vfs }) => vfs), + import("../core/blitzkit/vfs").then(({ vfs }) => vfs), ); diff --git a/packages/website/src/components/AvatarsList/index.tsx b/packages/website/src/components/AvatarsList/index.tsx index 3ba737505..903c5e28e 100644 --- a/packages/website/src/components/AvatarsList/index.tsx +++ b/packages/website/src/components/AvatarsList/index.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import fuzzysort from "fuzzysort"; import { times } from "lodash-es"; import { useMemo, useState } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { Gallery } from "../../stores/gallery"; import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/Compare/CompareTable.tsx b/packages/website/src/components/Compare/CompareTable.tsx index 45efd0c58..9a1c6ef9b 100644 --- a/packages/website/src/components/Compare/CompareTable.tsx +++ b/packages/website/src/components/Compare/CompareTable.tsx @@ -11,7 +11,7 @@ import { Text, } from "@radix-ui/themes"; import { times } from "lodash-es"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import type { TankCharacteristics } from "../../core/blitzkit/tankCharacteristics"; import { Var } from "../../core/radix/var"; import { useLocale } from "../../hooks/useLocale"; @@ -39,7 +39,7 @@ const [ consumableDefinitions, provisionDefinitions, ] = await Promise.all([ - api.skill(), + api.skills(), api.equipment(), api.consumables(), api.provisions(), diff --git a/packages/website/src/components/Compare/Controls.tsx b/packages/website/src/components/Compare/Controls.tsx index af8375490..0a6a25a16 100644 --- a/packages/website/src/components/Compare/Controls.tsx +++ b/packages/website/src/components/Compare/Controls.tsx @@ -1,6 +1,6 @@ import { PlusIcon, TrashIcon } from "@radix-ui/react-icons"; import { Button, Dialog, Flex, SegmentedControl } from "@radix-ui/themes"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; import { CompareEphemeral } from "../../stores/compareEphemeral"; diff --git a/packages/website/src/components/Compare/TankControl.tsx b/packages/website/src/components/Compare/TankControl.tsx index 5e5848219..e880b3c95 100644 --- a/packages/website/src/components/Compare/TankControl.tsx +++ b/packages/website/src/components/Compare/TankControl.tsx @@ -1,7 +1,7 @@ import { ExternalLinkIcon, LoopIcon, TrashIcon } from "@radix-ui/react-icons"; import { Dialog, Flex, IconButton } from "@radix-ui/themes"; import { useState } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; import { CompareEphemeral } from "../../stores/compareEphemeral"; diff --git a/packages/website/src/components/CrewSkillManager.tsx b/packages/website/src/components/CrewSkillManager.tsx index 984b8ca04..24957b254 100644 --- a/packages/website/src/components/CrewSkillManager.tsx +++ b/packages/website/src/components/CrewSkillManager.tsx @@ -1,6 +1,6 @@ import { alias, permanentSkills, romanize } from "@blitzkit/core"; import { Flex } from "@radix-ui/themes"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { GenericTankComponentButton } from "./ModuleButtons/GenericTankComponentButton"; interface CrewSkillManagerProps { @@ -8,7 +8,7 @@ interface CrewSkillManagerProps { onChange?: (skillLevels: Record) => void; } -const skillDefinitions = await api.skill(); +const skillDefinitions = await api.skills(); export function CrewSkillManager({ skillLevels, diff --git a/packages/website/src/components/Embeds/breakdown.tsx b/packages/website/src/components/Embeds/breakdown.tsx index 9a96cd919..197de2216 100644 --- a/packages/website/src/components/Embeds/breakdown.tsx +++ b/packages/website/src/components/Embeds/breakdown.tsx @@ -14,7 +14,7 @@ import { ContextMenu } from "@radix-ui/themes"; import { useEffect, useMemo, useState } from "react"; import { breakdownConfig } from "../../constants/embeds"; import { awaitableAverageDefinitions } from "../../core/awaitables/averageDefinitions"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { EmbedBreakdown } from "../../stores/embedBreakdown"; import { useEmbedStateCurry } from "../../stores/embedState/utilities"; import { BreakdownEmbedCard, BreakdownEmbedWrapper } from "../TanksEmbed"; diff --git a/packages/website/src/components/GuessBackground/index.tsx b/packages/website/src/components/GuessBackground/index.tsx index 66ddbf073..e7382a35e 100644 --- a/packages/website/src/components/GuessBackground/index.tsx +++ b/packages/website/src/components/GuessBackground/index.tsx @@ -1,6 +1,6 @@ import { Box } from "@radix-ui/themes"; import { useEffect } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember"; import { Var } from "../../core/radix/var"; import { Duel } from "../../stores/duel"; diff --git a/packages/website/src/components/Guesser.tsx b/packages/website/src/components/Guesser.tsx index ee11ef7cf..d42f7adbb 100644 --- a/packages/website/src/components/Guesser.tsx +++ b/packages/website/src/components/Guesser.tsx @@ -30,7 +30,7 @@ import fuzzysort from "fuzzysort"; import { debounce, times } from "lodash-es"; import { useCallback, useEffect, useRef, useState } from "react"; import { awaitableTankNames } from "../core/awaitables/tankNames"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { useLocale } from "../hooks/useLocale"; import { Guess, GuessState } from "../stores/guess"; import { classIcons } from "./ClassIcon"; diff --git a/packages/website/src/components/HomePageHotTanks.tsx b/packages/website/src/components/HomePageHotTanks.tsx index 40603b760..aeee78308 100644 --- a/packages/website/src/components/HomePageHotTanks.tsx +++ b/packages/website/src/components/HomePageHotTanks.tsx @@ -2,7 +2,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import { EyeOpenIcon } from "@radix-ui/react-icons"; import { Box, Flex, Heading, Text } from "@radix-ui/themes"; import { awaitablePopularTanks } from "../core/awaitables/popularTanks"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { LocaleProvider, useLocale, diff --git a/packages/website/src/components/MixerScene/components/Model.tsx b/packages/website/src/components/MixerScene/components/Model.tsx index 8a506a02f..2848525dd 100644 --- a/packages/website/src/components/MixerScene/components/Model.tsx +++ b/packages/website/src/components/MixerScene/components/Model.tsx @@ -2,7 +2,7 @@ import { useThree, type ThreeEvent } from "@react-three/fiber"; import type { QuicklimeEvent } from "quicklime"; import { useCallback, useEffect, useRef } from "react"; import { Group, Vector2 } from "three"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; import { jsxTree } from "../../../core/blitzkit/jsxTree"; import { modelTransformEvent, diff --git a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx b/packages/website/src/components/ModuleButtons/ConsumableButton.tsx index 0530c5cf8..3ee56570a 100644 --- a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx +++ b/packages/website/src/components/ModuleButtons/ConsumableButton.tsx @@ -1,7 +1,7 @@ import { alias } from "@blitzkit/core"; import { ClockIcon, ReloadIcon } from "@radix-ui/react-icons"; import { Flex, Text } from "@radix-ui/themes"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useDelta } from "../../hooks/useDelta"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; diff --git a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx b/packages/website/src/components/ModuleButtons/EquipmentButton.tsx index bda5b26ef..b55f67297 100644 --- a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx +++ b/packages/website/src/components/ModuleButtons/EquipmentButton.tsx @@ -1,5 +1,5 @@ import { alias } from "@blitzkit/core"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; import type { TankComponentButtonProps } from "./TankComponentButton"; diff --git a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx b/packages/website/src/components/ModuleButtons/ProvisionButton.tsx index ce5083f72..54c782e52 100644 --- a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx +++ b/packages/website/src/components/ModuleButtons/ProvisionButton.tsx @@ -1,5 +1,5 @@ import { alias } from "@blitzkit/core"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; import type { TankComponentButtonProps } from "./TankComponentButton"; diff --git a/packages/website/src/components/Performance/Tanks.tsx b/packages/website/src/components/Performance/Tanks.tsx index f2c2e5d43..6e60a25b7 100644 --- a/packages/website/src/components/Performance/Tanks.tsx +++ b/packages/website/src/components/Performance/Tanks.tsx @@ -11,7 +11,7 @@ import { } from "react"; import usePromise from "react-promise-suspense"; import { awaitableAverageDefinitions } from "../../core/awaitables/averageDefinitions"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { useAveragesExclusionRatio } from "../../hooks/useAveragesExclusionRatio"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website/src/components/PlaylistGenerator.tsx b/packages/website/src/components/PlaylistGenerator.tsx index 454dbc0d6..5e83c74e6 100644 --- a/packages/website/src/components/PlaylistGenerator.tsx +++ b/packages/website/src/components/PlaylistGenerator.tsx @@ -12,7 +12,7 @@ import { } from "@radix-ui/themes"; import { useMemo, useState } from "react"; import usePromise from "react-promise-suspense"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { filterTanks } from "../core/blitzkit/filterTanks"; import { generatePlaylist } from "../core/blitzkit/generatePlaylist"; import { useLocale } from "../hooks/useLocale"; diff --git a/packages/website/src/components/PlaylistTankEntry.tsx b/packages/website/src/components/PlaylistTankEntry.tsx index 2513283e7..6ffddd634 100644 --- a/packages/website/src/components/PlaylistTankEntry.tsx +++ b/packages/website/src/components/PlaylistTankEntry.tsx @@ -5,7 +5,7 @@ import { } from "@radix-ui/react-icons"; import { Checkbox, Flex, IconButton, Table, Text } from "@radix-ui/themes"; import { memo } from "react"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { useLocale } from "../hooks/useLocale"; import { Playlist, type PlaylistEntry } from "../stores/playlist"; import { TankRowHeaderCell } from "./TankRowHeaderCell"; diff --git a/packages/website/src/components/ProvisionsManager.tsx b/packages/website/src/components/ProvisionsManager.tsx index 195d55be6..910df237d 100644 --- a/packages/website/src/components/ProvisionsManager.tsx +++ b/packages/website/src/components/ProvisionsManager.tsx @@ -1,5 +1,5 @@ import { Flex } from "@radix-ui/themes"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { ProvisionButton } from "./ModuleButtons/ProvisionButton"; interface ProvisionsManagerProps { diff --git a/packages/website/src/components/RecentlyViewedTanks/index.tsx b/packages/website/src/components/RecentlyViewedTanks/index.tsx index 2b19921bc..0699a6a48 100644 --- a/packages/website/src/components/RecentlyViewedTanks/index.tsx +++ b/packages/website/src/components/RecentlyViewedTanks/index.tsx @@ -1,6 +1,6 @@ import { isEqual } from "lodash-es"; import { useMemo } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { TankFilters } from "../../stores/tankFilters"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; diff --git a/packages/website/src/components/TankCard/index.tsx b/packages/website/src/components/TankCard/index.tsx index deecfc0fc..70041aab6 100644 --- a/packages/website/src/components/TankCard/index.tsx +++ b/packages/website/src/components/TankCard/index.tsx @@ -1,7 +1,7 @@ import { alias, TankType, type TankDefinition } from "@blitzkit/core"; import { uniq } from "lodash-es"; import { type ReactNode } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/TankSearch/components/Card.tsx b/packages/website/src/components/TankSearch/components/Card.tsx index ca75714a5..a7cfee4ef 100644 --- a/packages/website/src/components/TankSearch/components/Card.tsx +++ b/packages/website/src/components/TankSearch/components/Card.tsx @@ -5,7 +5,7 @@ import { type TankDefinition, } from "@blitzkit/core"; import { useMemo } from "react"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; import { resolveReload } from "../../../core/blitzkit/resolveReload"; import { TankSort } from "../../../stores/tankopediaSort"; import { TankCard } from "../../TankCard"; diff --git a/packages/website/src/components/TankSearch/index.tsx b/packages/website/src/components/TankSearch/index.tsx index 1ac52e8a7..41bc3c44f 100644 --- a/packages/website/src/components/TankSearch/index.tsx +++ b/packages/website/src/components/TankSearch/index.tsx @@ -12,7 +12,7 @@ import { uniq } from "lodash-es"; import { memo, useMemo } from "react"; import usePromise from "react-promise-suspense"; import { awaitableTankNames } from "../../core/awaitables/tankNames"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { resolveReload } from "../../core/blitzkit/resolveReload"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website/src/components/TankSearchFilters/index.tsx b/packages/website/src/components/TankSearchFilters/index.tsx index baa0fd4a5..2e7a044a1 100644 --- a/packages/website/src/components/TankSearchFilters/index.tsx +++ b/packages/website/src/components/TankSearchFilters/index.tsx @@ -17,7 +17,7 @@ import { } from "@radix-ui/react-icons"; import { times } from "lodash-es"; import { Fragment, type ComponentProps, type ReactNode } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { App } from "../../stores/app"; import { TankFilters, type CaseType } from "../../stores/tankFilters"; diff --git a/packages/website/src/components/Tankopedia/CalloutsSection.tsx b/packages/website/src/components/Tankopedia/CalloutsSection.tsx index 567240013..9628f21f0 100644 --- a/packages/website/src/components/Tankopedia/CalloutsSection.tsx +++ b/packages/website/src/components/Tankopedia/CalloutsSection.tsx @@ -3,7 +3,7 @@ import { MinusCircledIcon } from "@radix-ui/react-icons"; import { Callout, Flex } from "@radix-ui/themes"; import { uniq } from "lodash-es"; import { useEffect } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { Duel } from "../../stores/duel"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; import { AesonPlug } from "../AesonPlug"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx index e9785a401..c9fffbc59 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n"; import { AccessibilityIcon, InfoCircledIcon } from "@radix-ui/react-icons"; import { Flex, Heading, IconButton, Popover, Text } from "@radix-ui/themes"; import { Fragment } from "react/jsx-runtime"; -import { api } from "../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../blitzkit/api"; import { useEquipment } from "../../../../../../hooks/useEquipment"; import { useLocale } from "../../../../../../hooks/useLocale"; import { Duel } from "../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx index 7d4f65ee8..fae9756ae 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx @@ -1,7 +1,7 @@ import type { QuicklimeEvent } from "quicklime"; import { useEffect, useRef } from "react"; import type { Group } from "three"; -import { api } from "../../../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../../../blitzkit/api"; import { modelTransformEvent, type ModelTransformEventData, diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx index 2182e8c2b..22240f72d 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx @@ -1,6 +1,6 @@ import { mauveDark } from "@radix-ui/colors"; import { LineBasicMaterial, MeshBasicMaterial } from "three"; -import { api } from "../../../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../../../blitzkit/api"; import { jsxTree } from "../../../../../../../../core/blitzkit/jsxTree"; import { useModel } from "../../../../../../../../hooks/useModel"; import { Duel } from "../../../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx index 6d8199444..75f96ca03 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx @@ -7,7 +7,7 @@ import { DEFAULT_PITCH_TRANSITION, applyPitchYawLimits, } from "../../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../../blitzkit/api"; import { hasEquipment } from "../../../../../../../core/blitzkit/hasEquipment"; import { modelTransformEvent } from "../../../../../../../core/blitzkit/modelTransform"; import { Var } from "../../../../../../../core/radix/var"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx index 446f68091..8e0ec8a7b 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx @@ -2,7 +2,7 @@ import { createDefaultSkills } from "@blitzkit/core"; import { Flex, Progress, Text } from "@radix-ui/themes"; import { clamp } from "lodash-es"; import { memo, useMemo, type ComponentProps, type ReactNode } from "react"; -import { api } from "../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../blitzkit/api"; import { tankCharacteristics, type TankCharacteristics, @@ -41,7 +41,7 @@ const [ api.provisions(), api.equipment(), api.models(), - api.skill(), + api.skills(), ]); export const InfoWithDelta = memo( diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx index e387ba9e3..08a304886 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx @@ -1,7 +1,7 @@ import { Flex } from "@radix-ui/themes"; import { useEffect } from "react"; import { applyPitchYawLimits } from "../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../core/blitzkit/api"; +import { api } from "../../../../../blitzkit/api"; import { modelTransformEvent } from "../../../../../core/blitzkit/modelTransform"; import { tankCharacteristics } from "../../../../../core/blitzkit/tankCharacteristics"; import { useEquipment } from "../../../../../hooks/useEquipment"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx index 43fc2322f..f24d11eb0 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx @@ -8,7 +8,7 @@ import { Popover, Text, } from "@radix-ui/themes"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { useEquipment } from "../../../../hooks/useEquipment"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx index f90be0e4a..ef7393ca7 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx @@ -1,5 +1,5 @@ import { Button, Flex, Heading } from "@radix-ui/themes"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { EquipmentManager } from "../../../EquipmentManager"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx index c0ca124d8..7a640b198 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx @@ -20,7 +20,7 @@ import { Text, Tooltip, } from "@radix-ui/themes"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { LinkI18n } from "../../../LinkI18n"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx index 4bbc77e25..cba181a22 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx @@ -1,6 +1,6 @@ import { availableProvisions } from "@blitzkit/core"; import { Button, Flex, Heading } from "@radix-ui/themes"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { ProvisionsManager } from "../../../ProvisionsManager"; diff --git a/packages/website/src/components/Tankopedia/GameModeSection.tsx b/packages/website/src/components/Tankopedia/GameModeSection.tsx index 58b5d9452..04741f445 100644 --- a/packages/website/src/components/Tankopedia/GameModeSection.tsx +++ b/packages/website/src/components/Tankopedia/GameModeSection.tsx @@ -1,6 +1,6 @@ import { alias } from "@blitzkit/core"; import { Box, Flex, Heading, Text } from "@radix-ui/themes"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { useLocale } from "../../hooks/useLocale"; import { Duel } from "../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx index 754d40ba4..7d141ba21 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx @@ -6,7 +6,7 @@ import { useEffect, useRef } from "react"; import { PerspectiveCamera, Vector3 } from "three"; import { OrbitControls as OrbitControlsClass } from "three-stdlib"; import { applyPitchYawLimits } from "../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../blitzkit/api"; import { hasEquipment } from "../../../../../../core/blitzkit/hasEquipment"; import { Pose, poseEvent } from "../../../../../../core/blitzkit/pose"; import { controlsEnabledEvent } from "../../../../../../core/controlsEnabled"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx index 1929a6050..c2fa1c967 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx @@ -1,7 +1,7 @@ import { useEffect } from "react"; import { degToRad } from "three/src/math/MathUtils.js"; import { applyPitchYawLimits } from "../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../core/blitzkit/api"; +import { api } from "../../../../../../blitzkit/api"; import { modelTransformEvent } from "../../../../../../core/blitzkit/modelTransform"; import { Duel } from "../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/index.tsx index f9d58e6e0..c4f57d55c 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/index.tsx @@ -1,7 +1,7 @@ import { Box, Flex } from "@radix-ui/themes"; import { times } from "lodash-es"; import { useEffect, useMemo, useRef } from "react"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; import { defaultEqualizer } from "../../../core/blitzkit/tankToDuelMember"; import { useFullScreen } from "../../../hooks/useFullScreen"; import { Duel } from "../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx index f700cd7bf..af4a07855 100644 --- a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx +++ b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx @@ -2,7 +2,7 @@ import { alias, formatCompact, TIER_ROMAN_NUMERALS } from "@blitzkit/core"; import { literals } from "@blitzkit/i18n/src/literals"; import { Box, Flex, Skeleton, Text } from "@radix-ui/themes"; import { awaitableAverageDefinitions } from "../../../../core/awaitables/averageDefinitions"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { useLocale } from "../../../../hooks/useLocale"; import { Tankopedia } from "../../../../stores/tankopedia"; import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx index 113ffd52d..5ea243ad2 100644 --- a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx +++ b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import { CaretLeftIcon, CaretRightIcon, PlusIcon } from "@radix-ui/react-icons"; import { Flex, Heading, IconButton, ScrollArea, Text } from "@radix-ui/themes"; import { Fragment, useEffect, useMemo, useRef, useState } from "react"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; import { useLocale } from "../../../hooks/useLocale"; import { Duel } from "../../../stores/duel"; import { Tankopedia } from "../../../stores/tankopedia"; diff --git a/packages/website/src/components/TierList/Row/index.tsx b/packages/website/src/components/TierList/Row/index.tsx index 2e5ba6024..34683e500 100644 --- a/packages/website/src/components/TierList/Row/index.tsx +++ b/packages/website/src/components/TierList/Row/index.tsx @@ -1,6 +1,6 @@ import { Flex, Table } from "@radix-ui/themes"; import { useEffect, useRef } from "react"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; import { TierList } from "../../../stores/tierList"; import { tierListRowElements } from "../Table/constants"; import { TierListTile } from "../Tile"; diff --git a/packages/website/src/components/TierList/Tiles.tsx b/packages/website/src/components/TierList/Tiles.tsx index b73a349e6..4809b62f6 100644 --- a/packages/website/src/components/TierList/Tiles.tsx +++ b/packages/website/src/components/TierList/Tiles.tsx @@ -2,7 +2,7 @@ import { metaSortTank } from "@blitzkit/core"; import { times } from "lodash-es"; import { useMemo, useState } from "react"; import usePromise from "react-promise-suspense"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { TankFilters } from "../../stores/tankFilters"; import { TierList } from "../../stores/tierList"; diff --git a/packages/website/src/components/TierList/URLManager.tsx b/packages/website/src/components/TierList/URLManager.tsx index e89c36036..c51531c95 100644 --- a/packages/website/src/components/TierList/URLManager.tsx +++ b/packages/website/src/components/TierList/URLManager.tsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { generateTierListParams } from "../../core/blitzkit/generateTierListParams"; import { TierList } from "../../stores/tierList"; diff --git a/packages/website/src/core/awaitables/tankNames.ts b/packages/website/src/core/awaitables/tankNames.ts index 846ff8cbd..21b71e9a7 100644 --- a/packages/website/src/core/awaitables/tankNames.ts +++ b/packages/website/src/core/awaitables/tankNames.ts @@ -1,4 +1,4 @@ import { fetchTankNames } from "@blitzkit/core"; -import { api } from "../blitzkit/api"; +import { api } from "../../blitzkit/api"; export const awaitableTankNames = fetchTankNames(api); diff --git a/packages/website/src/core/blitzkit/curateMixer.ts b/packages/website/src/core/blitzkit/curateMixer.ts index eb0761785..0291f7a09 100644 --- a/packages/website/src/core/blitzkit/curateMixer.ts +++ b/packages/website/src/core/blitzkit/curateMixer.ts @@ -1,4 +1,4 @@ -import { api } from "./api"; +import { api } from "../../blitzkit/api"; const tankDefinitions = await api.tanks(); const modelDefinitions = await api.models(); diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts index 16eb2c2c4..4184d9a10 100644 --- a/packages/website/src/core/blitzkit/filterTank.ts +++ b/packages/website/src/core/blitzkit/filterTank.ts @@ -2,7 +2,7 @@ import type { TankDefinition } from "@blitzkit/core"; import { checkConsumableProvisionInclusivity } from "@blitzkit/core/src/blitzkit/checkConsumableProvisionInclusivity"; import { times } from "lodash-es"; import type { TankFilters } from "../../stores/tankFilters"; -import { api } from "./api"; +import { api } from "../../blitzkit/api"; const SHELLS = times(3, (index) => index); diff --git a/packages/website/src/core/blitzkit/generatePlaylist.ts b/packages/website/src/core/blitzkit/generatePlaylist.ts index 98e4ae7e2..35e6a6109 100644 --- a/packages/website/src/core/blitzkit/generatePlaylist.ts +++ b/packages/website/src/core/blitzkit/generatePlaylist.ts @@ -7,7 +7,7 @@ import { import { App } from "../../stores/app"; import { Playlist } from "../../stores/playlist"; import { TankFilters } from "../../stores/tankFilters"; -import { api } from "./api"; +import { api } from "../../blitzkit/api"; import { filterTanks } from "./filterTanks"; const tankDefinitions = await api.tanks(); diff --git a/packages/website/src/core/blitzkit/hasEquipment.ts b/packages/website/src/core/blitzkit/hasEquipment.ts index 3c9836d0a..afaa3518b 100644 --- a/packages/website/src/core/blitzkit/hasEquipment.ts +++ b/packages/website/src/core/blitzkit/hasEquipment.ts @@ -1,5 +1,5 @@ import type { EquipmentMatrix } from "../../stores/duel"; -import { api } from "./api"; +import { api } from "../../blitzkit/api"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/hooks/useEccentricity.ts b/packages/website/src/hooks/useEccentricity.ts index 1e48ef59f..8ff426904 100644 --- a/packages/website/src/hooks/useEccentricity.ts +++ b/packages/website/src/hooks/useEccentricity.ts @@ -1,7 +1,7 @@ import { TankDefinition } from "@blitzkit/core"; import { sumBy } from "lodash-es"; import { useMemo } from "react"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { Duel } from "../stores/duel"; export enum UseEccentricityMode { diff --git a/packages/website/src/hooks/useEquipment.ts b/packages/website/src/hooks/useEquipment.ts index 3cbeb325e..87f61a6a6 100644 --- a/packages/website/src/hooks/useEquipment.ts +++ b/packages/website/src/hooks/useEquipment.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; import { Duel } from "../stores/duel"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/hooks/useEquipmentPreset.ts b/packages/website/src/hooks/useEquipmentPreset.ts index 157f8d4af..c4e60a5ac 100644 --- a/packages/website/src/hooks/useEquipmentPreset.ts +++ b/packages/website/src/hooks/useEquipmentPreset.ts @@ -1,4 +1,4 @@ -import { api } from "../core/blitzkit/api"; +import { api } from "../blitzkit/api"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts index 9b37622c8..0e5ccd637 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts @@ -1,5 +1,5 @@ import { CamouflageDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts index 183e13b4e..c384c12c3 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts @@ -1,5 +1,5 @@ import { ConsumableDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts index 02ea8e219..6ff6797d8 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts @@ -1,5 +1,5 @@ import { EquipmentDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts index 5c6d0ae74..39ea7e5db 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts @@ -1,5 +1,5 @@ import { Gallery } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts index 942c2f5b0..302911efd 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts @@ -1,5 +1,5 @@ import { GameDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts index 2fc081fb8..ad57a63d3 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts @@ -1,5 +1,5 @@ import { MapDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts index 9a5917ba9..400a6bea0 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts @@ -1,5 +1,5 @@ import { ModelDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts index f6a649645..19b006ea4 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts @@ -1,5 +1,5 @@ import { ProvisionDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts index eeae20428..57df50153 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts @@ -1,10 +1,10 @@ import { SkillDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; export async function GET() { - const definitions = await api.skill(); + const definitions = await api.skills(); const bytes = SkillDefinitions.encode(definitions).finish(); return new Response(bytes); diff --git a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts index 556ec3bdb..42bc10e86 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts @@ -1,5 +1,5 @@ import { TankDefinitions } from "@blitzkit/core"; -import { api } from "../../../core/blitzkit/api"; +import { api } from "../../../blitzkit/api"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts index c32a13501..c87221082 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/flags/circle/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts index e31a8ede0..38fd27e2f 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts @@ -1,5 +1,5 @@ import type { APIContext, GetStaticPathsItem } from "astro"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts index 9edbdf433..da0eaf1e7 100644 --- a/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/flags/scratched/[id].webp.ts @@ -1,5 +1,5 @@ import type { APIContext, GetStaticPathsItem } from "astro"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts b/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts index 032e1908d..1b6a176f7 100644 --- a/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts +++ b/packages/website/src/pages/[...chunk_api]/gallery/avatars/[name].ts @@ -2,7 +2,7 @@ import { fetchGlossary, type Avatar } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; import type { APIContext, GetStaticPathsItem } from "astro"; import { extname } from "path"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { getStaticPaths as _getStaticPaths } from "../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts b/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts index e0383102d..c8715a3b1 100644 --- a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts @@ -1,7 +1,7 @@ import type { SquadBattleTypeStylesYaml } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts index 2e3d176bb..9b7ec88c5 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/boosters/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts index 8b02390b8..baf7df8a9 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/consumables/[id].webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { extractPackedIcon } from "../../../../core/blitz/extractPackedIcon"; import { parsePackedSpriteRect } from "../../../../core/blitz/parsePackedSpriteRect"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts index f6581c798..32008a17e 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/currencies/[id].webp.ts @@ -1,7 +1,7 @@ import { assertSecret, type BlitzGlossary } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts index 89acb818d..7437d9296 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/equipment/[id].webp.ts @@ -1,7 +1,7 @@ import type { OptionalDevices } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts index 9237a57a2..9445bb978 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/modules/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts index db38f389a..112def640 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/provisions/[id].webp.ts @@ -3,7 +3,7 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; import { extractPackedIcon } from "../../../../core/blitz/extractPackedIcon"; import { parsePackedSpriteRect } from "../../../../core/blitz/parsePackedSpriteRect"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts index 917866910..9764e8de8 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts index 37fbd1e87..180f8d4e6 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/skills/[id].webp.ts @@ -1,7 +1,7 @@ import type { TankmenAvatar } from "@blitzkit/core"; import type { APIContext, GetStaticPathsItem } from "astro"; import sharp from "sharp"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { vfs } from "../../../../core/blitzkit/vfs"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts b/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts index 388ea05f2..6a20added 100644 --- a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts +++ b/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts @@ -1,5 +1,5 @@ -import { api } from "../../../../core/blitzkit/api"; -import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths"; +import { api } from "../../../../blitzkit/api"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { getStaticPaths as _getStaticPaths } from "../../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx index f1c25952e..a1b40c74f 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx @@ -1,9 +1,9 @@ import { createDefaultSkills } from "@blitzkit/core"; import { useEffect, useMemo, useState } from "react"; +import { api } from "../../../../blitzkit/api"; import { CompareTable } from "../../../../components/Compare/CompareTable"; import { Controls } from "../../../../components/Compare/Controls"; import { DamageWarning } from "../../../../components/DamageWarning"; -import { api } from "../../../../core/blitzkit/api"; import { tankCharacteristics } from "../../../../core/blitzkit/tankCharacteristics"; import { tankToCompareMember } from "../../../../core/blitzkit/tankToCompareMember"; import { @@ -23,7 +23,7 @@ const [ api.models(), api.equipment(), api.provisions(), - api.skill(), + api.skills(), api.tanks(), ]); diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx index 44e2985b7..901fdd471 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx @@ -5,7 +5,7 @@ import { Guesser } from "../../../../components/Guesser"; import { GuessRenderer } from "../../../../components/GuessRenderer"; import { GuessRendererLoader } from "../../../../components/GuessRendererLoader"; import { PageWrapper } from "../../../../components/PageWrapper"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { type LocaleAcceptorProps, LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro index e8b367c68..877051ae7 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro @@ -2,6 +2,7 @@ import { AstroSeo } from "@astrolib/seo"; import { assertSecret } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; +import { mixStaticPaths } from "../../../astro/mixStaticPaths"; import { AesonPlug } from "../../../components/AesonPlug"; import HelpTranslate from "../../../components/HelpTranslate.astro"; import HomeCosmetics from "../../../components/HomeCosmetics.astro"; @@ -10,7 +11,6 @@ import HomePlayers from "../../../components/HomePlayers.astro"; import HomeTanks from "../../../components/HomeTanks.astro"; import HomeTechnical from "../../../components/HomeTechnical.astro"; import { tools, type Tool } from "../../../constants/tools"; -import { mixStaticPaths } from "../../../core/blitzkit/mixStaticPaths"; import { getStrings } from "../../../core/i18n/getStrings"; import BaseLayout from "../../../layouts/BaseLayout.astro"; import { getStaticPaths as _getStaticPaths } from "../_index"; @@ -41,12 +41,10 @@ for (const id in tools) { } export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { - return [ - ...locales.supported - .filter(({ locale }) => locale !== locales.default) - .map(({ locale }) => ({ params: { locale }, props: { locale } })), - { params: { locale: undefined }, props: { locale: locales.default } }, - ]; + return locales.supported.map(({ locale }) => ({ + props: { locale }, + params: { locale: locale === locales.default ? undefined : locale }, + })); }); --- diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx index 6ff332013..e5bb00a9a 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx @@ -24,7 +24,7 @@ import { ModuleButton } from "../../../../components/ModuleButtons/ModuleButton" import { PageWrapper } from "../../../../components/PageWrapper"; import { ScreenshotButton } from "../../../../components/ScreenshotButton"; import { TankSearch } from "../../../../components/TankSearch"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { curateMixer } from "../../../../core/blitzkit/curateMixer"; import { LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx index 63472d04b..4b57512a6 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx @@ -38,7 +38,7 @@ import { StickyRowHeaderCell } from "../../../../components/StickyRowHeaderCell" import { StickyTableRoot } from "../../../../components/StickyTableRoot"; import { TankRowHeaderCell } from "../../../../components/TankRowHeaderCell"; import { awaitableAverageDefinitions } from "../../../../core/awaitables/averageDefinitions"; -import { api } from "../../../../core/blitzkit/api"; +import { api } from "../../../../blitzkit/api"; import { type LocaleAcceptorProps, LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx index b97c2eade..1b8a2d226 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { api } from "../../../../../core/blitzkit/api"; +import { api } from "../../../../../blitzkit/api"; import { withErrorWrapper } from "../../../../../hocs/withErrorWrapper"; import { withLocale } from "../../../../../hocs/withLocale"; import { useAwait } from "../../../../../hooks/useAwait"; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro index ac7f0a0f7..d6c07c28e 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro @@ -1,16 +1,16 @@ --- import "@radix-ui/colors/violet-dark.css"; -import { api } from "../../../../api/dynamic"; -import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; -import ColorScale from "../../../../components/ColorScale.astro"; -import BaseLayout from "../../../../layouts/BaseLayout.astro"; +import { mixStaticPaths } from "../../../../../astro/mixStaticPaths"; +import { api } from "../../../../../blitzkit/api"; +import ColorScale from "../../../../../components/ColorScale.astro"; +import BaseLayout from "../../../../../layouts/BaseLayout.astro"; import { getStaticPaths as _getStaticPaths } from "../index.astro"; import { Page } from "./_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { - const { list } = await api.tankList(); + const tanks = await api.tanks(); - return list.map((tank) => ({ + return Object.values(tanks.tanks).map((tank) => ({ params: { slug: tank.slug }, props: { id: tank.id }, })); diff --git a/packages/website/src/stores/duel/index.ts b/packages/website/src/stores/duel/index.ts index ccd2d2294..a650159a5 100644 --- a/packages/website/src/stores/duel/index.ts +++ b/packages/website/src/stores/duel/index.ts @@ -8,7 +8,7 @@ import { type TurretDefinition, } from "@blitzkit/core"; import { Varuna } from "varuna"; -import { api } from "../../core/blitzkit/api"; +import { api } from "../../blitzkit/api"; import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember"; type EquipmentMatrixItem = -1 | 0 | 1; diff --git a/packages/website/src/stores/tankopedia.ts b/packages/website/src/stores/tankopedia.ts index 5bda8954f..6d99f2635 100644 --- a/packages/website/src/stores/tankopedia.ts +++ b/packages/website/src/stores/tankopedia.ts @@ -5,10 +5,10 @@ import { } from "@blitzkit/core"; import type { Vector3 } from "three"; import { Varuna } from "varuna"; +import { api } from "../blitzkit/api"; import type { ArmorType } from "../components/Armor/components/SpacedArmorScene"; import type { ExternalModuleVariant } from "../components/Armor/components/SpacedArmorSceneComponent"; import type { XP_MULTIPLIERS } from "../components/Tankopedia/TechTreeSection"; -import { api } from "../core/blitzkit/api"; import { TankopediaDisplay } from "./tankopediaPersistent/constants"; export interface ShotLayerBase { @@ -105,7 +105,7 @@ interface Tankopedia { statSearch?: string; } -const skillDefinitions = await api.skill(); +const skillDefinitions = await api.skills(); export const Tankopedia = new Varuna((model) => ({ disturbed: false,