From 444705347fa682db95727e57a6da4b3de7cf60f9 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:51:09 -0500 Subject: [PATCH] imports --- packages/core/src/blitzkit/api/abstract.ts | 4 ++-- .../src/blitzkit/api/server/10_avatars.ts | 5 ++-- .../core/src/blitzkit/api/server/1_tanks.ts | 24 ++++++++++--------- .../src/blitzkit/api/server/6_consumables.ts | 7 ++---- .../src/blitzkit/api/server/7_provisions.ts | 7 ++---- .../core/src/blitzkit/api/server/8_skills.ts | 3 ++- .../core/src/blitzkit/api/server/9_game.ts | 3 ++- .../website/src/components/ClassIcon/index.ts | 2 +- .../components/TankSearchFilters/index.tsx | 11 ++------- .../components/TankopediaLoadout/index.tsx | 4 ++-- .../website/src/components/ToolBanner.astro | 7 +++--- .../website/src/core/blitzkit/filterTank.ts | 14 ++++++----- ...mpatibility.ts => useTankCompatibility.ts} | 14 +++++------ 13 files changed, 49 insertions(+), 56 deletions(-) rename packages/website/src/hooks/{useCompatibility.ts => useTankCompatibility.ts} (86%) diff --git a/packages/core/src/blitzkit/api/abstract.ts b/packages/core/src/blitzkit/api/abstract.ts index b4654ef45..b2a45b513 100644 --- a/packages/core/src/blitzkit/api/abstract.ts +++ b/packages/core/src/blitzkit/api/abstract.ts @@ -1,3 +1,4 @@ +import { Strings } from "@blitzkit/i18n"; import { CamouflageDefinitions, ConsumableDefinitions, @@ -9,8 +10,7 @@ import { ProvisionDefinitions, SkillDefinitions, TankDefinitions, -} from "@blitzkit/core"; -import { Strings } from "@blitzkit/i18n"; +} from "@blitzkit/protos"; import { BlitzScripts } from "../../types/blitzScripts"; export abstract class AbstractBlitzKitAPI { diff --git a/packages/core/src/blitzkit/api/server/10_avatars.ts b/packages/core/src/blitzkit/api/server/10_avatars.ts index 76cfb2787..33fcda55f 100644 --- a/packages/core/src/blitzkit/api/server/10_avatars.ts +++ b/packages/core/src/blitzkit/api/server/10_avatars.ts @@ -1,5 +1,6 @@ -import { Avatar, fetchGlossary, Gallery } from "@blitzkit/core"; +import { fetchGlossary } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; +import { Avatar, Gallery } from "@blitzkit/protos"; import { Cache } from "./0_base"; import { ServerBlitzKitAPI9 } from "./9_game"; @@ -11,7 +12,7 @@ export abstract class ServerBlitzKitAPI10 extends ServerBlitzKitAPI9 { await Promise.all( locales.supported.map(async (supported) => { const glossary = await fetchGlossary( - supported.blitz ?? supported.locale, + supported.variant_blitz_local ?? supported.locale, ); console.log( diff --git a/packages/core/src/blitzkit/api/server/1_tanks.ts b/packages/core/src/blitzkit/api/server/1_tanks.ts index c4ab6caeb..e6fea69f1 100644 --- a/packages/core/src/blitzkit/api/server/1_tanks.ts +++ b/packages/core/src/blitzkit/api/server/1_tanks.ts @@ -1,30 +1,32 @@ import { - AssaultRanges, BlitzCrewType, BlitzModuleType, BlitzTankClass, ChassisDefinitionsList, - Crew, EngineDefinitionsList, - Equalizer, - GunDefinition, GunDefinitionsList, - ModuleType, - ResearchCost, ShellDefinitionsList, ShellKind, sluggify, - TankDefinitions, - TankPrice, - TankPriceType, - TankType, toUniqueId, TurretDefinitionsList, - Unlock, UnlocksListing, VehicleDefinitionList, VehicleDefinitions, } from "@blitzkit/core"; +import { + AssaultRanges, + Crew, + Equalizer, + GunDefinition, + ModuleType, + ResearchCost, + TankDefinitions, + TankPrice, + TankPriceType, + TankType, + Unlock, +} from "@blitzkit/protos"; import { Cache, ServerBlitzKitAPI0 } from "./0_base"; export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { diff --git a/packages/core/src/blitzkit/api/server/6_consumables.ts b/packages/core/src/blitzkit/api/server/6_consumables.ts index bd4ca0dd2..75ac735ad 100644 --- a/packages/core/src/blitzkit/api/server/6_consumables.ts +++ b/packages/core/src/blitzkit/api/server/6_consumables.ts @@ -1,8 +1,5 @@ -import { - BlitzTankFilterDefinitionCategory, - Consumable, - ConsumableDefinitions, -} from "@blitzkit/core"; +import { BlitzTankFilterDefinitionCategory } from "@blitzkit/core"; +import { Consumable, ConsumableDefinitions } from "@blitzkit/protos"; import { Cache } from "./0_base"; import { ServerBlitzKitAPI5 } from "./5_equipments"; diff --git a/packages/core/src/blitzkit/api/server/7_provisions.ts b/packages/core/src/blitzkit/api/server/7_provisions.ts index 0f60d8ab2..f97e281e3 100644 --- a/packages/core/src/blitzkit/api/server/7_provisions.ts +++ b/packages/core/src/blitzkit/api/server/7_provisions.ts @@ -1,8 +1,5 @@ -import { - BlitzTankFilterDefinitionCategory, - Provision, - ProvisionDefinitions, -} from "@blitzkit/core"; +import { BlitzTankFilterDefinitionCategory } from "@blitzkit/core"; +import { Provision, ProvisionDefinitions } from "@blitzkit/protos"; import { Cache } from "./0_base"; import { ServerBlitzKitAPI6 } from "./6_consumables"; diff --git a/packages/core/src/blitzkit/api/server/8_skills.ts b/packages/core/src/blitzkit/api/server/8_skills.ts index 3111c0e60..6a5ed86a6 100644 --- a/packages/core/src/blitzkit/api/server/8_skills.ts +++ b/packages/core/src/blitzkit/api/server/8_skills.ts @@ -1,5 +1,6 @@ -import { BlitzTankClass, SkillDefinitions } from "@blitzkit/core"; +import { BlitzTankClass } from "@blitzkit/core"; +import { SkillDefinitions } from "@blitzkit/protos"; import { Cache } from "./0_base"; import { ServerBlitzKitAPI7 } from "./7_provisions"; diff --git a/packages/core/src/blitzkit/api/server/9_game.ts b/packages/core/src/blitzkit/api/server/9_game.ts index a045bd5ef..9c70f6402 100644 --- a/packages/core/src/blitzkit/api/server/9_game.ts +++ b/packages/core/src/blitzkit/api/server/9_game.ts @@ -1,5 +1,6 @@ -import { AvailableNationsYaml, GameDefinitions } from "@blitzkit/core"; +import { AvailableNationsYaml } from "@blitzkit/core"; +import { GameDefinitions } from "@blitzkit/protos"; import { Cache } from "./0_base"; import { ServerBlitzKitAPI8 } from "./8_skills"; diff --git a/packages/website/src/components/ClassIcon/index.ts b/packages/website/src/components/ClassIcon/index.ts index d21bd0fd2..e62343faa 100644 --- a/packages/website/src/components/ClassIcon/index.ts +++ b/packages/website/src/components/ClassIcon/index.ts @@ -1,4 +1,4 @@ -import { TankClass } from "@blitzkit/core"; +import { TankClass } from "@blitzkit/protos"; import type { ComponentProps, ReactNode } from "react"; import { ClassHeavy } from "./components/ClassHeavy"; import { ClassLight } from "./components/ClassLight"; diff --git a/packages/website/src/components/TankSearchFilters/index.tsx b/packages/website/src/components/TankSearchFilters/index.tsx index 8a993a9fb..64cf454d2 100644 --- a/packages/website/src/components/TankSearchFilters/index.tsx +++ b/packages/website/src/components/TankSearchFilters/index.tsx @@ -1,14 +1,7 @@ -import { - alias, - GunDefinition, - ShellType, - TANK_CLASSES, - TANK_TYPES, - TankType, - TIER_ROMAN_NUMERALS, -} from "@blitzkit/core"; +import { alias, TIER_ROMAN_NUMERALS } from "@blitzkit/core"; import { literals } from "@blitzkit/i18n"; import locales from "@blitzkit/i18n/locales.json"; +import { ShellType, TankType, type GunDefinition } from "@blitzkit/protos"; import { LockClosedIcon, LockOpen2Icon, diff --git a/packages/website/src/components/TankopediaLoadout/index.tsx b/packages/website/src/components/TankopediaLoadout/index.tsx index 84d34e685..268bbda26 100644 --- a/packages/website/src/components/TankopediaLoadout/index.tsx +++ b/packages/website/src/components/TankopediaLoadout/index.tsx @@ -1,6 +1,6 @@ import type { Consumable } from "@blitzkit/core"; import { TrashIcon } from "@radix-ui/react-icons"; -import { useCompatibility } from "../../hooks/useCompatibility"; +import { useTankCompatibility } from "../../hooks/useTankCompatibility"; import { useConsumables } from "../../hooks/useConsumables"; import { useProtagonist } from "../../hooks/useProtagonist"; import { useProtagonistGun } from "../../hooks/useProtagonistGun"; @@ -122,7 +122,7 @@ function Consumables({ characteristics }: ConsumablesProps) { const consumables = useConsumables(); const tank = useProtagonist(); const gun = useProtagonistGun(); - const isCompatible = useCompatibility(tank, gun); + const isCompatible = useTankCompatibility(tank, gun); return (
diff --git a/packages/website/src/components/ToolBanner.astro b/packages/website/src/components/ToolBanner.astro index 2e7b3cded..aa34bf307 100644 --- a/packages/website/src/components/ToolBanner.astro +++ b/packages/website/src/components/ToolBanner.astro @@ -1,7 +1,7 @@ --- import { ArrowLeftIcon } from "@radix-ui/react-icons"; +import { api } from "../api/dynamic"; import type { Tool } from "../constants/tools"; -import { getStrings } from "../core/i18n/getStrings"; import { Logo } from "../icons/Logo"; import { Back } from "./Back"; import { Flex } from "./Flex"; @@ -14,9 +14,8 @@ interface Props { } const { tool, locale } = Astro.props; -const strings = getStrings(locale); -const toolStrings = - strings.website.tools[tool.id as keyof typeof strings.website.tools]; +const strings = await api.strings(locale); +const toolStrings = strings.tools[tool.id as keyof typeof strings.tools]; ---