some more updates to imports

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),
 );

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";

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(),

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";

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";

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<string, number>) => void;
 }
 
-const skillDefinitions = await api.skill();
+const skillDefinitions = await api.skills();
 
 export function CrewSkillManager({
   skillLevels,

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";

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";

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";

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,

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,

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";

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";

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";

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";

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";

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";

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 {

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";

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";

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";

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";

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";

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";

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";

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,

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";

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";

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<InfoWithDeltaProps>(

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";

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";

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";

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";

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";

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";
 

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";

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";
 

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";

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";

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";

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";

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";

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";
 

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);

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();

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);
 

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();

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();
 

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 {

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();

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();
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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);

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";
 

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";
 

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";
 

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";
 

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 () => {

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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";
 

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 () => {

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(),
 ]);
 

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,

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 },
+  }));
 });
 ---
 

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,

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,

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";

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 },
   }));

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;

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<Tankopedia, ModelDefinition>((model) => ({
   disturbed: false,