Enable the sort-imports eslint rule (#1849)

## Description:

Enable the `sort-imports` eslint rule.

Fixes #1784

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced

eslint.config.js

@@ -1,13 +1,13 @@
 import eslintConfigPrettier from "eslint-config-prettier/flat";
+import eslintPluginLocal from "./eslint-plugin-local/plugin.js";
+import { fileURLToPath } from "node:url";
 import globals from "globals";
+import { includeIgnoreFile } from "@eslint/compat";
+import jest from "eslint-plugin-jest";
 import path from "node:path";
 import pluginJs from "@eslint/js";
 import stylistic from "@stylistic/eslint-plugin";
-import jest from "eslint-plugin-jest";
 import tseslint from "typescript-eslint";
-import { fileURLToPath } from "node:url";
-import { includeIgnoreFile } from "@eslint/compat";
-import eslintPluginLocal from "./eslint-plugin-local/plugin.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -116,7 +116,7 @@ export default [
       "no-undef": "error",
       "no-unused-vars": "off", // @typescript-eslint/no-unused-vars
       "quote-props": ["error", "consistent-as-needed"],
-      // 'sort-imports': 'error', // TODO: Enable this rule, https://github.com/openfrontio/OpenFrontIO/issues/1787
+      'sort-imports': 'error',
       "space-before-blocks": ["error", "always"],
       "space-before-function-paren": ["error", {
         anonymous: "always",

src/client/ClientGameRunner.ts

@@ -1,30 +1,3 @@
-import { translateText } from "../client/Utils";
-import { EventBus } from "../core/EventBus";
-import {
-  ClientID,
-  GameID,
-  GameRecord,
-  GameStartInfo,
-  PlayerRecord,
-  ServerMessage,
-} from "../core/Schemas";
-import { createGameRecord } from "../core/Util";
-import { ServerConfig } from "../core/configuration/Config";
-import { getConfig } from "../core/configuration/ConfigLoader";
-import { PlayerActions, UnitType } from "../core/game/Game";
-import { TileRef } from "../core/game/GameMap";
-import { GameMapLoader } from "../core/game/GameMapLoader";
-import {
-  ErrorUpdate,
-  GameUpdateType,
-  GameUpdateViewData,
-  HashUpdate,
-  WinUpdate,
-} from "../core/game/GameUpdates";
-import { GameView, PlayerView } from "../core/game/GameView";
-import { loadTerrainMap, TerrainMapData } from "../core/game/TerrainMapLoader";
-import { UserSettings } from "../core/game/UserSettings";
-import { WorkerClient } from "../core/worker/WorkerClient";
 import {
   AutoUpgradeEvent,
   DoBoatAttackEvent,
@@ -33,9 +6,24 @@ import {
   MouseMoveEvent,
   MouseUpEvent,
 } from "./InputHandler";
-import { endGame, startGame, startTime } from "./LocalPersistantStats";
+import {
-import { getPersistentID } from "./Main";
+  ClientID,
-import { terrainMapFileLoader } from "./TerrainMapFileLoader";
+  GameID,
+  GameRecord,
+  GameStartInfo,
+  PlayerRecord,
+  ServerMessage,
+} from "../core/Schemas";
+import {
+  ErrorUpdate,
+  GameUpdateType,
+  GameUpdateViewData,
+  HashUpdate,
+  WinUpdate,
+} from "../core/game/GameUpdates";
+import { GameRenderer, createRenderer } from "./graphics/GameRenderer";
+import { GameView, PlayerView } from "../core/game/GameView";
+import { PlayerActions, UnitType } from "../core/game/Game";
 import {
   SendAttackIntentEvent,
   SendBoatAttackIntentEvent,
@@ -44,8 +32,20 @@ import {
   SendUpgradeStructureIntentEvent,
   Transport,
 } from "./Transport";
+import { TerrainMapData, loadTerrainMap } from "../core/game/TerrainMapLoader";
+import { endGame, startGame, startTime } from "./LocalPersistantStats";
+import { EventBus } from "../core/EventBus";
+import { GameMapLoader } from "../core/game/GameMapLoader";
+import { ServerConfig } from "../core/configuration/Config";
+import { TileRef } from "../core/game/GameMap";
+import { UserSettings } from "../core/game/UserSettings";
+import { WorkerClient } from "../core/worker/WorkerClient";
 import { createCanvas } from "./Utils";
-import { createRenderer, GameRenderer } from "./graphics/GameRenderer";
+import { createGameRecord } from "../core/Util";
+import { getConfig } from "../core/configuration/ConfigLoader";
+import { getPersistentID } from "./Main";
+import { terrainMapFileLoader } from "./TerrainMapFileLoader";
+import { translateText } from "../client/Utils";
 
 export type LobbyConfig = {
   serverConfig: ServerConfig;

src/client/Cosmetics.ts

@@ -1,10 +1,10 @@
-import { z } from "zod";
+import { Cosmetics, CosmeticsSchema, Pattern } from "../core/CosmeticSchemas";
 import {
   StripeCreateCheckoutSessionResponseSchema,
   UserMeResponse,
 } from "../core/ApiSchemas";
-import { Cosmetics, CosmeticsSchema, Pattern } from "../core/CosmeticSchemas";
 import { getApiBase, getAuthHeader } from "./jwt";
+import { z } from "zod";
 
 export async function patterns(
   userMe: UserMeResponse | null,

src/client/HelpModal.ts

@@ -1,8 +1,8 @@
+import "./components/Difficulties";
+import "./components/Maps";
 import { LitElement, html } from "lit";
 import { customElement, query } from "lit/decorators.js";
 import { getAltKey, getModifierKey, translateText } from "../client/Utils";
-import "./components/Difficulties";
-import "./components/Maps";
 
 @customElement("help-modal")
 export class HelpModal extends LitElement {

src/client/HostLobbyModal.ts

@@ -1,9 +1,14 @@
 /* eslint-disable max-lines */
-import { LitElement, html } from "lit";
+import "./components/Difficulties";
-import { customElement, query, state } from "lit/decorators.js";
+import "./components/Maps";
-import randomMap from "../../resources/images/RandomMap.webp";
+import "./components/baseComponents/Modal";
-import { translateText } from "../client/Utils";
+import {
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+  ClientInfo,
+  GameConfig,
+  GameInfo,
+  GameInfoSchema,
+  TeamCountConfig,
+} from "../core/Schemas";
 import {
   Difficulty,
   Duos,
@@ -14,21 +19,16 @@ import {
   UnitType,
   mapCategories,
 } from "../core/game/Game";
-import { UserSettings } from "../core/game/UserSettings";
+import { LitElement, html } from "lit";
-import {
+import { customElement, query, state } from "lit/decorators.js";
-  ClientInfo,
-  GameConfig,
-  GameInfo,
-  GameInfoSchema,
-  TeamCountConfig,
-} from "../core/Schemas";
-import { generateID } from "../core/Util";
-import "./components/baseComponents/Modal";
-import "./components/Difficulties";
 import { DifficultyDescription } from "./components/Difficulties";
-import "./components/Maps";
 import { JoinLobbyEvent } from "./Main";
+import { UserSettings } from "../core/game/UserSettings";
+import { generateID } from "../core/Util";
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import randomMap from "../../resources/images/RandomMap.webp";
 import { renderUnitTypeOptions } from "./utilities/RenderUnitTypeOptions";
+import { translateText } from "../client/Utils";
 
 @customElement("host-lobby-modal")
 export class HostLobbyModal extends LitElement {

src/client/InputHandler.ts

@@ -1,8 +1,8 @@
 import { EventBus, GameEvent } from "../core/EventBus";
+import { ReplaySpeedMultiplier } from "./utilities/ReplaySpeedMultiplier";
 import { UnitType } from "../core/game/Game";
 import { UnitView } from "../core/game/GameView";
 import { UserSettings } from "../core/game/UserSettings";
-import { ReplaySpeedMultiplier } from "./utilities/ReplaySpeedMultiplier";
 
 export class MouseUpEvent implements GameEvent {
   constructor(
@@ -70,7 +70,7 @@ export class AlternateViewEvent implements GameEvent {
 
 export class CloseViewEvent implements GameEvent {}
 
-export class RefreshGraphicsEvent implements GameEvent {}
+export class RedrawGraphicsEvent implements GameEvent {}
 
 export class TogglePerformanceOverlayEvent implements GameEvent {}
 
@@ -302,7 +302,7 @@ export class InputHandler {
 
       if (e.key.toLowerCase() === "r" && e.altKey && !e.ctrlKey) {
         e.preventDefault();
-        this.eventBus.emit(new RefreshGraphicsEvent());
+        this.eventBus.emit(new RedrawGraphicsEvent());
       }
 
       if (e.code === this.keybinds.boatAttack) {

src/client/JoinPrivateLobbyModal.ts

@@ -1,16 +1,16 @@
-import { LitElement, html } from "lit";
+import "./components/baseComponents/Button";
-import { customElement, query, state } from "lit/decorators.js";
+import "./components/baseComponents/Modal";
-import { translateText } from "../client/Utils";
 import { GameInfo, GameInfoSchema } from "../core/Schemas";
-import { generateID } from "../core/Util";
+import { LitElement, html } from "lit";
 import {
   WorkerApiArchivedGameLobbySchema,
   WorkerApiGameIdExistsSchema,
 } from "../core/WorkerSchemas";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { customElement, query, state } from "lit/decorators.js";
 import { JoinLobbyEvent } from "./Main";
-import "./components/baseComponents/Button";
+import { generateID } from "../core/Util";
-import "./components/baseComponents/Modal";
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { translateText } from "../client/Utils";
 
 @customElement("join-private-lobby-modal")
 export class JoinPrivateLobbyModal extends LitElement {

src/client/LangSelector.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import "./LanguageModal";
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import "./LanguageModal";
 
 import ar from "../../resources/lang/ar.json";
 import bg from "../../resources/lang/bg.json";

src/client/LocalPersistantStats.ts

@@ -1,4 +1,3 @@
-import { z } from "zod";
 import {
   GameConfig,
   GameConfigSchema,
@@ -8,6 +7,7 @@ import {
   ID,
 } from "../core/Schemas";
 import { replacer } from "../core/Util";
+import { z } from "zod";
 
 const LocalStatsDataSchema = z.record(
   ID,

src/client/LocalServer.ts

@@ -1,5 +1,3 @@
-import { z } from "zod";
-import { EventBus } from "../core/EventBus";
 import {
   AllPlayersStats,
   ClientMessage,
@@ -12,10 +10,12 @@ import {
   Turn,
 } from "../core/Schemas";
 import { createGameRecord, decompressGameRecord, replacer } from "../core/Util";
+import { EventBus } from "../core/EventBus";
 import { LobbyConfig } from "./ClientGameRunner";
 import { ReplaySpeedChangeEvent } from "./InputHandler";
-import { getPersistentID } from "./Main";
 import { defaultReplaySpeedMultiplier } from "./utilities/ReplaySpeedMultiplier";
+import { getPersistentID } from "./Main";
+import { z } from "zod";
 
 export class LocalServer {
   // All turns from the game record on replay.

src/client/Main.ts

@@ -1,46 +1,42 @@
-import version from "../../resources/version.txt";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { EventBus } from "../core/EventBus";
-import { GameRecord, GameStartInfo, ID } from "../core/Schemas";
-import { ServerConfig } from "../core/configuration/Config";
-import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
-import { GameType } from "../core/game/Game";
-import { UserSettings } from "../core/game/UserSettings";
-import { joinLobby } from "./ClientGameRunner";
 import "./DarkModeButton";
-import { DarkModeButton } from "./DarkModeButton";
 import "./FlagInput";
+import "./GoogleAdElement";
+import "./LangSelector";
+import "./PublicLobby";
+import "./UsernameInput";
+import "./components/NewsButton";
+import "./components/baseComponents/Button";
+import "./components/baseComponents/Modal";
+import "./styles.css";
+import { GameRecord, GameStartInfo, ID } from "../core/Schemas";
+import { discordLogin, getUserMe, isLoggedIn, logOut } from "./jwt";
+import { generateCryptoRandomUUID, incrementGamesPlayed, translateText } from "./Utils";
+import { DarkModeButton } from "./DarkModeButton";
+import { EventBus } from "../core/EventBus";
 import { FlagInput } from "./FlagInput";
 import { FlagInputModal } from "./FlagInputModal";
 import { GameStartingModal } from "./GameStartingModal";
-import "./GoogleAdElement";
+import { GameType } from "../core/game/Game";
 import { HelpModal } from "./HelpModal";
-import { HostLobbyModal as HostPrivateLobbyModal } from "./HostLobbyModal";
+import { HostLobbyModal } from "./HostLobbyModal";
 import { JoinPrivateLobbyModal } from "./JoinPrivateLobbyModal";
-import "./LangSelector";
 import { LangSelector } from "./LangSelector";
 import { LanguageModal } from "./LanguageModal";
+import { NewsButton } from "./components/NewsButton";
 import { NewsModal } from "./NewsModal";
-import "./PublicLobby";
+import { OButton } from "./components/baseComponents/Button";
 import { PublicLobby } from "./PublicLobby";
+import { SendKickPlayerIntentEvent } from "./Transport";
+import { ServerConfig } from "../core/configuration/Config";
 import { SinglePlayerModal } from "./SinglePlayerModal";
 import { TerritoryPatternsModal } from "./TerritoryPatternsModal";
-import { SendKickPlayerIntentEvent } from "./Transport";
+import { UserMeResponse } from "../core/ApiSchemas";
 import { UserSettingModal } from "./UserSettingModal";
-import "./UsernameInput";
+import { UserSettings } from "../core/game/UserSettings";
 import { UsernameInput } from "./UsernameInput";
-import {
+import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
-  generateCryptoRandomUUID,
+import { joinLobby } from "./ClientGameRunner";
-  incrementGamesPlayed,
+import version from "../../resources/version.txt";
-  translateText,
-} from "./Utils";
-import "./components/NewsButton";
-import { NewsButton } from "./components/NewsButton";
-import "./components/baseComponents/Button";
-import { OButton } from "./components/baseComponents/Button";
-import "./components/baseComponents/Modal";
-import { discordLogin, getUserMe, isLoggedIn, logOut } from "./jwt";
-import "./styles.css";
 
 declare global {
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -360,8 +356,8 @@ class Client {
 
     const hostModal = document.querySelector(
       "host-lobby-modal",
-    ) as HostPrivateLobbyModal;
+    ) as HostLobbyModal;
-    hostModal instanceof HostPrivateLobbyModal;
+    hostModal instanceof HostLobbyModal;
     const hostLobbyButton = document.getElementById("host-lobby-button");
     if (hostLobbyButton === null) throw new Error("Missing host-lobby-button");
     hostLobbyButton.addEventListener("click", () => {

src/client/NewsModal.ts

@@ -1,10 +1,10 @@
-import { LitElement, css, html } from "lit";
-import { resolveMarkdown } from "lit-markdown";
-import { customElement, property, query } from "lit/decorators.js";
-import changelog from "../../resources/changelog.md";
-import { translateText } from "../client/Utils";
 import "./components/baseComponents/Button";
 import "./components/baseComponents/Modal";
+import { LitElement, css, html } from "lit";
+import { customElement, property, query } from "lit/decorators.js";
+import changelog from "../../resources/changelog.md";
+import { resolveMarkdown } from "lit-markdown";
+import { translateText } from "../client/Utils";
 
 @customElement("news-modal")
 export class NewsModal extends LitElement {

src/client/PublicLobby.ts

@@ -1,12 +1,12 @@
+import { GameID, GameInfo } from "../core/Schemas";
+import { GameMapType, GameMode } from "../core/game/Game";
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../client/Utils";
 import { ApiPublicLobbiesResponseSchema } from "../core/ExpressSchemas";
-import { GameMapType, GameMode } from "../core/game/Game";
-import { GameID, GameInfo } from "../core/Schemas";
-import { generateID } from "../core/Util";
 import { JoinLobbyEvent } from "./Main";
+import { generateID } from "../core/Util";
 import { terrainMapFileLoader } from "./TerrainMapFileLoader";
+import { translateText } from "../client/Utils";
 
 @customElement("public-lobby")
 export class PublicLobby extends LitElement {

src/client/SinglePlayerModal.ts

@@ -1,7 +1,7 @@
-import { LitElement, html } from "lit";
+import "./components/Difficulties";
-import { customElement, query, state } from "lit/decorators.js";
+import "./components/Maps";
-import randomMap from "../../resources/images/RandomMap.webp";
+import "./components/baseComponents/Button";
-import { translateText } from "../client/Utils";
+import "./components/baseComponents/Modal";
 import {
   Difficulty,
   Duos,
@@ -13,18 +13,18 @@ import {
   UnitType,
   mapCategories,
 } from "../core/game/Game";
-import { UserSettings } from "../core/game/UserSettings";
+import { LitElement, html } from "lit";
-import { TeamCountConfig } from "../core/Schemas";
+import { customElement, query, state } from "lit/decorators.js";
-import { generateID } from "../core/Util";
-import "./components/baseComponents/Button";
-import "./components/baseComponents/Modal";
-import "./components/Difficulties";
 import { DifficultyDescription } from "./components/Difficulties";
-import "./components/Maps";
 import { FlagInput } from "./FlagInput";
 import { JoinLobbyEvent } from "./Main";
+import { TeamCountConfig } from "../core/Schemas";
+import { UserSettings } from "../core/game/UserSettings";
 import { UsernameInput } from "./UsernameInput";
+import { generateID } from "../core/Util";
+import randomMap from "../../resources/images/RandomMap.webp";
 import { renderUnitTypeOptions } from "./utilities/RenderUnitTypeOptions";
+import { translateText } from "../client/Utils";
 
 @customElement("single-player-modal")
 export class SinglePlayerModal extends LitElement {

src/client/TerrainMapFileLoader.ts

@@ -1,4 +1,4 @@
-import version from "../../resources/version.txt";
 import { FetchGameMapLoader } from "../core/game/FetchGameMapLoader";
+import version from "../../resources/version.txt";
 
 export const terrainMapFileLoader = new FetchGameMapLoader(`/maps`, version);

src/client/TerritoryPatternsModal.ts

@@ -1,14 +1,14 @@
-import { base64url } from "jose";
-import type { TemplateResult } from "lit";
-import { html, LitElement, render } from "lit";
-import { customElement, query, state } from "lit/decorators.js";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { Pattern } from "../core/CosmeticSchemas";
-import { UserSettings } from "../core/game/UserSettings";
-import { PatternDecoder } from "../core/PatternDecoder";
 import "./components/Difficulties";
 import "./components/Maps";
+import { LitElement, html, render } from "lit";
+import { customElement, query, state } from "lit/decorators.js";
 import { handlePurchase, patterns } from "./Cosmetics";
+import { Pattern } from "../core/CosmeticSchemas";
+import { PatternDecoder } from "../core/PatternDecoder";
+import type { TemplateResult } from "lit";
+import { UserMeResponse } from "../core/ApiSchemas";
+import { UserSettings } from "../core/game/UserSettings";
+import { base64url } from "jose";
 import { translateText } from "./Utils";
 
 @customElement("territory-patterns-modal")

src/client/Transport.ts

@@ -1,5 +1,3 @@
-import { z } from "zod";
-import { EventBus, GameEvent } from "../core/EventBus";
 import {
   AllPlayers,
   GameType,
@@ -9,8 +7,6 @@ import {
   Tick,
   UnitType,
 } from "../core/game/Game";
-import { TileRef } from "../core/game/GameMap";
-import { PlayerView } from "../core/game/GameView";
 import {
   AllPlayersStats,
   ClientHashMessage,
@@ -24,9 +20,13 @@ import {
   ServerMessageSchema,
   Winner,
 } from "../core/Schemas";
-import { replacer } from "../core/Util";
+import { EventBus, GameEvent } from "../core/EventBus";
 import { LobbyConfig } from "./ClientGameRunner";
 import { LocalServer } from "./LocalServer";
+import { PlayerView } from "../core/game/GameView";
+import { TileRef } from "../core/game/GameMap";
+import { replacer } from "../core/Util";
+import { z } from "zod";
 
 export class PauseGameEvent implements GameEvent {
   constructor(public readonly paused: boolean) {}

src/client/UserSettingModal.ts

@@ -1,13 +1,13 @@
-import { LitElement, html } from "lit";
-import { customElement, query, state } from "lit/decorators.js";
-import { z } from "zod";
-import { translateText } from "../client/Utils";
-import { UserSettings } from "../core/game/UserSettings";
 import "./components/baseComponents/setting/SettingKeybind";
-import { SettingKeybind } from "./components/baseComponents/setting/SettingKeybind";
 import "./components/baseComponents/setting/SettingNumber";
 import "./components/baseComponents/setting/SettingSlider";
 import "./components/baseComponents/setting/SettingToggle";
+import { LitElement, html } from "lit";
+import { customElement, query, state } from "lit/decorators.js";
+import { SettingKeybind } from "./components/baseComponents/setting/SettingKeybind";
+import { UserSettings } from "../core/game/UserSettings";
+import { translateText } from "../client/Utils";
+import { z } from "zod";
 
 const KeybindSchema = z.record(z.string(), z.string());
 

src/client/UsernameInput.ts

@@ -1,12 +1,12 @@
 import { LitElement, html } from "lit";
-import { customElement, property, state } from "lit/decorators.js";
-import { v4 as uuidv4 } from "uuid";
-import { translateText } from "../client/Utils";
-import { UserSettings } from "../core/game/UserSettings";
 import {
   MAX_USERNAME_LENGTH,
   validateUsername,
 } from "../core/validations/username";
+import { customElement, property, state } from "lit/decorators.js";
+import { UserSettings } from "../core/game/UserSettings";
+import { translateText } from "../client/Utils";
+import { v4 as uuidv4 } from "uuid";
 
 const usernameKey = "username";
 

src/client/Utils.ts

@@ -1,6 +1,6 @@
 import IntlMessageFormat from "intl-messageformat";
-import { MessageType } from "../core/game/Game";
 import { LangSelector } from "./LangSelector";
+import { MessageType } from "../core/game/Game";
 
 export function renderTroops(troops: number): string {
   return renderNumber(troops / 10);

src/client/components/NewsButton.ts

@@ -1,9 +1,9 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import megaphone from "../../../resources/images/Megaphone.svg";
-import version from "../../../resources/version.txt";
 import { NewsModal } from "../NewsModal";
+import megaphone from "../../../resources/images/Megaphone.svg";
 import { translateText } from "../Utils";
+import version from "../../../resources/version.txt";
 
 @customElement("news-button")
 export class NewsButton extends LitElement {

src/client/graphics/AnimatedSpriteLoader.ts

@@ -1,19 +1,19 @@
-import miniBigSmoke from "../../../resources/sprites/bigsmoke.png";
-import conquestSword from "../../../resources/sprites/conquestSword.png";
-import dust from "../../../resources/sprites/dust.png";
-import miniExplosion from "../../../resources/sprites/miniExplosion.png";
-import miniFire from "../../../resources/sprites/minifire.png";
-import nuke from "../../../resources/sprites/nukeExplosion.png";
-import SAMExplosion from "../../../resources/sprites/samExplosion.png";
-import sinkingShip from "../../../resources/sprites/sinkingShip.png";
-import miniSmoke from "../../../resources/sprites/smoke.png";
-import miniSmokeAndFire from "../../../resources/sprites/smokeAndFire.png";
-import unitExplosion from "../../../resources/sprites/unitExplosion.png";
-import { Theme } from "../../core/configuration/Config";
-import { PlayerView } from "../../core/game/GameView";
 import { AnimatedSprite } from "./AnimatedSprite";
 import { FxType } from "./fx/Fx";
+import { PlayerView } from "../../core/game/GameView";
+import SAMExplosion from "../../../resources/sprites/samExplosion.png";
+import { Theme } from "../../core/configuration/Config";
 import { colorizeCanvas } from "./SpriteLoader";
+import conquestSword from "../../../resources/sprites/conquestSword.png";
+import dust from "../../../resources/sprites/dust.png";
+import miniBigSmoke from "../../../resources/sprites/bigsmoke.png";
+import miniExplosion from "../../../resources/sprites/miniExplosion.png";
+import miniFire from "../../../resources/sprites/minifire.png";
+import miniSmoke from "../../../resources/sprites/smoke.png";
+import miniSmokeAndFire from "../../../resources/sprites/smokeAndFire.png";
+import nuke from "../../../resources/sprites/nukeExplosion.png";
+import sinkingShip from "../../../resources/sprites/sinkingShip.png";
+import unitExplosion from "../../../resources/sprites/unitExplosion.png";
 
 type AnimatedSpriteConfig = {
   url: string;

src/client/graphics/GameRenderer.ts

@@ -1,21 +1,17 @@
-import { EventBus } from "../../core/EventBus";
-import { GameView } from "../../core/game/GameView";
-import { UserSettings } from "../../core/game/UserSettings";
-import { GameStartingModal } from "../GameStartingModal";
-import { RefreshGraphicsEvent as RedrawGraphicsEvent } from "../InputHandler";
-import { TransformHandler } from "./TransformHandler";
-import { UIState } from "./UIState";
 import { AlertFrame } from "./layers/AlertFrame";
 import { BuildMenu } from "./layers/BuildMenu";
 import { ChatDisplay } from "./layers/ChatDisplay";
 import { ChatModal } from "./layers/ChatModal";
 import { ControlPanel } from "./layers/ControlPanel";
 import { EmojiTable } from "./layers/EmojiTable";
+import { EventBus } from "../../core/EventBus";
 import { EventsDisplay } from "./layers/EventsDisplay";
 import { FPSDisplay } from "./layers/FPSDisplay";
 import { FxLayer } from "./layers/FxLayer";
 import { GameLeftSidebar } from "./layers/GameLeftSidebar";
 import { GameRightSidebar } from "./layers/GameRightSidebar";
+import { GameStartingModal } from "../GameStartingModal";
+import { GameView } from "../../core/game/GameView";
 import { GutterAdModal } from "./layers/GutterAdModal";
 import { HeadsUpMessage } from "./layers/HeadsUpMessage";
 import { Layer } from "./layers/Layer";
@@ -26,6 +22,7 @@ import { NameLayer } from "./layers/NameLayer";
 import { PlayerInfoOverlay } from "./layers/PlayerInfoOverlay";
 import { PlayerPanel } from "./layers/PlayerPanel";
 import { RailroadLayer } from "./layers/RailroadLayer";
+import { RedrawGraphicsEvent } from "../InputHandler";
 import { ReplayPanel } from "./layers/ReplayPanel";
 import { SettingsModal } from "./layers/SettingsModal";
 import { SpawnAd } from "./layers/SpawnAd";
@@ -35,9 +32,12 @@ import { StructureLayer } from "./layers/StructureLayer";
 import { TeamStats } from "./layers/TeamStats";
 import { TerrainLayer } from "./layers/TerrainLayer";
 import { TerritoryLayer } from "./layers/TerritoryLayer";
+import { TransformHandler } from "./TransformHandler";
 import { UILayer } from "./layers/UILayer";
+import { UIState } from "./UIState";
 import { UnitDisplay } from "./layers/UnitDisplay";
 import { UnitLayer } from "./layers/UnitLayer";
+import { UserSettings } from "../../core/game/UserSettings";
 import { WinModal } from "./layers/WinModal";
 
 export function createRenderer(

src/client/graphics/SpriteLoader.ts

@@ -1,17 +1,17 @@
+import { TrainType, UnitType } from "../../core/game/Game";
 import { Colord } from "colord";
+import { Theme } from "../../core/configuration/Config";
+import { UnitView } from "../../core/game/GameView";
 import atomBombSprite from "../../../resources/sprites/atombomb.png";
 import hydrogenBombSprite from "../../../resources/sprites/hydrogenbomb.png";
 import mirvSprite from "../../../resources/sprites/mirv2.png";
 import samMissileSprite from "../../../resources/sprites/samMissile.png";
 import tradeShipSprite from "../../../resources/sprites/tradeship.png";
 import trainCarriageSprite from "../../../resources/sprites/trainCarriage.png";
-import trainLoadedCarriageSprite from "../../../resources/sprites/trainCarriageLoaded.png";
 import trainEngineSprite from "../../../resources/sprites/trainEngine.png";
+import trainLoadedCarriageSprite from "../../../resources/sprites/trainCarriageLoaded.png";
 import transportShipSprite from "../../../resources/sprites/transportship.png";
 import warshipSprite from "../../../resources/sprites/warship.png";
-import { Theme } from "../../core/configuration/Config";
-import { TrainType, UnitType } from "../../core/game/Game";
-import { UnitView } from "../../core/game/GameView";
 
 // Can't reuse TrainType because "loaded" is not a type, just an attribute
 const TrainTypeSprite = {

src/client/graphics/TransformHandler.ts

@@ -1,12 +1,12 @@
-import { EventBus } from "../../core/EventBus";
-import { Cell } from "../../core/game/Game";
-import { GameView } from "../../core/game/GameView";
 import { CenterCameraEvent, DragEvent, ZoomEvent } from "../InputHandler";
 import {
   GoToPlayerEvent,
   GoToPositionEvent,
   GoToUnitEvent,
 } from "./layers/Leaderboard";
+import { Cell } from "../../core/game/Game";
+import { EventBus } from "../../core/EventBus";
+import { GameView } from "../../core/game/GameView";
 
 export const GOTO_INTERVAL_MS = 16;
 export const CAMERA_MAX_SPEED = 15;

src/client/graphics/fx/ConquestFx.ts

@@ -1,10 +1,10 @@
+import { FadeFx, SpriteFx } from "./SpriteFx";
+import { Fx, FxType } from "./Fx";
+import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
 import { ConquestUpdate } from "../../../core/game/GameUpdates";
 import { GameView } from "../../../core/game/GameView";
-import { renderNumber } from "../../Utils";
-import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
-import { Fx, FxType } from "./Fx";
-import { FadeFx, SpriteFx } from "./SpriteFx";
 import { TextFx } from "./TextFx";
+import { renderNumber } from "../../Utils";
 
 /**
  * Conquest FX:

src/client/graphics/fx/NukeFx.ts

@@ -1,7 +1,7 @@
-import { GameView } from "../../../core/game/GameView";
-import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
-import { Fx, FxType } from "./Fx";
 import { FadeFx, SpriteFx } from "./SpriteFx";
+import { Fx, FxType } from "./Fx";
+import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
+import { GameView } from "../../../core/game/GameView";
 
 /**
  * Shockwave effect: draw a growing 1px white circle

src/client/graphics/fx/SpriteFx.ts

@@ -1,8 +1,8 @@
-import { Theme } from "../../../core/configuration/Config";
+import { Fx, FxType } from "./Fx";
-import { PlayerView } from "../../../core/game/GameView";
 import { AnimatedSprite } from "../AnimatedSprite";
 import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
-import { Fx, FxType } from "./Fx";
+import { PlayerView } from "../../../core/game/GameView";
+import { Theme } from "../../../core/configuration/Config";
 
 function fadeInOut(t: number, fadeIn = 0.3, fadeOut = 0.7): number {
   if (t < fadeIn) {

src/client/graphics/fx/UnitExplosionFx.ts

@@ -1,6 +1,6 @@
-import { GameView } from "../../../core/game/GameView";
-import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
 import { Fx, FxType } from "./Fx";
+import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
+import { GameView } from "../../../core/game/GameView";
 import { SpriteFx } from "./SpriteFx";
 import { Timeline } from "./Timeline";
 

src/client/graphics/layers/AlertFrame.ts

@@ -1,12 +1,12 @@
-import { LitElement, css, html } from "lit";
-import { customElement, state } from "lit/decorators.js";
 import {
   BrokeAllianceUpdate,
   GameUpdateType,
 } from "../../../core/game/GameUpdates";
+import { LitElement, css, html } from "lit";
+import { customElement, state } from "lit/decorators.js";
 import { GameView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
 import { Layer } from "./Layer";
+import { UserSettings } from "../../../core/game/UserSettings";
 
 // Parameters for the alert animation
 const ALERT_SPEED = 1.6;

src/client/graphics/layers/BuildMenu.ts

@@ -1,39 +1,39 @@
-import { LitElement, css, html } from "lit";
+import {
-import { customElement, state } from "lit/decorators.js";
+  BuildUnitIntentEvent,
-import warshipIcon from "../../../../resources/images/BattleshipIconWhite.svg";
+  SendUpgradeStructureIntentEvent,
-import cityIcon from "../../../../resources/images/CityIconWhite.svg";
+} from "../../Transport";
-import factoryIcon from "../../../../resources/images/FactoryIconWhite.svg";
-import goldCoinIcon from "../../../../resources/images/GoldCoinIcon.svg";
-import mirvIcon from "../../../../resources/images/MIRVIcon.svg";
-import hydrogenBombIcon from "../../../../resources/images/MushroomCloudIconWhite.svg";
-import atomBombIcon from "../../../../resources/images/NukeIconWhite.svg";
-import portIcon from "../../../../resources/images/PortIcon.svg";
-import shieldIcon from "../../../../resources/images/ShieldIconWhite.svg";
-import missileSiloIcon from "../../../../resources/non-commercial/svg/MissileSiloIconWhite.svg";
-import samlauncherIcon from "../../../../resources/non-commercial/svg/SamLauncherIconWhite.svg";
-import { translateText } from "../../../client/Utils";
-import { EventBus } from "../../../core/EventBus";
 import {
   BuildableUnit,
   Gold,
   PlayerActions,
   UnitType,
 } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView } from "../../../core/game/GameView";
 import {
   CloseViewEvent,
   MouseDownEvent,
   ShowBuildMenuEvent,
   ShowEmojiMenuEvent,
 } from "../../InputHandler";
-import {
+import { LitElement, css, html } from "lit";
-  BuildUnitIntentEvent,
+import { customElement, state } from "lit/decorators.js";
-  SendUpgradeStructureIntentEvent,
+import { EventBus } from "../../../core/EventBus";
-} from "../../Transport";
+import { GameView } from "../../../core/game/GameView";
-import { renderNumber } from "../../Utils";
-import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
+import { TileRef } from "../../../core/game/GameMap";
+import { TransformHandler } from "../TransformHandler";
+import atomBombIcon from "../../../../resources/images/NukeIconWhite.svg";
+import cityIcon from "../../../../resources/images/CityIconWhite.svg";
+import factoryIcon from "../../../../resources/images/FactoryIconWhite.svg";
+import goldCoinIcon from "../../../../resources/images/GoldCoinIcon.svg";
+import hydrogenBombIcon from "../../../../resources/images/MushroomCloudIconWhite.svg";
+import mirvIcon from "../../../../resources/images/MIRVIcon.svg";
+import missileSiloIcon from "../../../../resources/non-commercial/svg/MissileSiloIconWhite.svg";
+import portIcon from "../../../../resources/images/PortIcon.svg";
+import { renderNumber } from "../../Utils";
+import samlauncherIcon from "../../../../resources/non-commercial/svg/SamLauncherIconWhite.svg";
+import shieldIcon from "../../../../resources/images/ShieldIconWhite.svg";
+import { translateText } from "../../../client/Utils";
+import warshipIcon from "../../../../resources/images/BattleshipIconWhite.svg";
 
 export type BuildItemDisplay = {
   unitType: UnitType;

src/client/graphics/layers/ChatDisplay.ts

@@ -1,16 +1,16 @@
-import { html, LitElement } from "lit";
-import { customElement, state } from "lit/decorators.js";
-import { DirectiveResult } from "lit/directive.js";
-import { unsafeHTML, UnsafeHTMLDirective } from "lit/directives/unsafe-html.js";
-import { EventBus } from "../../../core/EventBus";
-import { MessageType } from "../../../core/game/Game";
 import {
   DisplayMessageUpdate,
   GameUpdateType,
 } from "../../../core/game/GameUpdates";
+import { LitElement, html } from "lit";
+import { UnsafeHTMLDirective, unsafeHTML } from "lit/directives/unsafe-html.js";
+import { customElement, state } from "lit/decorators.js";
+import { DirectiveResult } from "lit/directive.js";
+import { EventBus } from "../../../core/EventBus";
 import { GameView } from "../../../core/game/GameView";
-import { onlyImages } from "../../../core/Util";
 import { Layer } from "./Layer";
+import { MessageType } from "../../../core/game/Game";
+import { onlyImages } from "../../../core/Util";
 
 type ChatEvent = {
   description: string;

src/client/graphics/layers/ChatIntegration.ts

@@ -1,9 +1,9 @@
-import { EventBus } from "../../../core/EventBus";
+import { COLORS, MenuElement, MenuElementParams } from "./RadialMenuElements";
+import { ChatModal, QuickChatPhrase, quickChatPhrases } from "./ChatModal";
 import { GameView, PlayerView } from "../../../core/game/GameView";
+import { EventBus } from "../../../core/EventBus";
 import { SendQuickChatEvent } from "../../Transport";
 import { translateText } from "../../Utils";
-import { ChatModal, QuickChatPhrase, quickChatPhrases } from "./ChatModal";
-import { COLORS, MenuElement, MenuElementParams } from "./RadialMenuElements";
 
 export class ChatIntegration {
   private ctModal: ChatModal;

src/client/graphics/layers/ChatModal.ts

@@ -1,13 +1,11 @@
+import { GameView, PlayerView } from "../../../core/game/GameView";
 import { LitElement, html } from "lit";
 import { customElement, query } from "lit/decorators.js";
-
-import { PlayerType } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-
-import quickChatData from "../../../../resources/QuickChat.json";
-import { EventBus } from "../../../core/EventBus";
 import { CloseViewEvent } from "../../InputHandler";
+import { EventBus } from "../../../core/EventBus";
+import { PlayerType } from "../../../core/game/Game";
 import { SendQuickChatEvent } from "../../Transport";
+import quickChatData from "../../../../resources/QuickChat.json";
 import { translateText } from "../../Utils";
 
 export type QuickChatPhrase = {

src/client/graphics/layers/ControlPanel.ts

@@ -1,14 +1,14 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../../../client/Utils";
-import { EventBus } from "../../../core/EventBus";
-import { Gold } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
-import { ClientID } from "../../../core/Schemas";
-import { AttackRatioEvent } from "../../InputHandler";
 import { renderNumber, renderTroops } from "../../Utils";
-import { UIState } from "../UIState";
+import { AttackRatioEvent } from "../../InputHandler";
+import { ClientID } from "../../../core/Schemas";
+import { EventBus } from "../../../core/EventBus";
+import { GameView } from "../../../core/game/GameView";
+import { Gold } from "../../../core/game/Game";
 import { Layer } from "./Layer";
+import { UIState } from "../UIState";
+import { translateText } from "../../../client/Utils";
 
 @customElement("control-panel")
 export class ControlPanel extends LitElement implements Layer {

src/client/graphics/layers/EmojiTable.ts

@@ -1,12 +1,12 @@
+import { CloseViewEvent, ShowEmojiMenuEvent } from "../../InputHandler";
+import { GameView, PlayerView } from "../../../core/game/GameView";
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { AllPlayers } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { TerraNulliusImpl } from "../../../core/game/TerraNulliusImpl";
 import { emojiTable, flattenedEmojiTable } from "../../../core/Util";
-import { CloseViewEvent, ShowEmojiMenuEvent } from "../../InputHandler";
+import { AllPlayers } from "../../../core/game/Game";
+import { EventBus } from "../../../core/EventBus";
 import { SendEmojiIntentEvent } from "../../Transport";
+import { TerraNulliusImpl } from "../../../core/game/TerraNulliusImpl";
 import { TransformHandler } from "../TransformHandler";
 
 @customElement("emoji-table")

src/client/graphics/layers/EventsDisplay.ts

@@ -1,21 +1,12 @@
 /* eslint-disable max-lines */
-import { html, LitElement, TemplateResult } from "lit";
-import { customElement, state } from "lit/decorators.js";
-import { DirectiveResult } from "lit/directive.js";
-import { unsafeHTML, UnsafeHTMLDirective } from "lit/directives/unsafe-html.js";
-import allianceIcon from "../../../../resources/images/AllianceIconWhite.svg";
-import chatIcon from "../../../../resources/images/ChatIconWhite.svg";
-import donateGoldIcon from "../../../../resources/images/DonateGoldIconWhite.svg";
-import swordIcon from "../../../../resources/images/SwordIconWhite.svg";
-import { EventBus } from "../../../core/EventBus";
 import {
   AllPlayers,
-  getMessageCategory,
   MessageCategory,
   MessageType,
   PlayerType,
   Tick,
   UnitType,
+  getMessageCategory,
 } from "../../../core/game/Game";
 import {
   AllianceExpiredUpdate,
@@ -36,18 +27,25 @@ import {
   SendAllianceExtensionIntentEvent,
   SendAllianceReplyIntentEvent,
 } from "../../Transport";
-import { Layer } from "./Layer";
-
 import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
-import { onlyImages } from "../../../core/Util";
-import { renderNumber, renderTroops } from "../../Utils";
 import {
   GoToPlayerEvent,
   GoToPositionEvent,
   GoToUnitEvent,
 } from "./Leaderboard";
-
+import { LitElement, TemplateResult, html } from "lit";
+import { UnsafeHTMLDirective, unsafeHTML } from "lit/directives/unsafe-html.js";
+import { customElement, state } from "lit/decorators.js";
 import { getMessageTypeClasses, translateText } from "../../Utils";
+import { renderNumber, renderTroops } from "../../Utils";
+import { DirectiveResult } from "lit/directive.js";
+import { EventBus } from "../../../core/EventBus";
+import { Layer } from "./Layer";
+import allianceIcon from "../../../../resources/images/AllianceIconWhite.svg";
+import chatIcon from "../../../../resources/images/ChatIconWhite.svg";
+import donateGoldIcon from "../../../../resources/images/DonateGoldIconWhite.svg";
+import { onlyImages } from "../../../core/Util";
+import swordIcon from "../../../../resources/images/SwordIconWhite.svg";
 
 type GameEvent = {
   description: string;

src/client/graphics/layers/FPSDisplay.ts

@@ -1,9 +1,9 @@
 import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 import { EventBus } from "../../../core/EventBus";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { TogglePerformanceOverlayEvent } from "../../InputHandler";
 import { Layer } from "./Layer";
+import { TogglePerformanceOverlayEvent } from "../../InputHandler";
+import { UserSettings } from "../../../core/game/UserSettings";
 
 @customElement("fps-display")
 export class FPSDisplay extends LitElement implements Layer {

src/client/graphics/layers/FxLayer.ts

@@ -1,21 +1,22 @@
-import { Theme } from "../../../core/configuration/Config";
-import { UnitType } from "../../../core/game/Game";
 import {
   BonusEventUpdate,
   ConquestUpdate,
   GameUpdateType,
   RailroadUpdate,
 } from "../../../core/game/GameUpdates";
-import { GameView, UnitView } from "../../../core/game/GameView";
-import { renderNumber } from "../../Utils";
-import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
-import { conquestFxFactory } from "../fx/ConquestFx";
 import { Fx, FxType } from "../fx/Fx";
-import { nukeFxFactory, ShockwaveFx } from "../fx/NukeFx";
+import { GameView, UnitView } from "../../../core/game/GameView";
+import { ShockwaveFx, nukeFxFactory } from "../fx/NukeFx";
+import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
+import { Layer } from "./Layer";
 import { SpriteFx } from "../fx/SpriteFx";
 import { TextFx } from "../fx/TextFx";
+import { Theme } from "../../../core/configuration/Config";
 import { UnitExplosionFx } from "../fx/UnitExplosionFx";
-import { Layer } from "./Layer";
+import { UnitType } from "../../../core/game/Game";
+import { conquestFxFactory } from "../fx/ConquestFx";
+import { renderNumber } from "../../Utils";
+
 export class FxLayer implements Layer {
   private canvas: HTMLCanvasElement;
   private context: CanvasRenderingContext2D;

src/client/graphics/layers/GameLeftSidebar.ts

@@ -1,14 +1,14 @@
-import { Colord } from "colord";
+import { LitElement, html } from "lit";
-import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import { Colord } from "colord";
+import { GameMode } from "../../../core/game/Game";
+import { GameView } from "../../../core/game/GameView";
+import { Layer } from "./Layer";
 import leaderboardRegularIcon from "../../../../resources/images/LeaderboardIconRegularWhite.svg";
 import leaderboardSolidIcon from "../../../../resources/images/LeaderboardIconSolidWhite.svg";
 import teamRegularIcon from "../../../../resources/images/TeamIconRegularWhite.svg";
 import teamSolidIcon from "../../../../resources/images/TeamIconSolidWhite.svg";
-import { GameMode } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
 import { translateText } from "../../Utils";
-import { Layer } from "./Layer";
 
 @customElement("game-left-sidebar")
 export class GameLeftSidebar extends LitElement implements Layer {

src/client/graphics/layers/GameRightSidebar.ts

@@ -1,20 +1,20 @@
-import { html, LitElement } from "lit";
+import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import { EventBus } from "../../../core/EventBus";
+import { GameType } from "../../../core/game/Game";
+import { GameUpdateType } from "../../../core/game/GameUpdates";
+import { GameView } from "../../../core/game/GameView";
+import { Layer } from "./Layer";
+import { PauseGameEvent } from "../../Transport";
+import { ShowReplayPanelEvent } from "./ReplayPanel";
+import { ShowSettingsModalEvent } from "./SettingsModal";
 import exitIcon from "../../../../resources/images/ExitIconWhite.svg";
 import pauseIcon from "../../../../resources/images/PauseIconWhite.svg";
 import playIcon from "../../../../resources/images/PlayIconWhite.svg";
 import replayRegularIcon from "../../../../resources/images/ReplayRegularIconWhite.svg";
 import replaySolidIcon from "../../../../resources/images/ReplaySolidIconWhite.svg";
 import settingsIcon from "../../../../resources/images/SettingIconWhite.svg";
-import { EventBus } from "../../../core/EventBus";
-import { GameType } from "../../../core/game/Game";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView } from "../../../core/game/GameView";
-import { PauseGameEvent } from "../../Transport";
 import { translateText } from "../../Utils";
-import { Layer } from "./Layer";
-import { ShowReplayPanelEvent } from "./ReplayPanel";
-import { ShowSettingsModalEvent } from "./SettingsModal";
 
 @customElement("game-right-sidebar")
 export class GameRightSidebar extends LitElement implements Layer {

src/client/graphics/layers/GutterAdModal.ts

@@ -1,8 +1,8 @@
+import { EventBus, GameEvent } from "../../../core/EventBus";
 import { LitElement, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { EventBus, GameEvent } from "../../../core/EventBus";
-import { getGamesPlayed } from "../../Utils";
 import { Layer } from "./Layer";
+import { getGamesPlayed } from "../../Utils";
 
 export class GutterAdModalEvent implements GameEvent {
   constructor(public readonly isVisible: boolean) {}

src/client/graphics/layers/HeadsUpMessage.ts

@@ -1,8 +1,8 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { GameView } from "../../../core/game/GameView";
-import { translateText } from "../../Utils";
 import { Layer } from "./Layer";
+import { translateText } from "../../Utils";
 
 @customElement("heads-up-message")
 export class HeadsUpMessage extends LitElement implements Layer {

src/client/graphics/layers/Leaderboard.ts

@@ -1,11 +1,11 @@
-import { LitElement, html } from "lit";
-import { customElement, property, state } from "lit/decorators.js";
-import { repeat } from "lit/directives/repeat.js";
-import { translateText } from "../../../client/Utils";
 import { EventBus, GameEvent } from "../../../core/EventBus";
 import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
-import { renderNumber } from "../../Utils";
+import { LitElement, html } from "lit";
+import { customElement, property, state } from "lit/decorators.js";
 import { Layer } from "./Layer";
+import { renderNumber } from "../../Utils";
+import { repeat } from "lit/directives/repeat.js";
+import { translateText } from "../../../client/Utils";
 
 type Entry = {
   name: string;

src/client/graphics/layers/MainRadialMenu.ts

@@ -1,27 +1,26 @@
-import { LitElement } from "lit";
-import { customElement } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { PlayerActions } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { TransformHandler } from "../TransformHandler";
-import { UIState } from "../UIState";
-import { BuildMenu } from "./BuildMenu";
-import { ChatIntegration } from "./ChatIntegration";
-import { EmojiTable } from "./EmojiTable";
-import { Layer } from "./Layer";
-import { PlayerActionHandler } from "./PlayerActionHandler";
-import { PlayerPanel } from "./PlayerPanel";
-import { RadialMenu, RadialMenuConfig } from "./RadialMenu";
 import {
-  centerButtonElement,
   COLORS,
   MenuElementParams,
+  centerButtonElement,
   rootMenuElement,
 } from "./RadialMenuElements";
-
+import { GameView, PlayerView } from "../../../core/game/GameView";
-import swordIcon from "../../../../resources/images/SwordIconWhite.svg";
+import { RadialMenu, RadialMenuConfig } from "./RadialMenu";
+import { BuildMenu } from "./BuildMenu";
+import { ChatIntegration } from "./ChatIntegration";
 import { ContextMenuEvent } from "../../InputHandler";
+import { EmojiTable } from "./EmojiTable";
+import { EventBus } from "../../../core/EventBus";
+import { Layer } from "./Layer";
+import { LitElement } from "lit";
+import { PlayerActionHandler } from "./PlayerActionHandler";
+import { PlayerActions } from "../../../core/game/Game";
+import { PlayerPanel } from "./PlayerPanel";
+import { TileRef } from "../../../core/game/GameMap";
+import { TransformHandler } from "../TransformHandler";
+import { UIState } from "../UIState";
+import { customElement } from "lit/decorators.js";
+import swordIcon from "../../../../resources/images/SwordIconWhite.svg";
 
 @customElement("main-radial-menu")
 export class MainRadialMenu extends LitElement implements Layer {

src/client/graphics/layers/MultiTabModal.ts

@@ -3,9 +3,9 @@ import { customElement, property, state } from "lit/decorators.js";
 import { GameEnv } from "../../../core/configuration/Config";
 import { GameType } from "../../../core/game/Game";
 import { GameView } from "../../../core/game/GameView";
+import { Layer } from "./Layer";
 import { MultiTabDetector } from "../../MultiTabDetector";
 import { translateText } from "../../Utils";
-import { Layer } from "./Layer";
 
 @customElement("multi-tab-modal")
 export class MultiTabModal extends LitElement implements Layer {

src/client/graphics/layers/NameLayer.ts

@@ -1,3 +1,13 @@
+import { AllPlayers, Cell, nukeTypes } from "../../../core/game/Game";
+import { GameView, PlayerView } from "../../../core/game/GameView";
+import { createCanvas, renderNumber, renderTroops } from "../../Utils";
+import { AlternateViewEvent } from "../../InputHandler";
+import { EventBus } from "../../../core/EventBus";
+import { Layer } from "./Layer";
+import { PseudoRandom } from "../../../core/PseudoRandom";
+import { Theme } from "../../../core/configuration/Config";
+import { TransformHandler } from "../TransformHandler";
+import { UserSettings } from "../../../core/game/UserSettings";
 import allianceIcon from "../../../../resources/images/AllianceIcon.svg";
 import allianceRequestBlackIcon from "../../../../resources/images/AllianceRequestBlackIcon.svg";
 import allianceRequestWhiteIcon from "../../../../resources/images/AllianceRequestWhiteIcon.svg";
@@ -7,20 +17,10 @@ import embargoBlackIcon from "../../../../resources/images/EmbargoBlackIcon.svg"
 import embargoWhiteIcon from "../../../../resources/images/EmbargoWhiteIcon.svg";
 import nukeRedIcon from "../../../../resources/images/NukeIconRed.svg";
 import nukeWhiteIcon from "../../../../resources/images/NukeIconWhite.svg";
+import { renderPlayerFlag } from "../../../core/CustomFlag";
 import shieldIcon from "../../../../resources/images/ShieldIconBlack.svg";
 import targetIcon from "../../../../resources/images/TargetIcon.svg";
 import traitorIcon from "../../../../resources/images/TraitorIcon.svg";
-import { renderPlayerFlag } from "../../../core/CustomFlag";
-import { EventBus } from "../../../core/EventBus";
-import { PseudoRandom } from "../../../core/PseudoRandom";
-import { Theme } from "../../../core/configuration/Config";
-import { AllPlayers, Cell, nukeTypes } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { AlternateViewEvent } from "../../InputHandler";
-import { createCanvas, renderNumber, renderTroops } from "../../Utils";
-import { TransformHandler } from "../TransformHandler";
-import { Layer } from "./Layer";
 
 class RenderInfo {
   public icons: Map<string, HTMLImageElement> = new Map(); // Track icon elements

src/client/graphics/layers/OptionsMenu.ts

@@ -1,14 +1,14 @@
-import { html, LitElement } from "lit";
+import { AlternateViewEvent, RedrawGraphicsEvent } from "../../InputHandler";
+import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { EventBus } from "../../../core/EventBus";
 import { GameType } from "../../../core/game/Game";
 import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { GameView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { AlternateViewEvent, RefreshGraphicsEvent } from "../../InputHandler";
-import { PauseGameEvent } from "../../Transport";
-import { translateText } from "../../Utils";
 import { Layer } from "./Layer";
+import { PauseGameEvent } from "../../Transport";
+import { UserSettings } from "../../../core/game/UserSettings";
+import { translateText } from "../../Utils";
 
 const button = ({
   classes = "",
@@ -116,7 +116,7 @@ export class OptionsMenu extends LitElement implements Layer {
   private onToggleDarkModeButtonClick() {
     this.userSettings.toggleDarkMode();
     this.requestUpdate();
-    this.eventBus.emit(new RefreshGraphicsEvent());
+    this.eventBus.emit(new RedrawGraphicsEvent());
   }
 
   private onToggleRandomNameModeButtonClick() {

src/client/graphics/layers/PlayerActionHandler.ts

@@ -1,7 +1,4 @@
-import { EventBus } from "../../../core/EventBus";
 import { PlayerActions, PlayerID } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { PlayerView } from "../../../core/game/GameView";
 import {
   SendAllianceRequestIntentEvent,
   SendAttackIntentEvent,
@@ -16,6 +13,9 @@ import {
   SendSpawnIntentEvent,
   SendTargetPlayerIntentEvent,
 } from "../../Transport";
+import { EventBus } from "../../../core/EventBus";
+import { PlayerView } from "../../../core/game/GameView";
+import { TileRef } from "../../../core/game/GameMap";
 import { UIState } from "../UIState";
 
 export class PlayerActionHandler {

src/client/graphics/layers/PlayerInfoOverlay.ts

@@ -1,9 +1,6 @@
+import { ContextMenuEvent, MouseMoveEvent } from "../../InputHandler";
+import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
 import { LitElement, TemplateResult, html } from "lit";
-import { ref } from "lit-html/directives/ref.js";
-import { customElement, property, state } from "lit/decorators.js";
-import { translateText } from "../../../client/Utils";
-import { renderPlayerFlag } from "../../../core/CustomFlag";
-import { EventBus } from "../../../core/EventBus";
 import {
   PlayerProfile,
   PlayerType,
@@ -11,13 +8,16 @@ import {
   Unit,
   UnitType,
 } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
+import { customElement, property, state } from "lit/decorators.js";
-import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
-import { ContextMenuEvent, MouseMoveEvent } from "../../InputHandler";
 import { renderNumber, renderTroops } from "../../Utils";
-import { TransformHandler } from "../TransformHandler";
-import { Layer } from "./Layer";
 import { CloseRadialMenuEvent } from "./RadialMenu";
+import { EventBus } from "../../../core/EventBus";
+import { Layer } from "./Layer";
+import { TileRef } from "../../../core/game/GameMap";
+import { TransformHandler } from "../TransformHandler";
+import { ref } from "lit-html/directives/ref.js";
+import { renderPlayerFlag } from "../../../core/CustomFlag";
+import { translateText } from "../../../client/Utils";
 
 function euclideanDistWorld(
   coord: { x: number; y: number },

src/client/graphics/layers/PlayerPanel.ts

@@ -1,19 +1,7 @@
-import { html, LitElement } from "lit";
-import { customElement, state } from "lit/decorators.js";
-import allianceIcon from "../../../../resources/images/AllianceIconWhite.svg";
-import chatIcon from "../../../../resources/images/ChatIconWhite.svg";
-import donateGoldIcon from "../../../../resources/images/DonateGoldIconWhite.svg";
-import donateTroopIcon from "../../../../resources/images/DonateTroopIconWhite.svg";
-import emojiIcon from "../../../../resources/images/EmojiIconWhite.svg";
-import targetIcon from "../../../../resources/images/TargetIconWhite.svg";
-import traitorIcon from "../../../../resources/images/TraitorIconWhite.svg";
-import { translateText } from "../../../client/Utils";
-import { EventBus } from "../../../core/EventBus";
 import { AllPlayers, PlayerActions } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { flattenedEmojiTable } from "../../../core/Util";
 import { CloseViewEvent, MouseUpEvent } from "../../InputHandler";
+import { GameView, PlayerView } from "../../../core/game/GameView";
+import { LitElement, html } from "lit";
 import {
   SendAllianceRequestIntentEvent,
   SendBreakAllianceIntentEvent,
@@ -23,11 +11,23 @@ import {
   SendEmojiIntentEvent,
   SendTargetPlayerIntentEvent,
 } from "../../Transport";
+import { customElement, state } from "lit/decorators.js";
 import { renderNumber, renderTroops } from "../../Utils";
-import { UIState } from "../UIState";
 import { ChatModal } from "./ChatModal";
 import { EmojiTable } from "./EmojiTable";
+import { EventBus } from "../../../core/EventBus";
 import { Layer } from "./Layer";
+import { TileRef } from "../../../core/game/GameMap";
+import { UIState } from "../UIState";
+import allianceIcon from "../../../../resources/images/AllianceIconWhite.svg";
+import chatIcon from "../../../../resources/images/ChatIconWhite.svg";
+import donateGoldIcon from "../../../../resources/images/DonateGoldIconWhite.svg";
+import donateTroopIcon from "../../../../resources/images/DonateTroopIconWhite.svg";
+import emojiIcon from "../../../../resources/images/EmojiIconWhite.svg";
+import { flattenedEmojiTable } from "../../../core/Util";
+import targetIcon from "../../../../resources/images/TargetIconWhite.svg";
+import traitorIcon from "../../../../resources/images/TraitorIconWhite.svg";
+import { translateText } from "../../../client/Utils";
 
 @customElement("player-panel")
 export class PlayerPanel extends LitElement implements Layer {

src/client/graphics/layers/RadialMenu.ts

@@ -1,16 +1,16 @@
 /* eslint-disable max-lines */
 import * as d3 from "d3";
-import backIcon from "../../../../resources/images/BackIconWhite.svg";
-import { EventBus, GameEvent } from "../../../core/EventBus";
-import { CloseViewEvent } from "../../InputHandler";
-import { translateText } from "../../Utils";
-import { Layer } from "./Layer";
 import {
   CenterButtonElement,
   MenuElement,
   MenuElementParams,
   TooltipKey,
 } from "./RadialMenuElements";
+import { EventBus, GameEvent } from "../../../core/EventBus";
+import { CloseViewEvent } from "../../InputHandler";
+import { Layer } from "./Layer";
+import backIcon from "../../../../resources/images/BackIconWhite.svg";
+import { translateText } from "../../Utils";
 
 export class CloseRadialMenuEvent implements GameEvent {
   constructor() {}

src/client/graphics/layers/RadialMenuElements.ts

@@ -1,16 +1,15 @@
-import { Config } from "../../../core/configuration/Config";
 import { AllPlayers, PlayerActions, UnitType } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { flattenedEmojiTable } from "../../../core/Util";
-import { renderNumber, translateText } from "../../Utils";
 import { BuildItemDisplay, BuildMenu, flattenedBuildTable } from "./BuildMenu";
+import { GameView, PlayerView } from "../../../core/game/GameView";
+import { renderNumber, translateText } from "../../Utils";
 import { ChatIntegration } from "./ChatIntegration";
+import { Config } from "../../../core/configuration/Config";
 import { EmojiTable } from "./EmojiTable";
+import { EventBus } from "../../../core/EventBus";
 import { PlayerActionHandler } from "./PlayerActionHandler";
 import { PlayerPanel } from "./PlayerPanel";
+import { TileRef } from "../../../core/game/GameMap";
 import { TooltipItem } from "./RadialMenu";
-
 import allianceIcon from "../../../../resources/images/AllianceIconWhite.svg";
 import boatIcon from "../../../../resources/images/BoatIconWhite.svg";
 import buildIcon from "../../../../resources/images/BuildIconWhite.svg";
@@ -18,12 +17,12 @@ import chatIcon from "../../../../resources/images/ChatIconWhite.svg";
 import donateGoldIcon from "../../../../resources/images/DonateGoldIconWhite.svg";
 import donateTroopIcon from "../../../../resources/images/DonateTroopIconWhite.svg";
 import emojiIcon from "../../../../resources/images/EmojiIconWhite.svg";
+import { flattenedEmojiTable } from "../../../core/Util";
 import infoIcon from "../../../../resources/images/InfoIcon.svg";
 import swordIcon from "../../../../resources/images/SwordIconWhite.svg";
 import targetIcon from "../../../../resources/images/TargetIconWhite.svg";
 import traitorIcon from "../../../../resources/images/TraitorIconWhite.svg";
 import xIcon from "../../../../resources/images/XIcon.svg";
-import { EventBus } from "../../../core/EventBus";
 
 export type MenuElementParams = {
   myPlayer: PlayerView;

src/client/graphics/layers/RailroadLayer.ts

@@ -1,15 +1,15 @@
-import { Colord } from "colord";
-import { Theme } from "../../../core/configuration/Config";
-import { PlayerID } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
 import {
   GameUpdateType,
-  RailroadUpdate,
   RailTile,
   RailType,
+  RailroadUpdate,
 } from "../../../core/game/GameUpdates";
+import { Colord } from "colord";
 import { GameView } from "../../../core/game/GameView";
 import { Layer } from "./Layer";
+import { PlayerID } from "../../../core/game/Game";
+import { Theme } from "../../../core/configuration/Config";
+import { TileRef } from "../../../core/game/GameMap";
 import { getRailroadRects } from "./RailroadSprites";
 
 type RailRef = {

src/client/graphics/layers/ReplayPanel.ts

@@ -1,14 +1,14 @@
-import { html, LitElement } from "lit";
+import { LitElement, html } from "lit";
+import {
+  ReplaySpeedMultiplier,
+  defaultReplaySpeedMultiplier,
+} from "../../utilities/ReplaySpeedMultiplier";
 import { customElement, property, state } from "lit/decorators.js";
 import { EventBus } from "../../../core/EventBus";
 import { GameView } from "../../../core/game/GameView";
-import { ReplaySpeedChangeEvent } from "../../InputHandler";
-import {
-  defaultReplaySpeedMultiplier,
-  ReplaySpeedMultiplier,
-} from "../../utilities/ReplaySpeedMultiplier";
-import { translateText } from "../../Utils";
 import { Layer } from "./Layer";
+import { ReplaySpeedChangeEvent } from "../../InputHandler";
+import { translateText } from "../../Utils";
 
 export class ShowReplayPanelEvent {
   constructor(

src/client/graphics/layers/SettingsModal.ts

@@ -1,6 +1,10 @@
-import { html, LitElement } from "lit";
+import { AlternateViewEvent, RedrawGraphicsEvent } from "../../InputHandler";
+import { LitElement, html } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
-import structureIcon from "../../../../resources/images/CityIconWhite.svg";
+import { EventBus } from "../../../core/EventBus";
+import { Layer } from "./Layer";
+import { PauseGameEvent } from "../../Transport";
+import { UserSettings } from "../../../core/game/UserSettings";
 import darkModeIcon from "../../../../resources/images/DarkModeIconWhite.svg";
 import emojiIcon from "../../../../resources/images/EmojiIconWhite.svg";
 import exitIcon from "../../../../resources/images/ExitIconWhite.svg";
@@ -8,13 +12,9 @@ import explosionIcon from "../../../../resources/images/ExplosionIconWhite.svg";
 import mouseIcon from "../../../../resources/images/MouseIconWhite.svg";
 import ninjaIcon from "../../../../resources/images/NinjaIconWhite.svg";
 import settingsIcon from "../../../../resources/images/SettingIconWhite.svg";
-import treeIcon from "../../../../resources/images/TreeIconWhite.svg";
+import structureIcon from "../../../../resources/images/CityIconWhite.svg";
-import { EventBus } from "../../../core/EventBus";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { AlternateViewEvent, RefreshGraphicsEvent } from "../../InputHandler";
-import { PauseGameEvent } from "../../Transport";
 import { translateText } from "../../Utils";
-import { Layer } from "./Layer";
+import treeIcon from "../../../../resources/images/TreeIconWhite.svg";
 
 export class ShowSettingsModalEvent {
   constructor(
@@ -126,7 +126,7 @@ export class SettingsModal extends LitElement implements Layer {
 
   private onToggleDarkModeButtonClick() {
     this.userSettings.toggleDarkMode();
-    this.eventBus.emit(new RefreshGraphicsEvent());
+    this.eventBus.emit(new RedrawGraphicsEvent());
     this.requestUpdate();
   }
 

src/client/graphics/layers/SpawnAd.ts

@@ -1,9 +1,9 @@
 import { LitElement, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../../../client/Utils";
 import { GameView } from "../../../core/game/GameView";
-import { getGamesPlayed } from "../../Utils";
 import { Layer } from "./Layer";
+import { getGamesPlayed } from "../../Utils";
+import { translateText } from "../../../client/Utils";
 
 const AD_TYPE = "bottom_rail";
 const AD_CONTAINER_ID = "bottom-rail-ad-container";

src/client/graphics/layers/SpawnTimer.ts

@@ -1,7 +1,7 @@
 import { GameMode, Team } from "../../../core/game/Game";
 import { GameView } from "../../../core/game/GameView";
-import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
+import { TransformHandler } from "../TransformHandler";
 
 export class SpawnTimer implements Layer {
   private ratios = [0];

src/client/graphics/layers/StructureIconsLayer.ts

@@ -1,20 +1,20 @@
-import { OutlineFilter } from "pixi-filters";
 import * as PIXI from "pixi.js";
-import bitmapFont from "../../../../resources/fonts/round_6x6_modified.xml";
+import { Cell, PlayerID, UnitType } from "../../../core/game/Game";
+import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
+import { EventBus } from "../../../core/EventBus";
+import { GameUpdateType } from "../../../core/game/GameUpdates";
+import { Layer } from "./Layer";
+import { OutlineFilter } from "pixi-filters";
+import SAMMissileIcon from "../../../../resources/images/SamLauncherUnit.png";
+import { Theme } from "../../../core/configuration/Config";
+import { ToggleStructureEvent } from "../../InputHandler";
+import { TransformHandler } from "../TransformHandler";
 import anchorIcon from "../../../../resources/images/AnchorIcon.png";
+import bitmapFont from "../../../../resources/fonts/round_6x6_modified.xml";
 import cityIcon from "../../../../resources/images/CityIcon.png";
 import factoryIcon from "../../../../resources/images/FactoryUnit.png";
 import missileSiloIcon from "../../../../resources/images/MissileSiloUnit.png";
-import SAMMissileIcon from "../../../../resources/images/SamLauncherUnit.png";
 import shieldIcon from "../../../../resources/images/ShieldIcon.png";
-import { Theme } from "../../../core/configuration/Config";
-import { EventBus } from "../../../core/EventBus";
-import { Cell, PlayerID, UnitType } from "../../../core/game/Game";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
-import { ToggleStructureEvent } from "../../InputHandler";
-import { TransformHandler } from "../TransformHandler";
-import { Layer } from "./Layer";
 
 type ShapeType = "triangle" | "square" | "pentagon" | "octagon" | "circle";
 

src/client/graphics/layers/StructureLayer.ts

@@ -1,19 +1,18 @@
-import { colord, Colord } from "colord";
+import { Cell, UnitType } from "../../../core/game/Game";
-import { Theme } from "../../../core/configuration/Config";
+import { Colord, colord } from "colord";
+import { GameView, UnitView } from "../../../core/game/GameView";
+import { euclDistFN, isometricDistFN } from "../../../core/game/GameMap";
 import { EventBus } from "../../../core/EventBus";
-import { TransformHandler } from "../TransformHandler";
+import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { Layer } from "./Layer";
-
+import SAMMissileIcon from "../../../../resources/non-commercial/images/buildings/silo4.png";
+import { Theme } from "../../../core/configuration/Config";
+import { TransformHandler } from "../TransformHandler";
+import anchorIcon from "../../../../resources/non-commercial/images/buildings/port1.png";
 import cityIcon from "../../../../resources/non-commercial/images/buildings/cityAlt1.png";
 import factoryIcon from "../../../../resources/non-commercial/images/buildings/factoryAlt1.png";
-import shieldIcon from "../../../../resources/non-commercial/images/buildings/fortAlt3.png";
-import anchorIcon from "../../../../resources/non-commercial/images/buildings/port1.png";
 import missileSiloIcon from "../../../../resources/non-commercial/images/buildings/silo1.png";
-import SAMMissileIcon from "../../../../resources/non-commercial/images/buildings/silo4.png";
+import shieldIcon from "../../../../resources/non-commercial/images/buildings/fortAlt3.png";
-import { Cell, UnitType } from "../../../core/game/Game";
-import { euclDistFN, isometricDistFN } from "../../../core/game/GameMap";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView, UnitView } from "../../../core/game/GameView";
 
 const underConstructionColor = colord({ r: 150, g: 150, b: 150 });
 

src/client/graphics/layers/TeamStats.ts

@@ -1,9 +1,9 @@
-import { LitElement, html } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
 import { GameMode, Team, UnitType } from "../../../core/game/Game";
 import { GameView, PlayerView } from "../../../core/game/GameView";
+import { LitElement, html } from "lit";
+import { customElement, property } from "lit/decorators.js";
 import { renderNumber, translateText } from "../../Utils";
+import { EventBus } from "../../../core/EventBus";
 import { Layer } from "./Layer";
 
 type TeamEntry = {

src/client/graphics/layers/TerrainLayer.ts

@@ -1,7 +1,7 @@
-import { Theme } from "../../../core/configuration/Config";
 import { GameView } from "../../../core/game/GameView";
-import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
+import { Theme } from "../../../core/configuration/Config";
+import { TransformHandler } from "../TransformHandler";
 
 export class TerrainLayer implements Layer {
   private canvas: HTMLCanvasElement;

src/client/graphics/layers/TerritoryLayer.ts

@@ -1,21 +1,21 @@
-import { PriorityQueue } from "@datastructures-js/priority-queue";
-import { Colord } from "colord";
-import { Theme } from "../../../core/configuration/Config";
-import { EventBus } from "../../../core/EventBus";
-import { Cell, PlayerType, UnitType } from "../../../core/game/Game";
-import { euclDistFN, TileRef } from "../../../core/game/GameMap";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { PseudoRandom } from "../../../core/PseudoRandom";
 import {
   AlternateViewEvent,
   DragEvent,
   MouseOverEvent,
-  RefreshGraphicsEvent,
+  RedrawGraphicsEvent,
 } from "../../InputHandler";
-import { TransformHandler } from "../TransformHandler";
+import { Cell, PlayerType, UnitType } from "../../../core/game/Game";
+import { GameView, PlayerView } from "../../../core/game/GameView";
+import { TileRef, euclDistFN } from "../../../core/game/GameMap";
+import { Colord } from "colord";
+import { EventBus } from "../../../core/EventBus";
+import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { Layer } from "./Layer";
+import { PriorityQueue } from "@datastructures-js/priority-queue";
+import { PseudoRandom } from "../../../core/PseudoRandom";
+import { Theme } from "../../../core/configuration/Config";
+import { TransformHandler } from "../TransformHandler";
+import { UserSettings } from "../../../core/game/UserSettings";
 
 export class TerritoryLayer implements Layer {
   private userSettings: UserSettings;
@@ -77,7 +77,7 @@ export class TerritoryLayer implements Layer {
     const prev = this.cachedTerritoryPatternsEnabled;
     this.cachedTerritoryPatternsEnabled = this.userSettings.territoryPatterns();
     if (prev !== undefined && prev !== this.cachedTerritoryPatternsEnabled) {
-      this.eventBus.emit(new RefreshGraphicsEvent());
+      this.eventBus.emit(new RedrawGraphicsEvent());
     }
     this.game.recentlyUpdatedTiles().forEach((t) => this.enqueueTile(t));
     const updates = this.game.updatesSinceLastTick();

src/client/graphics/layers/UILayer.ts

@@ -1,14 +1,14 @@
+import { GameView, UnitView } from "../../../core/game/GameView";
 import { Colord } from "colord";
 import { EventBus } from "../../../core/EventBus";
-import { Theme } from "../../../core/configuration/Config";
-import { UnitType } from "../../../core/game/Game";
 import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView, UnitView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { UnitSelectionEvent } from "../../InputHandler";
-import { ProgressBar } from "../ProgressBar";
-import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
+import { ProgressBar } from "../ProgressBar";
+import { Theme } from "../../../core/configuration/Config";
+import { TransformHandler } from "../TransformHandler";
+import { UnitSelectionEvent } from "../../InputHandler";
+import { UnitType } from "../../../core/game/Game";
+import { UserSettings } from "../../../core/game/UserSettings";
 
 const COLOR_PROGRESSION = [
   "rgb(232, 25, 25)",

src/client/graphics/layers/UnitDisplay.ts

@@ -1,17 +1,17 @@
-import { html, LitElement } from "lit";
+import { LitElement, html } from "lit";
-import { customElement } from "lit/decorators.js";
+import { EventBus } from "../../../core/EventBus";
-import portIcon from "../../../../resources/images/AnchorIcon.png";
+import { GameView } from "../../../core/game/GameView";
+import { Layer } from "./Layer";
+import { ToggleStructureEvent } from "../../InputHandler";
+import { UnitType } from "../../../core/game/Game";
 import cityIcon from "../../../../resources/images/CityIconWhite.svg";
+import { customElement } from "lit/decorators.js";
+import defensePostIcon from "../../../../resources/images/ShieldIconWhite.svg";
 import factoryIcon from "../../../../resources/images/FactoryIconWhite.svg";
 import missileSiloIcon from "../../../../resources/images/MissileSiloUnit.png";
-import defensePostIcon from "../../../../resources/images/ShieldIconWhite.svg";
+import portIcon from "../../../../resources/images/AnchorIcon.png";
-import samLauncherIcon from "../../../../resources/non-commercial/svg/SamLauncherIconWhite.svg";
-import { EventBus } from "../../../core/EventBus";
-import { UnitType } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
-import { ToggleStructureEvent } from "../../InputHandler";
 import { renderNumber } from "../../Utils";
-import { Layer } from "./Layer";
+import samLauncherIcon from "../../../../resources/non-commercial/svg/SamLauncherIconWhite.svg";
 
 @customElement("unit-display")
 export class UnitDisplay extends LitElement implements Layer {

src/client/graphics/layers/UnitLayer.ts

@@ -1,25 +1,24 @@
-import { colord, Colord } from "colord";
-import { EventBus } from "../../../core/EventBus";
-import { Theme } from "../../../core/configuration/Config";
-import { UnitType } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, UnitView } from "../../../core/game/GameView";
-import { BezenhamLine } from "../../../core/utilities/Line";
 import {
   AlternateViewEvent,
   MouseUpEvent,
   UnitSelectionEvent,
 } from "../../InputHandler";
-import { MoveWarshipIntentEvent } from "../../Transport";
+import { Colord, colord } from "colord";
-import { TransformHandler } from "../TransformHandler";
+import { GameView, UnitView } from "../../../core/game/GameView";
-import { Layer } from "./Layer";
-
-import { GameUpdateType } from "../../../core/game/GameUpdates";
 import {
   getColoredSprite,
   isSpriteReady,
   loadAllSprites,
 } from "../SpriteLoader";
+import { BezenhamLine } from "../../../core/utilities/Line";
+import { EventBus } from "../../../core/EventBus";
+import { GameUpdateType } from "../../../core/game/GameUpdates";
+import { Layer } from "./Layer";
+import { MoveWarshipIntentEvent } from "../../Transport";
+import { Theme } from "../../../core/configuration/Config";
+import { TileRef } from "../../../core/game/GameMap";
+import { TransformHandler } from "../TransformHandler";
+import { UnitType } from "../../../core/game/Game";
 
 enum Relationship {
   Self,

src/client/graphics/layers/WinModal.ts

@@ -1,12 +1,12 @@
 import { LitElement, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../../../client/Utils";
 import { EventBus } from "../../../core/EventBus";
 import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { GameView } from "../../../core/game/GameView";
-import { SendWinnerEvent } from "../../Transport";
 import { GutterAdModalEvent } from "./GutterAdModal";
 import { Layer } from "./Layer";
+import { SendWinnerEvent } from "../../Transport";
+import { translateText } from "../../../client/Utils";
 
 @customElement("win-modal")
 export class WinModal extends LitElement implements Layer {

src/client/jwt.ts

@@ -1,5 +1,3 @@
-import { decodeJwt } from "jose";
-import { z } from "zod";
 import {
   RefreshResponseSchema,
   TokenPayload,
@@ -7,7 +5,9 @@ import {
   UserMeResponse,
   UserMeResponseSchema,
 } from "../core/ApiSchemas";
+import { decodeJwt } from "jose";
 import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
+import { z } from "zod";
 
 function getAudience() {
   const { hostname } = new URL(window.location.href);

src/client/utilities/RenderUnitTypeOptions.ts

@@ -1,5 +1,5 @@
 // renderUnitTypeOptions.ts
-import { html, TemplateResult } from "lit";
+import { TemplateResult, html } from "lit";
 import { UnitType } from "../../core/game/Game";
 import { translateText } from "../Utils";
 

src/core/ApiSchemas.ts

@@ -1,6 +1,6 @@
 // This file contains schemas for api.openfront.io
-import { z } from "zod";
 import { base64urlToUuid } from "./Base64";
+import { z } from "zod";
 
 export const RefreshResponseSchema = z.object({
   token: z.string(),

src/core/CosmeticSchemas.ts

@@ -1,5 +1,5 @@
-import { z } from "zod";
 import { RequiredPatternSchema } from "./Schemas";
+import { z } from "zod";
 
 export const ProductSchema = z.object({
   productId: z.string(),

src/core/ExpressSchemas.ts

@@ -1,6 +1,6 @@
 // This file contians schemas for the primary openfront express server
-import { z } from "zod";
 import { GameInfoSchema } from "./Schemas";
+import { z } from "zod";
 
 export const ApiEnvResponseSchema = z.object({
   game_env: z.string(),

src/core/GameRunner.ts

@@ -1,7 +1,3 @@
-import { placeName } from "../client/graphics/NameBoxCalculator";
-import { getConfig } from "./configuration/ConfigLoader";
-import { Executor } from "./execution/ExecutionManager";
-import { WinCheckExecution } from "./execution/WinCheckExecution";
 import {
   AllPlayers,
   Attack,
@@ -18,19 +14,23 @@ import {
   PlayerProfile,
   PlayerType,
 } from "./game/Game";
-import { createGame } from "./game/GameImpl";
+import { ClientID, GameStartInfo, Turn } from "./Schemas";
-import { TileRef } from "./game/GameMap";
-import { GameMapLoader } from "./game/GameMapLoader";
 import {
   ErrorUpdate,
   GameUpdateType,
   GameUpdateViewData,
 } from "./game/GameUpdates";
-import { loadTerrainMap as loadGameMap } from "./game/TerrainMapLoader";
-import { PseudoRandom } from "./PseudoRandom";
-import { ClientID, GameStartInfo, Turn } from "./Schemas";
 import { sanitize, simpleHash } from "./Util";
+import { Executor } from "./execution/ExecutionManager";
+import { GameMapLoader } from "./game/GameMapLoader";
+import { PseudoRandom } from "./PseudoRandom";
+import { TileRef } from "./game/GameMap";
+import { WinCheckExecution } from "./execution/WinCheckExecution";
+import { createGame } from "./game/GameImpl";
 import { fixProfaneUsername } from "./validations/username";
+import { getConfig } from "./configuration/ConfigLoader";
+import { loadTerrainMap } from "./game/TerrainMapLoader";
+import { placeName } from "../client/graphics/NameBoxCalculator";
 
 export async function createGameRunner(
   gameStart: GameStartInfo,
@@ -39,7 +39,7 @@ export async function createGameRunner(
   callBack: (gu: GameUpdateViewData | ErrorUpdate) => void,
 ): Promise<GameRunner> {
   const config = await getConfig(gameStart.config, null);
-  const gameMap = await loadGameMap(gameStart.config.gameMap, mapLoader);
+  const gameMap = await loadTerrainMap(gameStart.config.gameMap, mapLoader);
   const random = new PseudoRandom(simpleHash(gameStart.gameID));
 
   const humans = gameStart.players.map(

src/core/Schemas.ts

@@ -1,7 +1,3 @@
-import { base64url } from "jose";
-import { z } from "zod";
-import quickChatData from "../../resources/QuickChat.json" with { type: "json" };
-import countries from "../client/data/countries.json" with { type: "json" };
 import {
   AllPlayers,
   Difficulty,
@@ -16,7 +12,11 @@ import {
 } from "./game/Game";
 import { PatternDecoder } from "./PatternDecoder";
 import { PlayerStatsSchema } from "./StatsSchemas";
+import { base64url } from "jose";
+import countries from "../client/data/countries.json" with { type: "json" };
 import { flattenedEmojiTable } from "./Util";
+import quickChatData from "../../resources/QuickChat.json" with { type: "json" };
+import { z } from "zod";
 
 export type GameID = string;
 export type ClientID = string;

src/core/StatsSchemas.ts

@@ -1,5 +1,5 @@
-import { z } from "zod";
 import { UnitType } from "./game/Game";
+import { z } from "zod";
 
 export const BombUnitSchema = z.union([
   z.literal("abomb"),

src/core/Util.ts

@@ -1,7 +1,8 @@
-import DOMPurify from "dompurify";
+import {
-import { customAlphabet } from "nanoid";
+  BOT_NAME_PREFIXES,
+  BOT_NAME_SUFFIXES,
+} from "./execution/utils/BotNames";
 import { Cell, Unit } from "./game/Game";
-import { GameMap, TileRef } from "./game/GameMap";
 import {
   GameConfig,
   GameID,
@@ -10,12 +11,10 @@ import {
   Turn,
   Winner,
 } from "./Schemas";
-
+import { GameMap, TileRef } from "./game/GameMap";
+import DOMPurify from "dompurify";
 import { ServerConfig } from "./configuration/Config";
-import {
+import { customAlphabet } from "nanoid";
-  BOT_NAME_PREFIXES,
-  BOT_NAME_SUFFIXES,
-} from "./execution/utils/BotNames";
 
 export function manhattanDistWrapped(
   c1: Cell,

src/core/WorkerSchemas.ts

@@ -1,6 +1,6 @@
 // This file contians schemas for the openfront worker express server
-import { z } from "zod";
 import { GameConfigSchema, GameRecordSchema } from "./Schemas";
+import { z } from "zod";
 
 export const CreateGameInputSchema = GameConfigSchema.or(
   z

src/core/configuration/ColorAllocator.ts

@@ -1,10 +1,5 @@
 import { Colord, extend } from "colord";
-import labPlugin from "colord/plugins/lab";
-import lchPlugin from "colord/plugins/lch";
-import Color from "colorjs.io";
 import { ColoredTeams, Team } from "../game/Game";
-import { PseudoRandom } from "../PseudoRandom";
-import { simpleHash } from "../Util";
 import {
   blueTeamColors,
   botTeamColors,
@@ -15,6 +10,11 @@ import {
   tealTeamColors,
   yellowTeamColors,
 } from "./Colors";
+import Color from "colorjs.io";
+import { PseudoRandom } from "../PseudoRandom";
+import labPlugin from "colord/plugins/lab";
+import lchPlugin from "colord/plugins/lch";
+import { simpleHash } from "../Util";
 extend([lchPlugin]);
 extend([labPlugin]);
 

src/core/configuration/Colors.ts

@@ -1,4 +1,4 @@
-import { colord, Colord, extend } from "colord";
+import { Colord, colord, extend } from "colord";
 import labPlugin from "colord/plugins/lab";
 import lchPlugin from "colord/plugins/lch";
 

src/core/configuration/Config.ts

@@ -1,5 +1,3 @@
-import { Colord } from "colord";
-import { JWK } from "jose";
 import {
   Difficulty,
   Game,
@@ -14,11 +12,13 @@ import {
   UnitInfo,
   UnitType,
 } from "../game/Game";
+import { GameConfig, GameID, TeamCountConfig } from "../Schemas";
 import { GameMap, TileRef } from "../game/GameMap";
+import { Colord } from "colord";
+import { JWK } from "jose";
+import { NukeType } from "../StatsSchemas";
 import { PlayerView } from "../game/GameView";
 import { UserSettings } from "../game/UserSettings";
-import { GameConfig, GameID, TeamCountConfig } from "../Schemas";
-import { NukeType } from "../StatsSchemas";
 
 export enum GameEnv {
   Dev,

src/core/configuration/ConfigLoader.ts

@@ -1,9 +1,9 @@
-import { ApiEnvResponseSchema } from "../ExpressSchemas";
-import { UserSettings } from "../game/UserSettings";
-import { GameConfig } from "../Schemas";
 import { Config, GameEnv, ServerConfig } from "./Config";
-import { DefaultConfig } from "./DefaultConfig";
 import { DevConfig, DevServerConfig } from "./DevConfig";
+import { ApiEnvResponseSchema } from "../ExpressSchemas";
+import { DefaultConfig } from "./DefaultConfig";
+import { GameConfig } from "../Schemas";
+import { UserSettings } from "../game/UserSettings";
 import { preprodConfig } from "./PreprodConfig";
 import { prodConfig } from "./ProdConfig";
 

src/core/configuration/DefaultConfig.ts

@@ -1,6 +1,5 @@
 /* eslint-disable max-lines */
-import { JWK } from "jose";
+import { Config, GameEnv, NukeMagnitude, ServerConfig, Theme } from "./Config";
-import { z } from "zod";
 import {
   Difficulty,
   Duos,
@@ -13,22 +12,23 @@ import {
   PlayerInfo,
   PlayerType,
   Quads,
-  TerrainType,
   TerraNullius,
+  TerrainType,
   Tick,
   Trios,
   UnitInfo,
   UnitType,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
-import { PlayerView } from "../game/GameView";
-import { UserSettings } from "../game/UserSettings";
 import { GameConfig, GameID, TeamCountConfig } from "../Schemas";
-import { NukeType } from "../StatsSchemas";
 import { assertNever, simpleHash, within } from "../Util";
-import { Config, GameEnv, NukeMagnitude, ServerConfig, Theme } from "./Config";
+import { JWK } from "jose";
+import { NukeType } from "../StatsSchemas";
 import { PastelTheme } from "./PastelTheme";
 import { PastelThemeDark } from "./PastelThemeDark";
+import { PlayerView } from "../game/GameView";
+import { TileRef } from "../game/GameMap";
+import { UserSettings } from "../game/UserSettings";
+import { z } from "zod";
 
 const JwksSchema = z.object({
   keys: z

src/core/configuration/DevConfig.ts

@@ -1,8 +1,8 @@
-import { UnitInfo, UnitType } from "../game/Game";
-import { UserSettings } from "../game/UserSettings";
-import { GameConfig } from "../Schemas";
-import { GameEnv, ServerConfig } from "./Config";
 import { DefaultConfig, DefaultServerConfig } from "./DefaultConfig";
+import { GameEnv, ServerConfig } from "./Config";
+import { UnitInfo, UnitType } from "../game/Game";
+import { GameConfig } from "../Schemas";
+import { UserSettings } from "../game/UserSettings";
 
 export class DevServerConfig extends DefaultServerConfig {
   adminToken(): string {

src/core/configuration/PastelTheme.ts

@@ -1,10 +1,10 @@
 import { Colord, colord } from "colord";
-import { PseudoRandom } from "../PseudoRandom";
-import { PlayerType, Team, TerrainType } from "../game/Game";
 import { GameMap, TileRef } from "../game/GameMap";
-import { PlayerView } from "../game/GameView";
+import { PlayerType, Team, TerrainType } from "../game/Game";
-import { ColorAllocator } from "./ColorAllocator";
 import { botColors, fallbackColors, humanColors, nationColors } from "./Colors";
+import { ColorAllocator } from "./ColorAllocator";
+import { PlayerView } from "../game/GameView";
+import { PseudoRandom } from "../PseudoRandom";
 import { Theme } from "./Config";
 
 type ColorCache = Map<string, Colord>;

src/core/configuration/PastelThemeDark.ts

@@ -1,10 +1,10 @@
 import { Colord, colord } from "colord";
-import { PseudoRandom } from "../PseudoRandom";
-import { PlayerType, Team, TerrainType } from "../game/Game";
 import { GameMap, TileRef } from "../game/GameMap";
-import { PlayerView } from "../game/GameView";
+import { PlayerType, Team, TerrainType } from "../game/Game";
-import { ColorAllocator } from "./ColorAllocator";
 import { botColors, fallbackColors, humanColors, nationColors } from "./Colors";
+import { ColorAllocator } from "./ColorAllocator";
+import { PlayerView } from "../game/GameView";
+import { PseudoRandom } from "../PseudoRandom";
 import { Theme } from "./Config";
 
 type ColorCache = Map<string, Colord>;

src/core/configuration/PreprodConfig.ts

@@ -1,5 +1,5 @@
-import { GameEnv } from "./Config";
 import { DefaultServerConfig } from "./DefaultConfig";
+import { GameEnv } from "./Config";
 
 export const preprodConfig = new (class extends DefaultServerConfig {
   env(): GameEnv {

src/core/configuration/ProdConfig.ts

@@ -1,5 +1,5 @@
-import { GameEnv } from "./Config";
 import { DefaultServerConfig } from "./DefaultConfig";
+import { GameEnv } from "./Config";
 
 export const prodConfig = new (class extends DefaultServerConfig {
   numWorkers(): number {

src/core/execution/AttackExecution.ts

@@ -1,4 +1,3 @@
-import { renderTroops } from "../../client/Utils";
 import {
   Attack,
   Execution,
@@ -7,12 +6,13 @@ import {
   Player,
   PlayerID,
   PlayerType,
-  TerrainType,
   TerraNullius,
+  TerrainType,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
-import { PseudoRandom } from "../PseudoRandom";
 import { FlatBinaryHeap } from "./utils/FlatBinaryHeap"; // adjust path if needed
+import { PseudoRandom } from "../PseudoRandom";
+import { TileRef } from "../game/GameMap";
+import { renderTroops } from "../../client/Utils";
 
 const malusForRetreat = 25;
 export class AttackExecution implements Execution {

src/core/execution/BotExecution.ts

@@ -1,7 +1,7 @@
 import { Execution, Game, Player } from "../game/Game";
+import { BotBehavior } from "./utils/BotBehavior";
 import { PseudoRandom } from "../PseudoRandom";
 import { simpleHash } from "../Util";
-import { BotBehavior } from "./utils/BotBehavior";
 
 export class BotExecution implements Execution {
   private active = true;

src/core/execution/BotSpawner.ts

@@ -1,10 +1,10 @@
-import { Game, PlayerInfo, PlayerType } from "../game/Game";
-import { TileRef } from "../game/GameMap";
-import { PseudoRandom } from "../PseudoRandom";
-import { GameID } from "../Schemas";
-import { simpleHash } from "../Util";
-import { SpawnExecution } from "./SpawnExecution";
 import { BOT_NAME_PREFIXES, BOT_NAME_SUFFIXES } from "./utils/BotNames";
+import { Game, PlayerInfo, PlayerType } from "../game/Game";
+import { GameID } from "../Schemas";
+import { PseudoRandom } from "../PseudoRandom";
+import { SpawnExecution } from "./SpawnExecution";
+import { TileRef } from "../game/GameMap";
+import { simpleHash } from "../Util";
 
 export class BotSpawner {
   private random: PseudoRandom;

src/core/execution/ConstructionExecution.ts

@@ -7,7 +7,6 @@ import {
   Unit,
   UnitType,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
 import { CityExecution } from "./CityExecution";
 import { DefensePostExecution } from "./DefensePostExecution";
 import { FactoryExecution } from "./FactoryExecution";
@@ -16,6 +15,7 @@ import { MissileSiloExecution } from "./MissileSiloExecution";
 import { NukeExecution } from "./NukeExecution";
 import { PortExecution } from "./PortExecution";
 import { SAMLauncherExecution } from "./SAMLauncherExecution";
+import { TileRef } from "../game/GameMap";
 import { WarshipExecution } from "./WarshipExecution";
 
 export class ConstructionExecution implements Execution {

src/core/execution/DefensePostExecution.ts

@@ -1,6 +1,6 @@
 import { Execution, Game, Player, Unit, UnitType } from "../game/Game";
-import { TileRef } from "../game/GameMap";
 import { ShellExecution } from "./ShellExecution";
+import { TileRef } from "../game/GameMap";
 
 export class DefensePostExecution implements Execution {
   private mg: Game;

src/core/execution/ExecutionManager.ts

@@ -1,14 +1,12 @@
-import { Execution, Game } from "../game/Game";
-import { PseudoRandom } from "../PseudoRandom";
 import { ClientID, GameID, Intent, Turn } from "../Schemas";
-import { simpleHash } from "../Util";
+import { Execution, Game } from "../game/Game";
 import { AllianceExtensionExecution } from "./alliance/AllianceExtensionExecution";
 import { AllianceRequestExecution } from "./alliance/AllianceRequestExecution";
 import { AllianceRequestReplyExecution } from "./alliance/AllianceRequestReplyExecution";
-import { BreakAllianceExecution } from "./alliance/BreakAllianceExecution";
 import { AttackExecution } from "./AttackExecution";
 import { BoatRetreatExecution } from "./BoatRetreatExecution";
 import { BotSpawner } from "./BotSpawner";
+import { BreakAllianceExecution } from "./alliance/BreakAllianceExecution";
 import { ConstructionExecution } from "./ConstructionExecution";
 import { DeleteUnitExecution } from "./DeleteUnitExecution";
 import { DonateGoldExecution } from "./DonateGoldExecution";
@@ -19,12 +17,14 @@ import { FakeHumanExecution } from "./FakeHumanExecution";
 import { MarkDisconnectedExecution } from "./MarkDisconnectedExecution";
 import { MoveWarshipExecution } from "./MoveWarshipExecution";
 import { NoOpExecution } from "./NoOpExecution";
+import { PseudoRandom } from "../PseudoRandom";
 import { QuickChatExecution } from "./QuickChatExecution";
 import { RetreatExecution } from "./RetreatExecution";
 import { SpawnExecution } from "./SpawnExecution";
 import { TargetPlayerExecution } from "./TargetPlayerExecution";
 import { TransportShipExecution } from "./TransportShipExecution";
 import { UpgradeStructureExecution } from "./UpgradeStructureExecution";
+import { simpleHash } from "../Util";
 
 export class Executor {
   // private random = new PseudoRandom(999)

src/core/execution/FakeHumanExecution.ts

@@ -14,17 +14,17 @@ import {
   Unit,
   UnitType,
 } from "../game/Game";
-import { euclDistFN, manhattanDistFN, TileRef } from "../game/GameMap";
+import { TileRef, euclDistFN, manhattanDistFN } from "../game/GameMap";
-import { PseudoRandom } from "../PseudoRandom";
-import { GameID } from "../Schemas";
 import { calculateBoundingBox, flattenedEmojiTable, simpleHash } from "../Util";
+import { BotBehavior } from "./utils/BotBehavior";
 import { ConstructionExecution } from "./ConstructionExecution";
 import { EmojiExecution } from "./EmojiExecution";
+import { GameID } from "../Schemas";
 import { NukeExecution } from "./NukeExecution";
+import { PseudoRandom } from "../PseudoRandom";
 import { SpawnExecution } from "./SpawnExecution";
 import { TransportShipExecution } from "./TransportShipExecution";
 import { closestTwoTiles } from "./Util";
-import { BotBehavior } from "./utils/BotBehavior";
 
 export class FakeHumanExecution implements Execution {
   private active = true;

src/core/execution/MIRVExecution.ts

@@ -7,11 +7,11 @@ import {
   Unit,
   UnitType,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
+import { NukeExecution } from "./NukeExecution";
 import { ParabolaPathFinder } from "../pathfinding/PathFinding";
 import { PseudoRandom } from "../PseudoRandom";
+import { TileRef } from "../game/GameMap";
 import { simpleHash } from "../Util";
-import { NukeExecution } from "./NukeExecution";
 
 export class MirvExecution implements Execution {
   private active = true;

src/core/execution/NukeExecution.ts

@@ -1,18 +1,18 @@
 import {
   Execution,
   Game,
-  isStructureType,
   MessageType,
   Player,
   TerraNullius,
   TrajectoryTile,
   Unit,
   UnitType,
+  isStructureType,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
+import { NukeType } from "../StatsSchemas";
 import { ParabolaPathFinder } from "../pathfinding/PathFinding";
 import { PseudoRandom } from "../PseudoRandom";
-import { NukeType } from "../StatsSchemas";
+import { TileRef } from "../game/GameMap";
 
 const SPRITE_RADIUS = 16;
 

src/core/execution/PlayerExecution.ts

@@ -1,8 +1,8 @@
-import { Config } from "../configuration/Config";
 import { Execution, Game, Player, UnitType } from "../game/Game";
-import { GameImpl } from "../game/GameImpl";
 import { GameMap, TileRef } from "../game/GameMap";
 import { calculateBoundingBox, getMode, inscribed, simpleHash } from "../Util";
+import { Config } from "../configuration/Config";
+import { GameImpl } from "../game/GameImpl";
 
 export class PlayerExecution implements Execution {
   private readonly ticksPerClusterCalc = 20;

src/core/execution/PortExecution.ts

@@ -1,6 +1,6 @@
 import { Execution, Game, Player, Unit, UnitType } from "../game/Game";
-import { TileRef } from "../game/GameMap";
 import { PseudoRandom } from "../PseudoRandom";
+import { TileRef } from "../game/GameMap";
 import { TradeShipExecution } from "./TradeShipExecution";
 import { TrainStationExecution } from "./TrainStationExecution";
 

src/core/execution/RailroadExecution.ts

@@ -1,7 +1,7 @@
 import { Execution, Game } from "../game/Game";
-import { TileRef } from "../game/GameMap";
 import { GameUpdateType, RailTile, RailType } from "../game/GameUpdates";
 import { Railroad } from "../game/Railroad";
+import { TileRef } from "../game/GameMap";
 
 export class RailroadExecution implements Execution {
   private mg: Game;

src/core/execution/SAMLauncherExecution.ts

@@ -1,15 +1,15 @@
 import {
   Execution,
   Game,
-  isUnit,
   MessageType,
   Player,
   Unit,
   UnitType,
+  isUnit,
 } from "../game/Game";
-import { TileRef } from "../game/GameMap";
 import { PseudoRandom } from "../PseudoRandom";
 import { SAMMissileExecution } from "./SAMMissileExecution";
+import { TileRef } from "../game/GameMap";
 
 type Target = {
   unit: Unit;