diff --git a/package-lock.json b/package-lock.json index c6b7f4c5f..8fb6cf438 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1290,14 +1290,14 @@ "resolved": "packages/client", "link": true }, - "node_modules/@openfront/core-public": { - "resolved": "packages/core-public", - "link": true - }, "node_modules/@openfront/engine": { "resolved": "packages/engine", "link": true }, + "node_modules/@openfront/engine-public": { + "resolved": "packages/engine-public", + "link": true + }, "node_modules/@openfront/server": { "resolved": "packages/server", "link": true @@ -10129,27 +10129,32 @@ "name": "@openfront/client", "version": "0.0.0", "dependencies": { - "@openfront/core-public": "*", - "@openfront/engine": "*" + "@openfront/engine": "*", + "@openfront/engine-public": "*" } }, "packages/core-public": { "name": "@openfront/core-public", - "version": "0.0.0" + "version": "0.0.0", + "extraneous": true }, "packages/engine": { "name": "@openfront/engine", "version": "0.0.0", "dependencies": { - "@openfront/core-public": "*" + "@openfront/engine-public": "*" } }, + "packages/engine-public": { + "name": "@openfront/engine-public", + "version": "0.0.0" + }, "packages/server": { "name": "@openfront/server", "version": "0.0.0", "dependencies": { - "@openfront/core-public": "*", - "@openfront/engine": "*" + "@openfront/engine": "*", + "@openfront/engine-public": "*" } } } diff --git a/packages/client/package.json b/packages/client/package.json index 0d0065d78..e2c8b93ad 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -5,7 +5,7 @@ "type": "module", "main": "src/Main.ts", "dependencies": { - "@openfront/core-public": "*", + "@openfront/engine-public": "*", "@openfront/engine": "*" } } diff --git a/packages/client/src/AccountModal.ts b/packages/client/src/AccountModal.ts index 7836f878c..6e5146a8a 100644 --- a/packages/client/src/AccountModal.ts +++ b/packages/client/src/AccountModal.ts @@ -5,9 +5,9 @@ import { PlayerGame, PlayerStatsTree, UserMeResponse, -} from "core-public/ApiSchemas"; +} from "engine-public/ApiSchemas"; import { assetUrl } from "engine/AssetUrls"; -import { Cosmetics } from "core-public/CosmeticSchemas"; +import { Cosmetics } from "engine-public/CosmeticSchemas"; import { fetchPlayerById, getUserMe } from "./Api"; import { discordLogin, logOut, sendMagicLink } from "./Auth"; import "./components/baseComponents/stats/DiscordUserHeader"; diff --git a/packages/client/src/Api.ts b/packages/client/src/Api.ts index f40c2c709..ca30dd9c6 100644 --- a/packages/client/src/Api.ts +++ b/packages/client/src/Api.ts @@ -1,6 +1,6 @@ import newsItemsFallback from "resources/news.json"; import { z } from "zod"; -import type { NewsItem } from "core-public/ApiSchemas"; +import type { NewsItem } from "engine-public/ApiSchemas"; import { NewsItemSchema, PlayerProfile, @@ -9,8 +9,8 @@ import { RankedLeaderboardResponseSchema, UserMeResponse, UserMeResponseSchema, -} from "core-public/ApiSchemas"; -import { AnalyticsRecord, AnalyticsRecordSchema } from "core-public/Schemas"; +} from "engine-public/ApiSchemas"; +import { AnalyticsRecord, AnalyticsRecordSchema } from "engine-public/Schemas"; import { getAuthHeader, logOut, userAuth } from "./Auth"; export async function fetchPlayerById( diff --git a/packages/client/src/Auth.ts b/packages/client/src/Auth.ts index 5c20abed9..7c8d17377 100644 --- a/packages/client/src/Auth.ts +++ b/packages/client/src/Auth.ts @@ -1,8 +1,8 @@ import { decodeJwt } from "jose"; import { UserSettings } from "engine/game/UserSettings"; import { z } from "zod"; -import { TokenPayload, TokenPayloadSchema } from "core-public/ApiSchemas"; -import { base64urlToUuid } from "core-public/Base64"; +import { TokenPayload, TokenPayloadSchema } from "engine-public/ApiSchemas"; +import { base64urlToUuid } from "engine-public/Base64"; import { getApiBase, getAudience } from "./Api"; import { generateCryptoRandomUUID } from "./Utils"; diff --git a/packages/client/src/ClanApi.ts b/packages/client/src/ClanApi.ts index 5fe99464e..8d91e8d75 100644 --- a/packages/client/src/ClanApi.ts +++ b/packages/client/src/ClanApi.ts @@ -15,7 +15,7 @@ import { type ClanRequestsResponse, ClanRequestsResponseSchema, JoinClanResponseSchema, -} from "core-public/ClanApiSchemas"; +} from "engine-public/ClanApiSchemas"; import { getApiBase, getUserMe } from "./Api"; import { getAuthHeader } from "./Auth"; @@ -36,7 +36,7 @@ export type { ClanMemberStats, ClanMemberWL, ClanRequestsResponse, -} from "core-public/ClanApiSchemas"; +} from "engine-public/ClanApiSchemas"; async function clanFetch( path: string, diff --git a/packages/client/src/ClientEnv.ts b/packages/client/src/ClientEnv.ts index d71aeed05..d260c4e22 100644 --- a/packages/client/src/ClientEnv.ts +++ b/packages/client/src/ClientEnv.ts @@ -1,6 +1,6 @@ import { JWK } from "jose"; import { z } from "zod"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { simpleHash } from "engine/Util"; import { GameEnv, diff --git a/packages/client/src/ClientGameRunner.ts b/packages/client/src/ClientGameRunner.ts index 633eaf8fc..96797b367 100644 --- a/packages/client/src/ClientGameRunner.ts +++ b/packages/client/src/ClientGameRunner.ts @@ -10,7 +10,7 @@ import { PlayerCosmeticRefs, PlayerRecord, ServerMessage, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { createPartialGameRecord, findClosestBy, replacer } from "engine/Util"; import { BuildableUnit, diff --git a/packages/client/src/Cosmetics.ts b/packages/client/src/Cosmetics.ts index 469e4a6c4..3bec925ac 100644 --- a/packages/client/src/Cosmetics.ts +++ b/packages/client/src/Cosmetics.ts @@ -1,5 +1,5 @@ import { assetUrl } from "engine/AssetUrls"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { ColorPalette, Cosmetics, @@ -10,12 +10,12 @@ import { Product, Skin, Subscription, -} from "core-public/CosmeticSchemas"; +} from "engine-public/CosmeticSchemas"; import { PlayerCosmeticRefs, PlayerCosmetics, PlayerPattern, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { UserSettings } from "engine/game/UserSettings"; import { changeSubscriptionTier, diff --git a/packages/client/src/FlagInput.ts b/packages/client/src/FlagInput.ts index 631034a1c..570d6cbe7 100644 --- a/packages/client/src/FlagInput.ts +++ b/packages/client/src/FlagInput.ts @@ -1,6 +1,6 @@ import { LitElement, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import { FlagName } from "core-public/Schemas"; +import { FlagName } from "engine-public/Schemas"; import { FLAG_KEY, USER_SETTINGS_CHANGED_EVENT, diff --git a/packages/client/src/FlagInputModal.ts b/packages/client/src/FlagInputModal.ts index b7e0f2174..c37aefc1f 100644 --- a/packages/client/src/FlagInputModal.ts +++ b/packages/client/src/FlagInputModal.ts @@ -1,9 +1,9 @@ import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; import Countries from "resources/countries.json" with { type: "json" }; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { assetUrl } from "engine/AssetUrls"; -import { Cosmetics, Flag } from "core-public/CosmeticSchemas"; +import { Cosmetics, Flag } from "engine-public/CosmeticSchemas"; import { UserSettings } from "engine/game/UserSettings"; import { getUserMe } from "./Api"; import { diff --git a/packages/client/src/FriendsApi.ts b/packages/client/src/FriendsApi.ts index dc63974f0..1af963374 100644 --- a/packages/client/src/FriendsApi.ts +++ b/packages/client/src/FriendsApi.ts @@ -5,7 +5,7 @@ import { FriendsListResponseSchema, type SendFriendRequestResponse, SendFriendRequestResponseSchema, -} from "core-public/ApiSchemas"; +} from "engine-public/ApiSchemas"; import { getApiBase } from "./Api"; import { getAuthHeader } from "./Auth"; diff --git a/packages/client/src/GameInfoModal.ts b/packages/client/src/GameInfoModal.ts index 2b1b9f790..fedf469ba 100644 --- a/packages/client/src/GameInfoModal.ts +++ b/packages/client/src/GameInfoModal.ts @@ -1,6 +1,6 @@ import { html, LitElement } from "lit"; import { customElement, property, query, state } from "lit/decorators.js"; -import { GameEndInfo } from "core-public/Schemas"; +import { GameEndInfo } from "engine-public/Schemas"; import { GameMapType } from "engine/game/Game"; import { fetchGameById } from "./Api"; import { terrainMapFileLoader } from "./TerrainMapFileLoader"; diff --git a/packages/client/src/GameModeSelector.ts b/packages/client/src/GameModeSelector.ts index bc2feee34..4a93fa0b6 100644 --- a/packages/client/src/GameModeSelector.ts +++ b/packages/client/src/GameModeSelector.ts @@ -9,7 +9,7 @@ import { Quads, Trios, } from "engine/game/Game"; -import { PublicGameInfo, PublicGames } from "core-public/Schemas"; +import { PublicGameInfo, PublicGames } from "engine-public/Schemas"; import "./components/IOSAddToHomeScreenBanner"; import { crazyGamesSDK } from "./CrazyGamesSDK"; import { HostLobbyModal } from "./HostLobbyModal"; diff --git a/packages/client/src/HostLobbyModal.ts b/packages/client/src/HostLobbyModal.ts index 292b11394..9252eb1b3 100644 --- a/packages/client/src/HostLobbyModal.ts +++ b/packages/client/src/HostLobbyModal.ts @@ -18,7 +18,7 @@ import { LobbyInfoEvent, TeamCountConfig, isValidGameID, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { generateID } from "engine/Util"; import { getPlayToken } from "./Auth"; import "./components/baseComponents/Modal"; diff --git a/packages/client/src/JoinLobbyModal.ts b/packages/client/src/JoinLobbyModal.ts index b586ae2c9..4e6d26241 100644 --- a/packages/client/src/JoinLobbyModal.ts +++ b/packages/client/src/JoinLobbyModal.ts @@ -19,7 +19,7 @@ import { GameRecordSchema, LobbyInfoEvent, PublicGameInfo, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { Difficulty, GameMapSize, diff --git a/packages/client/src/LobbySocket.ts b/packages/client/src/LobbySocket.ts index 1eec9f351..5538d0960 100644 --- a/packages/client/src/LobbySocket.ts +++ b/packages/client/src/LobbySocket.ts @@ -1,5 +1,5 @@ import { ClientEnv } from "client/ClientEnv"; -import { PublicGames, PublicLobbyMessageSchema } from "core-public/Schemas"; +import { PublicGames, PublicLobbyMessageSchema } from "engine-public/Schemas"; interface LobbySocketOptions { reconnectDelay?: number; diff --git a/packages/client/src/LocalPersistantStats.ts b/packages/client/src/LocalPersistantStats.ts index 2033a770e..16b380acb 100644 --- a/packages/client/src/LocalPersistantStats.ts +++ b/packages/client/src/LocalPersistantStats.ts @@ -1,4 +1,4 @@ -import { GameConfig, GameID, PartialGameRecord } from "core-public/Schemas"; +import { GameConfig, GameID, PartialGameRecord } from "engine-public/Schemas"; import { replacer } from "engine/Util"; export interface LocalStatsData { diff --git a/packages/client/src/LocalServer.ts b/packages/client/src/LocalServer.ts index ed138798d..fc7b17383 100644 --- a/packages/client/src/LocalServer.ts +++ b/packages/client/src/LocalServer.ts @@ -12,7 +12,7 @@ import { ServerStartGameMessage, StampedIntent, Turn, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { createPartialGameRecord, decompressGameRecord, diff --git a/packages/client/src/Main.ts b/packages/client/src/Main.ts index 1af3e2bfb..4a205a5f3 100644 --- a/packages/client/src/Main.ts +++ b/packages/client/src/Main.ts @@ -1,6 +1,6 @@ import version from "resources/version.txt?raw"; import { ClientEnv } from "client/ClientEnv"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { assetUrl } from "engine/AssetUrls"; import { EventBus } from "engine/EventBus"; import { @@ -9,7 +9,7 @@ import { GameRecord, GameStartInfo, PublicGameInfo, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { GameEnv } from "engine/configuration/Config"; import { GameType } from "engine/game/Game"; import { diff --git a/packages/client/src/Matchmaking.ts b/packages/client/src/Matchmaking.ts index 8fa1c802c..e339b27be 100644 --- a/packages/client/src/Matchmaking.ts +++ b/packages/client/src/Matchmaking.ts @@ -1,7 +1,7 @@ import { html, LitElement } from "lit"; import { customElement, state } from "lit/decorators.js"; import { ClientEnv } from "client/ClientEnv"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { getUserMe, hasLinkedAccount } from "./Api"; import { getPlayToken } from "./Auth"; import { BaseModal } from "./components/BaseModal"; diff --git a/packages/client/src/PatternInput.ts b/packages/client/src/PatternInput.ts index daaeba6bf..c59fcbe75 100644 --- a/packages/client/src/PatternInput.ts +++ b/packages/client/src/PatternInput.ts @@ -4,7 +4,7 @@ import { PATTERN_KEY, USER_SETTINGS_CHANGED_EVENT, } from "engine/game/UserSettings"; -import { PlayerPattern, PlayerSkin } from "core-public/Schemas"; +import { PlayerPattern, PlayerSkin } from "engine-public/Schemas"; import { renderPatternPreview } from "./components/PatternPreview"; import { getPlayerCosmetics } from "./Cosmetics"; import { crazyGamesSDK } from "./CrazyGamesSDK"; diff --git a/packages/client/src/SinglePlayerModal.ts b/packages/client/src/SinglePlayerModal.ts index be310067f..c04e36d99 100644 --- a/packages/client/src/SinglePlayerModal.ts +++ b/packages/client/src/SinglePlayerModal.ts @@ -1,7 +1,7 @@ import { TemplateResult, html } from "lit"; import { customElement, state } from "lit/decorators.js"; import { translateText } from "client/Utils"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { assetUrl } from "engine/AssetUrls"; import { Difficulty, @@ -11,7 +11,7 @@ import { GameType, UnitType, } from "engine/game/Game"; -import { TeamCountConfig } from "core-public/Schemas"; +import { TeamCountConfig } from "engine-public/Schemas"; import { generateID } from "engine/Util"; import { hasLinkedAccount } from "./Api"; import "./components/baseComponents/Button"; diff --git a/packages/client/src/Store.ts b/packages/client/src/Store.ts index 817e7f0eb..c7c4db29a 100644 --- a/packages/client/src/Store.ts +++ b/packages/client/src/Store.ts @@ -1,8 +1,8 @@ import type { TemplateResult } from "lit"; import { html } from "lit"; import { customElement } from "lit/decorators.js"; -import { UserMeResponse } from "core-public/ApiSchemas"; -import { Cosmetics } from "core-public/CosmeticSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; +import { Cosmetics } from "engine-public/CosmeticSchemas"; import { UserSettings } from "engine/game/UserSettings"; import { BaseModal } from "./components/BaseModal"; import "./components/CosmeticButton"; diff --git a/packages/client/src/TerritoryPatternsModal.ts b/packages/client/src/TerritoryPatternsModal.ts index 0bcf7f6e1..aea7e9af9 100644 --- a/packages/client/src/TerritoryPatternsModal.ts +++ b/packages/client/src/TerritoryPatternsModal.ts @@ -1,14 +1,14 @@ import type { TemplateResult } from "lit"; import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { UserMeResponse } from "core-public/ApiSchemas"; -import { Cosmetics, Skin } from "core-public/CosmeticSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; +import { Cosmetics, Skin } from "engine-public/CosmeticSchemas"; import { PATTERN_KEY, USER_SETTINGS_CHANGED_EVENT, UserSettings, } from "engine/game/UserSettings"; -import { PlayerPattern } from "core-public/Schemas"; +import { PlayerPattern } from "engine-public/Schemas"; import { BaseModal } from "./components/BaseModal"; import "./components/CosmeticButton"; import "./components/NotLoggedInWarning"; diff --git a/packages/client/src/Transport.ts b/packages/client/src/Transport.ts index bc242a90d..03053cb40 100644 --- a/packages/client/src/Transport.ts +++ b/packages/client/src/Transport.ts @@ -25,7 +25,7 @@ import { ServerMessage, ServerMessageSchema, Winner, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { replacer } from "engine/Util"; import { getPlayToken } from "./Auth"; import { LobbyConfig } from "./ClientGameRunner"; diff --git a/packages/client/src/Utils.ts b/packages/client/src/Utils.ts index 847a422b2..546251108 100644 --- a/packages/client/src/Utils.ts +++ b/packages/client/src/Utils.ts @@ -9,7 +9,7 @@ import { Team, Trios, } from "engine/game/Game"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; import type { LangSelector } from "./LangSelector"; import { Platform } from "./Platform"; @@ -272,7 +272,7 @@ export async function copyToClipboard( // Moved to the shared package; re-exported so existing `client/Utils` importers // keep working. -export { renderNumber, renderTroops } from "shared/format"; +export { renderNumber, renderTroops } from "engine-public/format"; export function formatPercentage(value: number): string { const perc = value * 100; diff --git a/packages/client/src/WebGLFrameBuilder.ts b/packages/client/src/WebGLFrameBuilder.ts index 07073b370..bb2a82442 100644 --- a/packages/client/src/WebGLFrameBuilder.ts +++ b/packages/client/src/WebGLFrameBuilder.ts @@ -1,7 +1,7 @@ import { Colord } from "colord"; import { base64url } from "jose"; import { assetUrl } from "engine/AssetUrls"; -import { decodePatternData } from "core-public/PatternDecoder"; +import { decodePatternData } from "engine-public/PatternDecoder"; import { PlayerType } from "engine/game/Game"; import { GameView } from "client/view"; import { uploadFrameData } from "./render/frame/Upload"; diff --git a/packages/client/src/components/CosmeticButton.ts b/packages/client/src/components/CosmeticButton.ts index 11709d4db..0244c12df 100644 --- a/packages/client/src/components/CosmeticButton.ts +++ b/packages/client/src/components/CosmeticButton.ts @@ -6,8 +6,8 @@ import { Pattern, Skin, Subscription, -} from "core-public/CosmeticSchemas"; -import { PlayerPattern } from "core-public/Schemas"; +} from "engine-public/CosmeticSchemas"; +import { PlayerPattern } from "engine-public/Schemas"; import { PaymentMethod, ResolvedCosmetic, diff --git a/packages/client/src/components/CosmeticContainer.ts b/packages/client/src/components/CosmeticContainer.ts index 94d7a78a7..040e4d909 100644 --- a/packages/client/src/components/CosmeticContainer.ts +++ b/packages/client/src/components/CosmeticContainer.ts @@ -1,6 +1,6 @@ import { html, LitElement } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { Product } from "core-public/CosmeticSchemas"; +import { Product } from "engine-public/CosmeticSchemas"; import "./PurchaseButton"; import { DEFAULT_DOLLAR_LABEL_KEY } from "./PurchaseButton"; diff --git a/packages/client/src/components/FriendsList.ts b/packages/client/src/components/FriendsList.ts index 31a048a02..6a365ac0a 100644 --- a/packages/client/src/components/FriendsList.ts +++ b/packages/client/src/components/FriendsList.ts @@ -1,6 +1,6 @@ import { html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import type { FriendEntry } from "core-public/ApiSchemas"; +import type { FriendEntry } from "engine-public/ApiSchemas"; import { acceptFriendRequest, deleteFriendRequest, diff --git a/packages/client/src/components/GameConfigSettings.ts b/packages/client/src/components/GameConfigSettings.ts index 01a7e9204..2a9f3841d 100644 --- a/packages/client/src/components/GameConfigSettings.ts +++ b/packages/client/src/components/GameConfigSettings.ts @@ -17,7 +17,7 @@ import { Trios, UnitType, } from "engine/game/Game"; -import { TeamCountConfig } from "core-public/Schemas"; +import { TeamCountConfig } from "engine-public/Schemas"; import { translateText } from "../Utils"; import "./Difficulties"; import "./FluentSlider"; diff --git a/packages/client/src/components/LobbyPlayerView.ts b/packages/client/src/components/LobbyPlayerView.ts index 2017fbd10..fd694eaf8 100644 --- a/packages/client/src/components/LobbyPlayerView.ts +++ b/packages/client/src/components/LobbyPlayerView.ts @@ -14,7 +14,7 @@ import { } from "engine/game/Game"; import { assignTeamsLobbyPreview } from "engine/game/TeamAssignment"; import { UserSettings } from "engine/game/UserSettings"; -import { ClientInfo, TeamCountConfig } from "core-public/Schemas"; +import { ClientInfo, TeamCountConfig } from "engine-public/Schemas"; import { createRandomName, formatPlayerDisplayName } from "engine/Util"; import { Theme } from "../theme/Theme"; import { themeProvider } from "../theme/ThemeProvider"; diff --git a/packages/client/src/components/NewsBox.ts b/packages/client/src/components/NewsBox.ts index 971617fa0..65ae008b4 100644 --- a/packages/client/src/components/NewsBox.ts +++ b/packages/client/src/components/NewsBox.ts @@ -1,7 +1,7 @@ import { LitElement, html, nothing } from "lit"; import { resolveMarkdown } from "lit-markdown"; import { customElement, state } from "lit/decorators.js"; -import type { NewsItem } from "core-public/ApiSchemas"; +import type { NewsItem } from "engine-public/ApiSchemas"; import { getNews } from "../Api"; import { translateText } from "../Utils"; diff --git a/packages/client/src/components/NotLoggedInWarning.ts b/packages/client/src/components/NotLoggedInWarning.ts index ed2201c41..e4db7722e 100644 --- a/packages/client/src/components/NotLoggedInWarning.ts +++ b/packages/client/src/components/NotLoggedInWarning.ts @@ -1,6 +1,6 @@ import { LitElement, html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { hasLinkedAccount } from "../Api"; @customElement("not-logged-in-warning") diff --git a/packages/client/src/components/PatternPreview.ts b/packages/client/src/components/PatternPreview.ts index 8ce60164f..227881348 100644 --- a/packages/client/src/components/PatternPreview.ts +++ b/packages/client/src/components/PatternPreview.ts @@ -1,9 +1,9 @@ import { Colord } from "colord"; import { base64url } from "jose"; import { html, TemplateResult } from "lit"; -import { DefaultPattern } from "core-public/CosmeticSchemas"; -import { PatternDecoder } from "core-public/PatternDecoder"; -import { PlayerPattern } from "core-public/Schemas"; +import { DefaultPattern } from "engine-public/CosmeticSchemas"; +import { PatternDecoder } from "engine-public/PatternDecoder"; +import { PlayerPattern } from "engine-public/Schemas"; import { translateText } from "../Utils"; export function renderPatternPreview( diff --git a/packages/client/src/components/PurchaseButton.ts b/packages/client/src/components/PurchaseButton.ts index e90ff7f43..2d674517a 100644 --- a/packages/client/src/components/PurchaseButton.ts +++ b/packages/client/src/components/PurchaseButton.ts @@ -1,6 +1,6 @@ import { html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { Product } from "core-public/CosmeticSchemas"; +import { Product } from "engine-public/CosmeticSchemas"; import { translateText } from "../Utils"; import "./CapIcon"; import "./PlutoniumIcon"; diff --git a/packages/client/src/components/RankedModal.ts b/packages/client/src/components/RankedModal.ts index 0de0c7887..a7ed3dda3 100644 --- a/packages/client/src/components/RankedModal.ts +++ b/packages/client/src/components/RankedModal.ts @@ -1,6 +1,6 @@ import { html } from "lit"; import { customElement, state } from "lit/decorators.js"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; import { getUserMe, hasLinkedAccount } from "../Api"; import { userAuth } from "../Auth"; import { translateText } from "../Utils"; diff --git a/packages/client/src/components/SubscriptionPanel.ts b/packages/client/src/components/SubscriptionPanel.ts index 25d31d84b..f9a718d2b 100644 --- a/packages/client/src/components/SubscriptionPanel.ts +++ b/packages/client/src/components/SubscriptionPanel.ts @@ -1,7 +1,7 @@ import { html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators.js"; -import { UserSubscription } from "core-public/ApiSchemas"; -import { Subscription } from "core-public/CosmeticSchemas"; +import { UserSubscription } from "engine-public/ApiSchemas"; +import { Subscription } from "engine-public/CosmeticSchemas"; import { cancelSubscription, invalidateUserMe, diff --git a/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts b/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts index c27d8ba4d..52baa1f85 100644 --- a/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts +++ b/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts @@ -1,4 +1,4 @@ -import { AnalyticsRecord, PlayerRecord } from "core-public/Schemas"; +import { AnalyticsRecord, PlayerRecord } from "engine-public/Schemas"; import { GOLD_INDEX_STEAL, GOLD_INDEX_TRADE, @@ -8,7 +8,7 @@ import { PLAYER_INDEX_BOT, PLAYER_INDEX_HUMAN, PLAYER_INDEX_NATION, -} from "core-public/StatsSchemas"; +} from "engine-public/StatsSchemas"; export enum RankType { ConquestHumans = "ConquestHumans", diff --git a/packages/client/src/components/baseComponents/ranking/PlayerRow.ts b/packages/client/src/components/baseComponents/ranking/PlayerRow.ts index d3dc33419..f4e207eed 100644 --- a/packages/client/src/components/baseComponents/ranking/PlayerRow.ts +++ b/packages/client/src/components/baseComponents/ranking/PlayerRow.ts @@ -4,7 +4,7 @@ import { GOLD_INDEX_TRADE, GOLD_INDEX_TRAIN_OTHER, GOLD_INDEX_TRAIN_SELF, -} from "core-public/StatsSchemas"; +} from "engine-public/StatsSchemas"; import { assetUrl } from "engine/AssetUrls"; import { renderNumber } from "../../../Utils"; import { PlayerInfo, RankType } from "./GameInfoRanking"; diff --git a/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts b/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts index cab87388c..8b643f268 100644 --- a/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts +++ b/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts @@ -1,6 +1,6 @@ import { LitElement, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import type { DiscordUser } from "core-public/ApiSchemas"; +import type { DiscordUser } from "engine-public/ApiSchemas"; import { getDiscordAvatarUrl, translateText } from "../../../Utils"; @customElement("discord-user-header") diff --git a/packages/client/src/components/baseComponents/stats/GameList.ts b/packages/client/src/components/baseComponents/stats/GameList.ts index 8f56a04e0..0d37c9257 100644 --- a/packages/client/src/components/baseComponents/stats/GameList.ts +++ b/packages/client/src/components/baseComponents/stats/GameList.ts @@ -1,6 +1,6 @@ import { LitElement, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import { PlayerGame } from "core-public/ApiSchemas"; +import { PlayerGame } from "engine-public/ApiSchemas"; import { GameMode } from "engine/game/Game"; import { GameInfoModal } from "../../../GameInfoModal"; import { translateText } from "../../../Utils"; diff --git a/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts b/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts index ac1825941..5c2684b1b 100644 --- a/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts +++ b/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts @@ -5,7 +5,7 @@ import { boatUnits, bombUnits, otherUnits, -} from "core-public/StatsSchemas"; +} from "engine-public/StatsSchemas"; import { renderNumber, translateText } from "../../../Utils"; @customElement("player-stats-table") diff --git a/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts b/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts index b1933caf1..7c878f09f 100644 --- a/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts +++ b/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts @@ -1,6 +1,6 @@ import { LitElement, PropertyValues, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; -import { PlayerStatsLeaf, PlayerStatsTree } from "core-public/ApiSchemas"; +import { PlayerStatsLeaf, PlayerStatsTree } from "engine-public/ApiSchemas"; import { Difficulty, GameMode, @@ -10,7 +10,7 @@ import { isGameMode, isGameType, } from "engine/game/Game"; -import { PlayerStats } from "core-public/StatsSchemas"; +import { PlayerStats } from "engine-public/StatsSchemas"; import { renderNumber, translateText } from "../../../Utils"; import "./PlayerStatsGrid"; import "./PlayerStatsTable"; diff --git a/packages/client/src/components/clan/ClanStatsBreakdown.ts b/packages/client/src/components/clan/ClanStatsBreakdown.ts index 8b9ca0f9c..33f919287 100644 --- a/packages/client/src/components/clan/ClanStatsBreakdown.ts +++ b/packages/client/src/components/clan/ClanStatsBreakdown.ts @@ -5,7 +5,7 @@ import { TEAM_BREAKDOWN_KEYS, type ClanMemberStats, type ClanMemberWL, -} from "core-public/ClanApiSchemas"; +} from "engine-public/ClanApiSchemas"; import { translateText } from "../../Utils"; import { renderWLBarRow } from "./ClanShared"; diff --git a/packages/client/src/components/leaderboard/LeaderboardClanTable.ts b/packages/client/src/components/leaderboard/LeaderboardClanTable.ts index 7b094dd99..8b1ce498b 100644 --- a/packages/client/src/components/leaderboard/LeaderboardClanTable.ts +++ b/packages/client/src/components/leaderboard/LeaderboardClanTable.ts @@ -3,7 +3,7 @@ import { customElement, state } from "lit/decorators.js"; import { ClanLeaderboardEntry, ClanLeaderboardResponse, -} from "core-public/ClanApiSchemas"; +} from "engine-public/ClanApiSchemas"; import { fetchClanLeaderboard } from "../../ClanApi"; import { translateText } from "../../Utils"; diff --git a/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts b/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts index c1ea0a6ef..53e0078c0 100644 --- a/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts +++ b/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts @@ -1,6 +1,6 @@ import { html, LitElement, nothing } from "lit"; import { customElement, query, state } from "lit/decorators.js"; -import { PlayerLeaderboardEntry } from "core-public/ApiSchemas"; +import { PlayerLeaderboardEntry } from "engine-public/ApiSchemas"; import { RankedType } from "engine/game/Game"; import { fetchPlayerLeaderboard, getUserMe } from "../../Api"; import { translateText } from "../../Utils"; diff --git a/packages/client/src/hud/layers/ControlPanel.ts b/packages/client/src/hud/layers/ControlPanel.ts index 1721d7cfa..86f35ed75 100644 --- a/packages/client/src/hud/layers/ControlPanel.ts +++ b/packages/client/src/hud/layers/ControlPanel.ts @@ -7,7 +7,7 @@ import { Gold } from "engine/game/Game"; import { GameUpdateType } from "engine/game/GameUpdates"; import { GameView } from "client/view"; import { UserSettings } from "engine/game/UserSettings"; -import { ClientID } from "core-public/Schemas"; +import { ClientID } from "engine-public/Schemas"; import { Controller } from "../../Controller"; import { AttackRatioEvent } from "../../InputHandler"; import { UIState } from "../../UIState"; diff --git a/packages/client/src/render/gl/RenderOverrides.ts b/packages/client/src/render/gl/RenderOverrides.ts index 5d2f4c9da..debf7bba3 100644 --- a/packages/client/src/render/gl/RenderOverrides.ts +++ b/packages/client/src/render/gl/RenderOverrides.ts @@ -1,4 +1,4 @@ -import type { GraphicsOverrides } from "core-public/GraphicsOverrides"; +import type { GraphicsOverrides } from "engine-public/GraphicsOverrides"; import type { RenderSettings } from "./RenderSettings"; const DARK_AMBIENT = 0.35; diff --git a/packages/client/src/render/gl/index.ts b/packages/client/src/render/gl/index.ts index d6c7b934e..2011dc9c0 100644 --- a/packages/client/src/render/gl/index.ts +++ b/packages/client/src/render/gl/index.ts @@ -9,8 +9,8 @@ export type { RadialMenuSelectEvent, } from "./Events"; export { GameView } from "./GameView"; -export { GraphicsOverridesSchema } from "core-public/GraphicsOverrides"; -export type { GraphicsOverrides } from "core-public/GraphicsOverrides"; +export { GraphicsOverridesSchema } from "engine-public/GraphicsOverrides"; +export type { GraphicsOverrides } from "engine-public/GraphicsOverrides"; export type { SpawnCenter } from "./passes/SpawnOverlayPass"; export { applyDarkModeOverride, diff --git a/packages/client/src/utilities/GameConfigHelpers.ts b/packages/client/src/utilities/GameConfigHelpers.ts index b6f8f0d6d..0125c4768 100644 --- a/packages/client/src/utilities/GameConfigHelpers.ts +++ b/packages/client/src/utilities/GameConfigHelpers.ts @@ -1,5 +1,5 @@ import { GameMapType, UnitType } from "engine/game/Game"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; /** * Maps a slider value (0-400) to the nations config value. diff --git a/packages/client/src/view/GameView.ts b/packages/client/src/view/GameView.ts index 37dd13681..daa63a91f 100644 --- a/packages/client/src/view/GameView.ts +++ b/packages/client/src/view/GameView.ts @@ -24,7 +24,7 @@ import { import { TerrainMapData } from "engine/game/TerrainMapLoader"; import { TerraNulliusImpl } from "engine/game/TerraNulliusImpl"; import { UnitGrid, UnitPredicate } from "engine/game/UnitGrid"; -import { ClientID, GameID, Player, PlayerCosmetics } from "core-public/Schemas"; +import { ClientID, GameID, Player, PlayerCosmetics } from "engine-public/Schemas"; import { formatPlayerDisplayName } from "engine/Util"; import { WorkerClient } from "engine/worker/WorkerClient"; import { computeAllianceClusters } from "../render/frame/derive/AllianceClusters"; diff --git a/packages/client/src/view/PlayerView.ts b/packages/client/src/view/PlayerView.ts index 28725c032..59732120a 100644 --- a/packages/client/src/view/PlayerView.ts +++ b/packages/client/src/view/PlayerView.ts @@ -1,8 +1,8 @@ import { Colord, colord } from "colord"; import { base64url } from "jose"; -import { ColorPalette } from "core-public/CosmeticSchemas"; -import { PatternDecoder } from "core-public/PatternDecoder"; -import { ClientID, PlayerCosmetics } from "core-public/Schemas"; +import { ColorPalette } from "engine-public/CosmeticSchemas"; +import { PatternDecoder } from "engine-public/PatternDecoder"; +import { ClientID, PlayerCosmetics } from "engine-public/Schemas"; import { createRandomName } from "engine/Util"; import { BuildableUnit, diff --git a/packages/core-public/package.json b/packages/engine-public/package.json similarity index 75% rename from packages/core-public/package.json rename to packages/engine-public/package.json index 861e968cb..6e553a562 100644 --- a/packages/core-public/package.json +++ b/packages/engine-public/package.json @@ -1,5 +1,5 @@ { - "name": "@openfront/core-public", + "name": "@openfront/engine-public", "version": "0.0.0", "private": true, "type": "module", diff --git a/packages/core-public/src/ApiSchemas.ts b/packages/engine-public/src/ApiSchemas.ts similarity index 100% rename from packages/core-public/src/ApiSchemas.ts rename to packages/engine-public/src/ApiSchemas.ts diff --git a/packages/core-public/src/Base64.ts b/packages/engine-public/src/Base64.ts similarity index 100% rename from packages/core-public/src/Base64.ts rename to packages/engine-public/src/Base64.ts diff --git a/packages/core-public/src/ClanApiSchemas.ts b/packages/engine-public/src/ClanApiSchemas.ts similarity index 100% rename from packages/core-public/src/ClanApiSchemas.ts rename to packages/engine-public/src/ClanApiSchemas.ts diff --git a/packages/core-public/src/CosmeticSchemas.ts b/packages/engine-public/src/CosmeticSchemas.ts similarity index 100% rename from packages/core-public/src/CosmeticSchemas.ts rename to packages/engine-public/src/CosmeticSchemas.ts diff --git a/packages/core-public/src/Emojis.ts b/packages/engine-public/src/Emojis.ts similarity index 100% rename from packages/core-public/src/Emojis.ts rename to packages/engine-public/src/Emojis.ts diff --git a/packages/core-public/src/EventBus.ts b/packages/engine-public/src/EventBus.ts similarity index 100% rename from packages/core-public/src/EventBus.ts rename to packages/engine-public/src/EventBus.ts diff --git a/packages/core-public/src/GraphicsOverrides.ts b/packages/engine-public/src/GraphicsOverrides.ts similarity index 100% rename from packages/core-public/src/GraphicsOverrides.ts rename to packages/engine-public/src/GraphicsOverrides.ts diff --git a/packages/core-public/src/PatternDecoder.ts b/packages/engine-public/src/PatternDecoder.ts similarity index 100% rename from packages/core-public/src/PatternDecoder.ts rename to packages/engine-public/src/PatternDecoder.ts diff --git a/packages/core-public/src/Schemas.ts b/packages/engine-public/src/Schemas.ts similarity index 100% rename from packages/core-public/src/Schemas.ts rename to packages/engine-public/src/Schemas.ts diff --git a/packages/core-public/src/StatsSchemas.ts b/packages/engine-public/src/StatsSchemas.ts similarity index 100% rename from packages/core-public/src/StatsSchemas.ts rename to packages/engine-public/src/StatsSchemas.ts diff --git a/packages/core-public/src/WorkerSchemas.ts b/packages/engine-public/src/WorkerSchemas.ts similarity index 100% rename from packages/core-public/src/WorkerSchemas.ts rename to packages/engine-public/src/WorkerSchemas.ts diff --git a/packages/shared/src/format.ts b/packages/engine-public/src/format.ts similarity index 100% rename from packages/shared/src/format.ts rename to packages/engine-public/src/format.ts diff --git a/packages/core-public/src/game/GameTypes.ts b/packages/engine-public/src/game/GameTypes.ts similarity index 98% rename from packages/core-public/src/game/GameTypes.ts rename to packages/engine-public/src/game/GameTypes.ts index 1f2ce68ee..9591742f5 100644 --- a/packages/core-public/src/game/GameTypes.ts +++ b/packages/engine-public/src/game/GameTypes.ts @@ -1,6 +1,6 @@ // Pure enum/const declarations shared between the engine and clients. // Extracted from engine/game/Game.ts so the public schema layer -// (core-public) can reference them without importing engine. +// (engine-public) can reference them without importing engine. export const AllPlayers = "AllPlayers" as const; diff --git a/packages/core-public/tsconfig.json b/packages/engine-public/tsconfig.json similarity index 100% rename from packages/core-public/tsconfig.json rename to packages/engine-public/tsconfig.json diff --git a/packages/engine/package.json b/packages/engine/package.json index 9ae53ac33..7647fecc4 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -6,6 +6,6 @@ "main": "src/index.ts", "types": "src/index.ts", "dependencies": { - "@openfront/core-public": "*" + "@openfront/engine-public": "*" } } diff --git a/packages/engine/src/EventBus.ts b/packages/engine/src/EventBus.ts index 2b16c113d..c84f34126 100644 --- a/packages/engine/src/EventBus.ts +++ b/packages/engine/src/EventBus.ts @@ -1,7 +1,7 @@ -// Type contracts live in core-public so the public schema layer can reference +// Type contracts live in engine-public so the public schema layer can reference // GameEvent without depending on the engine. Re-exported here for existing // `engine/EventBus` consumers. -import type { EventConstructor, GameEvent } from "core-public/EventBus"; +import type { EventConstructor, GameEvent } from "engine-public/EventBus"; export type { EventConstructor, GameEvent }; export class EventBus { diff --git a/packages/engine/src/GameRunner.ts b/packages/engine/src/GameRunner.ts index 446334a72..d76c11696 100644 --- a/packages/engine/src/GameRunner.ts +++ b/packages/engine/src/GameRunner.ts @@ -28,7 +28,7 @@ import { ErrorUpdate, GameUpdateViewData } from "./game/GameUpdates"; import { createNationsForGame } from "./game/NationCreation"; import { loadTerrainMap as loadGameMap } from "./game/TerrainMapLoader"; import { PseudoRandom } from "./PseudoRandom"; -import { ClientID, GameStartInfo, Turn } from "core-public/Schemas"; +import { ClientID, GameStartInfo, Turn } from "engine-public/Schemas"; import { simpleHash } from "./Util"; export async function createGameRunner( diff --git a/packages/engine/src/Util.ts b/packages/engine/src/Util.ts index fbd04d133..472bad15f 100644 --- a/packages/engine/src/Util.ts +++ b/packages/engine/src/Util.ts @@ -1,12 +1,12 @@ import DOMPurify from "dompurify"; import { customAlphabet } from "nanoid"; -// The emoji table moved to core-public; re-exported so existing `engine/Util` +// The emoji table moved to engine-public; re-exported so existing `engine/Util` // imports of these symbols keep working. export { emojiTable, flattenedEmojiTable, type Emoji, -} from "core-public/Emojis"; +} from "engine-public/Emojis"; import { Cell, PlayerType, Unit } from "./game/Game"; import { GameMap, TileRef } from "./game/GameMap"; import { @@ -17,7 +17,7 @@ import { PlayerRecord, Turn, Winner, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { TRIBE_NAME_PREFIXES, diff --git a/packages/engine/src/configuration/Config.ts b/packages/engine/src/configuration/Config.ts index f4553e4c0..9e317e0cd 100644 --- a/packages/engine/src/configuration/Config.ts +++ b/packages/engine/src/configuration/Config.ts @@ -18,8 +18,8 @@ import { import { TileRef } from "../game/GameMap"; import { PlayerLike } from "../game/ReadViews"; import { UserSettings } from "../game/UserSettings"; -import { GameConfig, TeamCountConfig } from "core-public/Schemas"; -import { NukeType } from "core-public/StatsSchemas"; +import { GameConfig, TeamCountConfig } from "engine-public/Schemas"; +import { NukeType } from "engine-public/StatsSchemas"; import { assertNever, sigmoid, toInt, within } from "../Util"; declare global { diff --git a/packages/engine/src/execution/AttackExecution.ts b/packages/engine/src/execution/AttackExecution.ts index d0a5e9ccb..ca46968e3 100644 --- a/packages/engine/src/execution/AttackExecution.ts +++ b/packages/engine/src/execution/AttackExecution.ts @@ -1,4 +1,4 @@ -import { renderTroops } from "shared/format"; +import { renderTroops } from "engine-public/format"; import { Attack, Difficulty, diff --git a/packages/engine/src/execution/ExecutionManager.ts b/packages/engine/src/execution/ExecutionManager.ts index be7e566ee..553cb685d 100644 --- a/packages/engine/src/execution/ExecutionManager.ts +++ b/packages/engine/src/execution/ExecutionManager.ts @@ -1,6 +1,6 @@ import { Execution, Game } from "../game/Game"; import { PseudoRandom } from "../PseudoRandom"; -import { ClientID, GameID, StampedIntent, Turn } from "core-public/Schemas"; +import { ClientID, GameID, StampedIntent, Turn } from "engine-public/Schemas"; import { simpleHash } from "../Util"; import { AllianceExtensionExecution } from "./alliance/AllianceExtensionExecution"; import { AllianceRejectExecution } from "./alliance/AllianceRejectExecution"; diff --git a/packages/engine/src/execution/NationExecution.ts b/packages/engine/src/execution/NationExecution.ts index 657f38173..a4d3501a0 100644 --- a/packages/engine/src/execution/NationExecution.ts +++ b/packages/engine/src/execution/NationExecution.ts @@ -13,7 +13,7 @@ import { } from "../game/Game"; import { TileRef } from "../game/GameMap"; import { PseudoRandom } from "../PseudoRandom"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { assertNever, simpleHash } from "../Util"; import { NationAllianceBehavior } from "./nation/NationAllianceBehavior"; import { NationEmojiBehavior } from "./nation/NationEmojiBehavior"; diff --git a/packages/engine/src/execution/NukeExecution.ts b/packages/engine/src/execution/NukeExecution.ts index c89d7b17a..69a1c700c 100644 --- a/packages/engine/src/execution/NukeExecution.ts +++ b/packages/engine/src/execution/NukeExecution.ts @@ -14,7 +14,7 @@ import { UniversalPathFinding } from "../pathfinding/PathFinder"; import { ParabolaUniversalPathFinder } from "../pathfinding/PathFinder.Parabola"; import { PathStatus } from "../pathfinding/types"; import { PseudoRandom } from "../PseudoRandom"; -import { NukeType } from "core-public/StatsSchemas"; +import { NukeType } from "engine-public/StatsSchemas"; import { listNukeBreakAlliance } from "./Util"; const SPRITE_RADIUS = 16; diff --git a/packages/engine/src/execution/SAMMissileExecution.ts b/packages/engine/src/execution/SAMMissileExecution.ts index 456d1b656..d3b0fba9c 100644 --- a/packages/engine/src/execution/SAMMissileExecution.ts +++ b/packages/engine/src/execution/SAMMissileExecution.ts @@ -9,7 +9,7 @@ import { import { TileRef } from "../game/GameMap"; import { PathFinding } from "../pathfinding/PathFinder"; import { PathStatus, SteppingPathFinder } from "../pathfinding/types"; -import { NukeType } from "core-public/StatsSchemas"; +import { NukeType } from "engine-public/StatsSchemas"; export class SAMMissileExecution implements Execution { private active = true; diff --git a/packages/engine/src/execution/SpawnExecution.ts b/packages/engine/src/execution/SpawnExecution.ts index 66dcec193..f9bacd80e 100644 --- a/packages/engine/src/execution/SpawnExecution.ts +++ b/packages/engine/src/execution/SpawnExecution.ts @@ -9,7 +9,7 @@ import { } from "../game/Game"; import { TileRef } from "../game/GameMap"; import { PseudoRandom } from "../PseudoRandom"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { simpleHash } from "../Util"; import { PlayerExecution } from "./PlayerExecution"; import { TribeExecution } from "./TribeExecution"; diff --git a/packages/engine/src/execution/TradeShipExecution.ts b/packages/engine/src/execution/TradeShipExecution.ts index 0aacff2a7..9210e1a06 100644 --- a/packages/engine/src/execution/TradeShipExecution.ts +++ b/packages/engine/src/execution/TradeShipExecution.ts @@ -1,4 +1,4 @@ -import { renderNumber } from "shared/format"; +import { renderNumber } from "engine-public/format"; import { Execution, Game, diff --git a/packages/engine/src/execution/TransportShipExecution.ts b/packages/engine/src/execution/TransportShipExecution.ts index f612f03d5..20c4d1ea5 100644 --- a/packages/engine/src/execution/TransportShipExecution.ts +++ b/packages/engine/src/execution/TransportShipExecution.ts @@ -1,4 +1,4 @@ -import { renderTroops } from "shared/format"; +import { renderTroops } from "engine-public/format"; import { Execution, Game, diff --git a/packages/engine/src/execution/TribeSpawner.ts b/packages/engine/src/execution/TribeSpawner.ts index 07efecfd6..a5b1b1280 100644 --- a/packages/engine/src/execution/TribeSpawner.ts +++ b/packages/engine/src/execution/TribeSpawner.ts @@ -1,6 +1,6 @@ import { Game, PlayerInfo, PlayerType } from "../game/Game"; import { PseudoRandom } from "../PseudoRandom"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { simpleHash } from "../Util"; import { SpawnExecution } from "./SpawnExecution"; import { TRIBE_NAME_PREFIXES, TRIBE_NAME_SUFFIXES } from "./utils/TribeNames"; diff --git a/packages/engine/src/execution/utils/PlayerSpawner.ts b/packages/engine/src/execution/utils/PlayerSpawner.ts index d2e2149d3..18b85f3fb 100644 --- a/packages/engine/src/execution/utils/PlayerSpawner.ts +++ b/packages/engine/src/execution/utils/PlayerSpawner.ts @@ -1,5 +1,5 @@ import { Game, PlayerType } from "../../game/Game"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { SpawnExecution } from "../SpawnExecution"; export class PlayerSpawner { diff --git a/packages/engine/src/game/Game.ts b/packages/engine/src/game/Game.ts index fdb95da7c..4a7c2ad61 100644 --- a/packages/engine/src/game/Game.ts +++ b/packages/engine/src/game/Game.ts @@ -1,7 +1,7 @@ import { Config } from "../configuration/Config"; import { AbstractGraph } from "../pathfinding/algorithms/AbstractGraph"; import { PathFinder } from "../pathfinding/types"; -import { AllPlayersStats, ClientID } from "core-public/Schemas"; +import { AllPlayersStats, ClientID } from "engine-public/Schemas"; import { formatPlayerDisplayName } from "../Util"; import { GameMap, TileRef } from "./GameMap"; import { @@ -14,7 +14,7 @@ import { MotionPlanRecord } from "./MotionPlans"; import { RailNetwork } from "./RailNetwork"; import { Stats } from "./Stats"; import { UnitPredicate } from "./UnitGrid"; -// Enums/consts now live in core-public so the public schema layer can use them +// Enums/consts now live in engine-public so the public schema layer can use them // without depending on the engine. Re-exported here so existing // `engine/game/Game` imports keep working. import { @@ -30,7 +30,7 @@ import { RankedType, Trios, UnitType, -} from "core-public/game/GameTypes"; +} from "engine-public/game/GameTypes"; export { AllPlayers, Difficulty, diff --git a/packages/engine/src/game/GameImpl.ts b/packages/engine/src/game/GameImpl.ts index 37b54735e..49a78e2aa 100644 --- a/packages/engine/src/game/GameImpl.ts +++ b/packages/engine/src/game/GameImpl.ts @@ -1,10 +1,10 @@ -import { renderNumber } from "shared/format"; +import { renderNumber } from "engine-public/format"; import { Config } from "../configuration/Config"; import { SharedWaterCache } from "../execution/nation/SharedWaterCache"; import { AbstractGraph } from "../pathfinding/algorithms/AbstractGraph"; import { PathFinder } from "../pathfinding/types"; -import { AllPlayersStats, ClientID, Winner } from "core-public/Schemas"; -import { ATTACK_INDEX_SENT } from "core-public/StatsSchemas"; +import { AllPlayersStats, ClientID, Winner } from "engine-public/Schemas"; +import { ATTACK_INDEX_SENT } from "engine-public/StatsSchemas"; import { simpleHash } from "../Util"; import { AllianceImpl } from "./AllianceImpl"; import { AllianceRequestImpl } from "./AllianceRequestImpl"; diff --git a/packages/engine/src/game/GameUpdates.ts b/packages/engine/src/game/GameUpdates.ts index c4075de19..e6f355da4 100644 --- a/packages/engine/src/game/GameUpdates.ts +++ b/packages/engine/src/game/GameUpdates.ts @@ -1,4 +1,4 @@ -import { AllPlayersStats, ClientID, Winner } from "core-public/Schemas"; +import { AllPlayersStats, ClientID, Winner } from "engine-public/Schemas"; import { EmojiMessage, GameUpdates, diff --git a/packages/engine/src/game/NationCreation.ts b/packages/engine/src/game/NationCreation.ts index a6b79cea2..3414772ce 100644 --- a/packages/engine/src/game/NationCreation.ts +++ b/packages/engine/src/game/NationCreation.ts @@ -1,5 +1,5 @@ import { PseudoRandom } from "../PseudoRandom"; -import { GameStartInfo } from "core-public/Schemas"; +import { GameStartInfo } from "engine-public/Schemas"; import { Cell, GameMapSize, diff --git a/packages/engine/src/game/PlayerImpl.ts b/packages/engine/src/game/PlayerImpl.ts index 88759bdd6..6d6baf142 100644 --- a/packages/engine/src/game/PlayerImpl.ts +++ b/packages/engine/src/game/PlayerImpl.ts @@ -1,5 +1,5 @@ import { PseudoRandom } from "../PseudoRandom"; -import { ClientID } from "core-public/Schemas"; +import { ClientID } from "engine-public/Schemas"; import { assertNever, findClosestBy, diff --git a/packages/engine/src/game/ReadViews.ts b/packages/engine/src/game/ReadViews.ts index 47400ede9..4810716a9 100644 --- a/packages/engine/src/game/ReadViews.ts +++ b/packages/engine/src/game/ReadViews.ts @@ -10,7 +10,7 @@ // Player-vs-PlayerView / Unit-vs-UnitView distinction. import { Player, type PlayerID, Unit } from "./Game"; import { GameMap, type TileRef } from "./GameMap"; -import { UnitType } from "core-public/game/GameTypes"; +import { UnitType } from "engine-public/game/GameTypes"; /** Player members read by Config gold/troop calculations. */ export type PlayerLike = Pick< diff --git a/packages/engine/src/game/Stats.ts b/packages/engine/src/game/Stats.ts index 98d9cfee7..7f6871c0a 100644 --- a/packages/engine/src/game/Stats.ts +++ b/packages/engine/src/game/Stats.ts @@ -1,5 +1,5 @@ -import { AllPlayersStats } from "core-public/Schemas"; -import { NukeType, OtherUnitType, PlayerStats } from "core-public/StatsSchemas"; +import { AllPlayersStats } from "engine-public/Schemas"; +import { NukeType, OtherUnitType, PlayerStats } from "engine-public/StatsSchemas"; import { Player, TerraNullius } from "./Game"; export interface Stats { diff --git a/packages/engine/src/game/StatsImpl.ts b/packages/engine/src/game/StatsImpl.ts index c7c2cfd57..8460863cc 100644 --- a/packages/engine/src/game/StatsImpl.ts +++ b/packages/engine/src/game/StatsImpl.ts @@ -1,4 +1,4 @@ -import { AllPlayersStats } from "core-public/Schemas"; +import { AllPlayersStats } from "engine-public/Schemas"; import { ATTACK_INDEX_CANCEL, ATTACK_INDEX_RECV, @@ -30,7 +30,7 @@ import { PlayerStats, unitTypeToBombUnit, unitTypeToOtherUnit, -} from "core-public/StatsSchemas"; +} from "engine-public/StatsSchemas"; import { Player, PlayerType, TerraNullius, UnitType } from "./Game"; import { Stats } from "./Stats"; diff --git a/packages/engine/src/game/TeamAssignment.ts b/packages/engine/src/game/TeamAssignment.ts index 2664d20fe..bb4a105b1 100644 --- a/packages/engine/src/game/TeamAssignment.ts +++ b/packages/engine/src/game/TeamAssignment.ts @@ -1,5 +1,5 @@ import { PseudoRandom } from "../PseudoRandom"; -import { ClientID } from "core-public/Schemas"; +import { ClientID } from "engine-public/Schemas"; import { simpleHash } from "../Util"; import { PlayerInfo, PlayerType, Team } from "./Game"; diff --git a/packages/engine/src/game/TerraNulliusImpl.ts b/packages/engine/src/game/TerraNulliusImpl.ts index c7443edc2..ccdb902db 100644 --- a/packages/engine/src/game/TerraNulliusImpl.ts +++ b/packages/engine/src/game/TerraNulliusImpl.ts @@ -1,4 +1,4 @@ -import { ClientID } from "core-public/Schemas"; +import { ClientID } from "engine-public/Schemas"; import { TerraNullius } from "./Game"; export class TerraNulliusImpl implements TerraNullius { diff --git a/packages/engine/src/game/UserSettings.ts b/packages/engine/src/game/UserSettings.ts index 04173fd26..9d14f9e53 100644 --- a/packages/engine/src/game/UserSettings.ts +++ b/packages/engine/src/game/UserSettings.ts @@ -1,9 +1,9 @@ import { GraphicsOverrides, GraphicsOverridesSchema, -} from "core-public/GraphicsOverrides"; -import { Cosmetics } from "core-public/CosmeticSchemas"; -import { PlayerPattern } from "core-public/Schemas"; +} from "engine-public/GraphicsOverrides"; +import { Cosmetics } from "engine-public/CosmeticSchemas"; +import { PlayerPattern } from "engine-public/Schemas"; export function getDefaultKeybinds(isMac: boolean): Record { return { diff --git a/packages/engine/src/validations/username.ts b/packages/engine/src/validations/username.ts index 1a53608a5..ed54641da 100644 --- a/packages/engine/src/validations/username.ts +++ b/packages/engine/src/validations/username.ts @@ -1,4 +1,4 @@ -import { ClanTagSchema, UsernameSchema } from "core-public/Schemas"; +import { ClanTagSchema, UsernameSchema } from "engine-public/Schemas"; export const MIN_USERNAME_LENGTH = 3; export const MAX_USERNAME_LENGTH = 27; diff --git a/packages/engine/src/worker/WorkerClient.ts b/packages/engine/src/worker/WorkerClient.ts index c3ed48873..3d7e0810f 100644 --- a/packages/engine/src/worker/WorkerClient.ts +++ b/packages/engine/src/worker/WorkerClient.ts @@ -10,7 +10,7 @@ import { } from "../game/Game"; import { TileRef } from "../game/GameMap"; import { ErrorUpdate, GameUpdateViewData } from "../game/GameUpdates"; -import { ClientID, GameStartInfo, Turn } from "core-public/Schemas"; +import { ClientID, GameStartInfo, Turn } from "engine-public/Schemas"; import { generateID } from "../Util"; import { WorkerMessage } from "./WorkerMessages"; // Inlined into the main bundle as a same-origin Blob, sidestepping the diff --git a/packages/engine/src/worker/WorkerMessages.ts b/packages/engine/src/worker/WorkerMessages.ts index ad2edc95a..28411fafc 100644 --- a/packages/engine/src/worker/WorkerMessages.ts +++ b/packages/engine/src/worker/WorkerMessages.ts @@ -8,7 +8,7 @@ import { } from "../game/Game"; import { TileRef } from "../game/GameMap"; import { ErrorUpdate, GameUpdateViewData } from "../game/GameUpdates"; -import { ClientID, GameStartInfo, Turn } from "core-public/Schemas"; +import { ClientID, GameStartInfo, Turn } from "engine-public/Schemas"; export type WorkerMessageType = | "init" diff --git a/packages/server/package.json b/packages/server/package.json index 4d3096920..2919b1ef2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -5,7 +5,7 @@ "type": "module", "main": "src/Server.ts", "dependencies": { - "@openfront/core-public": "*", + "@openfront/engine-public": "*", "@openfront/engine": "*" } } diff --git a/packages/server/src/Archive.ts b/packages/server/src/Archive.ts index c8bf575b0..c0f0a6618 100644 --- a/packages/server/src/Archive.ts +++ b/packages/server/src/Archive.ts @@ -6,7 +6,7 @@ import { GameRecordSchema, ID, PartialGameRecord, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { replacer } from "engine/Util"; import { logger } from "./Logger"; import { ServerEnv } from "./ServerEnv"; diff --git a/packages/server/src/Client.ts b/packages/server/src/Client.ts index 2bd4ccbc2..beec36e20 100644 --- a/packages/server/src/Client.ts +++ b/packages/server/src/Client.ts @@ -1,7 +1,7 @@ import WebSocket from "ws"; -import { TokenPayload } from "core-public/ApiSchemas"; +import { TokenPayload } from "engine-public/ApiSchemas"; import { Tick } from "engine/game/Game"; -import { ClientID, PlayerCosmetics, Winner } from "core-public/Schemas"; +import { ClientID, PlayerCosmetics, Winner } from "engine-public/Schemas"; export class Client { public lastPing: number = Date.now(); diff --git a/packages/server/src/ClientMsgRateLimiter.ts b/packages/server/src/ClientMsgRateLimiter.ts index 385b57e12..3d48d6d97 100644 --- a/packages/server/src/ClientMsgRateLimiter.ts +++ b/packages/server/src/ClientMsgRateLimiter.ts @@ -1,5 +1,5 @@ import { RateLimiter } from "limiter"; -import { ClientID } from "core-public/Schemas"; +import { ClientID } from "engine-public/Schemas"; const INTENTS_PER_SECOND = 10; const INTENTS_PER_MINUTE = 150; diff --git a/packages/server/src/GameManager.ts b/packages/server/src/GameManager.ts index abe9bd41f..f59499ca0 100644 --- a/packages/server/src/GameManager.ts +++ b/packages/server/src/GameManager.ts @@ -7,7 +7,7 @@ import { GameMode, GameType, } from "engine/game/Game"; -import { GameConfig, GameID, PublicGameType } from "core-public/Schemas"; +import { GameConfig, GameID, PublicGameType } from "engine-public/Schemas"; import { Client } from "./Client"; import { GamePhase, GameServer } from "./GameServer"; diff --git a/packages/server/src/GamePreviewBuilder.ts b/packages/server/src/GamePreviewBuilder.ts index 38ee14402..ab10fa791 100644 --- a/packages/server/src/GamePreviewBuilder.ts +++ b/packages/server/src/GamePreviewBuilder.ts @@ -1,6 +1,6 @@ import { z } from "zod"; import { buildAssetUrl } from "engine/AssetUrls"; -import { ClanTagSchema, GameInfo, UsernameSchema } from "core-public/Schemas"; +import { ClanTagSchema, GameInfo, UsernameSchema } from "engine-public/Schemas"; import { formatPlayerDisplayName } from "engine/Util"; import { GameMode } from "engine/game/Game"; import { getRuntimeAssetManifest } from "./RuntimeAssetManifest"; diff --git a/packages/server/src/GamePreviewRoute.ts b/packages/server/src/GamePreviewRoute.ts index c13fed477..be5fb9be5 100644 --- a/packages/server/src/GamePreviewRoute.ts +++ b/packages/server/src/GamePreviewRoute.ts @@ -4,7 +4,7 @@ import { parse } from "node-html-parser"; import path from "path"; import type { Logger } from "winston"; import { z } from "zod"; -import { GAME_ID_REGEX, GameInfo } from "core-public/Schemas"; +import { GAME_ID_REGEX, GameInfo } from "engine-public/Schemas"; import { replacer } from "engine/Util"; import type { GameManager } from "./GameManager"; import { diff --git a/packages/server/src/GameServer.ts b/packages/server/src/GameServer.ts index 5a8b9da00..5f314fa52 100644 --- a/packages/server/src/GameServer.ts +++ b/packages/server/src/GameServer.ts @@ -2,7 +2,7 @@ import ipAnonymize from "ip-anonymize"; import { Logger } from "winston"; import WebSocket from "ws"; import { z } from "zod"; -import { isAdminRole } from "core-public/ApiSchemas"; +import { isAdminRole } from "engine-public/ApiSchemas"; import { GameEnv } from "engine/configuration/Config"; import { GameType } from "engine/game/Game"; import { @@ -23,7 +23,7 @@ import { ServerTurnMessage, StampedIntent, Turn, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { createPartialGameRecord } from "engine/Util"; import { archive, finalizeGameRecord } from "./Archive"; import { Client } from "./Client"; diff --git a/packages/server/src/IPCBridgeSchema.ts b/packages/server/src/IPCBridgeSchema.ts index fbb383311..6534a5bbb 100644 --- a/packages/server/src/IPCBridgeSchema.ts +++ b/packages/server/src/IPCBridgeSchema.ts @@ -4,7 +4,7 @@ import { PublicGameInfoSchema, PublicGamesSchema, PublicGameTypeSchema, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; export type WorkerLobbyList = z.infer; export type WorkerReady = z.infer; diff --git a/packages/server/src/MapPlaylist.ts b/packages/server/src/MapPlaylist.ts index 411a6f243..f9f7956e9 100644 --- a/packages/server/src/MapPlaylist.ts +++ b/packages/server/src/MapPlaylist.ts @@ -16,7 +16,7 @@ import { mapCategories, } from "engine/game/Game"; import { PseudoRandom } from "engine/PseudoRandom"; -import { GameConfig, PublicGameType, TeamCountConfig } from "core-public/Schemas"; +import { GameConfig, PublicGameType, TeamCountConfig } from "engine-public/Schemas"; import { logger } from "./Logger"; import { getMapLandTiles } from "./MapLandTiles"; diff --git a/packages/server/src/MasterLobbyService.ts b/packages/server/src/MasterLobbyService.ts index 623901940..b0e8ab4b0 100644 --- a/packages/server/src/MasterLobbyService.ts +++ b/packages/server/src/MasterLobbyService.ts @@ -1,6 +1,6 @@ import { Worker } from "cluster"; import winston from "winston"; -import { PublicGameInfo, PublicGameType } from "core-public/Schemas"; +import { PublicGameInfo, PublicGameType } from "engine-public/Schemas"; import { generateID } from "engine/Util"; import { MasterCreateGame, diff --git a/packages/server/src/Privilege.ts b/packages/server/src/Privilege.ts index a91b1a530..4e8095ea6 100644 --- a/packages/server/src/Privilege.ts +++ b/packages/server/src/Privilege.ts @@ -11,15 +11,15 @@ import { } from "obscenity"; import countries from "resources/countries.json"; -import { Cosmetics } from "core-public/CosmeticSchemas"; -import { decodePatternData } from "core-public/PatternDecoder"; +import { Cosmetics } from "engine-public/CosmeticSchemas"; +import { decodePatternData } from "engine-public/PatternDecoder"; import { PlayerColor, PlayerCosmeticRefs, PlayerCosmetics, PlayerPattern, PlayerSkin, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { simpleHash } from "engine/Util"; const countryCodes = countries.filter((c) => !c.restricted).map((c) => c.code); diff --git a/packages/server/src/PrivilegeRefresher.ts b/packages/server/src/PrivilegeRefresher.ts index ed196f06f..10f94cbcd 100644 --- a/packages/server/src/PrivilegeRefresher.ts +++ b/packages/server/src/PrivilegeRefresher.ts @@ -1,7 +1,7 @@ import { base64url } from "jose"; import { Logger } from "winston"; -import { ReservedClanTagsResponseSchema } from "core-public/ClanApiSchemas"; -import { CosmeticsSchema } from "core-public/CosmeticSchemas"; +import { ReservedClanTagsResponseSchema } from "engine-public/ClanApiSchemas"; +import { CosmeticsSchema } from "engine-public/CosmeticSchemas"; import { startPolling } from "./PollingLoop"; import { FailOpenPrivilegeChecker, diff --git a/packages/server/src/ServerEnv.ts b/packages/server/src/ServerEnv.ts index 4ea97cdac..dcd1a37f4 100644 --- a/packages/server/src/ServerEnv.ts +++ b/packages/server/src/ServerEnv.ts @@ -1,7 +1,7 @@ import { JWK } from "jose"; import { z } from "zod"; import { GameEnv, parseGameEnv } from "engine/configuration/Config"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { simpleHash } from "engine/Util"; const JwksSchema = z.object({ diff --git a/packages/server/src/Worker.ts b/packages/server/src/Worker.ts index c211a6bc3..8045468fd 100644 --- a/packages/server/src/Worker.ts +++ b/packages/server/src/Worker.ts @@ -14,9 +14,9 @@ import { GameID, PartialGameRecordSchema, ServerErrorMessage, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { generateID, replacer } from "engine/Util"; -import { CreateGameInputSchema } from "core-public/WorkerSchemas"; +import { CreateGameInputSchema } from "engine-public/WorkerSchemas"; import { archive, finalizeGameRecord } from "./Archive"; import { Client } from "./Client"; import { GameManager } from "./GameManager"; diff --git a/packages/server/src/WorkerLobbyService.ts b/packages/server/src/WorkerLobbyService.ts index cceeab1cd..cfb43ceac 100644 --- a/packages/server/src/WorkerLobbyService.ts +++ b/packages/server/src/WorkerLobbyService.ts @@ -4,7 +4,7 @@ import { PublicGameInfo, PublicGames, PublicLobbyMessage, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; import { GameManager } from "./GameManager"; import { MasterMessageSchema, diff --git a/packages/server/src/jwt.ts b/packages/server/src/jwt.ts index 97aa92ab6..f689c9e4b 100644 --- a/packages/server/src/jwt.ts +++ b/packages/server/src/jwt.ts @@ -5,9 +5,9 @@ import { TokenPayloadSchema, UserMeResponse, UserMeResponseSchema, -} from "core-public/ApiSchemas"; +} from "engine-public/ApiSchemas"; import { GameEnv } from "engine/configuration/Config"; -import { PersistentIdSchema } from "core-public/Schemas"; +import { PersistentIdSchema } from "engine-public/Schemas"; import { ServerEnv } from "./ServerEnv"; type TokenVerificationResult = diff --git a/packages/shared/package.json b/packages/shared/package.json deleted file mode 100644 index 20bf8fcbf..000000000 --- a/packages/shared/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "@openfront/shared", - "version": "0.0.0", - "private": true, - "type": "module", - "main": "src/index.ts", - "types": "src/index.ts" -} diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json deleted file mode 100644 index bf5a36ddb..000000000 --- a/packages/shared/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": ["src/**/*"] -} diff --git a/tests/Attack.test.ts b/tests/Attack.test.ts index 74b869033..20b28d711 100644 --- a/tests/Attack.test.ts +++ b/tests/Attack.test.ts @@ -9,7 +9,7 @@ import { UnitType, } from "engine/game/Game"; import { TileRef } from "engine/game/GameMap"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; import { TestConfig } from "./util/TestConfig"; import { constructionExecution } from "./util/utils"; diff --git a/tests/AttackStats.test.ts b/tests/AttackStats.test.ts index 6a32c4ab1..dc79aecff 100644 --- a/tests/AttackStats.test.ts +++ b/tests/AttackStats.test.ts @@ -1,6 +1,6 @@ import { AttackExecution } from "engine/execution/AttackExecution"; import { Game, Player, PlayerInfo, PlayerType } from "engine/game/Game"; -import { GOLD_INDEX_WAR, GOLD_INDEX_WORK } from "core-public/StatsSchemas"; +import { GOLD_INDEX_WAR, GOLD_INDEX_WORK } from "engine-public/StatsSchemas"; import { setup } from "./util/Setup"; let game: Game; diff --git a/tests/ConquerGold.test.ts b/tests/ConquerGold.test.ts index b8b31abca..b0eccfe1b 100644 --- a/tests/ConquerGold.test.ts +++ b/tests/ConquerGold.test.ts @@ -1,6 +1,6 @@ import { SpawnExecution } from "engine/execution/SpawnExecution"; import { Game, Player, PlayerInfo, PlayerType } from "engine/game/Game"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; const gameID: GameID = "test_game"; diff --git a/tests/CosmeticRelationship.test.ts b/tests/CosmeticRelationship.test.ts index 4219e6f4d..6cbe3b1d3 100644 --- a/tests/CosmeticRelationship.test.ts +++ b/tests/CosmeticRelationship.test.ts @@ -1,5 +1,5 @@ import { cosmeticRelationship } from "client/Cosmetics"; -import { UserMeResponse } from "core-public/ApiSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; const product = { productId: "prod_123", priceId: "price_123", price: "$4.99" }; diff --git a/tests/DeleteUnitExecution.test.ts b/tests/DeleteUnitExecution.test.ts index 0b8b68722..b64d50aca 100644 --- a/tests/DeleteUnitExecution.test.ts +++ b/tests/DeleteUnitExecution.test.ts @@ -9,7 +9,7 @@ import { UnitType, } from "engine/game/Game"; import { TileRef } from "engine/game/GameMap"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; import { executeTicks } from "./util/utils"; diff --git a/tests/Donate.test.ts b/tests/Donate.test.ts index 2295632bc..290522814 100644 --- a/tests/Donate.test.ts +++ b/tests/Donate.test.ts @@ -2,7 +2,7 @@ import { DonateGoldExecution } from "engine/execution/DonateGoldExecution"; import { DonateTroopsExecution } from "engine/execution/DonateTroopExecution"; import { SpawnExecution } from "engine/execution/SpawnExecution"; import { PlayerInfo, PlayerType } from "engine/game/Game"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; describe("Donate troops to an ally", () => { diff --git a/tests/GameInfoRanking.test.ts b/tests/GameInfoRanking.test.ts index 198c480c4..05f9684f0 100644 --- a/tests/GameInfoRanking.test.ts +++ b/tests/GameInfoRanking.test.ts @@ -9,14 +9,14 @@ import { GameMode, GameType, } from "engine/game/Game"; -import { AnalyticsRecord, GameConfig } from "core-public/Schemas"; +import { AnalyticsRecord, GameConfig } from "engine-public/Schemas"; import { GOLD_INDEX_STEAL, GOLD_INDEX_TRADE, GOLD_INDEX_TRAIN_OTHER, GOLD_INDEX_TRAIN_SELF, GOLD_INDEX_WAR, -} from "core-public/StatsSchemas"; +} from "engine-public/StatsSchemas"; describe("Ranking class", () => { const mockConfig: GameConfig = { diff --git a/tests/GraphicsOverrides.test.ts b/tests/GraphicsOverrides.test.ts index d6f9470ec..208c026ce 100644 --- a/tests/GraphicsOverrides.test.ts +++ b/tests/GraphicsOverrides.test.ts @@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest"; import { GraphicsOverrides, GraphicsOverridesSchema, -} from "core-public/GraphicsOverrides"; +} from "engine-public/GraphicsOverrides"; import { applyGraphicsOverrides } from "client/render/gl/RenderOverrides"; import { createRenderSettings } from "client/render/gl/RenderSettings"; diff --git a/tests/LobbySocket.test.ts b/tests/LobbySocket.test.ts index 7529b8163..4d750e7ef 100644 --- a/tests/LobbySocket.test.ts +++ b/tests/LobbySocket.test.ts @@ -4,7 +4,7 @@ import { PublicGameInfo, PublicGames, PublicGameType, -} from "core-public/Schemas"; +} from "engine-public/Schemas"; function lobby( gameID: string, diff --git a/tests/MissileSilo.test.ts b/tests/MissileSilo.test.ts index 5ed3d04e0..88cc0fb87 100644 --- a/tests/MissileSilo.test.ts +++ b/tests/MissileSilo.test.ts @@ -9,7 +9,7 @@ import { UnitType, } from "engine/game/Game"; import { TileRef } from "engine/game/GameMap"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; import { constructionExecution, executeTicks } from "./util/utils"; diff --git a/tests/NationCreation.test.ts b/tests/NationCreation.test.ts index 6ac28f8d4..304f1530c 100644 --- a/tests/NationCreation.test.ts +++ b/tests/NationCreation.test.ts @@ -12,7 +12,7 @@ import { Nation as ManifestNation, } from "engine/game/TerrainMapLoader"; import { PseudoRandom } from "engine/PseudoRandom"; -import { GameConfig, GameStartInfo } from "core-public/Schemas"; +import { GameConfig, GameStartInfo } from "engine-public/Schemas"; function makeManifestNations(count: number): ManifestNation[] { const result: ManifestNation[] = []; diff --git a/tests/ResolveCosmetics.test.ts b/tests/ResolveCosmetics.test.ts index 00c442f67..fcd83c3ee 100644 --- a/tests/ResolveCosmetics.test.ts +++ b/tests/ResolveCosmetics.test.ts @@ -1,6 +1,6 @@ import { resolveCosmetics } from "client/Cosmetics"; -import { UserMeResponse } from "core-public/ApiSchemas"; -import { Cosmetics } from "core-public/CosmeticSchemas"; +import { UserMeResponse } from "engine-public/ApiSchemas"; +import { Cosmetics } from "engine-public/CosmeticSchemas"; const product = { productId: "prod_1", priceId: "price_1", price: "$4.99" }; diff --git a/tests/StatsSchema.test.ts b/tests/StatsSchema.test.ts index 4c8c3aa8b..7aa6e07ef 100644 --- a/tests/StatsSchema.test.ts +++ b/tests/StatsSchema.test.ts @@ -1,5 +1,5 @@ -import { PlayerStatsLeafSchema } from "core-public/ApiSchemas"; -import { PlayerStatsSchema } from "core-public/StatsSchemas"; +import { PlayerStatsLeafSchema } from "engine-public/ApiSchemas"; +import { PlayerStatsSchema } from "engine-public/StatsSchemas"; function testPlayerSchema( json: string, diff --git a/tests/TerritoryCapture.test.ts b/tests/TerritoryCapture.test.ts index 108edbe2a..318fd5a6b 100644 --- a/tests/TerritoryCapture.test.ts +++ b/tests/TerritoryCapture.test.ts @@ -1,6 +1,6 @@ import { SpawnExecution } from "engine/execution/SpawnExecution"; import { Player, PlayerInfo, PlayerType } from "engine/game/Game"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "./util/Setup"; describe("Territory management", () => { diff --git a/tests/client/clan/ClanApiQueries.test.ts b/tests/client/clan/ClanApiQueries.test.ts index 890908225..68897621f 100644 --- a/tests/client/clan/ClanApiQueries.test.ts +++ b/tests/client/clan/ClanApiQueries.test.ts @@ -20,7 +20,7 @@ import { fetchClanRequests, fetchClans, } from "client/ClanApi"; -import type { UserMeResponse } from "core-public/ApiSchemas"; +import type { UserMeResponse } from "engine-public/ApiSchemas"; const userWithClans = (tags: string[]): UserMeResponse => ({ diff --git a/tests/client/clan/ClanApiSchemas.test.ts b/tests/client/clan/ClanApiSchemas.test.ts index 075bec742..5d374f49a 100644 --- a/tests/client/clan/ClanApiSchemas.test.ts +++ b/tests/client/clan/ClanApiSchemas.test.ts @@ -9,7 +9,7 @@ import { ClanInfoSchema, ClanJoinRequestSchema, ClanMemberSchema, -} from "core-public/ClanApiSchemas"; +} from "engine-public/ClanApiSchemas"; describe("ClanInfoSchema", () => { const base = { diff --git a/tests/core/GameRunner.test.ts b/tests/core/GameRunner.test.ts index 47be2c47d..43b08006a 100644 --- a/tests/core/GameRunner.test.ts +++ b/tests/core/GameRunner.test.ts @@ -1,7 +1,7 @@ import { NationExecution } from "engine/execution/NationExecution"; import { SpawnExecution } from "engine/execution/SpawnExecution"; import { Cell, Nation, PlayerInfo, PlayerType } from "engine/game/Game"; -import { GameConfig, GameID } from "core-public/Schemas"; +import { GameConfig, GameID } from "engine-public/Schemas"; import { setup } from "../util/Setup"; import { executeTicks } from "../util/utils"; diff --git a/tests/core/executions/SAMLauncherExecution.test.ts b/tests/core/executions/SAMLauncherExecution.test.ts index 72254defd..f6c5255d2 100644 --- a/tests/core/executions/SAMLauncherExecution.test.ts +++ b/tests/core/executions/SAMLauncherExecution.test.ts @@ -9,7 +9,7 @@ import { PlayerType, UnitType, } from "engine/game/Game"; -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { setup } from "../../util/Setup"; import { constructionExecution, executeTicks } from "../../util/utils"; diff --git a/tests/core/game/GameImpl.test.ts b/tests/core/game/GameImpl.test.ts index 3dae25ff2..ed672a5b2 100644 --- a/tests/core/game/GameImpl.test.ts +++ b/tests/core/game/GameImpl.test.ts @@ -1,4 +1,4 @@ -import { GameID } from "core-public/Schemas"; +import { GameID } from "engine-public/Schemas"; import { AttackExecution } from "engine/execution/AttackExecution"; import { SpawnExecution } from "engine/execution/SpawnExecution"; //import { TransportShipExecution } from "engine/execution/TransportShipExecution"; diff --git a/tests/core/game/TrainStation.test.ts b/tests/core/game/TrainStation.test.ts index 4a790784a..fa5f9a12d 100644 --- a/tests/core/game/TrainStation.test.ts +++ b/tests/core/game/TrainStation.test.ts @@ -15,7 +15,7 @@ import { } from "engine/game/Game"; import { Cluster, TrainStation } from "engine/game/TrainStation"; import { UserSettings } from "engine/game/UserSettings"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; vi.mock("engine/game/Game"); vi.mock("engine/execution/TrainExecution"); diff --git a/tests/core/pathfinding/_fixtures.ts b/tests/core/pathfinding/_fixtures.ts index 34c9aa9d1..eb4e9f6bf 100644 --- a/tests/core/pathfinding/_fixtures.ts +++ b/tests/core/pathfinding/_fixtures.ts @@ -11,7 +11,7 @@ import { import { createGame as createGameImpl } from "engine/game/GameImpl"; import { GameMapImpl } from "engine/game/GameMap"; import { UserSettings } from "engine/game/UserSettings"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; import { TestConfig } from "../../util/TestConfig"; export const W = "W"; // Water diff --git a/tests/pathfinding/utils.ts b/tests/pathfinding/utils.ts index c85be17db..b817bfcf8 100644 --- a/tests/pathfinding/utils.ts +++ b/tests/pathfinding/utils.ts @@ -27,7 +27,7 @@ import { PathStatus, SteppingPathFinder, } from "engine/pathfinding/types"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; import { TestConfig } from "../util/TestConfig"; export type BenchmarkRoute = { diff --git a/tests/server/Archive.test.ts b/tests/server/Archive.test.ts index 43946d518..ef371e045 100644 --- a/tests/server/Archive.test.ts +++ b/tests/server/Archive.test.ts @@ -20,8 +20,8 @@ vi.mock("server/Logger", () => ({ }, })); -vi.mock("core-public/Schemas", async () => { - const actual = (await vi.importActual("core-public/Schemas")) as any; +vi.mock("engine-public/Schemas", async () => { + const actual = (await vi.importActual("engine-public/Schemas")) as any; return { ...actual, GameRecordSchema: { @@ -31,7 +31,7 @@ vi.mock("core-public/Schemas", async () => { }); import { GameType } from "engine/game/Game"; -import type { GameRecord } from "core-public/Schemas"; +import type { GameRecord } from "engine-public/Schemas"; import { archive } from "server/Archive"; function buildRecord(gameType: GameType, flag: string | undefined): GameRecord { diff --git a/tests/server/GameLifecycle.test.ts b/tests/server/GameLifecycle.test.ts index b90db0e32..2d98c4757 100644 --- a/tests/server/GameLifecycle.test.ts +++ b/tests/server/GameLifecycle.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -vi.mock("core-public/Schemas", async () => { - const actual = (await vi.importActual("core-public/Schemas")) as any; +vi.mock("engine-public/Schemas", async () => { + const actual = (await vi.importActual("engine-public/Schemas")) as any; return { ...actual, GameStartInfoSchema: { diff --git a/tests/server/KickPlayerAuthorization.test.ts b/tests/server/KickPlayerAuthorization.test.ts index 12938fa98..d1ab8fa1f 100644 --- a/tests/server/KickPlayerAuthorization.test.ts +++ b/tests/server/KickPlayerAuthorization.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -vi.mock("core-public/Schemas", async () => { - const actual = (await vi.importActual("core-public/Schemas")) as any; +vi.mock("engine-public/Schemas", async () => { + const actual = (await vi.importActual("engine-public/Schemas")) as any; return { ...actual, GameStartInfoSchema: { diff --git a/tests/util/Setup.ts b/tests/util/Setup.ts index 8d657d6a3..5bc9dc882 100644 --- a/tests/util/Setup.ts +++ b/tests/util/Setup.ts @@ -16,7 +16,7 @@ import { MapManifest, } from "engine/game/TerrainMapLoader"; import { UserSettings } from "engine/game/UserSettings"; -import { GameConfig } from "core-public/Schemas"; +import { GameConfig } from "engine-public/Schemas"; import { TestConfig } from "./TestConfig"; export async function setup( diff --git a/tests/util/viewStubs.ts b/tests/util/viewStubs.ts index 37bf719ac..58fb1c699 100644 --- a/tests/util/viewStubs.ts +++ b/tests/util/viewStubs.ts @@ -25,7 +25,7 @@ import { UnitUpdate, } from "engine/game/GameUpdates"; import { TerrainMapData } from "engine/game/TerrainMapLoader"; -import { Player, PlayerCosmetics } from "core-public/Schemas"; +import { Player, PlayerCosmetics } from "engine-public/Schemas"; import { WorkerClient } from "engine/worker/WorkerClient"; /** Theme stub — returns deterministic colors so PlayerView's color math works. */ diff --git a/tsconfig.base.json b/tsconfig.base.json index d4e7cab28..5b26220ae 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -9,8 +9,7 @@ "moduleResolution": "bundler", "paths": { "resources/*": ["./resources/*"], - "core-public/*": ["./packages/core-public/src/*"], - "shared/*": ["./packages/shared/src/*"], + "engine-public/*": ["./packages/engine-public/src/*"], "engine/*": ["./packages/engine/src/*"], "client/*": ["./packages/client/src/*"], "server/*": ["./packages/server/src/*"]