diff --git a/packages/closed b/packages/closed index d8bf9642b..03da56e30 160000 --- a/packages/closed +++ b/packages/closed @@ -1 +1 @@ -Subproject commit d8bf9642b086bdfbe1b00d0ca787598360057750 +Subproject commit 03da56e300aaea4b371b35b6c45585ee1fd0896a diff --git a/packages/scripts/src/buildCatalogItemAccessor.ts b/packages/scripts/src/buildCatalogItemAccessor.ts index aed6055e1..7201865c0 100644 --- a/packages/scripts/src/buildCatalogItemAccessor.ts +++ b/packages/scripts/src/buildCatalogItemAccessor.ts @@ -40,7 +40,7 @@ for (const file of files) { let content = ""; for (const _import of imports) { - content += `import { ${_import.name}Component } from "@protos/blitz/${_import.file}";\n`; + content += `import { ${_import.name}Component } from "@protos/${_import.file}";\n`; } content += diff --git a/packages/scripts/src/buildProxyClient.ts b/packages/scripts/src/buildProxyClient.ts index dbff22a1f..4ef228dbc 100644 --- a/packages/scripts/src/buildProxyClient.ts +++ b/packages/scripts/src/buildProxyClient.ts @@ -1,6 +1,6 @@ import { readFile, writeFile } from "fs/promises"; -const IMPORT = "@protos/blitz/auto_legacy_proxy_client"; +const IMPORT = "@protos/auto_legacy_proxy_client"; const SOURCE = "../../packages/closed/protos/blitz/auto_legacy_proxy_client.proto"; const TARGET = "../../packages/closed/src/unreal/methodPopulatedProxyClient.ts"; diff --git a/packages/scripts/src/protos.ts b/packages/scripts/src/protos.ts index e732e459d..78bafe4a7 100644 --- a/packages/scripts/src/protos.ts +++ b/packages/scripts/src/protos.ts @@ -39,17 +39,14 @@ args += "--ts_proto_opt=unrecognizedEnum=false\n"; args += "--ts_proto_opt=snakeToCamel=false\n"; args += `--ts_proto_out=${ROOT}\n`; -args += `-I=${ROOT}\n`; -// for (const dir of await readdir(ROOT)) { -// args += `-I=${ROOT}/${dir}\n`; -// } +for (const dir of await readdir(ROOT)) { + args += `-I=${ROOT}/${dir}\n`; +} const filesRaw = await readdir(`${ROOT}`, { recursive: true }); const files: string[] = []; for (const file of filesRaw) { - if (!file.startsWith("blitz/")) continue; - if (file.endsWith(".proto")) { files.push(file); args += `${ROOT}/${file}\n`; diff --git a/packages/website-ue/src/api/abstract.ts b/packages/website-ue/src/api/abstract.ts index e8d1b2d8a..de531a3b7 100644 --- a/packages/website-ue/src/api/abstract.ts +++ b/packages/website-ue/src/api/abstract.ts @@ -1,17 +1,17 @@ import type { MetadataAccessor } from "@blitzkit/closed"; import type { Strings } from "@blitzkit/i18n"; import locales from "@blitzkit/i18n/locales.json"; -import type { TankUpgradePricePresetComponent } from "@protos/blitz/blitz_static_tank_upgrade_price_preset_component"; -import type { Avatar } from "@protos/blitzkit/avatar"; -import type { AvatarList } from "@protos/blitzkit/avatar_list"; -import type { Avatars } from "@protos/blitzkit/avatars"; -import type { Background } from "@protos/blitzkit/background"; -import type { Backgrounds } from "@protos/blitzkit/backgrounds"; -import type { PopularTanks } from "@protos/blitzkit/popular_tanks"; -import type { Tank } from "@protos/blitzkit/tank"; -import type { TankList } from "@protos/blitzkit/tank_list"; -import type { Tanks } from "@protos/blitzkit/tanks"; -import type { Tiers } from "@protos/blitzkit/tiers"; +import type { Avatar } from "@protos/avatar"; +import type { AvatarList } from "@protos/avatar_list"; +import type { Avatars } from "@protos/avatars"; +import type { Background } from "@protos/background"; +import type { Backgrounds } from "@protos/backgrounds"; +import type { TankUpgradePricePresetComponent } from "@protos/blitz_static_tank_upgrade_price_preset_component"; +import type { PopularTanks } from "@protos/popular_tanks"; +import type { Tank } from "@protos/tank"; +import type { TankList } from "@protos/tank_list"; +import type { Tanks } from "@protos/tanks"; +import type { Tiers } from "@protos/tiers"; export abstract class AbstractAPI { abstract metadata: MetadataAccessor; diff --git a/packages/website-ue/src/api/client.ts b/packages/website-ue/src/api/client.ts index 92e982ea1..de77198e2 100644 --- a/packages/website-ue/src/api/client.ts +++ b/packages/website-ue/src/api/client.ts @@ -1,11 +1,11 @@ import { fetchPB } from "@blitzkit/core"; import type { Strings } from "@blitzkit/i18n"; -import { TankUpgradePricePresetComponent } from "@protos/blitz/blitz_static_tank_upgrade_price_preset_component"; -import { Avatars } from "@protos/blitzkit/avatars"; -import { PopularTanks } from "@protos/blitzkit/popular_tanks"; -import { TankList } from "@protos/blitzkit/tank_list"; -import { Tanks } from "@protos/blitzkit/tanks"; -import { Tiers } from "@protos/blitzkit/tiers"; +import { Avatars } from "@protos/avatars"; +import { TankUpgradePricePresetComponent } from "@protos/blitz_static_tank_upgrade_price_preset_component"; +import { PopularTanks } from "@protos/popular_tanks"; +import { TankList } from "@protos/tank_list"; +import { Tanks } from "@protos/tanks"; +import { Tiers } from "@protos/tiers"; import { AbstractAPI, Cache } from "./abstract"; const rejected = Promise.reject("Not implemented on client"); diff --git a/packages/website-ue/src/api/server.ts b/packages/website-ue/src/api/server.ts index dcb938665..0d2abe909 100644 --- a/packages/website-ue/src/api/server.ts +++ b/packages/website-ue/src/api/server.ts @@ -2,14 +2,14 @@ import type { MetadataAccessor } from "@blitzkit/closed"; import { assertSecret, sluggify } from "@blitzkit/core"; import type { Strings } from "@blitzkit/i18n"; import locales from "@blitzkit/i18n/locales.json"; -import type { RemoteStorageComponent } from "@protos/blitz/blitz_static_remote_storage_component"; -import type { Avatar, DeepPartial } from "@protos/blitzkit/avatar"; -import type { Background } from "@protos/blitzkit/background"; -import type { PopularTanks } from "@protos/blitzkit/popular_tanks"; -import type { Tank } from "@protos/blitzkit/tank"; -import type { TankListEntry } from "@protos/blitzkit/tank_list"; -import type { Tanks } from "@protos/blitzkit/tanks"; -import type { Tiers } from "@protos/blitzkit/tiers"; +import type { Avatar, DeepPartial } from "@protos/avatar"; +import type { Background } from "@protos/background"; +import type { RemoteStorageComponent } from "@protos/blitz_static_remote_storage_component"; +import type { PopularTanks } from "@protos/popular_tanks"; +import type { Tank } from "@protos/tank"; +import type { TankListEntry } from "@protos/tank_list"; +import type { Tanks } from "@protos/tanks"; +import type { Tiers } from "@protos/tiers"; import { existsSync } from "fs"; import { mkdir, readFile, writeFile } from "fs/promises"; import { google } from "googleapis"; diff --git a/packages/website-ue/src/components/AvatarCard/index.tsx b/packages/website-ue/src/components/AvatarCard/index.tsx index 9b067be09..26b6d52a9 100644 --- a/packages/website-ue/src/components/AvatarCard/index.tsx +++ b/packages/website-ue/src/components/AvatarCard/index.tsx @@ -1,6 +1,6 @@ import { literals } from "@blitzkit/i18n"; -import { Grade } from "@protos/blitz/blitz_static_standard_grades_enum"; -import type { Avatar } from "@protos/blitzkit/avatar"; +import type { Avatar } from "@protos/avatar"; +import { Grade } from "@protos/blitz_static_standard_grades_enum"; import { DownloadIcon, StarFilledIcon } from "@radix-ui/react-icons"; import { useGameStrings } from "../../hooks/useGameStrings"; import { useStrings } from "../../hooks/useStrings"; diff --git a/packages/website-ue/src/components/Price/index.tsx b/packages/website-ue/src/components/Price/index.tsx index bcf063387..f3ddec2ad 100644 --- a/packages/website-ue/src/components/Price/index.tsx +++ b/packages/website-ue/src/components/Price/index.tsx @@ -1,6 +1,6 @@ import { formatCompact } from "@blitzkit/core"; -import type { StandardPrice } from "@protos/blitz/blitz_static_standard_price"; -import type { StandardSinglePrice } from "@protos/blitz/blitz_static_standard_single_price"; +import type { StandardPrice } from "@protos/blitz_static_standard_price"; +import type { StandardSinglePrice } from "@protos/blitz_static_standard_single_price"; import type { ComponentProps } from "react"; import { useLocale } from "../../hooks/useLocale"; import { classNames } from "../../ui/classNames"; diff --git a/packages/website-ue/src/components/TankopediaLoadout/index.tsx b/packages/website-ue/src/components/TankopediaLoadout/index.tsx index 7bf5d8bb6..f8909bcc2 100644 --- a/packages/website-ue/src/components/TankopediaLoadout/index.tsx +++ b/packages/website-ue/src/components/TankopediaLoadout/index.tsx @@ -1,8 +1,8 @@ import { romanize } from "@blitzkit/core"; -import { Grade } from "@protos/blitz/blitz_static_standard_grades_enum"; -import type { StandardPrice } from "@protos/blitz/blitz_static_standard_price"; -import type { UpgradeLine } from "@protos/blitz/blitz_static_tank_upgrade_line"; -import type { StageParameters } from "@protos/blitz/blitz_static_tank_upgrade_single_stage"; +import { Grade } from "@protos/blitz_static_standard_grades_enum"; +import type { StandardPrice } from "@protos/blitz_static_standard_price"; +import type { UpgradeLine } from "@protos/blitz_static_tank_upgrade_line"; +import type { StageParameters } from "@protos/blitz_static_tank_upgrade_single_stage"; import { DoubleArrowDownIcon, DoubleArrowUpIcon } from "@radix-ui/react-icons"; import { useMemo } from "react"; import { diff --git a/packages/website-ue/src/pages/api/avatars/all.pb.ts b/packages/website-ue/src/pages/api/avatars/all.pb.ts index f5dedf6b7..d14320976 100644 --- a/packages/website-ue/src/pages/api/avatars/all.pb.ts +++ b/packages/website-ue/src/pages/api/avatars/all.pb.ts @@ -1,4 +1,4 @@ -import { Avatars } from "@protos/blitzkit/avatars"; +import { Avatars } from "@protos/avatars"; import { api } from "../../../api/dynamic"; export async function GET() { diff --git a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts index 9fc24e525..d37e12f70 100644 --- a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts +++ b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts @@ -1,4 +1,4 @@ -import { Nation } from "@protos/blitz/blitz_static_tank_component"; +import { Nation } from "@protos/blitz_static_tank_component"; import type { APIContext, GetStaticPaths } from "astro"; import { clientUnmountedResponse } from "../../../../api/responses"; import { game } from "../../../../game/game"; diff --git a/packages/website-ue/src/pages/api/tanks/all.pb.ts b/packages/website-ue/src/pages/api/tanks/all.pb.ts index a45501d89..749841658 100644 --- a/packages/website-ue/src/pages/api/tanks/all.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/all.pb.ts @@ -1,4 +1,4 @@ -import { Tanks } from "@protos/blitzkit/tanks"; +import { Tanks } from "@protos/tanks"; import { api } from "../../../api/dynamic"; /** diff --git a/packages/website-ue/src/pages/api/tanks/list.pb.ts b/packages/website-ue/src/pages/api/tanks/list.pb.ts index de12cc011..afa54848a 100644 --- a/packages/website-ue/src/pages/api/tanks/list.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/list.pb.ts @@ -1,4 +1,4 @@ -import { TankList } from "@protos/blitzkit/tank_list"; +import { TankList } from "@protos/tank_list"; import { api } from "../../../api/dynamic"; /** diff --git a/packages/website-ue/src/pages/api/tanks/popular.pb.ts b/packages/website-ue/src/pages/api/tanks/popular.pb.ts index 1955f61af..fb985d4d3 100644 --- a/packages/website-ue/src/pages/api/tanks/popular.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/popular.pb.ts @@ -1,4 +1,4 @@ -import { PopularTanks } from "@protos/blitzkit/popular_tanks"; +import { PopularTanks } from "@protos/popular_tanks"; import { api } from "../../../api/dynamic"; export async function GET() { diff --git a/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts b/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts index e257b07d0..0776442be 100644 --- a/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts +++ b/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts @@ -1,4 +1,4 @@ -import { TankUpgradePricePresetComponent } from "@protos/blitz/blitz_static_tank_upgrade_price_preset_component"; +import { TankUpgradePricePresetComponent } from "@protos/blitz_static_tank_upgrade_price_preset_component"; import type { APIContext, GetStaticPaths } from "astro"; import { api } from "../../../../../api/dynamic"; diff --git a/packages/website-ue/src/pages/api/tiers.pb.ts b/packages/website-ue/src/pages/api/tiers.pb.ts index b7558280e..6c157448f 100644 --- a/packages/website-ue/src/pages/api/tiers.pb.ts +++ b/packages/website-ue/src/pages/api/tiers.pb.ts @@ -1,4 +1,4 @@ -import { Tiers } from "@protos/blitzkit/tiers"; +import { Tiers } from "@protos/tiers"; import { api } from "../../api/dynamic"; /** diff --git a/packages/website-ue/src/stores/tankopedia.ts b/packages/website-ue/src/stores/tankopedia.ts index 6d9aa035b..651b83e81 100644 --- a/packages/website-ue/src/stores/tankopedia.ts +++ b/packages/website-ue/src/stores/tankopedia.ts @@ -1,4 +1,4 @@ -import type { Tank } from "@protos/blitzkit/tank"; +import type { Tank } from "@protos/tank"; import { Varuna } from "varuna"; import { createTankState } from "../tankopedia/createTankState"; import { type TankState } from "../tankopedia/tankState"; diff --git a/packages/website-ue/src/tankopedia/aggregateParameters.ts b/packages/website-ue/src/tankopedia/aggregateParameters.ts index 5ae957ecb..e67ac8e74 100644 --- a/packages/website-ue/src/tankopedia/aggregateParameters.ts +++ b/packages/website-ue/src/tankopedia/aggregateParameters.ts @@ -1,6 +1,6 @@ -import { StandardSinglePrice } from "@protos/blitz/blitz_static_standard_single_price"; -import type { TankCatalogComponent } from "@protos/blitz/blitz_static_tank_component"; -import { PenetrationGroup } from "@protos/blitz/blitz_static_tank_penetration_group"; +import { StandardSinglePrice } from "@protos/blitz_static_standard_single_price"; +import type { TankCatalogComponent } from "@protos/blitz_static_tank_component"; +import { PenetrationGroup } from "@protos/blitz_static_tank_penetration_group"; import { ModuleUpgrade, ModuleUpgrade_Modifier, @@ -13,7 +13,7 @@ import { TankAttributeChange_AttributeName, TankAttributeChange_Modifier, VisualChanges, -} from "@protos/blitz/blitz_static_tank_upgrade_single_stage"; +} from "@protos/blitz_static_tank_upgrade_single_stage"; import { isAlternativeLine, originalLineName, diff --git a/packages/website-ue/src/tankopedia/applyPitchYawLimits.ts b/packages/website-ue/src/tankopedia/applyPitchYawLimits.ts index d9e86b2a0..4d74268d5 100644 --- a/packages/website-ue/src/tankopedia/applyPitchYawLimits.ts +++ b/packages/website-ue/src/tankopedia/applyPitchYawLimits.ts @@ -1,5 +1,5 @@ import { normalizeAngleDeg } from "@blitzkit/core"; -import type { PitchLimit } from "@protos/blitz/blitz_static_tank_upgrade_single_stage"; +import type { PitchLimit } from "@protos/blitz_static_tank_upgrade_single_stage"; import { clamp, degToRad, lerp, radToDeg } from "three/src/math/MathUtils.js"; export function applyPitchYawLimits( diff --git a/packages/website-ue/src/tankopedia/characteristics.ts b/packages/website-ue/src/tankopedia/characteristics.ts index 43754359e..f6ef70ed4 100644 --- a/packages/website-ue/src/tankopedia/characteristics.ts +++ b/packages/website-ue/src/tankopedia/characteristics.ts @@ -1,10 +1,10 @@ -import { TankClass } from "@protos/blitz/blitz_static_tank_component"; +import { TankClass } from "@protos/blitz_static_tank_component"; import { ShellUpgradeSingleChange_AttributeName, StageParameters, TankAttributeChange_AttributeName, -} from "@protos/blitz/blitz_static_tank_upgrade_single_stage"; -import type { Tank } from "@protos/blitzkit/tank"; +} from "@protos/blitz_static_tank_upgrade_single_stage"; +import type { Tank } from "@protos/tank"; import { radToDeg } from "three/src/math/MathUtils.js"; import { applyPitchYawLimits } from "./applyPitchYawLimits"; import { TerrainHardness, type TankState } from "./tankState"; diff --git a/packages/website-ue/src/tankopedia/characteristicsOrder.tsx b/packages/website-ue/src/tankopedia/characteristicsOrder.tsx index d3898566b..298789a9a 100644 --- a/packages/website-ue/src/tankopedia/characteristicsOrder.tsx +++ b/packages/website-ue/src/tankopedia/characteristicsOrder.tsx @@ -3,7 +3,7 @@ import { Nation, TankClass, TankType, -} from "@protos/blitz/blitz_static_tank_component"; +} from "@protos/blitz_static_tank_component"; import type { ReactNode } from "react"; import { VintageIcon } from "../icons/Vintage"; import { diff --git a/packages/website-ue/src/tankopedia/computeCharacteristics.ts b/packages/website-ue/src/tankopedia/computeCharacteristics.ts index e81b9c5a3..40222c0a1 100644 --- a/packages/website-ue/src/tankopedia/computeCharacteristics.ts +++ b/packages/website-ue/src/tankopedia/computeCharacteristics.ts @@ -1,8 +1,8 @@ import { ShellUpgradeSingleChange_AttributeName, TankAttributeChange_AttributeName, -} from "@protos/blitz/blitz_static_tank_upgrade_single_stage"; -import type { Tank } from "@protos/blitzkit/tank"; +} from "@protos/blitz_static_tank_upgrade_single_stage"; +import type { Tank } from "@protos/tank"; import { aggregateParameters } from "./aggregateParameters"; import { characteristics, diff --git a/packages/website-ue/src/tankopedia/createTankState.ts b/packages/website-ue/src/tankopedia/createTankState.ts index 675c093ee..41870e6a7 100644 --- a/packages/website-ue/src/tankopedia/createTankState.ts +++ b/packages/website-ue/src/tankopedia/createTankState.ts @@ -1,4 +1,4 @@ -import type { Tank } from "@protos/blitzkit/tank"; +import type { Tank } from "@protos/tank"; import { alternativeLines } from "../config/alternativeLines"; import { TerrainHardness, type TankState } from "./tankState";