alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-07-05 02:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix config circular dependency (#296)

Browse Source
This commit is contained in:
evanpelle
2025-03-19 15:42:47 -07:00
committed by GitHub
parent 882a39ee70
commit 2c9fc7307e
13 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/ClientGameRunner.ts
+2 -1
View File
@@ -26,7 +26,8 @@ import {
} from "../core/game/GameUpdates";
import { WorkerClient } from "../core/worker/WorkerClient";
import { consolex, initRemoteSender } from "../core/Consolex";
import { getConfig, ServerConfig } from "../core/configuration/Config";
import { ServerConfig } from "../core/configuration/Config";
import { getConfig } from "../core/configuration/ConfigLoader";
import { GameView, PlayerView } from "../core/game/GameView";
import { GameUpdateViewData } from "../core/game/GameUpdates";
import { UserSettings } from "../core/game/UserSettings";
src/client/HostLobbyModal.ts
+2 -4
View File
@@ -8,10 +8,8 @@ import { DifficultyDescription } from "./components/Difficulties";
import "./components/Maps";
import randomMap from "../../resources/images/RandomMap.png";
import { generateID } from "../core/Util";
import {
getConfig,
getServerConfigFromClient,
} from "../core/configuration/Config";
import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
import { getConfig } from "../core/configuration/ConfigLoader";
import { JoinLobbyEvent } from "./Main";
@customElement("host-lobby-modal")
src/client/JoinPrivateLobbyModal.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import { customElement, query, state } from "lit/decorators.js";
import { consolex } from "../core/Consolex";
import { GameMapType, GameType } from "../core/game/Game";
import { GameInfo, GameRecord } from "../core/Schemas";
import { getServerConfigFromClient } from "../core/configuration/Config";
import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
import { JoinLobbyEvent } from "./Main";
@customElement("join-private-lobby-modal")
src/client/Main.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { DarkModeButton } from "./DarkModeButton";
import "./GoogleAdElement";
import { HelpModal } from "./HelpModal";
import { GameType } from "../core/game/Game";
import { getServerConfigFromClient } from "../core/configuration/Config";
import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
import GoogleAdElement from "./GoogleAdElement";
import { GameConfig, GameInfo, GameRecord } from "../core/Schemas";